teacup 2.1.1 → 2.1.2

data/Gemfile.lock

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

data/app/controllers/motion_layout_controller.rb

@@ -2,11 +2,13 @@ class MotionLayoutController < UIViewController
   attr :label1
   attr :label2
   attr :label3
+  attr :container
 
   layout :root do
     @label1 = subview(UILabel, :label1, text: 'label1')
     @label2 = subview(UILabel, :label2, text: 'label2')
     @label3 = subview(UILabel, :label3, text: 'label3')
+    @container = subview(CustomContainer, :container)
   end
 
   def layoutDidLoad
@@ -14,8 +16,20 @@ class MotionLayoutController < UIViewController
       metrics "margin" => 20, "top" => 100
       horizontal '|-margin-[label1]-margin-[label2(==label1)]-margin-|'
       horizontal '|-margin-[label3]-margin-|'
+      horizontal '|-margin-[container]-margin-|'
       vertical '|-top-[label1]'
       vertical '|-220-[label3(==label1)]'
+      vertical '|-320-[container(==label1)]'
+    end
+  end
+
+  class CustomContainer < UIView
+    attr :label4
+
+    def init
+      super.tap do
+        @label4 = subview(UILabel, :label4, text: 'label4')
+      end
     end
   end
 

data/lib/teacup/constraint.rb

@@ -44,69 +44,69 @@ module Teacup
       case sym
       when :full
         [
-          Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
-          Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
-          Teacup::Constraint.new(:self, :width).equals(relative_to, :width),
-          Teacup::Constraint.new(:self, :height).equals(relative_to, :height),
+          self.new(:self, :left).equals(relative_to, :left),
+          self.new(:self, :top).equals(relative_to, :top),
+          self.new(:self, :width).equals(relative_to, :width),
+          self.new(:self, :height).equals(relative_to, :height),
         ]
       when :full_width
         [
-          Teacup::Constraint.new(:self, :center_x).equals(relative_to, :center_x),
-          Teacup::Constraint.new(:self, :width).equals(relative_to, :width),
+          self.new(:self, :center_x).equals(relative_to, :center_x),
+          self.new(:self, :width).equals(relative_to, :width),
         ]
       when :full_height
         [
-          Teacup::Constraint.new(:self, :center_y).equals(relative_to, :center_y),
-          Teacup::Constraint.new(:self, :height).equals(relative_to, :height),
+          self.new(:self, :center_y).equals(relative_to, :center_y),
+          self.new(:self, :height).equals(relative_to, :height),
         ]
       when :center_x
         [
-          Teacup::Constraint.new(:self, :center_x).equals(:superview, :center_x),
+          self.new(:self, :center_x).equals(:superview, :center_x),
         ]
       when :center_y
         [
-          Teacup::Constraint.new(:self, :center_y).equals(:superview, :center_y),
+          self.new(:self, :center_y).equals(:superview, :center_y),
         ]
       when :centered
         [
-          Teacup::Constraint.new(:self, :center_x).equals(:superview, :center_x),
-          Teacup::Constraint.new(:self, :center_y).equals(:superview, :center_y),
+          self.new(:self, :center_x).equals(:superview, :center_x),
+          self.new(:self, :center_y).equals(:superview, :center_y),
         ]
       when :top
         [
-          Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
+          self.new(:self, :top).equals(relative_to, :top),
         ]
       when :right
         [
-          Teacup::Constraint.new(:self, :right).equals(relative_to, :right),
+          self.new(:self, :right).equals(relative_to, :right),
         ]
       when :bottom
         [
-          Teacup::Constraint.new(:self, :bottom).equals(relative_to, :bottom),
+          self.new(:self, :bottom).equals(relative_to, :bottom),
         ]
       when :left
         [
-          Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
+          self.new(:self, :left).equals(relative_to, :left),
         ]
       when :top_left, :topleft
         [
-          Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
-          Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
+          self.new(:self, :left).equals(relative_to, :left),
+          self.new(:self, :top).equals(relative_to, :top),
         ]
       when :top_right, :topright
         [
-          Teacup::Constraint.new(:self, :right).equals(relative_to, :right),
-          Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
+          self.new(:self, :right).equals(relative_to, :right),
+          self.new(:self, :top).equals(relative_to, :top),
         ]
       when :bottom_right, :bottomright
         [
-          Teacup::Constraint.new(:self, :right).equals(relative_to, :right),
-          Teacup::Constraint.new(:self, :bottom).equals(relative_to, :bottom),
+          self.new(:self, :right).equals(relative_to, :right),
+          self.new(:self, :bottom).equals(relative_to, :bottom),
         ]
       when :bottom_left, :bottomleft
         [
-          Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
-          Teacup::Constraint.new(:self, :bottom).equals(relative_to, :bottom),
+          self.new(:self, :left).equals(relative_to, :left),
+          self.new(:self, :bottom).equals(relative_to, :bottom),
         ]
       else
         raise "Unknown symbol #{sym.inspect}"
@@ -118,7 +118,7 @@ module Teacup
       self.attribute = attribute
       self.constant = 0
       self.multiplier = 1
-      self.priority = :high
+      self.priority = :high  # this is the xcode default
     end
 
     def equals(relative_to, attribute2=nil)
@@ -188,7 +188,7 @@ module Teacup
     end
 
     def copy
-      copy = Teacup::Constraint.new(self.target, self.attribute)
+      copy = self.class.new(self.target, self.attribute)
       copy.relationship = self.relationship
       copy.relative_to = self.relative_to
       copy.attribute2 = self.attribute2
@@ -211,16 +211,16 @@ module Teacup
     end
 
     def nslayoutconstraint
-      NSLayoutConstraint.constraintWithItem( self.target,
+      nsconstraint = NSLayoutConstraint.constraintWithItem( self.target,
                                   attribute: self.attribute,
                                   relatedBy: self.relationship,
                                      toItem: self.relative_to,
                                   attribute: self.attribute2,
                                  multiplier: self.multiplier,
                                    constant: self.constant
-                                           ) .tap do |nsconstraint|
-        nsconstraint.priority = priority_lookup self.priority
-      end
+                                           )
+      nsconstraint.priority = priority_lookup(self.priority)
+      return nsconstraint
     end
 
 private

data/lib/teacup/teacup_util.rb

@@ -4,11 +4,7 @@ module Teacup
   # Returns all the subviews of `target` that have a stylename.  `target` is not
   # included in the list.  Used by the motion-layout integration in layout.rb.
   def get_styled_subviews(target)
-    retval = target.subviews.select { |v| v.stylename }
-    retval.concat(target.subviews.map do |subview|
-      get_styled_subviews(subview)
-    end)
-    retval.flatten
+    target.subviews.select { |v| v.stylename }
   end
 
   def to_instance(class_or_instance)

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 
 end

data/spec/ios/motion_layout_spec.rb

@@ -39,6 +39,14 @@ describe "MotionLayout" do
       label3_top.should == 220
     end
 
+    it 'should have label4 at 320' do
+      frame = controller.container.label4.frame
+      frame = controller.container.convertRect(frame, toView: controller.view)
+      label4_top = CGRectGetMinY(frame)
+      label4_top.should == 320
+    end
+
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for