motion-kit 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c906092e2a2431bd9d2f116bce5248e790232dfb
-  data.tar.gz: 012fb50f2411ee1cb378ceb3025db7efc85a4293
+  metadata.gz: 665a6faaa86cd43115e40abd585320a896a9fd96
+  data.tar.gz: 5fea5265cd53696a68b3fa55537bb67a4a037e9e
 SHA512:
-  metadata.gz: 2eeb2ab71597b890e4378cf69cdc5c98972ff7e673f024d8124913557f1c90dbc0ee61fb9391c391b066b7752908a47fde716abb4a1eea176c5c220afca357e7
-  data.tar.gz: 3fd417f6eaba8a5a2f1c5fa27b60d0dbcd21e3159da3f8304b29f9eee18d9f627979efa7420c83006ab2a70578713531e816e7907c9ba2b319058625657b7b17
+  metadata.gz: b9e2d7f10c6c119022d9a34eec953ee8f8666f9ef5f9d9433508657b0507f567d94c2a238eb4fac0cb7168c54d2a3a75168357f110349a1edc4316c7eeaaa5ba
+  data.tar.gz: 664fe1f270a84b5078ec61b85535a12eccae172399a4b5534660ab32fb88bd3d7b3cee2ea6f921ce01b4d5605129ffbcfc8d531811e535ab8bc8bc5b82184991

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

@@ -31,7 +31,7 @@ module MotionKit
     end
 
     def set_layout(layout)
-      @layout = layout && WeakRef.new(layout)
+      @layout = WeakRef.new(layout)
     end
 
     def target
@@ -106,20 +106,21 @@ module MotionKit
 
     # Blocks passed to `deferred` are run at the end of a "session", usually
     # after a call to Layout#layout.
-    def deferred(&block)
-      if @layout != self
-        return @layout.add_deferred_block(self, &block)
-      else
-        return self.add_deferred_block(self, &block)
-      end
+    def deferred(context=nil, &block)
+      context ||= @context
+      return @layout.add_deferred_block(context, &block)
     end
 
     # Only intended for private use
-    def add_deferred_block(layout, &block)
-      raise InvalidDeferredError.new('deferred must be run inside of a context') if @is_top_level.nil?
+    def add_deferred_block(context, &block)
+      context ||= @context
+      if context.nil? && @assign_root
+        context ||= self.create_default_root_context
+      end
+      raise InvalidDeferredError.new('deferred must be run inside of a context') unless context
       raise ArgumentError.new('Block required') unless block
 
-      self.deferred_blocks << [@context, block]
+      self.deferred_blocks << [context, block]
 
       self
     end

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

@@ -90,7 +90,7 @@ module MotionKit
         element_id = element
         # See note below about why we don't need to `apply(:default_root)`
         element = preset_root || default_root
-      elsif @preset_root && @preset_root != element
+      elsif preset_root && preset_root != element
         # You're trying to make two roots, one at initialization
         # and one in your layout itself.
         raise ContextConflictError.new("Already created the root view")
@@ -154,20 +154,28 @@ module MotionKit
       return self
     end
 
+    def reapply?
+      @layout_state == :reapply
+    end
+
     # Calls the style method of all objects in the view hierarchy
     def reapply(&block)
       raise ArgumentError.new('Block required') unless block
 
-      if @layout_state == :reapply
+      if reapply?
         yield
       end
       return self
     end
 
+    def initial?
+      @layout_state == :initial
+    end
+
     def initial(&block)
       raise ArgumentError.new('Block required') unless block
 
-      if @layout_state == :initial
+      if initial?
         yield
       end
       return self
@@ -335,7 +343,7 @@ module MotionKit
     # `ViewLayout`, which returns the root view.
     def initialize_element(elem)
       if elem.is_a?(Class) && elem < TreeLayout
-        elem = elem.new_child(@layout, nil, self).view
+        elem = elem.new_child(@layout).view
       elsif elem.is_a?(Class)
         elem = elem.new
       elsif elem.is_a?(TreeLayout)

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.10.7'
+  VERSION = '0.10.8'
 end

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

@@ -9,8 +9,8 @@ module MotionKit
       end
       view.setTranslatesAutoresizingMaskIntoConstraints(false)
 
-      deferred do
-        constraints_target = ConstraintsTarget.new(view)
+      constraints_target = ConstraintsTarget.new(view)
+      deferred(constraints_target) do
         context(constraints_target, &block)
         constraints_target.apply_all_constraints(self, view)
       end

data/lib/motion-kit-osx/layouts/nsview_layout_constraints.rb

@@ -9,8 +9,8 @@ module MotionKit
       end
       view.setTranslatesAutoresizingMaskIntoConstraints(false)
 
-      deferred do
-        constraints_target = ConstraintsTarget.new(view)
+      constraints_target = ConstraintsTarget.new(view)
+      deferred(constraints_target) do
         context(constraints_target, &block)
         constraints_target.apply_all_constraints(self, view)
       end

metadata

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