rm-extensions 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4283e3df2472b537a1aa10f4324267fc9a4a90e8
-  data.tar.gz: 7949f50c7124319606630c82eaeab2aa689a484a
+  metadata.gz: 10b3c8d7d655d2182fc655af633cafccabdfe460
+  data.tar.gz: 064e5f501609992377c5579cb398dd2db2c26e37
 SHA512:
-  metadata.gz: 32cd5a61f8cfb11e00f2b69e1aeaa6ddeec451605719b826dbd8acca764b934130eccddb02f41843d9e4188b2465011f7f63419005af57a658c6f183cc9acf8a
-  data.tar.gz: c102ddcd8d60f0d611c22c0d6b7033c1952147f6c9fdcfb69e272d050b5c3d54398ae4f03aafe580d32d0162cc317d1d2970048c1d0df76948c5424c51ddeb7a
+  metadata.gz: ac1bc79b513e9b0adbafe309a3c6e795883c05b34eca599af6a730cf37cfdec82a2cda180b74137a41cb5a14e4a13098a3b5df49fb7fb2c80884c94a2d059ecf
+  data.tar.gz: 0ae909d56376adfd984be7dcbbbb4e36e26b5e39b093881040e4e261e71ffd8e7fb37d18286dda5d1e0f8025e7cce55cc6a3b36e01e96499f5a39a24b33a124d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.10
+
+[Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.9...v0.1.10)
+
+* Layout: compact constraint(s) passed to #remove so a nil can be passed to reduce code
+* Layout: adjust how to describe existing constraints
+
 ## 0.1.9
 
 [Commit history](https://github.com/joenoon/rm-extensions/compare/v0.1.8...v0.1.9)

data/Rakefile

@@ -1,16 +1,18 @@
 require "bundler/gem_tasks"
-$:.unshift('/Library/RubyMotion/lib')
-if ENV.fetch('platform', 'ios') == 'ios'
-  require 'motion/project/template/ios'
-elsif ENV['platform'] == 'osx'
-  require 'motion/project/template/osx'
-else
-  raise "Unsupported platform #{ENV['platform']}"
-end
-require 'bundler'
-Bundler.require
+if ENV['rubymotion']
+  $:.unshift('/Library/RubyMotion/lib')
+  if ENV.fetch('platform', 'ios') == 'ios'
+    require 'motion/project/template/ios'
+  elsif ENV['platform'] == 'osx'
+    require 'motion/project/template/osx'
+  else
+    raise "Unsupported platform #{ENV['platform']}"
+  end
+  require 'bundler'
+  Bundler.require
 
-Motion::Project::App.setup do |app|
-  # Use `rake config' to see complete project settings.
-  app.name = 'rm-extensions'
+  Motion::Project::App.setup do |app|
+    # Use `rake config' to see complete project settings.
+    app.name = 'rm-extensions'
+  end
 end

data/lib/motion/layout.rb

@@ -78,7 +78,7 @@ module RMExtensions
     end
 
     def remove(constraint)
-      constraints = [ constraint ].flatten
+      constraints = [ constraint ].flatten.compact
       @view.removeConstraints(constraints)
       @constraints.keys.each do |key|
         @constraints.delete(key) if constraints.include?(@constraints.fetch(key))
@@ -303,19 +303,37 @@ module RMExtensions
       eq(str, true)
     end
 
+    def describe_constraint(constraint)
+      self.class.describe_constraint(@subviews, constraint)
+    end
+
+    def describe_view
+      self.class.describe_view(@subviews, @view)
+    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)
+    # pass the subviews hash just as you would to Layout#subviews=, followed by the NSLayoutConstraint
+    def self.describe_constraint(subviews, constraint)
       subviews_inverse = subviews.invert
-      item = subviews_inverse[constraint.firstItem]
+      item = subviews_inverse[constraint.firstItem] || "view"
       item_attribute = ATTRIBUTE_LOOKUP_INVERSE[constraint.firstAttribute]
       related_by = RELATED_BY_LOOKUP_INVERSE[constraint.relation]
-      to_item = subviews_inverse[constraint.secondItem]
+      to_item = subviews_inverse[constraint.secondItem] || "view"
       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}"
+      "#{constraint.description}\n#{item}.#{item_attribute} #{related_by} #{to_item}.#{to_item_attribute} * #{multiplier} + #{constant} @ #{priority}"
+    end
+
+    # transforms a view's NSLayoutConstraints into strings.
+    # pass the subviews hash just as you would to Layout#subviews=, followed by the view to
+    # describe
+    def self.describe_view(subviews, view)
+      view.constraints.map do |constraint|
+        describe_constraint(subviews, constraint)
+      end.join("\n")
     end
 
     private

data/lib/rm-extensions/version.rb

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

metadata

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