rm-extensions 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def362607872dfcd691017faa171e66967d0630c
-  data.tar.gz: bbeb76a150653503536aa8e2cf02565d48d0bca9
+  metadata.gz: ca18caba001487c996e9f8af26733232b557e383
+  data.tar.gz: 1e9972eb5b2810de67b5c8088312afba316c7563
 SHA512:
-  metadata.gz: 3fc8a7624f1ecfe03c8af4bcea0f7c31092c3403091bc99754071efde2d98b2927531c361ca809c817b4a70753357ca0395e9e2c5563c3c8506856e20cda9de6
-  data.tar.gz: 608c671f2a9d9656961005e4e86d2e21a0d14e050dfbea5eb5bc759404ac992bc1d486507936bc149d9a0c4147e0a4937152d3b4ddebe90c027e66dc46c4f852
+  metadata.gz: 908c30a6f6a5193b07ef296879cff08f80e1cb1b88ef1f4d88871e9937f0c10b8e3d0c9395503bf34a9ab1a9a73551695ca234b588b19bfc64ee7009f38fc7de
+  data.tar.gz: 136c28f62665b1817bb4991ba90fd5b3265c6a1a5c8fb41aead3083455717462dce2f7dd46426e4c135ca28bbc8ba41a7e74771c6a785d7c7ca7a6081364d6d1

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+## 0.1.8
+
+[Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.7...v0.1.8)
+
+* Added RMExtensions::Layout#clear! which is a shortcut to view.removeConstraints(view.constraints).
+  It must be called after the `view` is set.
+* Added 'max' as a valid priority shortcut, since it reads better than 'required' in many cases.
+* Comments are now allowed on a line by themselves inside a `eqs` string, to make for easier commenting,
+  or to easily comment out an equation.
+* Added a special `last_visible` view identifier which can be used instead of an actual view name
+  inside an equation.  It will refer to the last view a constraint was applied to that was not hidden.
+  This can be used to more easily lay out constraints when some views should not be anchored against.
+  For example, you have 3 labels, A, B, and C, that you want stacked vertically:
+    A.top == 0
+    B.top == A.bottom + 5
+    C.top == B.bottom + 5
+  If B is hidden, there would be 10px in between A and C.  Instead, you can let RMExtensions::Layout handle
+  this for you:
+    A.top == 0                        # last_visible is set to A
+    B.top == last_visible.bottom + 5  # B is hidden, so last_visible remains A
+    C.top == last_visible.bottom + 5  # C now aligns to the bottom of A
+  It is usually easier and cleaner to build all possible views and mark some hidden than it is to have
+  many if/else view creation and constraint construction specific to what should be displayed.

data/lib/motion/layout.rb

@@ -27,6 +27,7 @@ module RMExtensions
     RELATED_BY_LOOKUP_INVERSE = RELATED_BY_LOOKUP.invert
 
     PRIORITY_LOOKUP = {
+      "max" => UILayoutPriorityRequired, # = 1000
       "required" => UILayoutPriorityRequired, # = 1000
       "high" => UILayoutPriorityDefaultHigh, # = 750
       "low" => UILayoutPriorityDefaultLow, # = 250
@@ -41,11 +42,16 @@ module RMExtensions
     }
 
     def initialize
+      @visible_items = []
       if block_given?
         yield self
       end
     end
 
+    def clear!
+      @view.removeConstraints(@view.constraints)
+    end
+
     def view(view)
       @view = view
     end
@@ -75,16 +81,17 @@ module RMExtensions
 
     # Constraints are of the form "view1.attr1 <relation> view2.attr2 * multiplier + constant @ priority"
     def eq(str)
+      parts = str.split("#", 2).first.split(" ").select { |x| !x.empty? }
+      return if parts.empty?
+
       item = nil
       item_attribute = nil
       related_by = nil
       to_item = nil
       to_item_attribute = nil
-      multiplier = nil
-      constant = nil
+      multiplier = 1.0
+      constant = 0.0
       
-      parts = str.split("#", 2).first.split(" ").select { |x| !x.empty? }
-
       debug = parts.delete("?")
 
       # first part should always be view1.attr1
@@ -146,8 +153,12 @@ module RMExtensions
 
       # normalize
 
+      if item == "last_visible"
+        item = @visible_items.first || "view"
+      end
+
       res_item = view_for_item(item)
-      res_constant = constant ? Float(PRIORITY_LOOKUP[constant] || constant) : 0.0
+      res_constant = Float(PRIORITY_LOOKUP[constant] || constant)
 
       if res_item
         case item_attribute
@@ -162,11 +173,15 @@ module RMExtensions
         end
       end
 
+      if to_item == "last_visible"
+        to_item = @visible_items.detect { |x| x != item } || "view"
+      end
+
       res_item_attribute = ATTRIBUTE_LOOKUP[item_attribute]
       res_related_by = RELATED_BY_LOOKUP[related_by]
       res_to_item = to_item ? view_for_item(to_item) : nil
       res_to_item_attribute = ATTRIBUTE_LOOKUP[to_item_attribute]
-      res_multiplier = multiplier ? Float(multiplier) : 1.0
+      res_multiplier = Float(multiplier)
       res_priority = priority ? Integer(PRIORITY_LOOKUP[priority] || priority) : nil
 
       errors = []
@@ -188,13 +203,17 @@ module RMExtensions
         p "  to_item_attribute:   #{to_item_attribute}"
         p "  multiplier:          #{multiplier}"
         p "  constant:            #{constant}"
-        p "  priority:            #{priority}"
+        p "  priority:            #{priority || "required"}"
       end
 
       if errors.size > 0
         raise(errors.join(", "))
       end
 
+      unless res_item.hidden?
+        @visible_items.unshift(item)
+      end
+
       constraint = NSLayoutConstraint.constraintWithItem(res_item,
          attribute:res_item_attribute,
          relatedBy:res_related_by,

data/lib/rm-extensions/version.rb

@@ -1,3 +1,3 @@
 module RMExtensions
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Joe Noon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Extensions and helpers for dealing with various areas of rubymotion
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md