motion-kit 0.10.11 → 0.11.0

data/spec/ios/apply_styles_spec.rb

@@ -1,22 +1,37 @@
 describe "Layouts automatically apply styles" do
 
   before do
-    @subject = TestApplyStyles.new
+    @subject = TestApplyStyles.new.build
   end
 
-  it "should call all style methods" do
-    @subject.view
-    @subject.did_call_logo.should == true
-    @subject.did_call_h1_label.should == true
-    @subject.did_call_label.should == true
+  describe "should call all style methods" do
+    {
+      logo:     -> { @subject.did_call_logo },
+      h1_label: -> { @subject.did_call_h1_label },
+      label:    -> { @subject.did_call_label },
+    }.each do |name, condition|
+      it "should call #{name} style method" do
+        condition.call.should == true
+      end
+    end
   end
 
-  it "should apply all styles" do
-    @subject.get(:logo).text.should == 'MK'
-    @subject.get(:label).text.should == ':label'
-    @subject.get(:label).numberOfLines.should == 2
-    @subject.get(:label).font.pointSize.should == 16
-    @subject.get(:label).textColor.should == UIColor.blackColor
+  describe "should apply all styles" do
+    it 'should style :logo' do
+      @subject.get(:logo).text.should == 'MK'
+    end
+    it 'should style :label' do
+      @subject.get(:label).text.should == ':label'
+    end
+    it 'should style :label' do
+      @subject.get(:label).numberOfLines.should == 2
+    end
+    it 'should style :label' do
+      @subject.get(:label).font.pointSize.should == 16
+    end
+    it 'should style :label' do
+      @subject.get(:label).textColor.should == UIColor.blackColor
+    end
   end
 
 end

data/spec/ios/calayer_spec.rb

@@ -0,0 +1,9 @@
+describe CALayer do
+
+  before do
+  end
+
+  it 'should style a CALayer' do
+  end
+
+end

data/spec/ios/child_layouts_spec.rb

@@ -0,0 +1,53 @@
+describe 'Child Layouts' do
+
+  before do
+    @layout = TestChildrenLayout.new.build
+  end
+
+  it 'should have 3 child layouts' do
+    @layout.child_layouts.length.should == 3
+  end
+
+  it 'should have a layout named :child_button' do
+    @layout.get(:child_button).should.be.kind_of(ChildButtonLayout)
+  end
+
+  it ':child_button layout should have a view named :button' do
+    @layout.get(:child_button).get(:button).should.be.kind_of(UIButton)
+  end
+
+  it 'should have a layout named :child_image' do
+    @layout.get(:child_image).should.be.kind_of(ChildImageLayout)
+  end
+
+  it ':child_image layout should have a view named :image' do
+    @layout.get(:child_image).get(:image).should.be.kind_of(UIImageView)
+  end
+
+  describe 'Calling reapply! on parent layout' do
+
+    before do
+      @layout.reapply!
+    end
+
+    it 'should reapply :label on root' do
+      @layout.get(:label).text.should == 'root reapplied'
+    end
+
+    it 'should reapply :label on child layout' do
+      @layout.child_layouts[0].get(:label).text.should == 'reapplied'
+    end
+
+    it 'should reapply :button on child layout' do
+      @layout.get(:child_button).reapply!
+      @layout.get(:child_button).get(:button).currentTitle.should == 'reapplied'
+    end
+
+    it 'should reapply :image on child layout' do
+      reapplied_image = @layout.get(:child_image).reapplied_image
+      @layout.get(:child_image).get(:image).image.should == reapplied_image
+    end
+
+  end
+
+end

data/spec/ios/constraints_helpers/scale_constraints_spec.rb

@@ -0,0 +1,62 @@
+class MagicSizeView < UIView
+
+  def intrinsicContentSize
+    CGSize.new(200, 100)
+  end
+
+end
+
+
+describe 'Constraints - Size helpers' do
+
+  before do
+    @layout = MK::Layout.new
+    @constraint = nil
+    @view = MagicSizeView.new
+  end
+
+  it 'should support `height :scale`' do
+    @layout.context(@view) do
+      @layout.constraints do
+        @constraint = @layout.height(:scale)
+      end
+    end
+
+    @constraint.target.should == @view
+    @constraint.attribute.should == :height
+    @constraint.attribute2.should == :width
+    @constraint.relationship.should == :equal
+    @constraint.multiplier.should == 0.5
+    nsconstraint = @constraint.resolve_all(@layout, @view).first
+    nsconstraint.firstItem.should == @view
+    nsconstraint.firstAttribute.should == NSLayoutAttributeHeight
+    nsconstraint.secondItem.should == @view
+    nsconstraint.secondAttribute.should == NSLayoutAttributeWidth
+    nsconstraint.relation.should == NSLayoutRelationEqual
+    nsconstraint.multiplier.should == 0.5
+    nsconstraint.constant.should == 0
+  end
+
+  it 'should support `width :scale`' do
+    @layout.context(@view) do
+      @layout.constraints do
+        @constraint = @layout.width(:scale)
+      end
+    end
+
+    @constraint.target.should == @view
+    @constraint.attribute.should == :width
+    @constraint.attribute2.should == :height
+    @constraint.relationship.should == :equal
+    @constraint.multiplier.should == 2.0
+    nsconstraint = @constraint.resolve_all(@layout, @view).first
+    nsconstraint.firstItem.should == @view
+    nsconstraint.firstAttribute.should == NSLayoutAttributeWidth
+    nsconstraint.secondItem.should == @view
+    nsconstraint.secondAttribute.should == NSLayoutAttributeHeight
+    nsconstraint.relation.should == NSLayoutRelationEqual
+    nsconstraint.multiplier.should == 2.0
+    nsconstraint.constant.should == 0
+  end
+
+end

data/spec/ios/create_layout_spec.rb

@@ -1,4 +1,4 @@
-describe MotionKit::Layout do
+describe 'Create Layout' do
   before do
     @subject = TestCreateLayout.new
   end

data/spec/ios/custom_root_layout_spec.rb

@@ -1,4 +1,4 @@
-describe MotionKit::Layout do
+describe 'Custom Root Layouts' do
   before do
     @view = UIView.new
     @subject = TestCustomRootLayout.new(root: @view)

data/spec/ios/frame_helper_spec.rb

@@ -9,7 +9,7 @@ describe 'Frame helpers' do
     @view_size = CGSize.new(8, 10)
     @view = UIView.alloc.initWithFrame([[0, 0], @view_size])
     @view.backgroundColor = UIColor.whiteColor
-    @view.motion_kit_id = :view
+    @layout.name_element(@view, :view)
 
     @superview_size = CGSize.new(60, 40)
     @superview = UIView.alloc.initWithFrame([[0, 0], @superview_size])
@@ -18,7 +18,7 @@ describe 'Frame helpers' do
 
     @another_view = UIView.alloc.initWithFrame([[10, 100], [120, 48]])
     @another_view.backgroundColor = UIColor.redColor
-    @another_view.motion_kit_id = :another_view
+    @layout.name_element(@another_view, :another_view)
 
     top_view.addSubview(@another_view)
     top_view.addSubview(@superview)

data/spec/ios/layout_spec.rb

@@ -1,6 +1,6 @@
-describe MotionKit::Layout do
+describe 'Simple Layout' do
   before do
-    @subject = TestLayout.new
+    @subject = TestLayout.new.build
   end
 
   it "should be an instance of MotionKit::Layout" do
@@ -12,7 +12,7 @@ describe MotionKit::Layout do
   end
 
   it "should add a UIView subview with the name :basic_view" do
-    view = @subject.view.subviews.find { |view| view.motion_kit_id == :basic_view }
+    view = @subject.get(:basic_view)
     view.should.be.kind_of(UIView)
   end
 
@@ -30,25 +30,14 @@ describe MotionKit::Layout do
 
   it "should allow getting the subviews by their id" do
     @subject.get(:basic_view).should.be.kind_of UIView
-    @subject.get(:basic_view, in: @subject.view).should.be.kind_of UIView
-    @subject.get(:basic_view, in: @subject.view).should == @subject.get(:basic_view)
-
     @subject.get(:basic_button).should.be.kind_of UIButton
-    @subject.get(:basic_button, in: @subject.view).should.be.kind_of UIView
-    @subject.get(:basic_button, in: @subject.view).should == @subject.get(:basic_button)
-
     @subject.get(:basic_label).should.be.kind_of UILabel
-    @subject.get(:basic_label, in: @subject.view).should.be.kind_of UIView
-    @subject.get(:basic_label, in: @subject.view).should == @subject.get(:basic_label)
   end
 
   it "should allow getting the subviews by first, last and nth child" do
     @subject.first(:repeated_label_3).should.be.kind_of UIView
-    @subject.first(:repeated_label_3, in: @subject.other_view).should.be.kind_of UIView
     @subject.nth(:repeated_label_3, 1).should.be.kind_of UIButton
-    @subject.nth(:repeated_label_3, at: 1, in: @subject.other_view).should.be.kind_of UIButton
     @subject.last(:repeated_label_3).should.be.kind_of UILabel
-    @subject.last(:repeated_label_3, in: @subject.other_view).should.be.kind_of UILabel
   end
 
   it "should allow getting all the subviews by name" do
@@ -57,12 +46,6 @@ describe MotionKit::Layout do
     views[0].should.be.kind_of UIView
     views[1].should.be.kind_of UIButton
     views[2].should.be.kind_of UILabel
-
-    views = @subject.all(:repeated_label_3, in: @subject.other_view)
-    views.length.should == 3
-    views[0].should.be.kind_of UIView
-    views[1].should.be.kind_of UIButton
-    views[2].should.be.kind_of UILabel
   end
 
   it "should support missing methods" do

data/spec/ios/layout_state_spec.rb

@@ -20,7 +20,7 @@ describe 'Blocks that are state specific' do
 
   it 'should run the reapply blocks from any method' do
     any_view = @subject.any_view
-    @subject.reapply!(any_view)
+    @subject.reapply!
     any_view.text.should == 'reapply'
   end
 

data/spec/ios/motionkit_util_spec.rb

@@ -12,91 +12,4 @@ describe 'MotionKit utility methods' do
     MotionKit.appearance_class.should.be.kind_of(Class)
   end
 
-  describe 'traversal methods' do
-    before do
-      view = UIView.new
-      view.tag = 1
-      subview1 = UIButton.new
-      subview1.tag = 2
-      subview2 = UILabel.new
-      subview2.tag = 3
-      subview3 = UILabel.new
-      subview3.tag = 4
-      subview4 = UIView.new
-      subview4.tag = 5
-      subview5 = UIButton.new
-      subview5.tag = 6
-      subview6 = UILabel.new
-      subview6.tag = 7
-
-      view.addSubview(subview1)
-      view.addSubview(subview2)
-      view.addSubview(subview3)
-      view.addSubview(subview4)
-
-      subview4.addSubview(subview5)
-      subview4.addSubview(subview6)
-
-      @subject = view
-    end
-
-    it 'should return the first UIButton that matches' do
-      found = MotionKit.find_first_view(@subject) { |view| view.is_a?(UIButton) }
-      found.should.be.kind_of(UIButton)
-      found.tag.should == 2
-    end
-
-    it 'should return the first UILabel that matches' do
-      found = MotionKit.find_first_view(@subject) { |view| view.is_a?(UILabel) }
-      found.should.be.kind_of(UILabel)
-      found.tag.should == 3
-    end
-
-    it 'should return nil for first UIImage' do
-      found = MotionKit.find_first_view(@subject) { |view| view.is_a?(UIImage) }
-      found.should == nil
-    end
-
-    it 'should return the last UIButton that matches' do
-      found = MotionKit.find_last_view(@subject) { |view| view.is_a?(UIButton) }
-      found.should.be.kind_of(UIButton)
-      found.tag.should == 6
-    end
-
-    it 'should return the last UILabel that matches' do
-      found = MotionKit.find_last_view(@subject) { |view| view.is_a?(UILabel) }
-      found.should.be.kind_of(UILabel)
-      found.tag.should == 7
-    end
-
-    it 'should return nil for last UIImage' do
-      found = MotionKit.find_last_view(@subject) { |view| view.is_a?(UIImage) }
-      found.should == nil
-    end
-
-    it 'should return all the UIButton that match' do
-      found = MotionKit.find_all_views(@subject) { |view| view.is_a?(UIButton) }
-      found.length.should == 2
-      found.map { |view| view.tag }.should == [2, 6]
-    end
-
-    it 'should return all the UILabel that match' do
-      found = MotionKit.find_all_views(@subject) { |view| view.is_a?(UILabel) }
-      found.length.should == 3
-      found.map { |view| view.tag }.should == [3, 4, 7]
-    end
-
-    it 'should return all the UIView that match' do
-      found = MotionKit.find_all_views(@subject) { |view| view.is_a?(UIView) }
-      found.length.should == 7
-      found.map { |view| view.tag }.should == [1, 2, 3, 4, 5, 6, 7]
-    end
-
-    it 'should return [] for all UIImages' do
-      found = MotionKit.find_all_views(@subject) { |view| view.is_a?(UIImage) }
-      found.should == []
-    end
-
-  end
-
 end

data/spec/ios/reapply_frame.rb

@@ -13,10 +13,8 @@ describe 'Views frames should remain unchanged' do
   end
 
   it "top should be in the right position before and after reapply" do
-    NSLog("top frame before reapply = #{@subject.get(:top).frame.inspect}")
     @subject.get(:top).frame.should == CGRectMake(@cw/2 - 5, 0, 10, 10)
     @subject.reapply!
-    NSLog("top frame after reapply = #{@subject.get(:top).frame.inspect}")
     @subject.get(:top).frame.should == CGRectMake(@cw/2 - 5, 0, 10, 10)
   end
 

data/spec/ios/relative_layout.spec.rb

@@ -1,6 +1,6 @@
-describe MotionKit::Layout do
+describe 'Relative Layouts' do
   before do
-    @subject = TestRelativeLayout.new
+    @subject = TestRelativeLayout.new.build
   end
 
   it "should have two subviews" do

data/spec/ios/remove_layout_spec.rb

@@ -1,6 +1,6 @@
-describe MotionKit::Layout do
+describe 'Remove views' do
   before do
-    @subject = TestRemoveLayout.new
+    @subject = TestRemoveLayout.new.build
   end
 
   it 'should remove the #label view' do
@@ -19,7 +19,6 @@ describe MotionKit::Layout do
     @subject.get(:view).should.be.kind_of(UIView)
     @subject.remove_view
     @subject.get(:view).should.be.nil
-    @subject.get(:image).should.be.nil
   end
 
 end

data/spec/ios/view_attr_spec.rb

@@ -22,4 +22,11 @@ describe 'View attr' do
     label.should == @layout.label
   end
 
+  it 'should handle multiple views' do
+    @layout.view
+    text_field = @layout.text_field
+    text_field.should.be.kind_of(UITextField)
+    text_view = @layout.text_view
+    text_view.should.be.kind_of(UITextView)
+  end
 end

data/spec/osx/constraints_helpers/table_view_spec.rb

@@ -0,0 +1,34 @@
+describe MotionKit::NSTableViewLayout do
+
+  before do
+    @layout = TestTableColumnLayout.new.build
+  end
+
+  it 'should have a column called "foo"' do
+    column = @layout.table.tableColumnWithIdentifier('foo')
+    column.should.be.kind_of(NSTableColumn)
+  end
+
+  it 'column1 should say "Foo"' do
+    @layout.column1.headerCell.stringValue.should == 'Foo'
+  end
+
+  it 'should have a column called "bar"' do
+    column = @layout.table.tableColumnWithIdentifier('bar')
+    column.should.be.kind_of(NSTableColumn)
+  end
+
+  it 'column2 should say "Bar"' do
+    @layout.column2.headerCell.stringValue.should == 'Bar'
+  end
+
+  it 'should have a column called "quux"' do
+    column = @layout.table.tableColumnWithIdentifier('quux')
+    column.should.be.kind_of(NSTableColumn)
+  end
+
+  it 'column3 should say "Quux"' do
+    @layout.column3.headerCell.stringValue.should == 'Quux'
+  end
+
+end

data/spec/osx/custom_root_layout_spec.rb

@@ -1,4 +1,4 @@
-describe MotionKit::Layout do
+describe 'Custom Root Layouts' do
   before do
     @view = NSView.new
     @subject = TestCustomRootLayout.new(root: @view)

data/spec/osx/frame_helper_spec.rb

@@ -17,7 +17,7 @@ describe 'Frame helpers' do
     @view_size = CGSize.new(8, 10)
     @view = NSView.alloc.initWithFrame([[0, 0], @view_size])
     @view.backgroundColor = NSColor.whiteColor
-    @view.motion_kit_id = :view
+    @layout.name_element(@view, :view)
 
     @superview_size = CGSize.new(60, 40)
     @superview = NSView.alloc.initWithFrame([[0, 0], @superview_size])
@@ -32,7 +32,7 @@ describe 'Frame helpers' do
 
     @another_view = NSView.alloc.initWithFrame([[10, 100], [120, 48]])
     @another_view.backgroundColor = NSColor.redColor
-    @another_view.motion_kit_id = :another_view
+    @layout.name_element(@another_view, :another_view)
 
     top_view.addSubview(@another_view)
     top_view.addSubview(@superview)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.11.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt
@@ -48,7 +48,6 @@ files:
 - lib/motion-kit/object.rb
 - lib/motion-kit/util.rb
 - lib/motion-kit/version.rb
-- lib/motion-kit-cocoa/cocoa_util.rb
 - lib/motion-kit-cocoa/constraints/constraint.rb
 - lib/motion-kit-cocoa/constraints/constraint_placeholder.rb
 - lib/motion-kit-cocoa/constraints/constraints_layout.rb
@@ -86,8 +85,10 @@ files:
 - README.md
 - spec/ios/apply_styles_spec.rb
 - spec/ios/autoresizing_helper_spec.rb
+- spec/ios/calayer_spec.rb
 - spec/ios/calculate_spec.rb
 - spec/ios/calculator_spec.rb
+- spec/ios/child_layouts_spec.rb
 - spec/ios/constraints_helpers/attribute_lookup_spec.rb
 - spec/ios/constraints_helpers/axis_lookup_spec.rb
 - spec/ios/constraints_helpers/center_constraints_spec.rb
@@ -96,6 +97,7 @@ files:
 - spec/ios/constraints_helpers/relationship_lookup_spec.rb
 - spec/ios/constraints_helpers/relative_corners_spec.rb
 - spec/ios/constraints_helpers/relative_location_spec.rb
+- spec/ios/constraints_helpers/scale_constraints_spec.rb
 - spec/ios/constraints_helpers/simple_constraints_spec.rb
 - spec/ios/constraints_helpers/size_constraints_spec.rb
 - spec/ios/constraints_helpers/view_lookup_constraints_spec.rb
@@ -128,6 +130,7 @@ files:
 - spec/osx/constraints_helpers/orientation_lookup_spec.rb
 - spec/osx/constraints_helpers/simple_constraints_spec.rb
 - spec/osx/constraints_helpers/size_constraints_spec.rb
+- spec/osx/constraints_helpers/table_view_spec.rb
 - spec/osx/create_menu_spec.rb
 - spec/osx/create_via_extensions_spec.rb
 - spec/osx/custom_root_layout_spec.rb
@@ -165,8 +168,10 @@ summary: The RubyMotion layout and styling gem.
 test_files:
 - spec/ios/apply_styles_spec.rb
 - spec/ios/autoresizing_helper_spec.rb
+- spec/ios/calayer_spec.rb
 - spec/ios/calculate_spec.rb
 - spec/ios/calculator_spec.rb
+- spec/ios/child_layouts_spec.rb
 - spec/ios/constraints_helpers/attribute_lookup_spec.rb
 - spec/ios/constraints_helpers/axis_lookup_spec.rb
 - spec/ios/constraints_helpers/center_constraints_spec.rb
@@ -175,6 +180,7 @@ test_files:
 - spec/ios/constraints_helpers/relationship_lookup_spec.rb
 - spec/ios/constraints_helpers/relative_corners_spec.rb
 - spec/ios/constraints_helpers/relative_location_spec.rb
+- spec/ios/constraints_helpers/scale_constraints_spec.rb
 - spec/ios/constraints_helpers/simple_constraints_spec.rb
 - spec/ios/constraints_helpers/size_constraints_spec.rb
 - spec/ios/constraints_helpers/view_lookup_constraints_spec.rb
@@ -207,6 +213,7 @@ test_files:
 - spec/osx/constraints_helpers/orientation_lookup_spec.rb
 - spec/osx/constraints_helpers/simple_constraints_spec.rb
 - spec/osx/constraints_helpers/size_constraints_spec.rb
+- spec/osx/constraints_helpers/table_view_spec.rb
 - spec/osx/create_menu_spec.rb
 - spec/osx/create_via_extensions_spec.rb
 - spec/osx/custom_root_layout_spec.rb

data/lib/motion-kit-cocoa/cocoa_util.rb

@@ -1,59 +0,0 @@
-module MotionKit
-  module_function
-
-  # performs a breadth-first search
-  def find_first_view(root, &condition)
-    if condition.call(root)
-      root
-    else
-      found = nil
-      root.subviews.find do |subview|
-        found = find_first_view(subview, &condition)
-      end
-      return found
-    end
-  end
-
-  # performs a depth-first and reversed search
-  def find_last_view(root, &condition)
-    found = nil
-    root.subviews.reverse.find do |subview|
-      found = find_last_view(subview, &condition)
-    end
-
-    if ! found && condition.call(root)
-      found = root
-    end
-
-    return found
-  end
-
-  # performs a breadth-first search, but returns all matches
-  def find_all_views(root, &condition)
-    found = []
-    if condition.call(root)
-      found << root
-    end
-
-    (root.subviews || []).each do |subview|
-      found.concat(find_all_views(subview, &condition))
-    end
-
-    return found
-  end
-
-  # similar to find_all_views, but for CALayer
-  def find_all_layers(root, &condition)
-    found = []
-    if condition.call(root)
-      found << root
-    end
-
-    (root.sublayers || []).each do |sublayer|
-      found.concat(find_all_layers(sublayer, &condition))
-    end
-
-    return found
-  end
-
-end