rm-extensions 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca18caba001487c996e9f8af26733232b557e383
-  data.tar.gz: 1e9972eb5b2810de67b5c8088312afba316c7563
+  metadata.gz: 4283e3df2472b537a1aa10f4324267fc9a4a90e8
+  data.tar.gz: 7949f50c7124319606630c82eaeab2aa689a484a
 SHA512:
-  metadata.gz: 908c30a6f6a5193b07ef296879cff08f80e1cb1b88ef1f4d88871e9937f0c10b8e3d0c9395503bf34a9ab1a9a73551695ca234b588b19bfc64ee7009f38fc7de
-  data.tar.gz: 136c28f62665b1817bb4991ba90fd5b3265c6a1a5c8fb41aead3083455717462dce2f7dd46426e4c135ca28bbc8ba41a7e74771c6a785d7c7ca7a6081364d6d1
+  metadata.gz: 32cd5a61f8cfb11e00f2b69e1aeaa6ddeec451605719b826dbd8acca764b934130eccddb02f41843d9e4188b2465011f7f63419005af57a658c6f183cc9acf8a
+  data.tar.gz: c102ddcd8d60f0d611c22c0d6b7033c1952147f6c9fdcfb69e272d050b5c3d54398ae4f03aafe580d32d0162cc317d1d2970048c1d0df76948c5424c51ddeb7a

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.1.9
+
+[Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.8...v0.1.9)
+
+* Util: Added #rmext_ivar, which is a shortcut to instance_variable_get/instance_variable_set
+* Layout: Added #reopen to yield the instance to a block for further processing
+* Layout: Added an internal "constraint table" to keep track of normalized equations and
+  NSLayoutConstraint objects.  equations can now be modified simply by re-applying the same
+  equation with a different constant.
+* Layout: Added #xeq to remove a constraint by equation
+* Layout: Added #remove(constraint(s)) to remove NSLayoutConstraint obects from the view
+  and also from the internal constraint table.
+
 ## 0.1.8
 
 [Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.7...v0.1.8)

data/lib/motion/layout.rb

@@ -41,17 +41,51 @@ module RMExtensions
       "v" => UILayoutConstraintAxisVertical
     }
 
+    # keeps track of views that are not #hidden? as constraints are built, so the
+    # special `last_visible` view name can be used in equations.
+    # exposed for advanced layout needs.
+    attr_accessor :visible_items
+
+    # Example:
+    # RMExtensions::Layout.new do |layout|
+    #   ...
+    # end
     def initialize
       @visible_items = []
+      @constraints = {}
       if block_given?
         yield self
       end
     end
 
+    # reopens the RMExtensions::Layout instance for additional processing, ex:
+    #   @layout.reopen do |layout|
+    #     ...
+    #   end
+    # note: you would need to store your instance somewhere on creation to be able to reopen it later, ex:
+    #   @layout = RMExtensions::Layout.new do |layout|
+    #     ...
+    #   end
+    def reopen
+      if block_given?
+        yield self
+      end
+      self
+    end
+
     def clear!
       @view.removeConstraints(@view.constraints)
     end
 
+    def remove(constraint)
+      constraints = [ constraint ].flatten
+      @view.removeConstraints(constraints)
+      @constraints.keys.each do |key|
+        @constraints.delete(key) if constraints.include?(@constraints.fetch(key))
+      end
+      true
+    end
+
     def view(view)
       @view = view
     end
@@ -73,14 +107,17 @@ module RMExtensions
       subviews(views)
     end
 
+    # takes a string one or more equations separated by newlines and
+    # processes each.  returns an array of constraints
     def eqs(str)
       str.split("\n").map(&:strip).select { |x| !x.empty? }.map do |line|
         eq(line)
-      end
+      end.compact
     end
 
     # Constraints are of the form "view1.attr1 <relation> view2.attr2 * multiplier + constant @ priority"
-    def eq(str)
+    # processes one equation string
+    def eq(str, remove=false)
       parts = str.split("#", 2).first.split(" ").select { |x| !x.empty? }
       return if parts.empty?
 
@@ -191,6 +228,8 @@ module RMExtensions
       errors.push("Invalid view2: #{to_item}") if to_item && !res_to_item
       errors.push("Invalid attr2: #{to_item_attribute}") unless res_to_item_attribute
 
+      internal_ident = "#{item}.#{item_attribute} #{related_by} #{to_item}.#{to_item_attribute} * #{multiplier} @ #{priority}"
+
       if errors.size > 0 || debug
         p "======================== constraint debug ========================"
         p "given:"
@@ -204,6 +243,7 @@ module RMExtensions
         p "  multiplier:          #{multiplier}"
         p "  constant:            #{constant}"
         p "  priority:            #{priority || "required"}"
+        p "  internal_ident:      #{internal_ident}"
       end
 
       if errors.size > 0
@@ -214,15 +254,39 @@ module RMExtensions
         @visible_items.unshift(item)
       end
 
-      constraint = NSLayoutConstraint.constraintWithItem(res_item,
-         attribute:res_item_attribute,
-         relatedBy:res_related_by,
-            toItem:res_to_item,
-         attribute:res_to_item_attribute,
-        multiplier:res_multiplier,
-          constant:res_constant)
-      if res_priority
-        constraint.priority = res_priority
+      if remove
+        if constraint = @constraints[internal_ident]
+          if debug
+            p "status:"
+            p "  existing (for removal)"
+          end
+          @view.removeConstraint(constraint)
+        else
+          raise "RMExtensions::Layout could not find constraint to remove for internal_ident: `#{internal_ident}` (note: this is an internal representation of the constraint, not the exact string given).  Make sure the constraint was created first."
+        end
+      elsif constraint = @constraints[internal_ident]
+        if debug
+          p "status:"
+          p "  existing (for modification)"
+        end
+        constraint.constant = res_constant
+      else
+        constraint = NSLayoutConstraint.constraintWithItem(res_item,
+           attribute:res_item_attribute,
+           relatedBy:res_related_by,
+              toItem:res_to_item,
+           attribute:res_to_item_attribute,
+          multiplier:res_multiplier,
+            constant:res_constant)
+        if debug
+          p "status:"
+          p "  created"
+        end
+        @constraints[internal_ident] = constraint
+        if res_priority
+          constraint.priority = res_priority
+        end
+        @view.addConstraint(constraint)
       end
 
       if debug
@@ -230,10 +294,17 @@ module RMExtensions
         p "  #{constraint.description}"
       end
 
-      @view.addConstraint(constraint)
       constraint
     end
 
+    # removes the constraint matching equation string.  constant is not considered.
+    # if no matching constraint is found, it will raise an exception.
+    def xeq(str)
+      eq(str, true)
+    end
+
+    # transforms an NSLayoutConstraint into a string.  this string is for debugging and produces
+    # a verbose translation.  its not meant to be copied directly as an equation.
     def describe(constraint)
       subviews_inverse = subviews.invert
       item = subviews_inverse[constraint.firstItem]

data/lib/motion/util.rb

@@ -18,6 +18,19 @@ module RMExtensions
         raise "This method must be called on the main thread." unless NSThread.currentThread.isMainThread
       end
 
+      # Shortcut to instance_variable_get and instance_variable_get:
+      # 1 arg for instance_variable_get
+      # 2 args for instance_variable_set
+      def rmext_ivar(*args)
+        if args.size == 1
+          instance_variable_get("@#{args[0]}")
+        elsif args.size == 2
+          instance_variable_set("@#{args[0]}", args[1])
+        else
+          raise "rmext_ivar called with invalid arguments: #{args.inspect}"
+        end
+      end
+
     end
 
   end

data/lib/rm-extensions/version.rb

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

metadata

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