teacup 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78d2c2affd8f6c85eb542169ac6f9e355ef5774e
-  data.tar.gz: 9d7e6c1ac113248c7259ea2eddd303f4e2a1c3e7
+  metadata.gz: 9d908853bb431306cc83a100710414f0ec8c06c0
+  data.tar.gz: f727586d4aa2f2b0c0d8723f69d7b8b09b55b643
 SHA512:
-  metadata.gz: fb517a21e621a6dc268fd12df22c4966c64e8c70e8cd63459f8170fe96f4cc9eb283148f575ae357477fcad29f552117b531b1ad8a1a05d03ff8876327db1765
-  data.tar.gz: 6c8237dfb7bf6620716544793ef556e7ddf7ca16a1491bd2b0b78f3b5b65f6fdb8b942e882e9eda3be2db8d3078c0e2e9b6bbb28503aba0a4d6cd8c4bc16380e
+  metadata.gz: 4677483dc33b8a921e5f9f524b3d5d9551c986b296c859b3d927152cdab7aec821e617111b1a7f673663f676f8796146bee0b3e43a5ad8657889fe76cb4ef503
+  data.tar.gz: f17d8e8c76f28c73b70b0ef5725c716a9d848989b679171f7e522cde37e185b192ddab5e8e9b4ddb2ff5386871a7e81b778f0306a8191993dc220cb0ae476386

data/lib/teacup/layout.rb

@@ -58,32 +58,16 @@ module Teacup
       @stylesheet = val
     end
 
-    # Returns a stylesheet to use to style the contents of this controller's
-    # view.  You can also assign a stylesheet to {stylesheet=}, which will in
-    # turn call {restyle!}.
-    #
-    # This method will be queried each time {restyle!} is called, and also
-    # implicitly whenever Teacup needs to draw your layout (currently only at
-    # view load time).
+    # Returns the stylesheet. If the stylesheet was assigned by name, the
+    # stylesheet object with this name is returned.
     #
     # @return Teacup::Stylesheet
-    #
-    # @example
-    #
-    #  def stylesheet
-    #    if [UIInterfaceOrientationLandscapeLeft,
-    #        UIInterfaceOrientationLandscapeRight].include?(UIInterface.currentDevice.orientation)
-    #      Teacup::Stylesheet[:ipad]
-    #    else
-    #      Teacup::Stylesheet[:ipadvertical]
-    #    end
-    #  end
     def stylesheet
       if @stylesheet.is_a? Symbol
         @stylesheet = Teacup::Stylesheet[@stylesheet]
       end
 
-      @stylesheet || self.class.stylesheet
+      return @stylesheet || self.class.stylesheet
     end
 
     # Alter the layout of a view
@@ -162,8 +146,10 @@ module Teacup
       end
 
       # assign the 'teacup_next_responder', which is queried for a stylesheet if
-      # one is not explicitly assigned to the view
-      if view.is_a? Layout
+      # one is not explicitly assigned to the view. If the view already has a
+      # teacup_next_responder assigned, it's because another object is already
+      # responsible for managing the view's stylesheet.
+      if view.teacup_next_responder.nil? && view.is_a?(Layout)
         view.teacup_next_responder = WeakRef.new(self)
       end
 

data/lib/teacup/merge_defaults.rb

@@ -39,6 +39,9 @@ module Teacup
   # constraints are a special case because when we merge an array of constraints
   # we need to make sure not to add more than one constraint for a given attribute
   def merge_constraints(left, right)
+    # Return early if there are no constraints to merge.
+    return right unless left
+
     left = left.map do |constraint|
       convert_constraints(constraint)
     end.flatten

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.2.0'
+  VERSION = '2.2.2'
 
 end

data/spec/ios/child_controllers_spec.rb

@@ -0,0 +1,8 @@
+describe 'Child view controllers' do
+  tests RootViewController
+
+  it 'should have the correct color' do
+    @controller.child_controller.view.backgroundColor.should == UIColor.yellowColor
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - the rubymotion community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   Teacup is a community-driven DSL for RubyMotion.  It has CSS-like styling, and
@@ -58,6 +58,7 @@ files:
 - lib/teacup.rb
 - spec/ios/appearance_spec.rb
 - spec/ios/calculations_spec.rb
+- spec/ios/child_controllers_spec.rb
 - spec/ios/constraints_spec.rb
 - spec/ios/custom_class_spec.rb
 - spec/ios/dependencies.rb
@@ -103,6 +104,7 @@ summary: A community-driven DSL for creating user interfaces on iOS and OS X.
 test_files:
 - spec/ios/appearance_spec.rb
 - spec/ios/calculations_spec.rb
+- spec/ios/child_controllers_spec.rb
 - spec/ios/constraints_spec.rb
 - spec/ios/custom_class_spec.rb
 - spec/ios/dependencies.rb