motion-kit 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c567bd9815d3e05e231e5ad9c823bb7800ad5e7
-  data.tar.gz: a815960a60ed988df0a3c0b9732492dbb04359d5
+  metadata.gz: 03fe5d5549262f60c5bdd3f134c540c484ac038d
+  data.tar.gz: 2f8f044bf5a3724101f66abc81d92e8d479c7785
 SHA512:
-  metadata.gz: be917bdbdf07b9fe387c08d4ff4cbcdc98c81d7156180e7fae3f2f798041bba3398085c5692a2b9a5264054d342f3d7415a1b6bfdbc3fa324fc048249d12426b
-  data.tar.gz: 5a11a4d4ddc081d2e09f6fce3cd485d442c457019456e6e3a957dce24c03a32d54f10a57ab9a9cd4b74adad76609aa08beb7c985d6f0e2041a74e830c69cb1f8
+  metadata.gz: 9712cb0d52df40684046c7d8eb96221554cf8aa75a48ff9680fb03ab34d3facabebacd1d0515cb154ed2f0257310ab332cdc60bb5a25b0bb68767e41664bfe18
+  data.tar.gz: ad61b27f06f9fb5cd3a1882a780caf3fbc3b8d033e5f344d731ca4a8f497ea5169f24ce2f9e8c9c8fc46b22a33b252bf6586f7276abe2a24c0550dd70b4bc946

data/lib/motion-kit-ios/helpers/layout_device.rb

@@ -6,6 +6,14 @@ module MotionKit
       UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone
     end
 
+    def iphone55?
+      iphone? && UIScreen.mainScreen.bounds.size.width == 414 && UIScreen.mainScreen.bounds.size.height == 736
+    end
+
+    def iphone47?
+      iphone? && UIScreen.mainScreen.bounds.size.width == 375 && UIScreen.mainScreen.bounds.size.height == 667
+    end
+
     def iphone4?
       iphone? && UIScreen.mainScreen.bounds.size.width == 320 && UIScreen.mainScreen.bounds.size.height == 568
     end

data/lib/motion-kit/helpers/base_layout.rb

@@ -92,6 +92,8 @@ module MotionKit
       return new_target unless block
       # this little line is incredibly important; the context is only set on
       # the top-level Layout object.
+
+      # mp "MOTIONKIT CONTEXT is #{new_target} meta: #{new_target.motion_kit_meta}"
       return parent_layout.context(new_target, &block) unless is_parent_layout?
 
       if new_target.is_a?(Symbol)

data/lib/motion-kit/helpers/tree_layout.rb

@@ -432,6 +432,19 @@ module MotionKit
       removed
     end
 
+    def remove_view(element_id, view)
+      unless is_parent_layout?
+        return parent_layout.remove_view(element_id, view)
+      end
+      removed = forget_tree(element_id, view)
+      if removed
+        context(self.view) do
+          self.apply(:remove_child, removed)
+        end
+      end
+      removed
+    end
+
     # Removes a view from the list of elements this layout is "tracking", but
     # leaves it in the view hierarchy.  Returns the views that were removed.
     def forget(element_id)
@@ -446,6 +459,33 @@ module MotionKit
       removed
     end
 
+    def forget_view(element_id, view)
+      unless is_parent_layout?
+        return parent_layout.remove_view(element_id, view)
+      end
+      # mp "forgetting #{element_id}, #{view}"
+      removed = nil
+      context(self.view) do
+        removed = @elements[element_id].delete(view) if @elements[element_id]
+      end
+      removed
+    end
+
+    # returns the root view that was removed, if any
+    def forget_tree(element_id, view)
+      removed = forget_view(element_id, view)
+      if view.subviews
+        view.subviews.each do | sub |
+          if (sub_ids = sub.motion_kit_meta[:motion_kit_ids])
+            sub_ids.each do | sub_id |
+              forget_tree(sub_id, sub) || []
+            end
+          end
+        end
+      end
+      removed
+    end
+
     def create_default_root_context
       if @assign_root
         # Originally I thought default_root should be `apply`ied like other
@@ -458,7 +498,7 @@ module MotionKit
       end
     end
 
-  protected
+    protected
 
     # This method builds the layout and returns the root view.
     def build_view

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/ios/device_helpers_spec.rb

@@ -7,7 +7,21 @@ describe 'Device helpers' do
   it 'should have device helpers' do
     @layout.context({}) do
       @layout.iphone?.should == true
-      @layout.iphone4?.should == true
+      if UIScreen.mainScreen.bounds.size.width == 320
+        @layout.iphone4?.should == true
+      else
+        @layout.iphone4?.should == false
+      end
+      if UIScreen.mainScreen.bounds.size.width == 375
+        @layout.iphone47?.should == true
+      else
+        @layout.iphone47?.should == false
+      end
+      if UIScreen.mainScreen.bounds.size.width == 375
+        @layout.iphone55?.should == true
+      else
+        @layout.iphone55?.should == false
+      end
       @layout.iphone35?.should == false
       @layout.ipad?.should == false
       @layout.retina?.should == true

data/spec/ios/remove_layout_spec.rb

@@ -9,6 +9,23 @@ describe 'Remove views' do
     @subject.get(:label).should.be.nil
   end
 
+  it 'should remove the first label view' do 
+    labels = @subject.all(:multi_label)
+    labels.count.should == 2
+    @subject.remove_first_multi_label
+    @subject.all(:multi_label).count.should == 1
+    @subject.get(:multi_label).should == labels.last
+  end
+
+  it 'should remove the last label view' do 
+    labels = @subject.all(:multi_label)
+    labels.count.should == 2
+    @subject.remove_last_multi_label
+    @subject.all(:multi_label).count.should == 1
+    @subject.get(:multi_label).should == labels.first
+  end
+
+
   it 'should forget the #image view' do
     image = @subject.get(:image)
     image.should.be.kind_of(UIImageView)
@@ -17,10 +34,20 @@ describe 'Remove views' do
     image.superview.should.not.be.nil
   end
 
+  it 'should forget the first label view' do 
+    labels = @subject.all(:multi_label)
+    labels.count.should == 2
+    @subject.forget_first_multi_label
+    @subject.all(:multi_label).count.should == 1
+    @subject.get(:multi_label).should == labels.last
+    labels.first.superview.should.not.be.nil
+  end
+
+
   it 'should remove the #view from the hierarchy' do
     view = @subject.get(:view)
     view.should.be.kind_of(UIView)
-    @subject.remove_view
+    @subject.remove_main_view
     @subject.get(:view).should.be.nil
     view.superview.should.be.nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,28 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: |
   MotionKit, for RubyMotion, is a DSL for creating and styling views in iOS and OS X.
 email: