geomotion 0.13.2 → 0.14.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geomotion (0.13.1)
+    geomotion (0.14.0)
 
 GEM
   remote: http://rubygems.org/

data/Geomotion.gemspec

@@ -5,10 +5,11 @@ Gem::Specification.new do |s|
   s.name        = "geomotion"
   s.version     = Geomotion::VERSION
   s.authors     = ["Clay Allsopp", "Colin T.A. Gray"]
-  s.email       = ["clay.allsopp@gmail.com", "colinta@gmail.com"]
+  s.email       = ["clay@usepropeller.com", "colinta@gmail.com"]
   s.homepage    = "https://github.com/clayallsopp/geomotion"
   s.summary     = "A RubyMotion Geometry Wrapper"
   s.description = "A RubyMotion Geometry Wrapper"
+  s.license  = 'MIT'
 
   s.files         = `git ls-files`.split($\)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Clay Allsopp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/geomotion/cg_point.rb

@@ -98,4 +98,10 @@ class CGPoint
     "#{self.class.name}(#{self.x}, #{self.y})"
   end
 
+private
+  # this method allows us to do parallel assignment of #x and #y
+  def to_ary
+    [self.x, self.y]
+  end
+
 end

data/lib/geomotion/cg_rect.rb

@@ -312,6 +312,7 @@ class CGRect
   # adjacent rects
   def above(margin = 0, options={})
     margin, options = 0, margin if margin.is_a?(NSDictionary)
+    margin = options.delete(:margin) if options.key?(:margin)
 
     height = options[:height] || self.size.height
     self.apply({
@@ -321,6 +322,7 @@ class CGRect
 
   def below(margin = 0, options={})
     margin, options = 0, margin if margin.is_a?(NSDictionary)
+    margin = options.delete(:margin) if options.key?(:margin)
 
     self.apply({
       down: self.size.height + margin
@@ -329,6 +331,7 @@ class CGRect
 
   def before(margin = 0, options={})
     margin, options = 0, margin if margin.is_a?(NSDictionary)
+    margin = options.delete(:margin) if options.key?(:margin)
 
     width = options[:width] || self.size.width
     self.apply({
@@ -338,11 +341,13 @@ class CGRect
 
   def beside(margin = 0, options={})
     margin, options = 0, margin if margin.is_a?(NSDictionary)
+    margin = options.delete(:margin) if options.key?(:margin)
 
     self.apply({
       right: self.size.width + margin
       }.merge(options))
   end
+  alias after beside
 
   # these methods create a rect INSIDE the receiver
 
@@ -416,6 +421,10 @@ private
     end
   end
 
+  def to_ary
+    [self.origin, self.size]
+  end
+
 public
   def center(absolute = false)
     cgrect_offset(absolute) + CGPoint.new(self.size.width / 2, self.size.height / 2)
@@ -529,6 +538,7 @@ public
   end
 
   alias grow_right wider
+
   def grow_left(amount, options={})
     raise "You must specify an amount in `CGRect#grow_left`" unless amount.is_a?(Numeric)
 
@@ -538,6 +548,7 @@ public
   end
 
   alias grow_down taller
+
   def grow_up(amount, options={})
     raise "You must specify an amount in `CGRect#grow_up`" unless amount.is_a?(Numeric)
 
@@ -566,6 +577,7 @@ public
   end
 
   alias shrink_left thinner
+
   def shrink_right(amount, options={})
     raise "You must specify an amount in `CGRect#shrink_right`" unless amount.is_a?(Numeric)
 
@@ -575,6 +587,7 @@ public
   end
 
   alias shrink_up shorter
+
   def shrink_down(amount, options={})
     raise "You must specify an amount in `CGRect#shrink_down`" unless amount.is_a?(Numeric)
 

data/lib/geomotion/cg_size.rb

@@ -98,4 +98,9 @@ class CGSize
     "#{self.class.name}(#{self.width}, #{self.height})"
   end
 
+private
+  def to_ary
+    [self.width, self.height]
+  end
+
 end

data/lib/geomotion/version.rb

@@ -1,3 +1,3 @@
 module Geomotion
-  VERSION = "0.13.2"
+  VERSION = "0.14.0"
 end

data/spec/cg_point_spec.rb

@@ -153,4 +153,12 @@ describe "CGPoint" do
       @point.should != point
     end
   end
-end
+
+  describe "#to_ary" do
+    it "should allow parallel assigment" do
+      x, y = @point
+      x.should == 10.0
+      y.should == 20.0
+    end
+  end
+end

data/spec/cg_rect_spec.rb

@@ -414,6 +414,12 @@ describe "CGRect" do
       rect.origin.y.should == -10
       rect.size.height.should == 10
     end
+
+    it "works with options and margin as option" do
+      rect = CGRect.make(height: 50).above(margin: 20, height: 10)
+      rect.origin.y.should == -30
+      rect.size.height.should == 10
+    end
   end
 
   describe "#below" do
@@ -440,6 +446,12 @@ describe "CGRect" do
       rect.origin.y.should == 50
       rect.size.height.should == 10
     end
+
+    it "works with options and margin as option" do
+      rect = CGRect.make(height: 50).below(margin: 20, height: 10)
+      rect.origin.y.should == 70
+      rect.size.height.should == 10
+    end
   end
 
   describe "#before" do
@@ -466,6 +478,12 @@ describe "CGRect" do
       rect.origin.x.should == -10
       rect.size.width.should == 10
     end
+
+    it "works with options and margin as option" do
+      rect = CGRect.make(width: 50).before(margin: 20, width: 10)
+      rect.origin.x.should == -30
+      rect.size.width.should == 10
+    end
   end
 
   describe "#beside" do
@@ -492,6 +510,12 @@ describe "CGRect" do
       rect.origin.x.should == 50
       rect.size.width.should == 10
     end
+
+    it "works with options and margin as option" do
+      rect = CGRect.make(width: 50).beside(margin: 20, width: 10)
+      rect.origin.x.should == 70
+      rect.size.width.should == 10
+    end
   end
 
   describe "#top_left" do
@@ -1104,4 +1128,12 @@ describe "CGRect" do
     end
   end
 
+  describe "#to_ary" do
+    it "should allow parallel assigment" do
+      position, size = @rect
+      position.should == CGPointMake(10.0, 100.0)
+      size.should == CGSizeMake(50, 20)
+    end
+  end
+
 end

data/spec/cg_size_spec.rb

@@ -149,4 +149,12 @@ describe "CGSize" do
     end
   end
 
-end
+  describe "#to_ary" do
+    it "should allow parallel assigment" do
+      width, height = @size
+      width.should  == 100.0
+      height.should == 200.0
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geomotion
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70366710050360 !ruby/object:Gem::Requirement
+  requirement: &70274280072720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366710050360
+  version_requirements: *70274280072720
 description: A RubyMotion Geometry Wrapper
 email:
-- clay.allsopp@gmail.com
+- clay@usepropeller.com
 - colinta@gmail.com
 executables: []
 extensions: []
@@ -36,6 +36,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Geomotion.gemspec
+- LICENSE
 - README.md
 - Rakefile
 - app/app_delegate.rb
@@ -57,7 +58,8 @@ files:
 - spec/cg_rect_spec.rb
 - spec/cg_size_spec.rb
 homepage: https://github.com/clayallsopp/geomotion
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: