motion-kit 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5e920f2573c2ee36b557a87123717d8c4e8eede
-  data.tar.gz: 1e0eb4395e42b78b11964ec15d8184187e41ea44
+  metadata.gz: 35471767d3b359768976d596f1c8c6e97231c02b
+  data.tar.gz: 0278f47cc49bf7aa77906ef06f143f36ea52faf0
 SHA512:
-  metadata.gz: d4279eaf70ce6cf8c776df309df9d26f136aed4519f955d6e143f4e1338989a36957cd31e3e4a2929088668330e6e76ea24308ba4d9a740970a4692511801ef1
-  data.tar.gz: 260ab1fef50781ce07bbdf3ac8bc875e69cc62ade984ccbc454ea54ea879396223cd8fbe5cc2f4890b3c347681f23285213e3fe47b488983c3f794a94b9e1487
+  metadata.gz: c460d3c67c1f3cb4fa50f074061ead9c34c2e9c9dacda427bd728f8f2f1e4ff354c33907b3a00c6e498d6378668e6c359776d20dd51ff881890d54874ea13fe5
+  data.tar.gz: fc2ec0c29a6244223a7ac889d98128e8dca3ec1b6a6d61bf350669b030eb0c48cbb2ff6640a72e2c121eb9b291ef09944acb02e4c8ab7b954a307b5e459a8aee

data/README.md

@@ -717,10 +717,10 @@ One common use case is to use a child layout to create many instances of the
 same layout that repeat, for instance a "row" of content.  In this case you will
 probably have many views with the same id, and you will not know the index of
 the container view that you want to add constraints to.  In this situation, use
-the `nearest`, `previous` or `next` method to find a container, sibling, or
+the `nearest`, `prev` or `next` method to find a container, sibling, or
 child view.
 
-`previous` and `next` are easy; they just search for a sibling view.  No
+`prev` and `next` are easy; they just search for a sibling view.  No
 superviews or subviews are searched.
 
 `nearest` will search child views, siblings, and superviews, in that order.  The

data/lib/motion-kit-cocoa/constraints/constraint.rb

@@ -55,6 +55,7 @@ module MotionKit
       @constant = 0
       @priority = nil
       @compare_flag = false
+      @active = true
     end
 
     # like `equals`, but also sets `compare_flag` to true, so you can use ==,
@@ -270,6 +271,72 @@ module MotionKit
       end
     end
 
+    def active
+      @active
+    end
+
+    def active=(active)
+      if @resolved
+        if active
+          @resolved.each do |constraint|
+            common_ancestor.addConstraint(constraint)
+          end
+        else
+          @resolved.each do |constraint|
+            common_ancestor.removeConstraint(constraint)
+          end
+        end
+      else
+        @active = active
+      end
+    end
+
+    def activate
+      self.active = true
+      self
+    end
+
+    def deactivate
+      self.active = false
+      self
+    end
+
+    def common_ancestor
+      if @resolved
+        @common_ancestor ||= begin
+          constraint = @resolved[0]
+          base_view_class = MotionKit.base_view_class
+
+          if constraint.firstItem.is_a?(base_view_class) && constraint.secondItem.is_a?(base_view_class)
+            common_ancestor = nil
+
+            ancestors = [constraint.firstItem]
+            parent_view = constraint.firstItem
+            while parent_view = parent_view.superview
+              ancestors << parent_view
+            end
+
+            current_view = constraint.secondItem
+            while current_view
+              if ancestors.include? current_view
+                common_ancestor = current_view
+                break
+              end
+              current_view = current_view.superview
+            end
+
+            unless common_ancestor
+              raise NoCommonAncestorError.new("No common ancestors between #{constraint.firstItem} and #{constraint.secondItem}")
+            end
+          else
+            common_ancestor = constraint.firstItem
+          end
+
+          common_ancestor
+        end
+      end
+    end
+
     class << self
 
       def axis_lookup(axis)

data/lib/motion-kit-cocoa/constraints/constraints_target.rb

@@ -23,34 +23,9 @@ module MotionKit
     def apply_all_constraints(layout, target)
       @constraints.map do |mk_constraint|
         mk_constraint.resolve_all(layout, target).map do |constraint|
-          base_view_class = MotionKit.base_view_class
-
-          if constraint.firstItem.is_a?(base_view_class) && constraint.secondItem.is_a?(base_view_class)
-            common_ancestor = nil
-
-            ancestors = [constraint.firstItem]
-            parent_view = constraint.firstItem
-            while parent_view = parent_view.superview
-              ancestors << parent_view
-            end
-
-            current_view = constraint.secondItem
-            while current_view
-              if ancestors.include? current_view
-                common_ancestor = current_view
-                break
-              end
-              current_view = current_view.superview
-            end
-
-            unless common_ancestor
-              raise NoCommonAncestorError.new("No common ancestors between #{constraint.firstItem} and #{constraint.secondItem}")
-            end
-          else
-            common_ancestor = constraint.firstItem
+          if mk_constraint.active
+            mk_constraint.common_ancestor.addConstraint(constraint)
           end
-
-          common_ancestor.addConstraint(constraint)
           constraint
         end
       end.flatten

data/lib/motion-kit-osx/helpers/nstabview_helpers.rb

@@ -0,0 +1,11 @@
+class NSTabViewHelpers < MK::NSViewHelpers
+  targets NSTabView
+
+  def add_tab(identifier, label, &block)
+    tab_view_item = NSTabViewItem.alloc.initWithIdentifier(identifier)
+    tab_view_item.label = label
+    target.addTabViewItem(tab_view_item)
+    tab_view_item.view = NSView.alloc.initWithFrame(target.contentRect)
+    context(tab_view_item.view, &block)
+  end
+end

data/lib/motion-kit-osx/helpers/nsview_autoresizing_helpers.rb

@@ -39,7 +39,7 @@ module MotionKit
         when :fill_bottom
           value |= NSViewWidthSizable | NSViewMaxYMargin
         when :fill_width
-          value |= NSViewMinYMargin | NSViewWidthSizable | NSViewMaxXMargin
+          value |= NSViewMinYMargin | NSViewWidthSizable | NSViewMaxYMargin
         when :fill_left
           value |= NSViewHeightSizable | NSViewMaxXMargin
         when :fill_right

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

@@ -197,7 +197,7 @@ module MotionKit
 
     def initial(&block)
       raise ArgumentError.new('Block required') unless block
-      puts('this method is no longer necessary!  all code that *isn\'t in a `reapply` block is now only applied during initial setup.')
+      puts('the `initial` method is no longer necessary!  all code that *isn\'t in a `reapply` block is now only applied during initial setup.')
 
       if initial?
         yield

data/lib/motion-kit/version.rb

@@ -1,3 +1,3 @@
 module MotionKit
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 end

data/spec/ios/constraints_helpers/active_constraints_spec.rb

@@ -0,0 +1,25 @@
+describe 'Constraints - activate/deactivate helpers' do
+
+  before do
+    @layout = MotionKit::Layout.new
+    @constraint = nil
+    @view = UIView.new
+  end
+
+  should 'should activate/deactivate constraints' do
+
+    @layout.context(@view) do
+      @layout.constraints do
+        @constraint = @layout.height(10)
+      end
+    end
+
+    @view.constraints.count.should == 1
+    @constraint.deactivate
+    @view.constraints.count.should == 0
+    @constraint.activate
+    @view.constraints.count.should == 1
+
+  end
+
+end

data/spec/osx/constraints_helpers/active_constraints_spec.rb

@@ -0,0 +1,25 @@
+describe 'Constraints - activate/deactivate helpers' do
+
+  before do
+    @layout = MotionKit::Layout.new
+    @constraint = nil
+    @view = NSView.new
+  end
+
+  should 'should activate/deactivate constraints' do
+
+    @layout.context(@view) do
+      @layout.constraints do
+        @constraint = @layout.height(10)
+      end
+    end
+
+    @view.constraints.count.should == 1
+    @constraint.deactivate
+    @view.constraints.count.should == 0
+    @constraint.activate
+    @view.constraints.count.should == 1
+
+  end
+
+end

data/spec/osx/custom_root_layout_spec.rb

@@ -50,8 +50,8 @@ describe 'Custom Root Layouts' do
   it "should allow bare styles in layout when root is specified in initializer" do
     @subject = TestNoRootLayout.new(root: @view).build
     @subject.view.should == @view
-    @subject.view.backgroundColor.should == UIColor.redColor
-    @subject.view.subviews.first.should.be.kind_of?(UILabel)
+    @subject.view.backgroundColor.should == NSColor.redColor
+    @subject.view.subviews.first.should.be.kind_of?(NSTextField)
   end
 
 end

data/spec/osx/nstabview_helper_spec.rb

@@ -0,0 +1,27 @@
+describe 'NSTabView helpers' do
+  class TestTabViewLayout < MK::Layout
+    def layout
+      add NSTabView, :tab_view do
+        add_tab "tab_identifier", "tab_label" do
+          wantsLayer true
+          backgroundColor NSColor.redColor
+        end
+      end
+    end
+  end
+
+  it 'should support `add_tab` method' do
+    @layout = TestTabViewLayout.new
+
+    view = NSView.alloc.initWithFrame([[0, 0], [500, 500]])
+    view.addSubview(@layout.view)
+
+    @tab_view = @layout.get(:tab_view)
+
+    @tab_view.numberOfTabViewItems.should == 1
+    @tab_view.tabViewItems.first.identifier.should == "tab_identifier"
+    @tab_view.tabViewItems.first.label.should == "tab_label"
+    @tab_view.tabViewItems.first.view.wantsLayer.should == true
+    @tab_view.tabViewItems.first.view.backgroundColor.should == NSColor.redColor
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-kit
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dbt
@@ -34,19 +34,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/motion-kit/calculator/calculate.rb
-- lib/motion-kit/calculator/calculator.rb
-- lib/motion-kit/calculator/frame_calculator.rb
-- lib/motion-kit/calculator/origin_calculator.rb
-- lib/motion-kit/calculator/size_calculator.rb
-- lib/motion-kit/helpers/base_layout.rb
-- lib/motion-kit/helpers/base_layout_class_methods.rb
-- lib/motion-kit/helpers/parent.rb
-- lib/motion-kit/helpers/tree_layout.rb
-- lib/motion-kit/motion-kit.rb
-- lib/motion-kit/object.rb
-- lib/motion-kit/util.rb
-- lib/motion-kit/version.rb
+- README.md
 - lib/motion-kit-cocoa/calculator/view_calculator.rb
 - lib/motion-kit-cocoa/cocoa_util.rb
 - lib/motion-kit-cocoa/constraints/constraint.rb
@@ -79,6 +67,7 @@ files:
 - lib/motion-kit-osx/helpers/nsmenuitem_extensions.rb
 - lib/motion-kit-osx/helpers/nstablecolumn_helpers.rb
 - lib/motion-kit-osx/helpers/nstableview_helpers.rb
+- lib/motion-kit-osx/helpers/nstabview_helpers.rb
 - lib/motion-kit-osx/helpers/nsview_autoresizing_helpers.rb
 - lib/motion-kit-osx/helpers/nsview_constraints_helpers.rb
 - lib/motion-kit-osx/helpers/nsview_frame_helpers.rb
@@ -87,13 +76,26 @@ files:
 - lib/motion-kit-osx/helpers/nswindow_helpers.rb
 - lib/motion-kit-osx/osx_util.rb
 - lib/motion-kit.rb
-- README.md
+- lib/motion-kit/calculator/calculate.rb
+- lib/motion-kit/calculator/calculator.rb
+- lib/motion-kit/calculator/frame_calculator.rb
+- lib/motion-kit/calculator/origin_calculator.rb
+- lib/motion-kit/calculator/size_calculator.rb
+- lib/motion-kit/helpers/base_layout.rb
+- lib/motion-kit/helpers/base_layout_class_methods.rb
+- lib/motion-kit/helpers/parent.rb
+- lib/motion-kit/helpers/tree_layout.rb
+- lib/motion-kit/motion-kit.rb
+- lib/motion-kit/object.rb
+- lib/motion-kit/util.rb
+- lib/motion-kit/version.rb
 - 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/active_constraints_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
@@ -134,6 +136,7 @@ files:
 - spec/ios/uitextfield_spec.rb
 - spec/ios/view_attr_spec.rb
 - spec/osx/autoresizing_helper_spec.rb
+- spec/osx/constraints_helpers/active_constraints_spec.rb
 - spec/osx/constraints_helpers/orientation_lookup_spec.rb
 - spec/osx/constraints_helpers/simple_constraints_spec.rb
 - spec/osx/constraints_helpers/size_constraints_spec.rb
@@ -145,6 +148,7 @@ files:
 - spec/osx/menu_extensions_spec.rb
 - spec/osx/menu_layout_spec.rb
 - spec/osx/menu_spec.rb
+- spec/osx/nstabview_helper_spec.rb
 - spec/osx/nsview_frame_helper_spec.rb
 - spec/osx/nswindow_frame_helper_spec.rb
 - spec/osx/root_menu_spec.rb
@@ -169,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The RubyMotion layout and styling gem.
@@ -180,6 +184,7 @@ test_files:
 - spec/ios/calculate_spec.rb
 - spec/ios/calculator_spec.rb
 - spec/ios/child_layouts_spec.rb
+- spec/ios/constraints_helpers/active_constraints_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
@@ -220,6 +225,7 @@ test_files:
 - spec/ios/uitextfield_spec.rb
 - spec/ios/view_attr_spec.rb
 - spec/osx/autoresizing_helper_spec.rb
+- spec/osx/constraints_helpers/active_constraints_spec.rb
 - spec/osx/constraints_helpers/orientation_lookup_spec.rb
 - spec/osx/constraints_helpers/simple_constraints_spec.rb
 - spec/osx/constraints_helpers/size_constraints_spec.rb
@@ -231,6 +237,7 @@ test_files:
 - spec/osx/menu_extensions_spec.rb
 - spec/osx/menu_layout_spec.rb
 - spec/osx/menu_spec.rb
+- spec/osx/nstabview_helper_spec.rb
 - spec/osx/nsview_frame_helper_spec.rb
 - spec/osx/nswindow_frame_helper_spec.rb
 - spec/osx/root_menu_spec.rb