sugarcube 0.16 → 0.16.2

data/lib/sugarcube/nsdata.rb

@@ -4,18 +4,19 @@ class NSData
   # @return [NSString]
   def nsstring(encoding=nil)
     if encoding
-      NSString.stringWithCString(self.bytes, encoding:encoding)
+      return NSString.stringWithCString(self.bytes, encoding:encoding)
     else
-      NSString.stringWithUTF8String(self.bytes)
+
+      return NSString.stringWithUTF8String(self)
     end
   end
 
   # @return [UIImage]
   def uiimage(scale=nil)
     if scale
-      UIImage.imageWithData(self, scale:scale)
+      return UIImage.imageWithData(self, scale:scale)
     else
-      UIImage.imageWithData(self)
+      return UIImage.imageWithData(self)
     end
   end
 

data/lib/sugarcube/uiimage.rb

@@ -29,6 +29,8 @@ class UIImage
   ##|
 
   # Merges the two images.  The target is drawn first, `image` is drawn on top.
+  # The two images are centered, and the maximum size is used so that both
+  # images fit on the canvas.
   def <<(image)
     size = self.size
     if image.size.width > size.width
@@ -39,9 +41,13 @@ class UIImage
     end
 
     UIGraphicsBeginImageContextWithOptions(size, false, self.scale)
-    self.drawAtPoint([0, 0])
-    # draw the border and drop shadow
-    image.drawAtPoint([0, 0])
+
+    self_position = CGPoint.new((size.width - self.size.width) / 2, (size.width - self.size.width) / 2)
+    self.drawAtPoint(self_position)
+
+    image_position = CGPoint.new((size.width - image.size.width) / 2, (size.width - image.size.width) / 2)
+    image.drawAtPoint(image_position)
+
     new_image = UIGraphicsGetImageFromCurrentImageContext()
     UIGraphicsEndImageContext()
     return new_image
@@ -62,11 +68,21 @@ class UIImage
     return sub_image
   end
 
-  # Delegates to scale_to_fill(position: :center)
+  # Delegates to `scale_to_fill(position: :center)`
   def scale_to_fill(new_size)
     scale_to_fill(new_size, position: :center)
   end
 
+  # Delegates to `scale_to_fill(position: :center, scale: scale)`
+  def scale_to_fill(new_size, scale: scale)
+    scale_to_fill(new_size, position: :center, scale: scale)
+  end
+
+  # Delegates to `scale_to_fill(new_size, position: position, scale: self.scale)`
+  def scale_to_fill(new_size, position:position)
+    scale_to_fill(new_size, position: position, scale: self.scale)
+  end
+
   # Scales an image to fit within the given size, stretching one or both
   # dimensions so that it completely fills the area.   The current aspect ratio
   # is maintained.  If you want to place an image inside a container image, this
@@ -87,10 +103,25 @@ class UIImage
   #   are: `[:topleft, :top, :topright, :left, :center, :right, :bottomleft,
   #   :bottom, :bottomright]` (if you forget and use an underscore, like
   #   `top_left`, that'll work, too)
+  #  @param scale [Numeric] image scale
   # @return [UIImage]
-  def scale_to_fill(new_size, position:position)
+  def scale_to_fill(new_size, position:position, scale:scale)
     new_size = SugarCube::CoreGraphics::Size(new_size)
     my_size = self.size
+    if new_size.width == my_size.width && new_size.height == my_size.height && self.scale == scale
+      return self
+    end
+
+    # first, scale down; then we'll scale back up if we went too far
+    if my_size.width > new_size.width
+      my_size.height *= new_size.width / my_size.width
+      my_size.width = new_size.width
+    end
+
+    if my_size.height > new_size.height
+      my_size.width *= new_size.height / my_size.height
+      my_size.height = new_size.height
+    end
 
     if my_size.width < new_size.width
       my_size.height *= new_size.width / my_size.width
@@ -109,29 +140,29 @@ class UIImage
     if position.is_a?(Symbol)
       min_x = 0
       min_y = 0
-      max_x = my_size.width;
-      max_y = my_size.height;
+      max_x = my_size.width
+      max_y = my_size.height
       mid_x = max_x / 2
       mid_y = max_y / 2
       case position
       when :top_left, :topleft
-        position = SugarCube::CoreGraphics::Point(min_x, min_y)
+        position = CGPoint.new(min_x, min_y)
       when :top
-        position = SugarCube::CoreGraphics::Point(mid_x, min_y)
+        position = CGPoint.new(mid_x, min_y)
       when :top_right, :topright
-        position = SugarCube::CoreGraphics::Point(max_x, min_y)
+        position = CGPoint.new(max_x, min_y)
       when :left
-        position = SugarCube::CoreGraphics::Point(min_x, mid_x)
+        position = CGPoint.new(min_x, mid_x)
       when :center
-        position = SugarCube::CoreGraphics::Point(mid_x, mid_x)
+        position = CGPoint.new(mid_x, mid_x)
       when :right
-        position = SugarCube::CoreGraphics::Point(max_x, mid_x)
+        position = CGPoint.new(max_x, mid_x)
       when :bottom_left, :bottomleft
-        position = SugarCube::CoreGraphics::Point(min_x, max_y)
+        position = CGPoint.new(min_x, max_y)
       when :bottom
-        position = SugarCube::CoreGraphics::Point(mid_x, max_y)
+        position = CGPoint.new(mid_x, max_y)
       when :bottom_right, :bottomright
-        position = SugarCube::CoreGraphics::Point(max_x, max_y)
+        position = CGPoint.new(max_x, max_y)
       else
         raise "Unknown position #{position.inspect}"
       end
@@ -141,7 +172,7 @@ class UIImage
     thumbnail_x = position.x * (new_size.width - my_size.width) / my_size.width
     thumbnail_y = position.y * (new_size.height - my_size.height) / my_size.height
 
-    UIGraphicsBeginImageContextWithOptions(new_size, false, self.scale)
+    UIGraphicsBeginImageContextWithOptions(new_size, false, scale)
     thumbnail_rect = CGRectZero
     thumbnail_rect.origin = [thumbnail_x, thumbnail_y]
     thumbnail_rect.size  = my_size

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.16'
+  Version = '0.16.2'
 end

data/resources/en.lproj/Localizable.strings

@@ -0,0 +1 @@
+"hello" = "howdy";

data/spec/nsdata_spec.rb

@@ -1,11 +1,30 @@
 describe "NSData" do
 
-  it "should be able to create a string from data" do
-    "test".nsdata.nsstring.should == "test"
+  it "native methods should work - ASCII" do
+    NSString.stringWithUTF8String('test'.dataUsingEncoding(NSUTF8StringEncoding)).should == 'test'
+    NSString.stringWithUTF8String('test'.nsdata).should == 'test'
+  end
+
+  it "native methods should work - unicode" do
+    NSString.stringWithUTF8String("t\u0113st".dataUsingEncoding(NSUTF8StringEncoding)).should == "t\u0113st"
+    NSString.stringWithUTF8String("t\u0113st".nsdata).should == "t\u0113st"
+  end
+
+  it "native methods should work - turkey" do
+    NSString.stringWithUTF8String("\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".dataUsingEncoding(NSUTF8StringEncoding)).should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
+    NSString.stringWithUTF8String("\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".nsdata).should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
+  end
+
+  it "should be able to create an ASCII string from data" do
+    'test'.nsdata.nsstring.should == 'test'
   end
 
   it "should be able to create a unicode string from data" do
     "t\u0113st".nsdata.nsstring.should == "t\u0113st"
   end
 
+  it "should be able to create a turkey string from data" do
+    "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".nsdata.nsstring.should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
+  end
+
 end

data/spec/nsstring_files_spec.rb

@@ -1,4 +1,25 @@
-describe NSString do
+describe 'NSString' do
+
+  it "should have a #document method" do
+    'foo'.document.hasPrefix('/Users').should == true
+  end
+
+  it "should have an #exists? method" do
+    'foo'.document.exists?.should == false
+  end
+
+  it "should have a remove! method" do
+    unless 'remove_me'.exists?
+      NSData.data.writeToFile('remove_me'.document, atomically: true)
+    end
+    'remove_me'.document.remove!
+    'remove_me'.exists?.should == false
+  end
+
+  it "should have a resource_exists? method" do
+    'little_square.png'.resource_exists?.should == true
+    'foo'.resource_exists?.should == false
+  end
 
   describe 'resource()' do
     describe '"info.plist".resource' do
@@ -10,6 +31,7 @@ describe NSString do
         @it.hasSuffix("SugarCube_spec.app/info.plist").should == true
       end
     end
+
     describe '"PkgInfo".resource' do
       before { @it = "PkgInfo".resource }
       it 'should start with "/Users"' do
@@ -20,7 +42,6 @@ describe NSString do
       end
     end
   end
-  
 
   describe 'resource_url()' do
 =begin
@@ -47,7 +68,7 @@ describe NSString do
       end
     end
   end
-  
+
   describe 'info_plist' do
     describe '"CFBundleVersion".info_plist' do
       before { @it = "CFBundleVersion".info_plist }
@@ -55,7 +76,7 @@ describe NSString do
         @it.should == "1.0"
       end
     end
-    
+
     describe '"CFBundleSupportedPlatforms".info_plist' do
       before { @it = "CFBundleSupportedPlatforms".info_plist }
       it 'should be ["iPhoneOS"]' do

data/spec/nsstring_spec.rb

@@ -0,0 +1,66 @@
+describe "NSString" do
+
+  it "should have a #nsurl method" do
+    url = 'https://github.com/status'.nsurl
+    NSURL.should === url
+    url.absoluteString.should == 'https://github.com/status'
+    url.host.should == 'github.com'
+  end
+
+  it "should have a #nsdata method" do
+    data = 'test'.nsdata
+    NSData.should === data
+    bytes = data.bytes
+    bytes[0].should == 116
+    bytes[1].should == 101
+    bytes[2].should == 115
+    bytes[3].should == 116
+  end
+
+  it "should have a #uiimage method" do
+    UIImage.imageNamed('little_square').should == 'little_square'.uiimage
+  end
+
+  it "should have a #uiimageview method" do
+    view = 'little_square'.uiimageview
+    UIView.should === view
+    view.image.should == UIImage.imageNamed('little_square')
+  end
+
+  it "should have a #uifont method" do
+    font = 'Helvetica'.uifont
+    UIFont.should === font
+    font.familyName.should == 'Helvetica'
+    font.pointSize.should == UIFont.systemFontSize
+  end
+
+  it "should have a #uicolor method" do
+    color = '#ffffff'.uicolor
+    UIColor.should === color
+    color.red.should == 1.0
+    color.green.should == 1.0
+    color.blue.should == 1.0
+
+    color = '#808080'.uicolor
+    UIColor.should === color
+    ((color.red * 2).round / 2.0).should == 0.5
+    ((color.green * 2).round / 2.0).should == 0.5
+    ((color.blue * 2).round / 2.0).should == 0.5
+  end
+
+  it "should have a #escape_url method" do
+    ' '.escape_url.should == '%20'
+    '?<>&=;%'.escape_url.should == '%3F%3C%3E%26%3D%3B%25'
+  end
+
+  it "should have a #unescape_url method" do
+    '%20'.unescape_url.should == ' '
+    '%3F%3C%3E%26%3D%3B%25'.unescape_url.should == '?<>&=;%'
+  end
+
+  it "should have a #localized method" do
+    'hello'.localized.should == 'howdy'
+    'hello'._.should == 'howdy'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -109,6 +109,7 @@ files:
 - resources/Default-568h@2x.png
 - resources/Default.png
 - resources/Default@2x.png
+- resources/en.lproj/Localizable.strings
 - resources/little_square.png
 - resources/little_square@2x.png
 - resources/tall-568h@2x.png
@@ -128,6 +129,7 @@ files:
 - spec/nsdate_spec.rb
 - spec/nsdate_upto_spec.rb
 - spec/nsstring_files_spec.rb
+- spec/nsstring_spec.rb
 - spec/numeric_spec.rb
 - spec/symbol_uicolor_spec.rb
 - spec/uicolor_components_spec.rb
@@ -176,6 +178,7 @@ test_files:
 - spec/nsdate_spec.rb
 - spec/nsdate_upto_spec.rb
 - spec/nsstring_files_spec.rb
+- spec/nsstring_spec.rb
 - spec/numeric_spec.rb
 - spec/symbol_uicolor_spec.rb
 - spec/uicolor_components_spec.rb