motion-pixate-layout 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,2 @@
+language: objective-c
+before_install: ruby --version

data/README.md

@@ -1,8 +1,11 @@
 # MotionPixateLayout
 
+[![Build Status](https://travis-ci.org/terriblelabs/motion-pixate-layout.png?branch=master)](https://travis-ci.org/terriblelabs/motion-pixate-layout)
+[![Code Climate](https://codeclimate.com/github/terriblelabs/motion-pixate-layout.png)](https://codeclimate.com/github/terriblelabs/motion-pixate-layout)
+
 This project adds a simple DSL to your Rubymotion UIViewControllers to create subviews to be styled with [Pixate](http://www.pixate.com/).
 
-The idea is inspired by [Teacup](https://github.com/rubymotion/teacup), which has an awesome layout/subview DSL for layout out your controllers.  While this DSL is great, Teacup brings in a lot of style/stylesheet features that are not useful to Pixate users.  MotionPixateLayout also adds a convenient shorthand selector to quickly set the styleId and styleClass of subviews.
+The idea is inspired by [Teacup](https://github.com/rubymotion/teacup), which has an awesome layout/subview DSL for laying out your controllers.  While this DSL is great, Teacup brings in a lot of style/stylesheet features that are not useful to Pixate users.  MotionPixateLayout also adds a convenient shorthand selector to quickly set the styleId and styleClass of subviews.
 
 ## A quick example
 
@@ -36,7 +39,7 @@ class MyViewController < UIViewController
   # pixate_layout { ... }
 
   def update_label_text
-    subviews['title-label'] = 'An updated title'
+    subviews['title-label'].text = 'An updated title'
   end
 end
 ````

data/Rakefile

@@ -10,5 +10,7 @@ Motion::Project::App.setup do |app|
   app.name = 'testSuite'
   app.identifier = 'com.terriblelabs.motionPixateLayout.testSuite'
 
-  app.pixate.framework = 'vendor/PXEngine.framework'
+  if File.exist?('vendor/PXEngine.framework')
+    app.pixate.framework = 'vendor/PXEngine.framework'
+  end
 end

data/lib/motion-pixate-layout/fake_pixate/ui_view.rb

@@ -0,0 +1,5 @@
+unless defined?(PXEngine)
+  class UIView
+    attr_accessor :styleId, :styleClass, :updateStyles
+  end
+end

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

@@ -1,60 +1,12 @@
 module MotionPixateLayout
   class Layout
     attr_accessor :selector
+    attr_reader :after, :before, :blocks
 
-    def <<(block)
-      blocks << block
-    end
-
-    def each
-      blocks.each do |block|
-        yield block
-      end
-    end
-
-    def after
-      @_after ||= []
-    end
-
-    def before
-      @_before ||= []
-    end
-
-    def blocks
-      @_blocks ||= []
-    end
-  end
-
-  class Proxy
-    attr_reader :view
-
-    def initialize(view)
-      @view = view
-    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
+    def initialize
+      @before = []
+      @after = []
+      @blocks = []
     end
   end
 end

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

@@ -0,0 +1,61 @@
+module MotionPixateLayout
+  class Proxy
+    attr_reader :controller
+
+    def initialize(controller)
+      @controller = controller
+    end
+
+    def view
+      controller.view
+    end
+
+    def layout
+      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
+      run_blocks controller, layout.before
+      run_blocks self, layout.blocks
+      run_blocks controller, layout.after
+      controller.view.updateStyles
+    end
+
+    def apply_selector
+      if layout.selector
+        view.styleId = layout.selector.style_id
+        view.styleClass = layout.selector.style_classes.join(' ')
+      end
+    end
+
+    def run_blocks(context, blocks)
+      blocks.each { |block| context.instance_eval &block }
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module MotionPixateLayout
-  Version = '0.0.1'
+  Version = '0.0.2'
 end

data/lib/motion-pixate-layout/z_core_extensions/ui_view_controller.rb

@@ -3,7 +3,7 @@ class UIViewController
     def pixate_layout(selector='', &block)
       if block_given?
         pixate_layout.selector = MotionPixateLayout::Selector.new(selector)
-        pixate_layout << block
+        pixate_layout.blocks << block
       else
         @_pixate_layout ||= MotionPixateLayout::Layout.new
       end
@@ -23,33 +23,34 @@ class UIViewController
   end
 
   def viewDidLoad
-    if pixate_layout.selector
-      view.styleId = pixate_layout.selector.style_id
-      view.styleClass = pixate_layout.selector.style_classes.join(' ')
-    end
+    MotionPixateLayout::Proxy.new(self).run
+  end
+
+  def subviews
+    @subviews_hash ||= SubviewHash.new(view)
+  end
 
-    proxy = MotionPixateLayout::Proxy.new(view)
+  class SubviewHash
+    attr_reader :view
 
-    pixate_layout.before.each do |block|
-      instance_eval &block
+    def initialize(view)
+      @view = view
     end
 
-    pixate_layout.each do |block|
-      proxy.instance_eval &block
+    def [](key)
+      hash[key] ||= current_hash[key]
     end
 
-    view.updateStyles
+    private
 
-    pixate_layout.after.each do |block|
-      instance_eval &block
+    def hash
+      @hash ||= current_hash
     end
-  end
 
-  def subviews
-    Hash[
-      view.subviews.select(&:styleId).map do |view|
-        [view.styleId, view]
-      end
-    ].freeze
+    def current_hash
+      Hash[
+        view.subviews.select(&:styleId).map { |view| [view.styleId, view] }
+      ]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-pixate-layout
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-pixate
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
@@ -74,7 +75,9 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/motion-pixate-layout.rb
+- lib/motion-pixate-layout/fake_pixate/ui_view.rb
 - lib/motion-pixate-layout/layout.rb
+- lib/motion-pixate-layout/proxy.rb
 - lib/motion-pixate-layout/selector.rb
 - lib/motion-pixate-layout/version.rb
 - lib/motion-pixate-layout/z_core_extensions/ui_view_controller.rb