teacup 0.3.8 → 0.3.9

data/lib/teacup/layout.rb

@@ -59,7 +59,9 @@ module Teacup
     #     subview(UIImage, backgroundColor: UIColor.colorWithImagePattern(image)
     #   end
     #
-    def layout(view, name_or_properties=nil, properties_or_nil=nil, &block)
+    def layout(view_or_class, name_or_properties=nil, properties_or_nil=nil, &block)
+      view = to_instance(view_or_class)
+
       name = nil
       properties = properties_or_nil
 
@@ -123,16 +125,7 @@ module Teacup
     #   end
     #
     def subview(class_or_instance, *args, &block)
-      if Class === class_or_instance
-        unless class_or_instance <= UIView
-          raise "Expected subclass of UIView, got: #{class_or_instance.inspect}"
-        end
-        instance = class_or_instance.new
-      elsif UIView === class_or_instance
-        instance = class_or_instance
-      else
-        raise "Expected a UIView, got: #{class_or_instance.inspect}"
-      end
+      instance = to_instance(class_or_instance)
 
       (superview_chain.last || top_level_view).addSubview(instance)
 
@@ -143,6 +136,19 @@ module Teacup
 
     protected
 
+    def to_instance(class_or_instance)
+      if Class === class_or_instance
+        unless class_or_instance <= UIView
+          raise "Expected subclass of UIView, got: #{class_or_instance.inspect}"
+        end
+        return class_or_instance.new
+      elsif class_or_instance.is_a?(UIView)
+        return class_or_instance
+      else
+        raise "Expected a UIView, got: #{class_or_instance.inspect}"
+      end
+    end
+
     # Get's the current stack of views in nested calls to layout.
     #
     # The view at the end of the stack is the one into which subviews

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70122065202280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122065202280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70122065201680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122065201680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
 
@@ -111,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: A community-driven DSL for creating user interfaces on iOS.