motion-layout 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f42af24024b537423331b8b2285825e9d7857d5
+  data.tar.gz: 3b5390b2f8861cf387dc67cad41f0f9d93b62d6e
+SHA512:
+  metadata.gz: ba2dde578ce4440ab16c19f7a0b0dcb02bd1ea869007f418d20c2c1e1b3e4a49a3556e848896cfc283ffd5011a28009d00819aa24f9bce6754df240aa6be98c1
+  data.tar.gz: 84fa6e2e52e1fce4c484ff093f803cb96bc5ca09ae99ff7da3b04c5e5255c088d66495feb84c9948375fe16f5b782dae3cd4b60492427f1c4bd4f4631e69be7d

data/README.md

@@ -22,7 +22,7 @@ Then in your `Rakefile`:
 
 ## Usage
 
-Using AutoLayout is a way to put UI elements in your iPhone app without using Interface Builder, and without being very specific about pixel sizes, locations, etc. The layout strings are ASCII inspired, and Apple's documentation on the [Visual Format Language](http://developer.apple.com/library/ios/#documentation/UserExperience/Conceptual/AutolayoutPG/Articles/formatLanguage.html#//apple_ref/doc/uid/TP40010853-CH3-SW1) is a necessary read and reference.
+Using AutoLayout is a way to put UI elements in your iPhone app without using Interface Builder, and without being very specific about pixel sizes, locations, etc. The layout strings are ASCII inspired, and Apple's documentation on the [Visual Format Language](https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/AutolayoutPG/VisualFormatLanguage/VisualFormatLanguage.html) is a necessary read and reference.
 
 Here's an example of `Motion::Layout` usage from inside of [Basecamp for iPhone](https://itunes.apple.com/us/app/id599139477) on a `UITableView`'s `tableFooterView`:
 
@@ -45,7 +45,7 @@ And here's an example you can run right inside this repo, the Time app converted
 ``` ruby
 Motion::Layout.new do |layout|
   layout.view view
-  layout.subviews "state" => @state, "action" => @action
+  layout.subviews state: @state, action: @action
   layout.metrics "top" => 200, "margin" => 20, "height" => 40
   layout.vertical "|-top-[state(==height)]-margin-[action(==height)]"
   layout.horizontal "|-margin-[state]-margin-|"

data/lib/motion-layout/layout.rb

@@ -10,11 +10,11 @@ module Motion
     end
 
     def metrics(metrics)
-      @metrics = metrics
+      @metrics = Hash[metrics.keys.map(&:to_s).zip(metrics.values)]
     end
 
     def subviews(subviews)
-      @subviews = subviews
+      @subviews = Hash[subviews.keys.map(&:to_s).zip(subviews.values)]
     end
 
     def view(view)
@@ -34,15 +34,17 @@ module Motion
     def strain
       @subviews.values.each do |subview|
         subview.translatesAutoresizingMaskIntoConstraints = false
-        @view.addSubview(subview)
+        @view.addSubview(subview) unless subview.superview
       end
 
+      views = @subviews.merge("superview" => @view)
+
       constraints = []
       constraints += @verticals.map do |vertical|
-        NSLayoutConstraint.constraintsWithVisualFormat("V:#{vertical}", options:NSLayoutFormatAlignAllCenterX, metrics:@metrics, views:@subviews)
+        NSLayoutConstraint.constraintsWithVisualFormat("V:#{vertical}", options:NSLayoutFormatAlignAllCenterX, metrics:@metrics, views:views)
       end
       constraints += @horizontals.map do |horizontal|
-        NSLayoutConstraint.constraintsWithVisualFormat("H:#{horizontal}", options:NSLayoutFormatAlignAllCenterY, metrics:@metrics, views:@subviews)
+        NSLayoutConstraint.constraintsWithVisualFormat("H:#{horizontal}", options:NSLayoutFormatAlignAllCenterY, metrics:@metrics, views:views)
       end
 
       @view.addConstraints(constraints.flatten)

data/lib/motion-layout/version.rb

@@ -1,5 +1,5 @@
 module Motion
   class Layout
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-layout
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Quaranto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies: []
 description: A nice way to use iOS6+ autolayout in your RubyMotion app. Use ASCII-art
   inspired format strings to build your app's layout!
@@ -36,27 +35,26 @@ files:
 - screenshot2.png
 homepage: https://github.com/qrush/motion-layout
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A nice way to use iOS6+ autolayout in your RubyMotion app. Use ASCII-art
   inspired format strings to build your app's layout!
 test_files: []