sugarcube 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c8482c83573e42f64f42c9aa90718298be515d
-  data.tar.gz: 58b279d2a997169e4ef3bb3582376c581257d484
+  metadata.gz: 1f67b205769f1f470e8b590eb8b52767cd56a5b8
+  data.tar.gz: 2f24635340a8c3f5e22c73fe427b4ab6b2dfbe28
 SHA512:
-  metadata.gz: 1f199aad09635d42e99d6a352f813f3db32d64c1d01cdec9da5e3878f0b1462d3648a92dc78519936fdc49a7dd6ebcc8610c457e97d8799bb0c844b805bee5a9
-  data.tar.gz: c5a175dcf6a9c5502bc3d6757f9290b868ce52836aaafda2b4eba12cf5e79723d2a2b5f4dc034e59f4d214ccdc04a6b3eeb657e10be4ae14ff5ae510b8183eba
+  metadata.gz: b7db2394ee9acfd81c91048a737dcc2e4b2bbcc523979aadb75698f98c998ae6cbe63e2212663175bb5b55b516d7153959299b4cacc3c493e96979a6f8943c67
+  data.tar.gz: 11a4567ddff9a7c70b0fec35fc85da9e0ff7ea94ab9591b6202433c497b2125673379ccb9e357d4f3a40535f751b6eb78275b7e5fb6caeb8b0773d16b4db7052

data/README.md

@@ -556,7 +556,7 @@ image.draw do |context|
 end
 
 # size
-image = Image.canvas(size: [10, 20])
+image = UIImage.canvas(size: [10, 20])
 image.width  # => 10
 image.height  # => 20
 ```

data/lib/ios/sugarcube-attributedstring/nsattributedstring.rb

@@ -1,23 +1,23 @@
 class NSString
 
   def bold(size=nil)
-    font = :bold.uifont(size)
-    nsattributedstring({ NSFontAttributeName => font })
+    nsattributedstring.bold(size)
   end
 
   def italic(size=nil)
-    font = :italic.uifont(size)
-    nsattributedstring({ NSFontAttributeName => font })
+    nsattributedstring.italic(size)
   end
 
   def monospace(size=nil)
-    font = :monospace.uifont(size)
-    nsattributedstring({ NSFontAttributeName => font })
+    nsattributedstring.monospace(size)
   end
 
   def underline(underline_style=nil)
-    underline_style ||= NSUnderlineStyleSingle
-    nsattributedstring({ NSUnderlineStyleAttributeName => underline_style })
+    if underline_style
+      nsattributedstring.underline_style(underline_style)
+    else
+      nsattributedstring.underline
+    end
   end
 
 end
@@ -45,17 +45,26 @@ class NSAttributedString
   end
 
   def bold(size=nil)
-    font = :bold.uifont(size)
+    size ||= UIFont.systemFontSize
+    font = UIFont.boldSystemFontOfSize(size)
     self.font(font)
   end
 
   def italic(size=nil)
-    font = :italic.uifont(size)
+    size ||= UIFont.systemFontSize
+    font = UIFont.italicSystemFontOfSize(size)
+    self.font(font)
+  end
+
+  def monospace(size=nil)
+    size ||= UIFont.systemFontSize
+    font = UIFont.fontWithName('Courier New', size: size)
     self.font(font)
   end
 
   def font(value)
-    with_attributes({ NSFontAttributeName => value.uifont })
+    value = value.uifont if value.respond_to?(:uifont)
+    with_attributes({ NSFontAttributeName => value })
   end
 
   def underline
@@ -67,17 +76,20 @@ class NSAttributedString
   end
 
   def foreground_color(value)
-    with_attributes({ NSForegroundColorAttributeName => value.uicolor })
+    value = value.uicolor if value.respond_to?(:uicolor)
+    with_attributes({ NSForegroundColorAttributeName => value })
   end
   alias color foreground_color
 
   def background_color(value)
-    with_attributes({ NSBackgroundColorAttributeName => value.uicolor })
+    value = value.uicolor if value.respond_to?(:uicolor)
+    with_attributes({ NSBackgroundColorAttributeName => value })
   end
   alias bg_color background_color
 
   def stroke_color(value)
-    with_attributes({ NSStrokeColorAttributeName => value.uicolor })
+    value = value.uicolor if value.respond_to?(:uicolor)
+    with_attributes({ NSStrokeColorAttributeName => value })
   end
 
   def superscript(amount=nil)

data/lib/osx/sugarcube-attributedstring/nsattributedstring.rb

@@ -1,18 +1,19 @@
 class NSString
 
   def bold(size=nil)
-    font = :bold.nsfont(size)
-    nsattributedstring({ NSFontAttributeName => font })
+    nsattributedstring.bold(size)
   end
 
   def monospace(size=nil)
-    font = :monospace.nsfont(size)
-    nsattributedstring({ NSFontAttributeName => font })
+    nsattributedstring.monospace(size)
   end
 
   def underline(underline_style=nil)
-    underline_style ||= NSSingleUnderlineStyle
-    nsattributedstring({ NSUnderlineStyleAttributeName => underline_style })
+    if underline_style
+      nsattributedstring.underline_style(underline_style)
+    else
+      nsattributedstring.underline
+    end
   end
 
 end
@@ -26,12 +27,20 @@ class NSAttributedString
   end
 
   def bold(size=nil)
-    font = :bold.nsfont(size)
+    size ||= NSFont.systemFontSize
+    font = NSFont.boldSystemFontOfSize(size)
     self.font(font)
   end
 
   def font(value)
-    with_attributes({ NSFontAttributeName => value.nsfont })
+    value = value.nsfont if value.respond_to?(:nsfont)
+    with_attributes({ NSFontAttributeName => value })
+  end
+
+  def monospace(size=nil)
+    size ||= NSFont.systemFontSize
+    font = NSFont.fontWithName('Courier New', size: size)
+    self.font({ NSFontAttributeName => font })
   end
 
   def underline
@@ -43,17 +52,20 @@ class NSAttributedString
   end
 
   def foreground_color(value)
-    with_attributes({ NSForegroundColorAttributeName => value.nscolor })
+    value = value.nscolor if value.respond_to?(:nscolor)
+    with_attributes({ NSForegroundColorAttributeName => value })
   end
   alias color foreground_color
 
   def background_color(value)
-    with_attributes({ NSBackgroundColorAttributeName => value.nscolor })
+    value = value.nscolor if value.respond_to?(:nscolor)
+    with_attributes({ NSBackgroundColorAttributeName => value })
   end
   alias bg_color background_color
 
   def stroke_color(value)
-    with_attributes({ NSStrokeColorAttributeName => value.nscolor })
+    value = value.nscolor if value.respond_to?(:nscolor)
+    with_attributes({ NSStrokeColorAttributeName => value })
   end
 
   def superscript(amount=nil)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.3.3'
+  Version = '3.3.4'
 end

data/spec/ios/nsattributedstring_spec.rb

@@ -28,18 +28,26 @@ describe 'NSAttributeString' do
     end
 
     it 'should convert html' do
+      plain_subject = 'Plain'.attributed_html
       bold_subject = '<b>Bold</b>'.attributed_html
       emphasis_subject = '<em>Emphasis</em>'.attributed_html
       underline_subject = '<u>Underline</u>'.attributed_html
 
+      plain_subject.should.be.kind_of(NSAttributedString)
       bold_subject.should.be.kind_of(NSAttributedString)
       emphasis_subject.should.be.kind_of(NSAttributedString)
       underline_subject.should.be.kind_of(NSAttributedString)
 
+      plain_font = plain_subject.attributesAtIndex(0, effectiveRange:nil)['NSFont']
+
       # Commented out tests don't work because :bold.uifont isn't the same font instance as the html converter uses.
       # bold_subject.attributesAtIndex(0, effectiveRange:nil)['NSFont'].should == :bold.uifont
       # emphasis_subject.attributesAtIndex(0, effectiveRange:nil)['NSFont'].should == :italic.uifont
       underline_subject.attributesAtIndex(0, effectiveRange:nil)['NSUnderline'].should == NSUnderlineStyleSingle
+
+      # we can at least make sure the font is not the default
+      bold_subject.attributesAtIndex(0, effectiveRange:nil)['NSFont'].should != plain_font
+      emphasis_subject.attributesAtIndex(0, effectiveRange:nil)['NSFont'].should != plain_font
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -306,12 +306,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []