Anshorei
/
squib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix deprecation warnings

dev
Andy Meneely 2017-05-30 16:02:23 -04:00
parent 5b3548d7aa
commit c6e1c67e5f
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -8,6 +8,12 @@ Features:
* `save_sheet` method now supports `rtl` or "right-to-left", for easier duplex printing of backs (#204, #208) by @sparr * `save_sheet` method now supports `rtl` or "right-to-left", for easier duplex printing of backs (#204, #208) by @sparr
* `yaml` method for reading in data, much like `csv` and `xlsx` by @blinks * `yaml` method for reading in data, much like `csv` and `xlsx` by @blinks
Chores:
* Bumped dependencies for Cairo to 1.15.8, Pango et al. to 3.1.4, and nokogiri to 1.7.2. Locked in Cairo and Pango deps so we don't have live release issues that we had recently.
Bugs:
* Fixed some deprecation warnings on `text`
Special thanks to @sparr and @blinks for all of their work!! Special thanks to @sparr and @blinks for all of their work!!
## v0.13.2 / 2017-01-27 ## v0.13.2 / 2017-01-27

20
lib/squib/args/paragraph.rb
View File

@ -49,11 +49,11 @@ module Squib
def validate_align(arg, _i) def validate_align(arg, _i)
case arg.to_s.downcase.strip case arg.to_s.downcase.strip
when 'left' when 'left'
Pango::ALIGN_LEFT Pango::Alignment::LEFT
when 'right' when 'right'
Pango::ALIGN_RIGHT Pango::Alignment::RIGHT
when 'center' when 'center'
Pango::ALIGN_CENTER Pango::Alignment::CENTER
else else
raise ArgumentError, 'align must be one of: center, left, right' raise ArgumentError, 'align must be one of: center, left, right'
end end
@ -62,11 +62,11 @@ module Squib
def validate_wrap(arg, _i) def validate_wrap(arg, _i)
case arg.to_s.downcase.strip case arg.to_s.downcase.strip
when 'word' when 'word'
Pango::Layout::WRAP_WORD Pango::WrapMode::WORD
when 'char', 'false' when 'char', 'false'
Pango::Layout::WRAP_CHAR Pango::WrapMode::CHAR
when 'word_char', 'true' when 'word_char', 'true'
Pango::Layout::WRAP_WORD_CHAR Pango::WrapMode::WORD_CHAR
else else
raise ArgumentError, 'wrap must be one of: word, char, word_char, true, or false' raise ArgumentError, 'wrap must be one of: word, char, word_char, true, or false'
end end
@ -75,13 +75,13 @@ module Squib
def validate_ellipsize(arg, _i) def validate_ellipsize(arg, _i)
case arg.to_s.downcase.strip case arg.to_s.downcase.strip
when 'none', 'false' when 'none', 'false'
Pango::Layout::ELLIPSIZE_NONE Pango::EllipsizeMode::NONE
when 'start' when 'start'
Pango::Layout::ELLIPSIZE_START Pango::EllipsizeMode::START
when 'middle' when 'middle'
Pango::Layout::ELLIPSIZE_MIDDLE Pango::EllipsizeMode::MIDDLE
when 'end', 'true' when 'end', 'true'
Pango::Layout::ELLIPSIZE_END Pango::EllipsizeMode::END
else else
raise ArgumentError, 'ellipsize must be one of: none, start, middle, end, true, or false' raise ArgumentError, 'ellipsize must be one of: none, start, middle, end, true, or false'
end end