motion-kit 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a28612bd72f42867be9f7a5dc6e8d03f9c89ef2
-  data.tar.gz: 0aba2379868df670e26807df6d48ccbfbe6a6aa1
+  metadata.gz: 178a4a8d53c639db16f7d73765521a9ee5b220b5
+  data.tar.gz: bd48860c5baff3f5ee0543c28426b6c2d63e09f5
 SHA512:
-  metadata.gz: ab2048fbca5054345ec6323b25c9e3a689261f4592f579346bbb638359063e37b3d81c63ac15db092dc3da012ace33753c54e1abb2284d5846ef19e9bc4266c1
-  data.tar.gz: 6f4ddbb452f81897d06f80302167ea9141924755637c054e9bcd34555df0e9c1a4667554d439cf8d7f27136c69d357dfa4d1eb60f82b7921af6a1626900e182b
+  metadata.gz: b8b0dd1b76e3875e5aa86dddf9d2e56862b3f5954e7ef33413ad430750a0b3a0565e56355597c9428ac5d322d17c593c48d009a157a6adff10ec1c01567a3706
+  data.tar.gz: 368ac319ec7994a9a7623ea6c4149c61372f9f087041cc77b6f4b2830f1d1a1d176b467e59fe7bef026c393fddc51ad064b53b18865a4ef6b907b670f991ba0e

data/README.md

@@ -422,9 +422,17 @@ module MotionKit
 end
 ```
 
-For your own custom classes, or built-in classes that don't already have a
-`Layout` class defined, you can provide a Layout class by calling the `targets`
-method in your class body.
+### Adding your own helper methods
+
+For your own custom classes, or when you want to write
+helper methods for a built-in class, you will need to write a class that
+"`targets`" that class.  This will be a subclass of `MK::UIViewLayout`; it looks
+and *feels* like a `MK::Layout` subclass, but these classes are used to extend
+the MotionKit DSL, and should not be instantiated or used to build layouts.
+
+Again, to be clear: you should be subclassing `MK::Layout` when you build your
+controller layouts, and you should write a subclass of `MK::UIViewLayout` *only*
+when you are adding extensions to the MotionKit DSL.
 
 ```ruby
 # Be sure to extend an existing Layout class, otherwise you'll lose a lot of

data/lib/motion-kit-cocoa/constraints/constraint.rb

@@ -59,6 +59,8 @@ module MotionKit
     # <=, and >=
     #
     # @example
+    #     x.is(10)
+    #     x.is(10).priority(:required)
     #     x.is == 10
     #     (x.is == 10).priority :required
     #     width.is >= 100
@@ -83,7 +85,7 @@ module MotionKit
 
     def >=(compare)
       if @compare_flag
-        if @relationship && Constraint.relationship_lookup(@relationship) != NSLayoutRelationEqual
+        if @relationship && Constraint.relationship_lookup(@relationship) != NSLayoutRelationGreaterThanOrEqual
           raise InvalidRelationshipError.new("You cannot use `.is >=` on a constraint that is already defined as #{@relationship}")
         end
 
@@ -97,7 +99,7 @@ module MotionKit
 
     def <=(compare)
       if @compare_flag
-        if @relationship && Constraint.relationship_lookup(@relationship) != NSLayoutRelationEqual
+        if @relationship && Constraint.relationship_lookup(@relationship) != NSLayoutRelationLessThanOrEqual
           raise InvalidRelationshipError.new("You cannot use `.is <=` on a constraint that is already defined as #{@relationship}")
         end
 
@@ -249,12 +251,15 @@ module MotionKit
       @resolved ||= begin
         item = Constraint.view_lookup(layout, view, self.target)
         rel_item = Constraint.view_lookup(layout, view, self.relative_to)
+        relationship = Constraint.relationship_lookup(self.relationship)
+        attribute1 = Constraint.attribute_lookup(self.attribute)
+        attribute2 = Constraint.attribute_lookup(self.attribute2)
 
         nsconstraint = NSLayoutConstraint.constraintWithItem(item,
-          attribute: Constraint.attribute_lookup(self.attribute),
-          relatedBy: Constraint.relationship_lookup(self.relationship),
+          attribute: attribute1,
+          relatedBy: relationship,
           toItem: rel_item,
-          attribute: Constraint.attribute_lookup(self.attribute2),
+          attribute: attribute2,
           multiplier: self.multiplier,
           constant: self.constant
           )
@@ -552,13 +557,15 @@ module MotionKit
       @resolved ||= begin
         item = Constraint.view_lookup(layout, view, self.target)
         rel_item = Constraint.view_lookup(layout, view, self.relative_to)
+        relationship = Constraint.relationship_lookup(self.relationship)
 
-        [[:width, 0], [:height, 1]].map do |attribute, index|
+        [[:width, 0], [:height, 1]].map do |attr_name, index|
+          attribute = Constraint.attribute_lookup(attr_name)
           nsconstraint = NSLayoutConstraint.constraintWithItem(item,
-            attribute: Constraint.attribute_lookup(attribute),
-            relatedBy: Constraint.relationship_lookup(self.relationship),
+            attribute: attribute,
+            relatedBy: relationship,
             toItem: rel_item,
-            attribute: Constraint.attribute_lookup(attribute),
+            attribute: attribute,
             multiplier: self.multiplier[index],
             constant: self.constant[index]
             )
@@ -732,17 +739,20 @@ module MotionKit
       @resolved ||= begin
         item = Constraint.view_lookup(layout, view, self.target)
         rel_item = Constraint.view_lookup(layout, view, self.relative_to)
+        relationship = Constraint.relationship_lookup(self.relationship)
 
         [0, 1].map do |index|
           attribute = Constraint.attribute_lookup(self.attribute[index])
+          mul = self.multiplier[index]
+          const = self.constant[index]
 
           nsconstraint = NSLayoutConstraint.constraintWithItem(item,
             attribute: attribute,
-            relatedBy: Constraint.relationship_lookup(self.relationship),
+            relatedBy: relationship,
             toItem: rel_item,
             attribute: attribute,
-            multiplier: self.multiplier[index],
-            constant: self.constant[index]
+            multiplier: mul,
+            constant: const
             )
 
           if self.priority

data/lib/motion-kit-cocoa/constraints/constraints_layout.rb

@@ -22,7 +22,7 @@ module MotionKit
       ConstraintPlaceholder.new(:nth, name, value)
     end
 
-    def x(value=nil, rel=:equal)
+    def x(value=nil, rel=nil)
       target_constraint(:left, rel, value)
     end
     alias left x
@@ -37,7 +37,7 @@ module MotionKit
     end
     alias max_left max_x
 
-    def leading(value=nil, rel=:equal)
+    def leading(value=nil, rel=nil)
       target_constraint(:leading, rel, value)
     end
 
@@ -49,7 +49,7 @@ module MotionKit
       leading(value, :lte)
     end
 
-    def center_x(value=nil, rel=:equal)
+    def center_x(value=nil, rel=nil)
       target_constraint(:center_x, rel, value)
     end
 
@@ -61,7 +61,7 @@ module MotionKit
       center_x(value, :lte)
     end
 
-    def right(value=nil, rel=:equal)
+    def right(value=nil, rel=nil)
       target_constraint(:right, rel, value)
     end
 
@@ -73,7 +73,7 @@ module MotionKit
       right(value, :lte)
     end
 
-    def trailing(value=nil, rel=:equal)
+    def trailing(value=nil, rel=nil)
       target_constraint(:trailing, rel, value)
     end
 
@@ -85,7 +85,7 @@ module MotionKit
       trailing(value, :lte)
     end
 
-    def y(value=nil, rel=:equal)
+    def y(value=nil, rel=nil)
       target_constraint(:top, rel, value)
     end
     alias top y
@@ -100,7 +100,7 @@ module MotionKit
     end
     alias max_top max_y
 
-    def center_y(value=nil, rel=:equal)
+    def center_y(value=nil, rel=nil)
       target_constraint(:center_y, rel, value)
     end
 
@@ -112,7 +112,7 @@ module MotionKit
       center_y(value, :lte)
     end
 
-    def bottom(value=nil, rel=:equal)
+    def bottom(value=nil, rel=nil)
       target_constraint(:bottom, rel, value)
     end
 
@@ -124,7 +124,7 @@ module MotionKit
       bottom(value, :lte)
     end
 
-    def baseline(value=nil, rel=:equal)
+    def baseline(value=nil, rel=nil)
       target_constraint(:baseline, rel, value)
     end
 
@@ -136,7 +136,7 @@ module MotionKit
       baseline(value, :lte)
     end
 
-    def width(value=nil, rel=:equal)
+    def width(value=nil, rel=nil)
       target_constraint(:width, rel, value)
     end
     alias w width
@@ -149,7 +149,7 @@ module MotionKit
       width(value, :lte)
     end
 
-    def height(value=nil, rel=:equal)
+    def height(value=nil, rel=nil)
       target_constraint(:height, :equal, value)
     end
     alias h height
@@ -162,7 +162,7 @@ module MotionKit
       target_constraint(:height, :lte, value)
     end
 
-    def size(value=nil, rel=:equal)
+    def size(value=nil, rel=nil)
       target_constraint(:size, rel, value, SizeConstraint)
     end
 
@@ -174,7 +174,7 @@ module MotionKit
       size(value, :lte)
     end
 
-    def center(value=nil, rel=:equal)
+    def center(value=nil, rel=nil)
       target_constraint([:center_x, :center_y], rel, value, PointConstraint)
     end
 
@@ -186,7 +186,7 @@ module MotionKit
       center(value, :lte)
     end
 
-    def top_left(value=nil, rel=:equal)
+    def top_left(value=nil, rel=nil)
       target_constraint([:left, :top], rel, value, PointConstraint)
     end
     alias origin top_left
@@ -201,7 +201,7 @@ module MotionKit
     end
     alias max_origin max_top_left
 
-    def top_right(value=nil, rel=:equal)
+    def top_right(value=nil, rel=nil)
       target_constraint([:right, :top], rel, value, PointConstraint)
     end
 
@@ -213,7 +213,7 @@ module MotionKit
       top_right(value, :lte)
     end
 
-    def bottom_left(value=nil, rel=:equal)
+    def bottom_left(value=nil, rel=nil)
       target_constraint([:left, :bottom], rel, value, PointConstraint)
     end
 
@@ -225,7 +225,7 @@ module MotionKit
       bottom_left(value, :lte)
     end
 
-    def bottom_right(value=nil, rel=:equal)
+    def bottom_right(value=nil, rel=nil)
       target_constraint([:right, :bottom], rel, value, PointConstraint)
     end
 

data/lib/motion-kit/layouts/base_layout.rb

@@ -179,23 +179,40 @@ module MotionKit
     def objc_version(method_name, args)
       if method_name.count(':') > 1
         objc_method_name = method_name
-        objc_method_args = [args[0]].concat args[1].values
       elsif args.length == 2 && args[1].is_a?(Hash) && !args[1].empty?
         objc_method_name = "#{method_name}:#{args[1].keys.join(':')}:"
+      else
+        return nil, nil
+      end
+
+      if args[1].is_a?(Hash)
         objc_method_args = [args[0]].concat args[1].values
       else
-        objc_method_name = nil
-        objc_method_args = nil
+        objc_method_args = args
       end
+
       return objc_method_name, objc_method_args
     end
 
-    def ruby_version(method_name)
+    def ruby_version(method_name, args)
       if method_name.count(':') > 1
-        method_name.split(':').first
+        parts = method_name.split(':')
+        ruby_method_name = parts.first
+        if args[1].is_a?(Hash)
+          ruby_method_args = args
+        else
+          keys = parts[1..-1].map(&:to_sym)
+          ruby_method_args = [args[0]] << Hash[keys.zip args[1..-1]]
+        end
+      elsif method_name.count(':') == 1
+        ruby_method_name = method_name.split(':').first
+        ruby_method_args = args
       else
-        method_name
+        ruby_method_name = method_name
+        ruby_method_args = args
       end
+
+      return ruby_method_name, ruby_method_args
     end
 
     # Tries to call the setter (`foo 'value'` => `view.setFoo('value')`), or
@@ -218,7 +235,7 @@ module MotionKit
       end
 
       objc_method_name, objc_method_args = objc_version(method_name, args)
-      ruby_method_name = ruby_version(method_name)
+      ruby_method_name, ruby_method_args = ruby_version(method_name, args)
 
       @layout_delegate ||= Layout.layout_for(target.class)
       if @layout_delegate
@@ -226,7 +243,7 @@ module MotionKit
         if objc_method_name && @layout_delegate.respond_to?(objc_method_name)
           return @layout_delegate.send(objc_method_name, *objc_method_args, &block)
         elsif @layout_delegate.respond_to?(ruby_method_name)
-          return @layout_delegate.send(ruby_method_name, *args, &block)
+          return @layout_delegate.send(ruby_method_name, *ruby_method_args, &block)
         end
       end
 
@@ -239,13 +256,13 @@ module MotionKit
 
     def apply_with_context(method_name, *args, &block)
       objc_method_name, objc_method_args = objc_version(method_name, args)
-      ruby_method_name = ruby_version(method_name)
+      ruby_method_name, ruby_method_args = ruby_version(method_name, args)
 
       if objc_method_name && target.respond_to?(objc_method_name)
         new_context = target.send(objc_method_name, *objc_method_args)
         self.context(new_context, &block)
       elsif target.respond_to?(ruby_method_name)
-        new_context = target.send(ruby_method_name, *args)
+        new_context = target.send(ruby_method_name, *ruby_method_args)
         self.context(new_context, &block)
       elsif ruby_method_name.include?('_')
         objc_name = MotionKit.objective_c_method_name(ruby_method_name)
@@ -257,7 +274,7 @@ module MotionKit
 
     def apply_with_target(method_name, *args, &block)
       objc_method_name, objc_method_args = objc_version(method_name, args)
-      ruby_method_name = ruby_version(method_name)
+      ruby_method_name, ruby_method_args = ruby_version(method_name, args)
 
       setter = MotionKit.setter(ruby_method_name)
       assign = "#{ruby_method_name}="
@@ -272,13 +289,13 @@ module MotionKit
       if objc_method_name && target.respond_to?(objc_method_name)
         target.send(objc_method_name, *objc_method_args, &block)
       elsif args.empty? && target.respond_to?(ruby_method_name)
-        target.send(ruby_method_name, *args, &block)
+        target.send(ruby_method_name, *ruby_method_args, &block)
       elsif target.respond_to?(setter)
         target.send(setter, *args, &block)
       elsif target.respond_to?(assign)
         target.send(assign, *args, &block)
       elsif target.respond_to?(ruby_method_name)
-        target.send(ruby_method_name, *args, &block)
+        target.send(ruby_method_name, *ruby_method_args, &block)
       # UIAppearance classes are a whole OTHER thing; they never return 'true'
       elsif target.is_a?(MotionKit.appearance_class)
         target.send(setter, *args, &block)

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

data/spec/ios/calayer_spec.rb

@@ -4,6 +4,7 @@ describe CALayer do
   end
 
   it 'should style a CALayer' do
+    1.should == 1
   end
 
 end

data/spec/ios/constraints_helpers/center_constraints_spec.rb

@@ -3,12 +3,14 @@ describe 'Constraints - Center helpers' do
   before do
     @layout = MK::Layout.new
     @constraint = nil
-    @view = nil
+    @view = UIView.new
+    @parent_view = UIView.new
+    @parent_view.addSubview(@view)
     @another_view = nil
   end
 
   it 'should support `center [10, 10]`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.center([10, 10])
       end
@@ -26,21 +28,21 @@ describe 'Constraints - Center helpers' do
     resolved[0].firstItem.should == @view
     resolved[0].firstAttribute.should == NSLayoutAttributeCenterX
     resolved[0].relation.should == NSLayoutRelationEqual
-    resolved[0].secondItem.should == nil
-    resolved[0].secondAttribute.should == NSLayoutAttributeNotAnAttribute
+    resolved[0].secondItem.should == @parent_view
+    resolved[0].secondAttribute.should == NSLayoutAttributeCenterX
     resolved[0].multiplier.should == 1
     resolved[0].constant.should == 10
 
     resolved[1].firstItem.should == @view
     resolved[1].firstAttribute.should == NSLayoutAttributeCenterY
     resolved[1].relation.should == NSLayoutRelationEqual
-    resolved[1].secondItem.should == nil
-    resolved[1].secondAttribute.should == NSLayoutAttributeNotAnAttribute
+    resolved[1].secondItem.should == @parent_view
+    resolved[1].secondAttribute.should == NSLayoutAttributeCenterY
     resolved[1].multiplier.should == 1
     resolved[1].constant.should == 10
   end
   it 'should support `min_center [10, 10]`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_center([10, 10])
       end
@@ -54,7 +56,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `max_center [10, 10]`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_center([10, 10])
       end
@@ -68,7 +70,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center x: 10, y: 10`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.center(x: 10, y: 10)
       end
@@ -82,7 +84,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `min_center x: 10, y: 10`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.min_center(x: 10, y: 10)
       end
@@ -96,7 +98,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `max_center x: 10, y: 10`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @layout.constraints do
         @constraint = @layout.max_center(x: 10, y: 10)
       end
@@ -110,7 +112,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view[, :center])`' do
-    @top = @view = @layout.context(UIView.new) do
+    @top = @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view)
@@ -125,7 +127,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view).plus(10).plus([5, 10])`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).plus(10).plus([5, 10])
@@ -140,7 +142,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `min_center.equals(:another_view[, :center])`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.min_center.equals(:another_view)
@@ -173,7 +175,7 @@ describe 'Constraints - Center helpers' do
     resolved[1].constant.should == 0
   end
   it 'should support `max_center.equals(:another_view[, :center])`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.max_center.equals(:another_view)
@@ -188,7 +190,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).plus(10)
@@ -203,7 +205,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `min_center.equals(:another_view).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.min_center.equals(:another_view).plus(10)
@@ -218,7 +220,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `max_center.equals(:another_view).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.max_center.equals(:another_view).plus(10)
@@ -233,7 +235,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view).plus([10, 10])`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).plus([10, 10])
@@ -248,7 +250,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `min_center.equals(:another_view).plus([10, 10])`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.min_center.equals(:another_view).plus([10, 10])
@@ -263,7 +265,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `max_center.equals(:another_view).plus(x: 10, y: 10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.max_center.equals(:another_view).plus(x: 10, y: 10)
@@ -278,7 +280,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view).times(2).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).times(2).plus(10)
@@ -293,7 +295,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `min_center.equals(:another_view).times(2).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.min_center.equals(:another_view).times(2).plus(10)
@@ -308,7 +310,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `max_center.equals(:another_view).times(2).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.max_center.equals(:another_view).times(2).plus(10)
@@ -341,7 +343,7 @@ describe 'Constraints - Center helpers' do
     resolved[1].constant.should == 10
   end
   it 'should support `center.equals(:another_view).times([2, 2]).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).times([2, 2]).plus(10)
@@ -356,7 +358,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `min_center.equals(:another_view).times([2, 2]).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.min_center.equals(:another_view).times([2, 2]).plus(10)
@@ -371,7 +373,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `max_center.equals(:another_view).times(x: 2, y: 2).plus(10)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.max_center.equals(:another_view).times(x: 2, y: 2).plus(10)
@@ -386,7 +388,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view).times(2).times([3, 4])`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).times(2).times([3, 4])
@@ -401,7 +403,7 @@ describe 'Constraints - Center helpers' do
     @constraint.attribute2.should == [:center_x, :center_y]
   end
   it 'should support `center.equals(:another_view).divided_by(2)`' do
-    @view = @layout.context(UIView.new) do
+    @layout.context(@view) do
       @another_view = @layout.add UIView.alloc.initWithFrame([[1, 1], [2, 2]]), :another_view
       @layout.constraints do
         @constraint = @layout.center.equals(:another_view).divided_by(2)