motion-kit 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525e32728b35f92e5b149c067887539f4e1fd493
-  data.tar.gz: e5170c04a01756a4626c943448ab80e169884b19
+  metadata.gz: c38cc123b569dc34b2b5b8b829d7520d549f1c84
+  data.tar.gz: 36d097e9d6ad953a6f245ce2550e223a30a6db88
 SHA512:
-  metadata.gz: 2088f89d374db7d138d4a878ecc88fb59f819485e6aae7cf6a2c01037796cbf4225b0b00db55df2e255c82ec434670016c3babbb5521e73498bafd2c1d2a2d84
-  data.tar.gz: a7f7d63d194d14835d6d357f64cfb9ad33217f8d060a9d9fc401ea07e1b29c31a8d069e497bea7cbab3d257c772721a3e31e221c0358da8949283fc366647a34
+  metadata.gz: 6f88abc1b00777b63b6272626aed88526f93b459b0e9ab6daf0c815921ec403b23d954e6e70b19517b584b713fe3160de649f215fd9da302eba780dfc5c663c7
+  data.tar.gz: 93e2b1fd29e5b046ccd64b4fa67569a64b6c5ffd491f0017320be5970609c61f39eb7e1047fbc5cd03164c258a80e483ddc60052212cb2edd5656a996621df0f

data/README.md

@@ -270,6 +270,46 @@ end
 ```
 
 
+### Setting a custom root view
+
+If you need to use a custom root view, you can use the `root` method from within
+the `layout` method.  When you create or assign the root view this way, you must
+assign subviews and styles *inside* a block that you pass to `root`.
+
+```ruby
+def layout
+  root(SomeOtherViewclass) do
+    add UILabel
+  end
+end
+```
+
+You can also pass in a root view to your layout, like this:
+
+```ruby
+def loadView
+  @layout = MyLayout.new(root: self.view).build
+end
+```
+
+Make sure to call `.build`; otherwise, the layout will be returned but the view not built.
+
+In this case, if you want to style the root view, just refer to it in your layout:
+
+```ruby
+def layout
+  root :my_root_view do
+    # ...
+  end
+end
+
+def my_root_view_style
+  background_color UIColor.grayColor
+end
+```
+
+This is especially useful with collection views, table views, and table cells.
+
 ### How do styles get applied?
 
 If you've used RMQ's Stylers, you'll recognize a very similar pattern here. In
@@ -638,7 +678,7 @@ class MainController < UIViewController
 
   def loadView
     @layout = MainLayout.new
-    self.view = @layout
+    self.view = @layout.view
   end
 
   # for the constraints to work reliably they should be added in this method:
@@ -765,44 +805,6 @@ annoying subtletees of the NSCell/NSControl dichotomy.
     gem install sweet-kit
 
 
-### Setting a custom root view
-
-If you need to use a custom root view, you can use the `root` method from within
-the `layout` method.  When you create or assign the root view this way, you must
-assign subviews and styles *inside* a block that you pass to `root`.
-
-```ruby
-def layout
-  root(SomeOtherViewclass) do
-    add UILabel
-  end
-end
-```
-
-You can also pass in a root view to your layout, like this:
-
-```ruby
-def loadView
-  @layout = MyLayout.new(root: self.view)
-end
-```
-
-In this case, if you want to style the root view, just refer to it in your layout:
-
-```ruby
-def layout
-  root :my_root_view do
-    # ...
-  end
-end
-
-def my_root_view_style
-  background_color UIColor.grayColor
-end
-```
-
-This is especially useful with collection views, table views, and table cells.
-
 # Contributing
 
 We welcome your contributions! Please be sure to run the specs before you do,

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

@@ -24,10 +24,7 @@ module MotionKit
       @layout_delegate = nil
       @layout_state = :initial
       # You can set a root view by using .new(root: some_view)
-      if args[:root]
-        @preset_root = args[:root]
-        view # Prebuild the view
-      end
+      @preset_root = args[:root]
     end
 
     def set_layout(layout)

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

@@ -11,7 +11,13 @@ module MotionKit
       return nil if klass.nil? && self == BaseLayout
       return @targets || superclass.targets if klass.nil?
       @targets = klass
+
+      if BaseLayout.target_klasses.key?(klass) && BaseLayout.target_klasses[klass] != self
+        NSLog('WARNING!  The class “%@” was registered with the layout class “%@”',
+          klass, BaseLayout.target_klasses[klass])
+      end
       BaseLayout.target_klasses[klass] = self
+
       nil
     end
 

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

@@ -56,6 +56,18 @@ module MotionKit
       @view ||= build_view
     end
 
+    # Builds the layout and then returns self for chaining.
+    def build
+      view
+      self
+    end
+
+    # Checks if the layout has been built yet or not.
+    def built?
+      !@view.nil?
+    end
+    alias build? built? # just in case
+
     # Assign a view to act as the 'root' view for this layout.  This method can
     # only be called once, and must be called before `add` is called for the
     # first time (otherwise `add` will create a default root view).  This method
@@ -78,13 +90,13 @@ 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
+      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")
       end
 
-      @view = initialize_view(element)
+      @view = initialize_element(element)
       if block
         if @context
           raise ContextConflictError.new("Already in a context")
@@ -104,7 +116,7 @@ module MotionKit
 
     # instantiates a view, possibly running a 'layout block' to add child views.
     def create(element, element_id=nil, &block)
-      element = initialize_view(element)
+      element = initialize_element(element)
 
       if element_id
         # We set the optional id and call the '_style' method, if it's been
@@ -168,7 +180,7 @@ module MotionKit
       # make sure we have a target - raises NoContextError if none exists
       self.target
 
-      element = initialize_view(element)
+      element = initialize_element(element)
       unless @context
         create_default_root_context
       end
@@ -264,7 +276,7 @@ module MotionKit
         # view-related methods, but actually this method *only* gets called
         # from within the `layout` method, and so should already be inside the
         # correct Layout subclass.
-        @context = root(default_root)
+        @context = root(preset_root || default_root)
       else
         raise NoContextError.new("No top level view specified (missing outer 'create' method?)")
       end
@@ -322,7 +334,7 @@ module MotionKit
     #
     # Accepts a view instance, a class (which is instantiated with 'new') or a
     # `ViewLayout`, which returns the root view.
-    def initialize_view(elem)
+    def initialize_element(elem)
       if elem.is_a?(Class) && elem < TreeLayout
         elem = elem.new_child(@layout, nil, self).view
       elsif elem.is_a?(Class)

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/ios/custom_root_layout_spec.rb

@@ -33,4 +33,25 @@ describe MotionKit::Layout do
     @subject.view.subviews.first.subviews.first.backgroundColor.should == UIColor.blackColor
   end
 
+  it "shouldn't build if `build` or `view` aren't called" do
+    @subject.built?.should == false
+  end
+
+  it "should build when `build` is called" do
+    @subject.build
+    @subject.built?.should == true
+  end
+
+  it "should build when `view` is called" do
+    @subject.view
+    @subject.built?.should == true
+  end
+
+  it "should allow bare styles in layout when root is specified in initializer" do
+    @subject = TestNoRootLayout.new(root: @view).build
+    @subject.view.should == @view
+    @subject.view.backgroundColor.should == UIColor.redColor
+    @subject.view.subviews.first.should.be.kind_of?(UILabel)
+  end
+
 end

metadata

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