teacup 2.1.3 → 2.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (2.1.3)
+    teacup (2.1.4)
 
 GEM
   remote: https://rubygems.org/

data/app/controllers/dependency_controller.rb

@@ -0,0 +1,24 @@
+class DependencyController < UIViewController
+  attr :button
+
+  stylesheet :dependency
+
+  layout do
+    @button = subview(UIView, :my_button)
+  end
+
+end
+
+
+Teacup::Stylesheet.new :dependency do
+
+  style :button,
+    size: [90, 90],
+    backgroundColor: UIColor.redColor
+
+  style :my_button, extends: :button,
+    top: 0,
+    center_x: 80, # <-- This results in a frame of [[80, 0], [90, 90]] instead of [[35, 0], [90, 90]]
+    title: 'My Button'
+
+end

data/lib/teacup/handler.rb

@@ -25,13 +25,28 @@
 module Teacup
   module_function
 
+  # Some properties need to be assigned before others (size in particular, so
+  # that `:center_x` can work properly).  This hash makes sure higher priority
+  # style names before lower-numbers.
+  Priorities = {
+    frame: 2,
+    size: 1,
+    width: 1,
+    height: 1,
+  }
+  Priorities.default = -1
+
   # applies a Hash of styles, and converts the frame styles (origin, size, top,
   # left, width, height) into one frame property.
   #
   # For UIAppearance support, the class of the UIView class that is being
   # modified can be passed in
   def apply_hash(target, properties, klass=nil)
-    properties.each do |key, value|
+    properties.sort do |a, b|
+      priority_a = Priorities[a[0]]
+      priority_b = Priorities[b[0]]
+      priority_b <=> priority_a
+    end.each do |key, value|
       Teacup.apply target, key, value, klass
     end
   end

data/lib/teacup/layout.rb

@@ -164,6 +164,7 @@ module Teacup
       # 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
+        puts("=============== layout.rb line #{__LINE__} ===============")
         view.teacup_next_responder = self
       end
 

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 
 end

data/lib/teacup-ios/style.rb

@@ -1,3 +1,4 @@
+# Fixes here should be copied to teacup-osx/style.rb
 module Teacup
   # The Style class is where the precedence rules are applied.  A Style can
   # query the Stylesheet that created it to look up other styles (for

data/lib/teacup-osx/style.rb

@@ -1,3 +1,4 @@
+# Fixes here should be copied to teacup-ios/style.rb
 module Teacup
   # The Style class is where the precedence rules are applied.  A Style can
   # query the Stylesheet that created it to look up other styles (for

data/spec/ios/dependencies.rb

@@ -0,0 +1,11 @@
+describe "Style Dependencies" do
+  tests DependencyController
+
+  it "should style size before styling center_x" do
+    @controller.button.frame.origin.x.should == 35
+    @controller.button.frame.origin.y.should == 0
+    @controller.button.frame.size.width.should == 90
+    @controller.button.frame.size.height.should == 90
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -38,6 +38,7 @@ files:
 - app/app_delegate.rb
 - app/controllers/appearance_controller.rb
 - app/controllers/constraints_controller.rb
+- app/controllers/dependency_controller.rb
 - app/controllers/gradient_controller.rb
 - app/controllers/landscape_only_controller.rb
 - app/controllers/main_controller.rb
@@ -134,6 +135,7 @@ files:
 - spec/ios/calculations_spec.rb
 - spec/ios/constraints_spec.rb
 - spec/ios/custom_class_spec.rb
+- spec/ios/dependencies.rb
 - spec/ios/gradient_spec.rb
 - spec/ios/layout_module_spec.rb
 - spec/ios/layout_spec.rb
@@ -179,6 +181,7 @@ test_files:
 - spec/ios/calculations_spec.rb
 - spec/ios/constraints_spec.rb
 - spec/ios/custom_class_spec.rb
+- spec/ios/dependencies.rb
 - spec/ios/gradient_spec.rb
 - spec/ios/layout_module_spec.rb
 - spec/ios/layout_spec.rb