motion-kit 0.9.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca8bcc4c3162610c0090bb119ed03e2c1ebf5484
-  data.tar.gz: 002fd919664672e8b07fc6a56ac8103e4d61b75b
+  metadata.gz: 525e32728b35f92e5b149c067887539f4e1fd493
+  data.tar.gz: e5170c04a01756a4626c943448ab80e169884b19
 SHA512:
-  metadata.gz: 125fd67fafeeccbed6778c15281a9bdd4f1e4cb48d28f57edd18dec56089345cec1069a3a7b2c407e194efe8241d9c6285179fff28354078467810027e1239b5
-  data.tar.gz: 85d2bf979800eee4f63d2114fc0cda48a2a2918ee0b2a8f9f2a38828e97f482b571ef6e4702930ddc2d17ddecdd0f22368a35a79c99e817fd6f3c829a1764bb2
+  metadata.gz: 2088f89d374db7d138d4a878ecc88fb59f819485e6aae7cf6a2c01037796cbf4225b0b00db55df2e255c82ec434670016c3babbb5521e73498bafd2c1d2a2d84
+  data.tar.gz: a7f7d63d194d14835d6d357f64cfb9ad33217f8d060a9d9fc401ea07e1b29c31a8d069e497bea7cbab3d257c772721a3e31e221c0358da8949283fc366647a34

data/README.md

@@ -11,12 +11,11 @@
    - [Frame geometry][readmore-frames]
    - [CoreAnimation][readmore-coreanimation]
    - [NSMenu/NSMenuItem][readmore-nsmenu]
-   - [Joybox][readmore-joybox] *TODO*
-   - [SpriteKit][readmore-spritekit] *TODO*
-4. Non-polluting
-5. ProMotion/RMQ/SugarCube-compatible (kind of goes hand-in-hand with non-polluting)
-6. Styles and layouts are "just code" (not hash-based like in Teacup)
-7. Written by [the authors][authors] of [ProMotion][] and [Teacup][]
+4. Easily extendable to support custom, mini-DSLs
+5. Non-polluting
+6. ProMotion/RMQ/SugarCube-compatible (kind of goes hand-in-hand with being non-polluting)
+7. Styles and layouts are "just code" (not hash-based like in Teacup)
+8. Written by [the authors][authors] of [ProMotion][] and [Teacup][]
 
 [authors]: CONTRIBUTORS.md
 [Colin]: https://github.com/colinta
@@ -24,14 +23,14 @@
 [ProMotion]: https://github.com/clearsightstudio/ProMotion
 [RMQ]: https://github.com/infinitered/rmq
 [Teacup]: https://github.com/rubymotion/teacup
+[SweetKit]: https://github.com/rubymotion/sweet-kit
 
+[READMORE]: https://github.com/rubymotion/motion-kit/blob/master/READMORE.md
 [readmore-uikit]:          https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#uikit
 [readmore-applicationkit]: https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#applicationkit
-[readmore-joybox]:         https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#joybox
-[readmore-spritekit]:      https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#spritekit
 [readmore-coreanimation]:  https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#coreanimation
-[readmore-frames]:  https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#frames
-[readmore-autolayout]:  https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#autolayout
+[readmore-frames]:         https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#frames
+[readmore-autolayout]:     https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#autolayout
 [readmore-nsmenu]:         https://github.com/rubymotion/motion-kit/blob/master/READMORE.md#nsmenu
 
 
@@ -370,6 +369,16 @@ class CustomLayout < MK::UIViewLayout
 end
 ```
 
+### Even more information...
+
+...is in the [READMORE][] document.  I re-explain some of these topics, go into
+some more detail, that kinda thing.  Basically an overflow document for topics I
+don't want to stuff into the README.
+
+
+## MotionKit extensions
+
+These are all built-in, unless otherwise specified.
 
 ### Frames
 
@@ -641,10 +650,21 @@ class MainController < UIViewController
 end
 ```
 
+### MotionKit::Events
+
+    gem install motion-kit-events
+
+Adds `on :event` and `trigger :event` methods to `MK::Layout` objects.  These
+can be used to send events from the Layout to your controller, further
+simplifying the controller code (and usually making it more testable).  See the
+[MotionKit::Events documentation][motion-kit-events] for more information.
+
+[motion-kit-events]: https://github.com/rubymotion/motion-kit-events
+
 
-### Some handy tricks and Features
+## Some handy tricks and Features
 
-#### Orientation specific styles
+### Orientation specific styles
 
 These are available on iOS.
 
@@ -659,7 +679,7 @@ add UIView, :container do
 end
 ```
 
-#### Update views via 'initial', 'reapply', and 'deferred'
+### Update views via 'initial', 'reapply', and 'deferred'
 
 If you call 'layout.reapply!', your style methods will be called again (but
 NOT the `layout` method). You very well might want to control what methods get
@@ -698,7 +718,7 @@ end
 ```
 
 
-#### Apply styles via module
+### Apply styles via module
 
 ```ruby
 module AppStyles
@@ -727,8 +747,25 @@ class LoginLayout < MotionKit::Layout
 end
 ```
 
+### Using SweetKit
+
+The [SweetKit][] gem combines MotionKit and SugarCube.  The helpers it provides
+allow for even more expressiveness, for instance:
+
+```ruby
+add UITextField do
+  return_key_type :email
+  text_alignment :right
+end
+```
+
+The OS X helpers are really nice, because it tries to hide most of the
+annoying subtletees of the NSCell/NSControl dichotomy.
+
+    gem install sweet-kit
+
 
-#### Setting a custom root view
+### Setting a custom root view
 
 If you need to use a custom root view, you can use the `root` method from within
 the `layout` method.  When you create or assign the root view this way, you must
@@ -742,6 +779,29 @@ def layout
 end
 ```
 
+You can also pass in a root view to your layout, like this:
+
+```ruby
+def loadView
+  @layout = MyLayout.new(root: self.view)
+end
+```
+
+In this case, if you want to style the root view, just refer to it in your layout:
+
+```ruby
+def layout
+  root :my_root_view do
+    # ...
+  end
+end
+
+def my_root_view_style
+  background_color UIColor.grayColor
+end
+```
+
+This is especially useful with collection views, table views, and table cells.
 
 # Contributing
 

data/lib/motion-kit-cocoa/layouts/sugarcube_compat.rb

@@ -5,14 +5,24 @@
 module MotionKit
   class BaseLayout
 
+    delegate_method_fix :adjust
     delegate_method_fix :frame
     delegate_method_fix :left
     delegate_method_fix :right
     delegate_method_fix :up
     delegate_method_fix :down
     delegate_method_fix :origin
+    delegate_method_fix :thinner
+    delegate_method_fix :wider
+    delegate_method_fix :shorter
+    delegate_method_fix :taller
     delegate_method_fix :size
     delegate_method_fix :center
+    delegate_method_fix :shadow
+    delegate_method_fix :tree
+    delegate_method_fix :root
+    delegate_method_fix :restore
+    delegate_method_fix :blink
 
   end
 end

data/lib/motion-kit-osx/layouts/nswindow_frame.rb

@@ -2,6 +2,7 @@
 module MotionKit
   class NSWindowLayout
 
+    overrides :frame
     def frame(value, autosave_name=nil)
       retval = target.setFrame(value, display: true)
       if autosave_name

data/lib/motion-kit/layouts/base_layout.rb

@@ -16,13 +16,18 @@ module MotionKit
 
     attr :parent
 
-    def initialize
+    def initialize(args={})
       # @layout is the object we look in for style methods
       @layout = self
       # the Layout object that implements custom style methods. Leave this as nil
       # in the initializer.
       @layout_delegate = nil
       @layout_state = :initial
+      # You can set a root view by using .new(root: some_view)
+      if args[:root]
+        @preset_root = args[:root]
+        view # Prebuild the view
+      end
     end
 
     def set_layout(layout)

data/lib/motion-kit/layouts/tree_layout.rb

@@ -48,7 +48,7 @@ module MotionKit
 
     end
 
-    # The parent view.  This method builds the layout and returns the root view.
+    # The main view.  This method builds the layout and returns the root view.
     def view
       if @layout != self
         return @layout.view
@@ -77,7 +77,11 @@ module MotionKit
       if element.is_a?(Symbol)
         element_id = element
         # See note below about why we don't need to `apply(:default_root)`
-        element = default_root
+        element = preset_root || default_root
+      elsif @preset_root
+        # You're trying to make two roots, one at initialization
+        # and one in your layout itself.
+        raise ContextConflictError.new("Already created the root view")
       end
 
       @view = initialize_view(element)
@@ -268,6 +272,12 @@ module MotionKit
 
   protected
 
+    def preset_root
+      # Set in the initializer
+      # TreeLayout.new(root: some_view)
+      @preset_root
+    end
+
     # This method builds the layout and returns the root view.
     def build_view
       # Only in the 'layout' method will we allow default container to be

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.9.6'
+  VERSION = '0.10.0'
 end

data/spec/ios/custom_root_layout_spec.rb

@@ -0,0 +1,36 @@
+describe MotionKit::Layout do
+  before do
+    @view = UIView.new
+    @subject = TestCustomRootLayout.new(root: @view)
+  end
+
+  it "should set the root view to the @view instance" do
+    @subject.view.should == @view
+  end
+
+  it "should still create subviews" do
+    @subject.view.subviews.first.should.be.kind_of UIButton
+    @subject.view.subviews.first.subviews.first.should.be.kind_of UILabel
+  end
+
+  it "should call style method" do
+    @subject.view.backgroundColor.should == UIColor.blueColor
+  end
+
+  it "should raise exception if you try to specify a root inside the layout too" do
+    -> do
+      subject = TestCustomDuplicateRootLayout.new(root: @view)
+      subject.view
+    end.should.raise(MotionKit::ContextConflictError)
+  end
+
+  it "should allow multiple nested layouts" do
+    @subject = TestMultipleNestedLayout.new
+    @subject.view.backgroundColor.should == UIColor.purpleColor
+    @subject.view.subviews.first.should.be.kind_of TestNestedView
+    @subject.view.subviews.first.backgroundColor.should == UIColor.yellowColor
+    @subject.view.subviews.first.subviews.first.should.be.kind_of UIButton
+    @subject.view.subviews.first.subviews.first.backgroundColor.should == UIColor.blackColor
+  end
+
+end

data/spec/osx/custom_root_layout_spec.rb

@@ -0,0 +1,36 @@
+describe MotionKit::Layout do
+  before do
+    @view = NSView.new
+    @subject = TestCustomRootLayout.new(root: @view)
+  end
+
+  it "should set the root view to the @view instance" do
+    @subject.view.should == @view
+  end
+
+  it "should still create subviews" do
+    @subject.view.subviews.first.should.be.kind_of NSButton
+    @subject.view.subviews.first.subviews.first.should.be.kind_of NSTextField
+  end
+
+  it "should call style method" do
+    @subject.view.backgroundColor.should == NSColor.blueColor
+  end
+
+  it "should raise exception if you try to specify a root inside the layout too" do
+    -> do
+      subject = TestCustomDuplicateRootLayout.new(root: @view)
+      subject.view
+    end.should.raise(MotionKit::ContextConflictError)
+  end
+
+  it "should allow multiple nested layouts" do
+    @subject = TestMultipleNestedLayout.new
+    @subject.view.backgroundColor.should == NSColor.purpleColor
+    @subject.view.subviews.first.should.be.kind_of TestNestedView
+    @subject.view.subviews.first.backgroundColor.should == NSColor.yellowColor
+    @subject.view.subviews.first.subviews.first.should.be.kind_of NSButton
+    @subject.view.subviews.first.subviews.first.backgroundColor.should == NSColor.blackColor
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt
@@ -95,6 +95,7 @@ files:
 - spec/ios/constraints_helpers/view_lookup_constraints_spec.rb
 - spec/ios/create_layout_spec.rb
 - spec/ios/custom_layout_spec.rb
+- spec/ios/custom_root_layout_spec.rb
 - spec/ios/deferred_spec.rb
 - spec/ios/device_helpers_spec.rb
 - spec/ios/frame_helper_spec.rb
@@ -121,6 +122,7 @@ files:
 - spec/osx/constraints_helpers/size_constraints_spec.rb
 - spec/osx/create_menu_spec.rb
 - spec/osx/create_via_extensions_spec.rb
+- spec/osx/custom_root_layout_spec.rb
 - spec/osx/deferred_spec.rb
 - spec/osx/frame_helper_spec.rb
 - spec/osx/menu_extensions_spec.rb
@@ -169,6 +171,7 @@ test_files:
 - spec/ios/constraints_helpers/view_lookup_constraints_spec.rb
 - spec/ios/create_layout_spec.rb
 - spec/ios/custom_layout_spec.rb
+- spec/ios/custom_root_layout_spec.rb
 - spec/ios/deferred_spec.rb
 - spec/ios/device_helpers_spec.rb
 - spec/ios/frame_helper_spec.rb
@@ -195,6 +198,7 @@ test_files:
 - spec/osx/constraints_helpers/size_constraints_spec.rb
 - spec/osx/create_menu_spec.rb
 - spec/osx/create_via_extensions_spec.rb
+- spec/osx/custom_root_layout_spec.rb
 - spec/osx/deferred_spec.rb
 - spec/osx/frame_helper_spec.rb
 - spec/osx/menu_extensions_spec.rb