motion-kit 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aef617ad6abab23df20a00836c0189ae5f7d962
-  data.tar.gz: 5795cf1d58ea7c33a713b0f964dd812bdccc57fc
+  metadata.gz: eedf449e832f4fd4ba85cd38676396f3cba7bc85
+  data.tar.gz: 5214242fb4dd14ace924f3090a6dd453a8b3b821
 SHA512:
-  metadata.gz: 99f22fcf82ab5a2dda61e570725cd0450455512ad99366595d4119cf39c94ed6b59981e5b7adc9579568116a3fc900b2feaf3dd72f3566a88ad857064ada680b
-  data.tar.gz: 349f157dac34e5b4aa2ef0ce58776a75b6b931d0668de50f1e597747051510af00f15cfe1b846fec04734c5350f4e46047890de6f59b89e327708f5acb525026
+  metadata.gz: 42a2537b79984c792ce5bb117f2b739406418326a8e41e6539071524ae44fb14ea7ad4fd5608c3437f20ae15680fca1c192b68d2bcacb296bae3716469ec219c
+  data.tar.gz: d8fab44502565556b68c92dc1b0640fce0415b04a6e7281472d71cb211a57818d046a604a50d22bd2187ec8521cc05cc26fad946ef9135105c1c0c3dadcd4fd2

data/README.md

@@ -824,12 +824,11 @@ end
 Instead, you should retain the constraint and make changes to it directly:
 
 ```ruby
-  initial do
-    constraints do
-      @label_left_constraint = left 10
-    end
+  constraints do
+    @label_left_constraint = left 10
   end
 
+  # reapply blocks are called via the Layout#reapply! method.
   reapply do
     portrait do
       @label_left_constraint.equals 10
@@ -893,29 +892,34 @@ add UIView, :container do
 end
 ```
 
-### Update views via 'initial', 'reapply', and 'deferred'
+### Update views via 'always', 'reapply', and 'deferred'
+
+In your style methods, you can register blocks that get called during
+"restyling", which is usually triggered by a rotation change (though, if you're
+making good use of autoresizingMask or AutoLayout constraints, you should not
+have to do this, right?).
 
-If you call 'layout.reapply!', your style methods will be called again (but
-NOT the `layout` method). You very well might want to control what methods get
-called on later invocations, or only on the *initial* layout.
+It's important to note that the style methods are not actually called again. The
+blocks are retained on the view, along with the "context", and calling
+`reapply!` calls all those blocks with the context set as you'd expect.
 
-This is more for being able to initialize values, or to handle orientation, than
-anything else.  There is not much performance increase/decrease if you just
-reapply styles every time, but you might not want to have your frame or colors
-reset, if you've done some animation.
+If you have code that you want to be called during initialization *and* during
+reapply, use the `always` helper:
 
 ```ruby
 def login_button_style
-  # only once, when the `layout` is created
-  initial do
-  end
+  # only once, when the layout is first being created
+  title 'initial title'
 
-  # on later invocations
+  # only during reapply
   reapply do
+    title 'something happened!'
   end
 
-  # style every time
-  title 'Press Me'
+  # applied every time
+  always do
+    title 'You win!'
+  end
 end
 ```
 

data/lib/motion-kit-cocoa/calculator/view_calculator.rb

@@ -24,10 +24,10 @@ module MotionKit
         return intrinsic_size(view).send(dimension) # :left or :right
       elsif amount.is_a?(String) && amount.include?('%')
         if not full_view
-          if view.is_a?(MotionKit.base_view_class)
-            full_view = view.superview
-          elsif view.is_a?(CALayer)
+          if view.is_a?(CALayer)
             full_view = view.superlayer
+          elsif view.respond_to?(:superview)
+            full_view = view.superview
           end
 
           if not full_view

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

@@ -127,7 +127,8 @@ module MotionKit
     # after a call to Layout#layout.
     def deferred(context=nil, &block)
       context ||= @context
-      return parent_layout.add_deferred_block(context, &block)
+      parent_layout.add_deferred_block(context, &block)
+      return self
     end
 
     # Only intended for private use
@@ -140,8 +141,6 @@ module MotionKit
       raise ArgumentError.new('Block required') unless block
 
       self.deferred_blocks << [context, block]
-
-      self
     end
 
     # Only intended for private use

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

@@ -60,6 +60,7 @@ module MotionKit
     def initialize(args={})
       super
       @child_layouts = []
+      @reapply_blocks = []
       @elements = {}
     end
 
@@ -138,12 +139,7 @@ module MotionKit
     def reapply!
       root ||= self.view
       @layout_state = :reapply
-
-      @elements.each do |element_id, elements|
-        elements.each do |element|
-          style_and_context(element, element_id)
-        end
-      end
+      run_reapply_blocks
 
       @child_layouts.each do |child_layout|
         child_layout.reapply!
@@ -158,22 +154,50 @@ module MotionKit
       @layout_state == :reapply
     end
 
-    # Calls the style method of all objects in the view hierarchy
+    # Only intended for private use
+    def reapply_blocks
+      @reapply_blocks ||= []
+    end
+
+    # Blocks passed to `reapply` are only run when `reapply!` is called.
     def reapply(&block)
       raise ArgumentError.new('Block required') unless block
+      raise InvalidDeferredError.new('reapply must be run inside of a context') unless @context
 
       if reapply?
         yield
       end
+
+      block = block.weak!
+      parent_layout.reapply_blocks << [@context, block]
       return self
     end
 
+    # Only intended for private use
+    def run_reapply_blocks
+      self.reapply_blocks.each do |target, block|
+        context(target, &block)
+      end
+    end
+
     def initial?
       @layout_state == :initial
     end
 
+    def always(&block)
+      raise ArgumentError.new('Block required') unless block
+
+      if initial?
+        yield
+      end
+      reapply(&block)
+
+      return self
+    end
+
     def initial(&block)
       raise ArgumentError.new('Block required') unless block
+      puts('this method is no longer necessary!  all code that *isn\'t in a `reapply` block is now only applied during initial setup.')
 
       if initial?
         yield

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.14.2'
+  VERSION = '0.15.0'
 end

data/spec/ios/child_layouts_spec.rb

@@ -24,6 +24,14 @@ describe 'Child Layouts' do
     @layout.get(:child_image).get(:image).should.be.kind_of(UIImageView)
   end
 
+    it 'should have initial styles on :label' do
+      @layout.get(:label).text.should == 'root foo'
+    end
+
+    it 'should apply tag on :label' do
+      @layout.get(:label).tag.should == 100
+    end
+
   describe 'Calling reapply! on parent layout' do
 
     before do
@@ -34,6 +42,10 @@ describe 'Child Layouts' do
       @layout.get(:label).text.should == 'root reapplied'
     end
 
+    it 'should apply tag on :label' do
+      @layout.get(:label).tag.should == 100
+    end
+
     it 'should reapply :label on child layout' do
       @layout.child_layouts[0].get(:label).text.should == 'reapplied'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt