teacup 2.1.16 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96de147670ba7ae190e6c389f563208d5d902e22
-  data.tar.gz: e670534419eb6001161a7650229b52b898781fea
+  metadata.gz: 78d2c2affd8f6c85eb542169ac6f9e355ef5774e
+  data.tar.gz: 9d7e6c1ac113248c7259ea2eddd303f4e2a1c3e7
 SHA512:
-  metadata.gz: e826592ea8620316ceee9c14adfa1f21b07e570cc1450b48f27ecba5e1b9a93d46a5134fecdbfbefe8a0df0af0d6524a34f58fbec1e75c5fd9cbf95641ce8548
-  data.tar.gz: 3e399a95a2dadca2ca6a11c49009abc5ce4d0063e1311804624f3ed3398e64b590c36888338ca648e26dfced6f8d26a6fd0663fa5b91287980047be463fce39d
+  metadata.gz: fb517a21e621a6dc268fd12df22c4966c64e8c70e8cd63459f8170fe96f4cc9eb283148f575ae357477fcad29f552117b531b1ad8a1a05d03ff8876327db1765
+  data.tar.gz: 6c8237dfb7bf6620716544793ef556e7ddf7ca16a1491bd2b0b78f3b5b65f6fdb8b942e882e9eda3be2db8d3078c0e2e9b6bbb28503aba0a4d6cd8c4bc16380e

data/lib/teacup/calculations.rb

@@ -10,9 +10,9 @@ module Teacup
 
       case dimension
       when :width
-        view.superview.frame.size.width * percent + offset
+        (view.superview.frame.size.width * percent + offset).round
       when :height
-        view.superview.frame.size.height * percent + offset
+        (view.superview.frame.size.height * percent + offset).round
       else
         raise "Unknown dimension #{dimension}"
       end

data/lib/teacup/constraint.rb

@@ -8,6 +8,7 @@ module Teacup
     attr_accessor :multiplier
     attr_accessor :constant
     attr_accessor :priority
+    attr_accessor :identifier
 
     if defined? NSLayoutRelationEqual
       Priorities = {
@@ -187,6 +188,13 @@ module Teacup
       self
     end
 
+    def identifier(identifier=nil)
+      return @identifier if identifier.nil?
+
+      self.identifier = identifier
+      self
+    end
+
     def copy
       copy = self.class.new(self.target, self.attribute)
       copy.relationship = self.relationship
@@ -195,6 +203,7 @@ module Teacup
       copy.multiplier = self.multiplier
       copy.constant = self.constant
       copy.priority = self.priority
+      copy.identifier = self.identifier
       copy
     end
 
@@ -220,6 +229,7 @@ module Teacup
                                    constant: self.constant
                                            )
       nsconstraint.priority = priority_lookup(self.priority)
+      nsconstraint.setIdentifier(self.identifier) if self.identifier
       return nsconstraint
     end
 

data/lib/teacup/merge_defaults.rb

@@ -29,11 +29,50 @@ module Teacup
         target[key] = value
       elsif value.is_a?(Hash) and left[key].is_a?(Hash)
         target[key] = Teacup::merge_defaults(left[key], value, (left==target ? left[key] : {}))
+      elsif key == :constraints
+        left[key] = merge_constraints(left[key], value)
       end
     end
     target
   end
 
+  # 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)
+    left = left.map do |constraint|
+      convert_constraints(constraint)
+    end.flatten
+    right = right.map do |constraint|
+      convert_constraints(constraint)
+    end.flatten
+
+    constrained_attributes = left.map do |constraint|
+      constraint.attribute
+    end
+    additional_constraints = right.reject do |constraint|
+      constrained_attributes.include?(constraint.attribute)
+    end
+    left + additional_constraints
+  end
+
+  def convert_constraints(constraints)
+    if constraints.is_a? Array
+      constraints.map do |constraint|
+        convert_constraints(constraint)
+      end
+    elsif constraints.is_a? Hash
+      constraints.map do |sym, relative_to|
+        convert_constraints(Teacup::Constraint.from_sym(sym, relative_to))
+      end
+    elsif constraints.is_a?(Symbol)
+      Teacup::Constraint.from_sym(constraints)
+    elsif constraints.is_a?(Teacup::Constraint)
+      constraints
+    else
+      raise "Unsupported constraint: #{constraints.inspect}"
+    end
+  end
+
   # modifies left by passing it in as the `target`.
   def merge_defaults!(left, right)
     Teacup::merge_defaults(left, right, left)

data/lib/teacup/teacup_view.rb

@@ -148,6 +148,17 @@ module Teacup
 
         view_class = self.class
 
+        controller = nil
+        target = self
+        while target && controller.nil?
+          if target.nextResponder.is_a?(UIViewController)
+            controller = target.nextResponder
+            target = nil
+          else
+            target = target.nextResponder
+          end
+        end
+
         case original_constraint.target
         when view_class
           constraint.target = original_constraint.target
@@ -173,6 +184,24 @@ module Teacup
           constraint.relative_to = self
         when :superview
           constraint.relative_to = self.superview
+        when :top_layout_guide
+          if controller.respondsToSelector(:topLayoutGuide)
+            constraint.relative_to = controller.topLayoutGuide
+          else
+            if controller
+              NSLog("topLayoutGuide is only supported in >= iOS 7. Reverting to nil bound")
+            end
+            constraint.relative_to = nil
+          end
+        when :bottom_layout_guide
+          if controller.respondsToSelector(:bottomLayoutGuide)
+            constraint.relative_to = controller.bottomLayoutGuide
+          else
+            if controller
+              NSLog("bottomLayoutGuide is only supported in >= iOS 7. Reverting to nil bound")
+            end
+            constraint.relative_to = nil
+          end
         when Symbol, String
           # TODO: this re-checks lots of views - everytime it goes up to the
           # superview, it checks all the leaves again.
@@ -333,6 +362,5 @@ module Teacup
       end
     end
 
-
   end
 end

data/lib/teacup/version.rb

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

data/spec/ios/calculations_spec.rb

@@ -1,6 +1,6 @@
 class Viewish
   def superview
-    @superview ||= Viewish.new
+    @superview ||= self.class.new
   end
 
   def bounds
@@ -12,6 +12,12 @@ class Viewish
   end
 end
 
+class IrregularBounds < Viewish
+  def bounds
+    CGRect.new([0, 0], [101, 43])
+  end
+end
+
 
 describe 'Teacup.calculate' do
 
@@ -35,6 +41,11 @@ describe 'Teacup.calculate' do
     Teacup.calculate(Viewish.new, :height, '50%').should == 22
   end
 
+  it "should round to the nearest point" do
+    Teacup.calculate(IrregularBounds.new, :height, '25%').should == 11
+    Teacup.calculate(IrregularBounds.new, :width, '25%').should == 25
+  end
+
   describe 'should return percents with offset' do
     it ':width, 50% + 10' do
       Teacup.calculate(Viewish.new, :width, '50% + 10').should == 60

data/spec/ios/constraints_spec.rb

@@ -22,6 +22,20 @@ describe 'Using constraints in portrait' do
     end
   end
 
+  it 'should have a top_layout_view' do
+    @controller.top_layout_view.frame.tap do |f|
+      f.origin.x.should == 0
+      f.origin.y.should == @controller.topLayoutGuide.length
+    end
+  end
+
+  it 'should have a bottom_layout_view' do
+    @controller.bottom_layout_view.frame.tap do |f|
+      f.origin.x.should == 0
+      f.origin.y.should == @controller.container.frame.size.height - @controller.bottomLayoutGuide.length - 10
+    end
+  end
+
   it 'should have a center view' do
     @controller.center_view.frame.tap do |f|
       f.origin.x.should == 8
@@ -129,3 +143,63 @@ describe 'Using constraints in landscape' do
   end
 
 end
+
+describe 'extends merges constraints' do
+  before do
+    Teacup::Stylesheet.stylesheets[:merge_constraints] = nil
+    Teacup::Stylesheet.new(:merge_constraints) do
+      style :button,
+        constraints: [
+          :full_width,
+          constrain_height(22),
+          constrain_top(0)
+        ]
+
+      style :tall_button, extends: :button,
+        constraints: [
+          constrain_width(100),
+          constrain_height(44),
+        ]
+    end
+  end
+
+  it 'should not affect "base class" style' do
+    merge_constraints_stylesheet = Teacup::Stylesheet[:merge_constraints]
+    button_style = merge_constraints_stylesheet.query(:button)
+    button_style[:constraints].size.should == 3
+
+    full_constraint = button_style[:constraints][0]
+    height_constraint = button_style[:constraints][1]
+    top_constraint = button_style[:constraints][2]
+
+    full_constraint.should == :full_width
+    height_constraint.attribute.should == Teacup::Constraint::Attributes[:height]
+    height_constraint.constant.should == 22
+    top_constraint.attribute.should == Teacup::Constraint::Attributes[:top]
+    top_constraint.constant.should == 0
+  end
+
+  it 'should merge constraints when extending styles' do
+    merge_constraints_stylesheet = Teacup::Stylesheet[:merge_constraints]
+    tall_button_style = merge_constraints_stylesheet.query(:tall_button)
+    tall_button_style[:constraints].size.should == 4
+
+    width_constraint = tall_button_style[:constraints][0]
+    height_constraint = tall_button_style[:constraints][1]
+    center_x_constraint = tall_button_style[:constraints][2]
+    top_constraint = tall_button_style[:constraints][3]
+
+    width_constraint.attribute.should == Teacup::Constraint::Attributes[:width]
+    width_constraint.constant.should == 100
+    height_constraint.attribute.should == Teacup::Constraint::Attributes[:height]
+    height_constraint.constant.should == 44
+    center_x_constraint.attribute.should == Teacup::Constraint::Attributes[:center_x]
+    center_x_constraint.attribute2.should == Teacup::Constraint::Attributes[:center_x]
+    rel_to = center_x_constraint.relative_to
+    # nil is a valid value for :superview
+    rel_to ||= :superview
+    rel_to.should == :superview
+    top_constraint.attribute.should == Teacup::Constraint::Attributes[:top]
+    top_constraint.constant.should == 0
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.16
+  version: 2.2.0
 platform: ruby
 authors:
 - the rubymotion community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   Teacup is a community-driven DSL for RubyMotion.  It has CSS-like styling, and