rm-extensions 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc5b5569839be0c1b41cfea9a8c319e8b34b1e74
-  data.tar.gz: 5ffb320a7f8e0bdc87c75b61238f4f2826d4a37c
+  metadata.gz: 2ba4ba13ce05f6391b658a6d6968fd368d6eb66e
+  data.tar.gz: 9140c139f8dc4c75d01183e46019df8ebac3a7c2
 SHA512:
-  metadata.gz: f5c8699627b303137e762d883e77b6f9367ef192ff0a4795fbc7c1dbf202b2501a8490a274eb204aa57bbbb0cf8c3b410d731b5a1c45d3678b58b9a78d4f3c26
-  data.tar.gz: 3e1b1ea19d4a8e4846e6d0fba244658a9ebcff7ba426df55f051ed359a5d75a10f571b1f6bdd84ec6df4492d2f81a190baee95dac072c9e2a84aefbd4ed7e341
+  metadata.gz: 4ba45a55bbee4a13e6d0d72326208e4c704377ad24b28c6e04569e857cfeb74e869e9d846e9744367432e34068f8808dd502326f79b9cf242dfcebdb541b7c6c
+  data.tar.gz: 03222f43b0510a630fd09b33f30bc59815c06ad6d54e41384f76880d0f645bb449ff297ee689d01988235ff66d4a8be31df1385d60b174b6c7222be4c18d7c4e

data/lib/motion/layout.rb

@@ -16,12 +16,16 @@ module RMExtensions
       nil => NSLayoutAttributeNotAnAttribute
     }
 
+    ATTRIBUTE_LOOKUP_INVERSE = ATTRIBUTE_LOOKUP.invert
+
     RELATED_BY_LOOKUP = {
       "<=" => NSLayoutRelationLessThanOrEqual,
       "==" => NSLayoutRelationEqual,
       ">=" => NSLayoutRelationGreaterThanOrEqual
     }
 
+    RELATED_BY_LOOKUP_INVERSE = RELATED_BY_LOOKUP.invert
+
     PRIORITY_LOOKUP = {
       "required" => UILayoutPriorityRequired, # = 1000
       "high" => UILayoutPriorityDefaultHigh, # = 750
@@ -29,6 +33,8 @@ module RMExtensions
       "fit" => UILayoutPriorityFittingSizeLevel # = 50
     }
 
+    PRIORITY_LOOKUP_INVERSE = PRIORITY_LOOKUP.invert
+
     AXIS_LOOKUP = {
       "h" => UILayoutConstraintAxisHorizontal,
       "v" => UILayoutConstraintAxisVertical
@@ -58,18 +64,14 @@ module RMExtensions
       @subviews
     end
 
-    def eqs(str, debug=false)
+    def eqs(str)
       str.split("\n").map(&:strip).select { |x| !x.empty? }.map do |line|
-        eq(line, debug)
+        eq(line)
       end
     end
 
-    def eq?(str)
-      eq(str, true)
-    end
-
     # Constraints are of the form "view1.attr1 <relation> view2.attr2 * multiplier + constant @ priority"
-    def eq(str, debug=false)
+    def eq(str)
       item = nil
       item_attribute = nil
       related_by = nil
@@ -78,7 +80,9 @@ module RMExtensions
       multiplier = nil
       constant = nil
       
-      parts = str.split(" ").select { |x| !x.empty? }
+      parts = str.split("#", 2).first.split(" ").select { |x| !x.empty? }
+
+      debug = parts.delete("?")
 
       # first part should always be view1.attr1
       part = parts.shift
@@ -107,9 +111,9 @@ module RMExtensions
         parts.delete_at(idx)
       end
 
-      # look for multipler
+      # look for multiplier
       if idx = parts.index("*")
-        multipler = parts[idx + 1]
+        multiplier = parts[idx + 1]
         parts.delete_at(idx)
         parts.delete_at(idx)
       end
@@ -137,21 +141,6 @@ module RMExtensions
         end
       end
 
-      debug_hash = nil
-
-      if debug
-        debug_hash = {
-          :item => item,
-          :item_attribute => item_attribute,
-          :related_by => related_by,
-          :to_item => to_item,
-          :to_item_attribute => to_item_attribute,
-          :multiplier => multiplier,
-          :constant => constant,
-          :priority => priority
-        }
-      end
-
       # normalize
 
       res_item = item == "view" ? @view : @subviews[item]
@@ -186,18 +175,18 @@ module RMExtensions
       errors.push("Invalid attr2: #{to_item_attribute}") unless res_to_item_attribute
 
       if errors.size > 0 || debug
-        puts "======================== constraint debug ========================"
-        puts "given:"
-        puts "  #{str}"
-        puts "interpreted:"
-        puts "  item:                #{item}"
-        puts "  item_attribute:      #{item_attribute}"
-        puts "  related_by:          #{related_by}"
-        puts "  to_item:             #{to_item}"
-        puts "  to_item_attribute:   #{to_item_attribute}"
-        puts "  multiplier:          #{multiplier}"
-        puts "  constant:            #{constant}"
-        puts "  priority:            #{priority}"
+        p "======================== constraint debug ========================"
+        p "given:"
+        p "  #{str}"
+        p "interpreted:"
+        p "  item:                #{item}"
+        p "  item_attribute:      #{item_attribute}"
+        p "  related_by:          #{related_by}"
+        p "  to_item:             #{to_item}"
+        p "  to_item_attribute:   #{to_item_attribute}"
+        p "  multiplier:          #{multiplier}"
+        p "  constant:            #{constant}"
+        p "  priority:            #{priority}"
       end
 
       if errors.size > 0
@@ -216,13 +205,26 @@ module RMExtensions
       end
 
       if debug
-        puts "implemented:"
-        puts "  #{constraint.description}"
+        p "implemented:"
+        p "  #{constraint.description}"
       end
 
       @view.addConstraint(constraint)
       constraint
     end
 
+    def describe(constraint)
+      subviews_inverse = subviews.invert
+      item = subviews_inverse[constraint.firstItem]
+      item_attribute = ATTRIBUTE_LOOKUP_INVERSE[constraint.firstAttribute]
+      related_by = RELATED_BY_LOOKUP_INVERSE[constraint.relation]
+      to_item = subviews_inverse[constraint.secondItem]
+      to_item_attribute = ATTRIBUTE_LOOKUP_INVERSE[constraint.secondAttribute]
+      multiplier = constraint.multiplier
+      constant = constraint.constant
+      priority = PRIORITY_LOOKUP_INVERSE[constraint.priority] || constraint.priority
+      "#{item}.#{item_attribute} #{related_by} #{to_item}.#{to_item_attribute} * #{multiplier} + #{constant} @ #{priority}"
+    end
+
   end
 end

data/lib/rm-extensions/version.rb

@@ -1,3 +1,3 @@
 module RMExtensions
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Joe Noon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies: []
 description: Extensions and helpers for dealing with various areas of rubymotion
 email: