purplish-frame 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a975811211dbbab81c240d1ef92861fe446e19c7
-  data.tar.gz: c4cb7e58b861f52622131b4bd53c283bc921832e
+  metadata.gz: 52639b6f88197722c13732d3f88449886bcac6af
+  data.tar.gz: 6e87358e34eecfca43a468383a400bf918cdf186
 SHA512:
-  metadata.gz: eae0bb7e101db47bbb349d52e4355706cd2cb987f01f929e73c5683fc87981b2e132d3e7f77800a513c02fa13a5e38e279f95e73266bddd3099849cec12160b6
-  data.tar.gz: 117f71e65fe3f4b4f495aff2529f1cc08eb96e0897ae9e8dd8fb3bb1ca6f76631dfbb008ebdc416f969f94f37de20b22c9f8441b97e8509088e8857ead511c78
+  metadata.gz: 1c3c1f78eb0e33e54e3c15e7ac22ee650fc588bbc51b1331639342fe8c27a95d87d5f4371207e450c431310e6af44660b4ab4044cb8edc45b83ee08ffbd0adf6
+  data.tar.gz: 486871e5665d586c6d4e9a3738d15b2493a2deeab88cf505cd02dbd41214561c45d2e53d5d95d871cfcdd0b8fbaee1ece47709e7b0763df75e576519cf12570b

data/README.md

@@ -24,14 +24,14 @@ rect.center_y
 => #30
 ```
 
-Similar usage for UIView for iOS and NSView, NSSize, NSPoint, NSRect for OS X.
+Similar usage for UIView for iOS and NSView, NSSize, NSPoint, NSRect for OS X, CALayer for both platforms.
 
 ```ruby
 rect = CGRectMake(10, -20, 100, 100)
 rect.inset(5, 20)
 => #<CGRect origin=#<CGPoint x=15.0 y=0.0> size=#<CGSize width=90.0 height=60.0>>
 ```
-Similar usage for UIView for iOS and NSView, NSRect for OS X.
+Similar usage for UIView for iOS and NSView, NSRect for OS X, CALayer for both platforms.
 
 ```ruby
 CGSize.new(100, 100).scale_to_fit(CGSize.new(10, 10))

data/lib/purplish-frame/ui/ca_layer.rb

@@ -0,0 +1,16 @@
+class CALayer
+  include PurplishFrame::View
+
+  def view_frame
+    frame
+  end
+
+  def center=(pt)
+    #We need to check because pt might be HIPoint or some Boxed type
+    pt = pt.to_point if pt.respond_to? :to_point
+    f = frame
+    f.origin.x = pt.x-width/2
+    f.origin.y = pt.y-height/2
+    self.frame = f
+  end
+end

data/lib/purplish-frame/ui/ios/ca_layer.rb

@@ -0,0 +1,32 @@
+class CALayer
+  def center
+    CGPointMake(left+width/2, top+height/2)
+  end
+
+
+  def top
+    frame.origin.y
+  end
+
+  def top=(y)
+    f = frame
+    f.origin.y = y
+    self.frame = f
+  end
+
+  def bottom
+    frame.origin.y + frame.size.height
+  end
+
+  def bottom=(bottom)
+    f = frame
+    f.origin.y = bottom - f.size.height
+    self.frame = f
+  end
+
+  def height=(height)
+    f = frame
+    f.size.height = height
+    self.frame = f
+  end
+end

data/lib/purplish-frame/ui/osx/ca_layer.rb

@@ -0,0 +1,41 @@
+class CALayer
+  def center
+    NSMakePoint(left+width/2, top-height/2)
+  end
+
+  def center=(pt)
+    #We need to check because pt might be HIPoint or some Boxed type
+    pt = pt.to_point if pt.respond_to? :to_point
+    f = frame
+    f.origin.x = pt.x-width/2
+    f.origin.y = pt.y-height/2
+    self.frame = f
+  end
+
+  def top
+    frame.origin.y + frame.size.height
+  end
+
+  def top=(y)
+    f = frame
+    f.origin.y = y - height
+    self.frame = f
+  end
+
+  def bottom
+    frame.origin.y
+  end
+
+  def bottom=(bottom)
+    f = frame
+    f.origin.y = bottom
+    self.frame = f
+  end
+
+  def height=(height)
+    f = frame
+    f.origin.y -= height - frame.size.height
+    f.size.height = height
+    self.frame = f
+  end
+end

data/lib/purplish-frame/version.rb

@@ -1,3 +1,3 @@
 module PurplishFrame
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/purplish-frame.rb

@@ -2,25 +2,42 @@ unless defined?(Motion::Project::Config)
   raise "This file must be required within a RubyMotion project Rakefile."
 end
 
+class Motion::Project::App
+  def self.osx?
+    respond_to?(:template) && template == :osx
+  end
+end
+
 Motion::Project::App.setup do |app|
   Dir.glob(File.join(File.dirname(__FILE__), 'purplish-frame/**/*.rb')).each do |file|
-    app.files.unshift(file)
+    exclude = false
+    if Motion::Project::App.osx?
+      if file.include? '/ios/'
+        exclude = true
+      end
+    else
+      if file.include? '/osx/'
+        exclude = true
+      end
+    end
+    app.files.unshift(file) unless exclude
   end
 
   #Just to be safe. Did not work reliably with ENV['experimental_dependency']=1
   core_lib = File.join(File.dirname(__FILE__), 'purplish-frame')
-  app.files_dependencies({
-    "#{core_lib}/ui/ios/ui_screen.rb" => [ "#{core_lib}/ui/ios/cocoa_touch_view.rb"],
-    "#{core_lib}/ui/ios/ui_view.rb" => [ "#{core_lib}/ui/ios/cocoa_touch_view.rb"],
-
-    "#{core_lib}/ui/osx/ns_view.rb" => [ "#{core_lib}/ui/osx/cocoa_view.rb"],
-    "#{core_lib}/ui/osx/ns_screen.rb" => [ "#{core_lib}/ui/osx/cocoa_view.rb"],
-    "#{core_lib}/ui/osx/ns_window.rb" => [ "#{core_lib}/ui/osx/cocoa_view.rb"],
-
-    "#{core_lib}/non-ui/cg_size.rb" => [ "#{core_lib}/non-ui/can_scale_width_height.rb"],
-    "#{core_lib}/non-ui/osx/ns_size.rb" => [ "#{core_lib}/non-ui/can_scale_width_height.rb"],
-
-    "#{core_lib}/non-ui/ios/ui_image.rb" => [ "#{core_lib}/non-ui/has_size_width_height.rb"],
-    "#{core_lib}/non-ui/osx/ns_image.rb" => [ "#{core_lib}/non-ui/has_size_width_height.rb"],
-  })
+  dependencies = {}
+  if Motion::Project::App.osx?
+    dependencies["#{core_lib}/ui/osx/ns_view.rb"] = ["#{core_lib}/ui/osx/cocoa_view.rb"]
+    dependencies["#{core_lib}/ui/osx/ns_screen.rb"] = ["#{core_lib}/ui/osx/cocoa_view.rb"]
+    dependencies["#{core_lib}/ui/osx/ns_window.rb"] = ["#{core_lib}/ui/osx/cocoa_view.rb"]
+    dependencies["#{core_lib}/non-ui/osx/ns_size.rb"] = ["#{core_lib}/non-ui/can_scale_width_height.rb"]
+    dependencies["#{core_lib}/non-ui/osx/ns_image.rb"] = ["#{core_lib}/non-ui/has_size_width_height.rb"]
+  else
+    dependencies["#{core_lib}/ui/ios/ui_screen.rb"] = ["#{core_lib}/ui/ios/cocoa_touch_view.rb"]
+    dependencies["#{core_lib}/ui/ios/ui_view.rb"] = ["#{core_lib}/ui/ios/cocoa_touch_view.rb"]
+    dependencies["#{core_lib}/non-ui/ios/ui_image.rb"] = ["#{core_lib}/non-ui/has_size_width_height.rb"]
+  end
+  dependencies["#{core_lib}/non-ui/cg_size.rb"] = ["#{core_lib}/non-ui/can_scale_width_height.rb"]
+  dependencies["#{core_lib}/ui/ca_layer.rb"] = ["#{core_lib}/ui/view.rb"]
+  app.files_dependencies(dependencies)
 end

data/spec/ui/ios/ca_layer_spec.rb

@@ -0,0 +1,43 @@
+if PurplishFrame.ios?
+  class CGRect
+    def close?(to, delta)
+      origin.x.close?(to.origin.x, delta) && origin.y.close?(to.origin.y, delta) && size.width.close?(to.size.width, delta) && size.height.close?(to.size.height, delta)
+    end
+  end
+
+  describe "CALayer" do
+    delta = 0.0001
+    before do
+      @v = CALayer.new.tap do |l|
+        l.frame = [[10, 20], [100, 200]]
+      end
+    end
+
+    it "Accessing" do
+      @v.left.should.equal 10
+      @v.right.should.equal 110
+      @v.top.should.equal 20
+      @v.bottom.should.equal 220
+      @v.center_x.should.equal 60
+      @v.center_y.should.equal 120
+      @v.width.should.equal 100
+      @v.height.should.equal 200
+    end
+
+    it "Insets" do
+      @v.inset!(10, 10)
+      @v.frame.should.close CGRectMake(20, 30, 80, 180), delta
+    end
+
+    it "Insets" do
+      @v.inset!(5, 20)
+      @v.frame.should.close CGRectMake(15, 40, 90, 160), delta
+    end
+
+    it "Insets" do
+      @v.inset!(-5, -20)
+      @v.frame.should.close CGRectMake(5, 0, 110, 240), delta
+    end
+  end
+end
+

data/spec/ui/osx/ca_layer_spec.rb

@@ -0,0 +1,46 @@
+if PurplishFrame.osx?
+  class CGRect
+    def close?(to, delta)
+      origin.x.close?(to.origin.x, delta) && origin.y.close?(to.origin.y, delta) && size.width.close?(to.size.width, delta) && size.height.close?(to.size.height, delta)
+    end
+  end
+
+  describe "CALayer" do
+    delta = 0.0001
+    before do
+      @v = CALayer.new.tap do |l|
+        l.frame = [[10, 20], [100, 200]]
+      end
+    end
+
+    it "Accessing" do
+      @v.left.should.equal 10
+      @v.right.should.equal 110
+      @v.top.should.equal 220
+      @v.bottom.should.equal 20
+      @v.center_x.should.equal 60
+      @v.center_y.should.equal 120
+      @v.width.should.equal 100
+      @v.height.should.equal 200
+    end
+
+    it "Insets" do
+      #Returns CGRect!
+      @v.inset!(10, 10)
+      @v.frame.should.close CGRectMake(20, 30, 80, 180), delta
+    end
+
+    it "Insets" do
+      #Returns CGRect!
+      @v.inset!(5, 20)
+      @v.frame.should.close CGRectMake(15, 40, 90, 160), delta
+    end
+
+    it "Insets" do
+      #Returns CGRect!
+      @v.inset!(-5, -20)
+      @v.frame.should.close CGRectMake(5, 0, 110, 240), delta
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purplish-frame
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Hwee-Boon Yar
@@ -40,9 +40,12 @@ files:
 - lib/purplish-frame/non-ui/point.rb
 - lib/purplish-frame/non-ui/rect.rb
 - lib/purplish-frame/purplish_frame.rb
+- lib/purplish-frame/ui/ca_layer.rb
+- lib/purplish-frame/ui/ios/ca_layer.rb
 - lib/purplish-frame/ui/ios/cocoa_touch_view.rb
 - lib/purplish-frame/ui/ios/ui_screen.rb
 - lib/purplish-frame/ui/ios/ui_view.rb
+- lib/purplish-frame/ui/osx/ca_layer.rb
 - lib/purplish-frame/ui/osx/cocoa_view.rb
 - lib/purplish-frame/ui/osx/ns_screen.rb
 - lib/purplish-frame/ui/osx/ns_view.rb
@@ -56,8 +59,10 @@ files:
 - spec/non-ui/osx/ns_point_spec.rb
 - spec/non-ui/osx/ns_rect_spec.rb
 - spec/non-ui/osx/ns_size_spec.rb
+- spec/ui/ios/ca_layer_spec.rb
 - spec/ui/ios/ui_screen_spec.rb
 - spec/ui/ios/ui_view_spec.rb
+- spec/ui/osx/ca_layer_spec.rb
 - spec/ui/osx/ns_screen_spec.rb
 - spec/ui/osx/ns_view_spec.rb
 homepage: https://github.com/hboon/purplish-frame
@@ -92,8 +97,10 @@ test_files:
 - spec/non-ui/osx/ns_point_spec.rb
 - spec/non-ui/osx/ns_rect_spec.rb
 - spec/non-ui/osx/ns_size_spec.rb
+- spec/ui/ios/ca_layer_spec.rb
 - spec/ui/ios/ui_screen_spec.rb
 - spec/ui/ios/ui_view_spec.rb
+- spec/ui/osx/ca_layer_spec.rb
 - spec/ui/osx/ns_screen_spec.rb
 - spec/ui/osx/ns_view_spec.rb
 has_rdoc: