motion-kit 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b421fd69490b2630780a1b9bab2ffd51046ac3b8
-  data.tar.gz: ba3cc35a64cd442eb5f81b16690da74c04c85171
+  metadata.gz: 75784fe191e7e2d7d542feba6044bc6800815ceb
+  data.tar.gz: 447dc3b5237ba7c1b825d651b0d52968f23f40fd
 SHA512:
-  metadata.gz: be5d06c82a29b217674f8f2243fae01d04c27feb5372ebe6ae6302c1ce31c3e0863b7416d6ed0a0825816310c52262e6a1c6ca1cf7b1103d400f87b3a92ee6f4
-  data.tar.gz: 00a89e9b73436c7432e98d04dd60903c4dc06c7dddc702b6d3dbdccd2c065cf0c797b855dbe4a787495ed9f5b7e5cfb0d036ad29bba7292ffa9c15db278cfc86
+  metadata.gz: 0a6bd50fe3b55a323bd04ecacfbf35a58fe0720f10ec3657acdd77bb868767e24f6905723aa52f959e577e868e9a93b6191a0e0c70bb7ab9b76c473a221a3e10
+  data.tar.gz: c47ccad04b7b15fdad7f0f9f7239f531c36f3125d3c362ab53392b24892b7f9769084926550bb31d2f967a0094976657715d4480ab7814bc3023e781df0bbc5f

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end

data/lib/motion-kit-ios/layouts/uiview_layout_frame.rb

@@ -97,11 +97,7 @@ module MotionKit
       from_view_size = from_view.frame.size
       o = from_view.convertPoint([0, 0], toView: target.superview)
 
-      calculate_view = target
-
-      if point[:x] == :reset || point[:y] == :reset
-        calculate_view = UIView.alloc.initWithFrame([[0, 0], target.frame.size])
-      end
+      calculate_view = UIView.alloc.initWithFrame([[0, 0], target.frame.size])
 
       if f.is_a?(Hash)
         f = f.merge(relative: true)

data/spec/ios/reapply_frame.rb

@@ -0,0 +1,66 @@
+describe 'Views frames should remain unchanged' do
+
+  before do
+    @subject = ReapplyTestLayout.new
+    @cw = @subject.view.frame.size.width  # container width
+    @ch = @subject.view.frame.size.height # container height
+  end
+
+  it "top_left should be in the right position before and after reapply" do
+    @subject.get(:top_left).frame.should == CGRectMake(0,0,10,10)
+    @subject.reapply!
+    @subject.get(:top_left).frame.should == CGRectMake(0,0,10,10)
+  end
+
+  it "top should be in the right position before and after reapply" do
+    NSLog("top frame before reapply = #{@subject.get(:top).frame.inspect}")
+    @subject.get(:top).frame.should == CGRectMake(@cw/2 - 5, 0, 10, 10)
+    @subject.reapply!
+    NSLog("top frame after reapply = #{@subject.get(:top).frame.inspect}")
+    @subject.get(:top).frame.should == CGRectMake(@cw/2 - 5, 0, 10, 10)
+  end
+
+  it "top_right should be in the right position before and after reapply" do
+    @subject.get(:top_right).frame.should == CGRectMake(@cw - 10, 0, 10, 10)
+    @subject.reapply!
+    @subject.get(:top_right).frame.should == CGRectMake(@cw - 10, 0, 10, 10)
+  end
+
+  it "left should be in the right position before and after reapply" do
+    @subject.get(:left).frame.should == CGRectMake(0, @ch/2 - 5, 10, 10)
+    @subject.reapply!
+    @subject.get(:left).frame.should == CGRectMake(0, @ch/2 - 5, 10, 10)
+  end
+
+  it "center should be in the right position before and after reapply" do
+    @subject.get(:center).frame.should == CGRectMake(@cw/2 - 5, @ch/2 - 5, 10, 10)
+    @subject.reapply!
+    @subject.get(:center).frame.should == CGRectMake(@cw/2 - 5, @ch/2 - 5, 10, 10)
+  end
+
+  it "right should be in the right position before and after reapply" do
+    @subject.get(:right).frame.should == CGRectMake(@cw - 10, @ch/2 - 5, 10, 10)
+    @subject.reapply!
+    @subject.get(:right).frame.should == CGRectMake(@cw - 10, @ch/2 - 5, 10, 10)
+  end
+
+  it "bottom_left should be in the right position before and after reapply" do
+    @subject.get(:bottom_left).frame.should == CGRectMake(0, @ch - 10, 10, 10)
+    @subject.reapply!
+    @subject.get(:bottom_left).frame.should == CGRectMake(0, @ch - 10, 10, 10)
+  end
+
+  it "bottom should be in the right position before and after reapply" do
+    @subject.get(:bottom).frame.should == CGRectMake(@cw/2 - 5, @ch - 10, 10, 10)
+    @subject.reapply!
+    @subject.get(:bottom).frame.should == CGRectMake(@cw/2 - 5, @ch - 10, 10, 10)
+  end
+
+  it "bottom_right should be in the right position before and after reapply" do
+    @subject.get(:bottom_right).frame.should == CGRectMake(@cw - 10, @ch - 10, 10, 10)
+    @subject.reapply!
+    @subject.get(:bottom_right).frame.should == CGRectMake(@cw - 10, @ch - 10, 10, 10)
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt
@@ -108,6 +108,7 @@ files:
 - spec/ios/orientation_helper_specs.rb
 - spec/ios/parent_layout_spec.rb
 - spec/ios/parent_spec.rb
+- spec/ios/reapply_frame.rb
 - spec/ios/relative_layout.spec.rb
 - spec/ios/remove_layout_spec.rb
 - spec/ios/root_layout_spec.rb
@@ -184,6 +185,7 @@ test_files:
 - spec/ios/orientation_helper_specs.rb
 - spec/ios/parent_layout_spec.rb
 - spec/ios/parent_spec.rb
+- spec/ios/reapply_frame.rb
 - spec/ios/relative_layout.spec.rb
 - spec/ios/remove_layout_spec.rb
 - spec/ios/root_layout_spec.rb