lib/motion-kit-cocoa/constraints/constraint.rb in motion-kit-0.11.1 vs lib/motion-kit-cocoa/constraints/constraint.rb in motion-kit-0.11.2

@@ -57,10 +57,12 @@
 
     # like `equals`, but also sets `compare_flag` to true, so you can use ==,
     # <=, and >=
     #
     # @example
+    #     x.is(10)
+    #     x.is(10).priority(:required)
     #     x.is == 10
     #     (x.is == 10).priority :required
     #     width.is >= 100
     #     height.is <= 200
     def is(value=nil)
@@ -81,11 +83,11 @@
       end
     end
 
     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
 
         gte(compare)
 
@@ -95,11 +97,11 @@
       end
     end
 
     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
 
         lte(compare)
 
@@ -247,16 +249,19 @@
 
     def resolve_all(layout, view)
       @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
           )
 
         if self.priority
@@ -550,17 +555,19 @@
 
     def resolve_all(layout, view)
       @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]
             )
 
           if self.priority
@@ -730,20 +737,23 @@
 
     def resolve_all(layout, view)
       @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
             nsconstraint.priority = Constraint.priority_lookup(self.priority)
           end