sugarcube 1.3.4 → 1.3.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sugarcube (1.3.4)
+    sugarcube (1.3.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/sugarcube-attributedstring/nsattributedstring.rb

@@ -23,7 +23,10 @@ class NSString
   def nsattributedstring(attributes={})
     NSAttributedString.alloc.initWithString(self, attributes: attributes)
   end
-  alias attrd nsattributedstring
+
+  def attrd
+    self.nsattributedstring
+  end
 
 end
 
@@ -147,6 +150,10 @@ class NSAttributedString
     self
   end
 
+  def attrd
+    self.nsattributedstring
+  end
+
   def +(attributedstring)
     NSMutableAttributedString.alloc.initWithAttributedString(self) + attributedstring.nsattributedstring
   end

data/lib/sugarcube-events.rb

@@ -12,4 +12,9 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-events/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  cleanup = File.join(File.dirname(__FILE__), 'sugarcube/sugarcube_cleanup.rb')
+  uicontrol = File.join(File.dirname(__FILE__), 'sugarcube-events/uicontrol.rb')
+  uitextview = File.join(File.dirname(__FILE__), 'sugarcube-events/uitextview.rb')
+  app.files_dependencies uicontrol => [cleanup], uitextview => [cleanup]
 end

data/lib/sugarcube-gestures.rb

@@ -12,4 +12,8 @@ Motion::Project::App.setup do |app|
   Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-gestures/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+
+  cleanup = File.join(File.dirname(__FILE__), 'sugarcube/sugarcube_cleanup.rb')
+  gestures = File.join(File.dirname(__FILE__), 'sugarcube-gestures/gestures.rb')
+  app.files_dependencies gestures => [cleanup]
 end

data/lib/sugarcube-image/uiimage.rb

@@ -431,6 +431,7 @@ class UIImage
   #   image.overlay(UIColor.redColor)
   def overlay(color)
     image_rect = CGRectMake(0, 0, self.size.width, self.size.height)
+    new_image = nil
 
     UIImage.canvas(size: self.size, scale: self.scale) do |ctx|
       self.drawInRect(image_rect)
@@ -623,7 +624,7 @@ class UIImage
     end
 
     unless options[:scale]
-      options = options.merge(scale: self.scale)
+      options[:scale] = self.scale
     end
 
     self.class.canvas(options) do |context|

data/lib/sugarcube-uikit/uiview.rb

@@ -52,9 +52,9 @@ class UIView
   # up the responder chain until the nextResponder is a UIViewController
   # subclass, or returns nil if none is found.
   def controller
-    if nextResponder && nextResponder.is_a?(UIViewController)
+    if nextResponder.is_a?(UIViewController)
       nextResponder
-    elsif nextResponder
+    elsif nextResponder.is_a?(UIView)
       nextResponder.controller
     else
       nil

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.3.4'
+  Version = '1.3.5'
 end

data/spec/uiimage_spec.rb

@@ -468,4 +468,38 @@ describe 'UIImage' do
 
   end
 
+  describe '`overlay` should add shading to an image' do
+
+    it 'should return an image' do
+      red = UIImage.canvas(size: [10, 10]) do |context|
+        :red.uicolor.set
+        CGContextAddRect(context, [[0, 0], [10, 10]])
+        CGContextFillPath(context)
+      end
+      red.overlay(:white).should.is_a?(UIImage)
+    end
+
+    it 'should return an image that is the same size' do
+      red = UIImage.canvas(size: [10, 10]) do |context|
+        :red.uicolor.set
+        CGContextAddRect(context, [[0, 0], [10, 10]])
+        CGContextFillPath(context)
+      end
+      overlay = red.overlay(:white)
+      overlay.size.width.should == red.size.width
+      overlay.size.height.should == red.size.height
+    end
+
+    it 'should return an image that is a different color' do
+      red = UIImage.canvas(size: [10, 10]) do |context|
+        :red.uicolor.set
+        CGContextAddRect(context, [[0, 0], [10, 10]])
+        CGContextFillPath(context)
+      end
+      overlay = red.overlay(:white)
+      overlay.color_at([0, 0]).should != red.color_at([0, 0])
+    end
+
+  end
+
 end

data/spec/uiview_spec.rb

@@ -2,20 +2,66 @@ describe "UIView" do
 
   it "should convert to a UIImage" do
     test = UIView.alloc.initWithFrame([[0, 0], [10, 10]])
+    test.backgroundColor = :black.uicolor
+
+    red = UIView.alloc.initWithFrame([[0, 0], [2, 2]])
+    red.backgroundColor = :red.uicolor
+    test << red
+
     image = test.uiimage
     image.class.should == UIImage
     CGSizeEqualToSize(image.size, [10, 10]).should == true
     image.scale.should == UIScreen.mainScreen.scale
+    # file = 'uiview_uiimage_test.png'.document
+    # image.nsdata.write_to(file)
   end
 
   it "should convert a UIScrollView to a UIImage" do
+    # scrollview has to be in the active window, or screen shot doesn't work
+    # (doesn't apply to other views)
+    window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    window.makeKeyAndVisible
+
     test = UIScrollView.alloc.initWithFrame([[0, 0], [10, 10]])
     test.contentSize = [20, 20]
+    test.contentOffset = [2.5, 2.5]
+    test.backgroundColor = :black.uicolor
+    window << test
+
+    red = UIView.alloc.initWithFrame([[0, 0], [8, 8]])
+    red.backgroundColor = :red.uicolor(0.5)
+    test << red
+    # file = 'uiview_uiimage_red.png'.document
+    # red.uiimage.nsdata.write_to(file)
+
+    green = UIView.alloc.initWithFrame([[10, 0], [10, 10]])
+    green.backgroundColor = :green.uicolor(0.5)
+    test << green
+    # file = 'uiview_uiimage_green.png'.document
+    # green.uiimage.nsdata.write_to(file)
+
+    blue = UIView.alloc.initWithFrame([[0, 10], [10, 10]])
+    blue.backgroundColor = :blue.uicolor(0.5)
+    test << blue
+    # file = 'uiview_uiimage_blue.png'.document
+    # blue.uiimage.nsdata.write_to(file)
+
+    white = UIView.alloc.initWithFrame([[10, 10], [10, 10]])
+    white.backgroundColor = :white.uicolor(0.5)
+    test << white
+    # file = 'uiview_uiimage_white.png'.document
+    # white.uiimage.nsdata.write_to(file)
+
+    gray = UIView.alloc.initWithFrame([[18, 18], [2, 2]])
+    gray.backgroundColor = :gray.uicolor(0.5)
+    test << gray
 
     image = test.uiimage
     image.class.should == UIImage
     CGSizeEqualToSize(image.size, [10, 10]).should == true
     image.scale.should == UIScreen.mainScreen.scale
+    # file = 'uiview_uiimage_small.png'.document
+    # image.nsdata.write_to(file)
 
     image = test.uiimage(:all)
     image.class.should == UIImage
@@ -26,6 +72,8 @@ describe "UIView" do
     image.class.should == UIImage
     CGSizeEqualToSize(image.size, [20, 20]).should == true
     image.scale.should == UIScreen.mainScreen.scale
+    # file = 'uiview_uiimage_big.png'.document
+    # image.nsdata.write_to(file)
   end
 
   describe "should convert bounds" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description