motion-pixate-layout 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-pixate-layout (0.0.3)
+    motion-pixate-layout (0.0.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -14,6 +14,9 @@ class MyViewController < UIViewController
   pixate_layout '#my-view.fancy' do
     UILabel '#title-label.small.green', text: 'My Title'
     UIButton '#ok-button.call-to-action'
+    UIView '#parent' do
+      UILabel '#child'
+    end
   end
 end
 ````
@@ -29,6 +32,7 @@ This code hooks into UIViewController's `viewDidLoad` mode and:
 1. Adds a UIButton with these attributes as a subview of the controller's view:
     * styleId: 'ok-button'
     * styleClass: 'call-to-action'
+1. Adds a UIView with styleId of 'parent' to the controllers view with a child subview with styleId 'child'
 
 ## Accessing subviews
 

data/lib/motion-pixate-layout/proxy.rb

@@ -14,40 +14,21 @@ module MotionPixateLayout
       controller.pixate_layout
     end
 
-    def method_missing(method_name, *args)
-      if Kernel.constants.include?(method_name.to_sym)
-        view_class = Kernel.const_get(method_name.to_s)
-        raise "#{view_class.name} is not a known UIView subclass" unless view_class <= UIView
-        return subview(view_class, *args)
-      else
-        raise "#{method_name} is not defined. Should be a subclass of UIView."
-      end
-    end
-
-    def subview(subview_class, selector, attributes = {})
-      selector = MotionPixateLayout::Selector.new(selector)
-
-      subview_class.new.tap do |subview|
-        subview.styleId = selector.style_id
-        subview.styleClass = selector.style_classes.join(" ")
-
-        attributes.each do |key, value|
-          subview.send "#{key}=", value
-        end
-
-        view.addSubview subview
-      end
-    end
-
     def run
       apply_selector
       apply_attributes
       run_blocks controller, layout.before
-      run_blocks self, layout.blocks
+      view_proxy.run_blocks
       run_blocks controller, layout.after
       controller.view.updateStyles
     end
 
+    def view_proxy
+      @view_proxy ||= ViewProxy.new(self.view).tap do |proxy|
+        proxy.blocks = layout.blocks
+      end
+    end
+
     def apply_selector
       if layout.selector
         view.styleId = layout.selector.style_id
@@ -55,15 +36,61 @@ module MotionPixateLayout
       end
     end
 
+    def run_blocks(context, blocks)
+      blocks.each { |block| context.instance_eval &block }
+    end
+
     def apply_attributes
       layout.view_attributes ||= []
       layout.view_attributes.each do |key, value|
         view.public_send "#{key}=", value
       end
     end
+  end
 
-    def run_blocks(context, blocks)
-      blocks.each { |block| context.instance_eval &block }
+  class ViewProxy
+    attr_accessor :blocks
+    attr_reader :view
+
+    def initialize(view)
+      @view = view
+      self.blocks = []
     end
+
+    def subview(subview_class, selector, attributes = {}, &block)
+      selector = MotionPixateLayout::Selector.new(selector)
+
+      subview_class.new.tap do |subview|
+        subview.styleId = selector.style_id
+        subview.styleClass = selector.style_classes.join(" ")
+
+        attributes.each do |key, value|
+          subview.send "#{key}=", value
+        end
+
+        view.addSubview subview
+        if block_given?
+          ViewProxy.new(subview).tap do |proxy|
+            proxy.blocks << block
+            proxy.run_blocks
+          end
+        end
+      end
+    end
+
+    def method_missing(method_name, *args, &block)
+      if Kernel.constants.include?(method_name.to_sym)
+        view_class = Kernel.const_get(method_name.to_s)
+        raise "#{view_class.name} is not a known UIView subclass" unless view_class <= UIView
+        return subview(view_class, *args, &block)
+      else
+        raise "#{method_name} is not defined. Should be a subclass of UIView."
+      end
+    end
+
+    def run_blocks
+      blocks.each { |block| self.instance_eval &block }
+    end
+
   end
 end

data/lib/motion-pixate-layout/version.rb

@@ -1,3 +1,3 @@
 module MotionPixateLayout
-  Version = '0.0.4'
+  Version = '0.0.5'
 end

data/motion-pixate-layout.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/motion-pixate-layout/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Joe Lind"]
-  gem.email         = ["joe@terriblelabs.com"]
+  gem.authors       = ["Joe Lind", "Nick Pachulski"]
+  gem.email         = ["joe@terriblelabs.com", "hello@nickpachulski.com"]
   gem.description   = "A RubyMotion DSL to add subviews that are styled with Pixate"
   gem.summary   = "A RubyMotion DSL to add subviews that are styled with Pixate"
   gem.homepage = 'http://github.com/terriblelabs/motion-pixate-layout'

data/spec/lib/layout_spec.rb

@@ -10,7 +10,11 @@ describe "MotionPixateLayout::Layout" do
 
         pixate_layout '#view-id.view-class.view-class-2', accessibilityLabel: 'main view' do
           UILabel '#style-id.class1.class2', text: 'Test Label'
-          UIView '#subview'
+          UIView '#subview' do
+            UILabel '#grandchild' do
+              UIButton '#great_grandchild'
+            end
+          end
         end
 
         after_pixate_layout do
@@ -20,6 +24,17 @@ describe "MotionPixateLayout::Layout" do
 
       tests TestViewController
 
+      it 'recursively adds subviews supplied in blocks' do
+
+        controller.subviews['subview'].subviews.size.should == 1
+        controller.subviews['subview'].subviews.first.tap do |grandchild|
+          grandchild.styleId.should == 'grandchild'
+          grandchild.should.be.kind_of UILabel
+          grandchild.subviews.size.should == 1
+          grandchild.subviews.first.styleId.should == 'great_grandchild'
+        end
+      end
+
       it "is added to UIViewController" do
         UIViewController.should.respond_to :pixate_layout
       end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: motion-pixate-layout
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
 - Joe Lind
+- Nick Pachulski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-pixate
@@ -62,6 +63,7 @@ dependencies:
 description: A RubyMotion DSL to add subviews that are styled with Pixate
 email:
 - joe@terriblelabs.com
+- hello@nickpachulski.com
 executables: []
 extensions: []
 extra_rdoc_files: []