motion_bindable 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c897c0eb305bd4f7b5ffd32cf03c647c02f225
-  data.tar.gz: cd0bf8cc88ac483a0296e0fc0399cf157dd77e32
+  metadata.gz: ca57bb625e112f16ca5235ede05268ebba35a898
+  data.tar.gz: 0295b1de273b684a0542201d3e8d5c206fa46a82
 SHA512:
-  metadata.gz: be96fcb5c62954e620367ebf7318eaa3aa2ea5fc9367d375aa6a472ada78e5f2e3d4b7de5c7f753837f741acfa350a604fe177c60f6e9f53e8b8f6dc57ad44b1
-  data.tar.gz: 523280e1eb706f1b561e9e81f52512537a49e3e824487ef2ec896eeaf41f739f3bd6f3267fbf2266bf85b07ccc4a51df32ddf44e34961b4fac17ecaab09bbc7b
+  metadata.gz: 6e70e15e59ad61a1fc6f007d1b2023a11c279f5980c1f81d5148f6968c39fa76a66d73d6395bcd5606dcb5c27ec4c3d2c0ee60d401ec5a322f352f08a0903b48
+  data.tar.gz: eac62bffcf0e08564602b3399b51a1d1734d548fee82cbb2671ed6ff1c9fd6747cb617fcada65a21417c85ede1b259652160f7edcb3ba4e7e9f125a171018d74

data/lib/motion_bindable/strategy.rb

@@ -18,6 +18,7 @@ module MotionBindable
 
     attr_accessor :object
     attr_accessor :bound
+    attr_reader :attr_name
 
     def initialize(object, attr_name)
       @attr_name = attr_name.to_sym
@@ -39,10 +40,6 @@ module MotionBindable
       self
     end
 
-    def refresh_object
-      attribute
-    end
-
     def unbind
       @watching = nil
     end
@@ -50,22 +47,22 @@ module MotionBindable
     private # Methods to leave alone
 
     def attribute
-      object.send(@attr_name)
+      object.send(attr_name)
     end
 
     def attribute=(value)
-      object.send(:"#{@attr_name.to_s}=", value)
+      object.send(:"#{attr_name.to_s}=", value)
     end
 
     def initial_state
-      if attribute.nil?
+      if attribute.nil? && respond_to?(:on_bound_change)
         if respond_to?(:refresh_bound) then on_bound_change(refresh_bound)
         else on_bound_change
-        end if respond_to?(:on_bound_change)
-      else
+        end
+      elsif respond_to?(:on_object_change)
         if respond_to?(:refresh_object) then on_object_change(refresh_object)
         else on_object_change(attribute)
-        end if respond_to?(:on_object_change)
+        end
       end
     end
 
@@ -78,7 +75,7 @@ module MotionBindable
       end
       if respond_to?(:start_observing_object) then start_observing_object
       elsif respond_to?(:refresh_object) && respond_to?(:on_object_change)
-        sides << object
+        sides << :object
       end
 
       watch(sides)

data/lib/motion_bindable/version.rb

@@ -1,3 +1,3 @@
 module MotionBindable
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/strategies/proc.rb

@@ -6,6 +6,10 @@ module MotionBindable::Strategies
       bound.call
     end
 
+    def refresh_object
+      attribute
+    end
+
     def on_bound_change(new = nil)
       self.attribute = new || bound.call
     end

data/lib/strategies/strategies.rb

@@ -5,6 +5,10 @@ module MotionBindable::Strategies
       MotionBindable::Strategies::UITextField,
       ::UITextField
     )
+    ::MotionBindable::Strategy.register_strategy(
+      MotionBindable::Strategies::UILabel,
+      ::UILabel
+    )
     ::MotionBindable::Strategy.register_strategy(
       MotionBindable::Strategies::Proc,
       ::Proc

data/lib/strategies/ui_label.rb

@@ -0,0 +1,26 @@
+module MotionBindable::Strategies
+
+  class UILabel < ::MotionBindable::Strategy
+
+    def start_observing_object
+      # Observe the attribute
+      object.addObserver(
+        self,
+        forKeyPath: attr_name,
+        options: NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld,
+        context: nil
+      )
+    end
+
+    def on_object_change(new = nil)
+      @bound.text = (new || attribute)
+      @bound.setNeedsDisplay
+    end
+
+    def observeValueForKeyPath(_, ofObject: _, change: _, context: _)
+      on_object_change
+    end
+
+  end
+
+end

data/lib/strategies/ui_text_field.rb

@@ -22,11 +22,11 @@ module MotionBindable::Strategies
     end
 
     def on_bound_change(new = nil)
-      self.attribute = new || bound.text
+      self.attribute = (new || bound.text)
     end
 
     def on_object_change(new = nil)
-      @bound.text = new || attribute
+      @bound.text = (new || attribute)
     end
 
     def unbind

data/spec/{strategy_spec.rb → strategies/strategy_spec.rb}

@@ -32,8 +32,7 @@ describe 'MotionBindable::Strategy' do
       @object = ObjectOne.new
       @bound = Object.new
       @strategy = Strategy.new(@object, :attribute)
-      @strategy.stub!(:watch_bound)
-      @strategy.stub!(:watch_object)
+      @strategy.stub!(:watch)
     end
 
     describe '#bind' do

data/spec/strategies/ui_label_spec.rb

@@ -0,0 +1,67 @@
+class FakeModel
+  include MotionBindable::Bindable
+  attr_accessor :nested
+  attr_accessor :attribute
+  def attribute
+    @attribute
+  end
+end
+
+describe 'MotionBindable::Strategies::UILabel' do
+
+  before do
+    MotionBindable::Strategy.register_strategy(
+      MotionBindable::Strategies::UILabel,
+      UILabel
+    )
+
+    @label = UILabel.alloc.initWithFrame [[110, 60], [100, 26]]
+    @label2 = UILabel.alloc.initWithFrame [[110, 60], [100, 26]]
+    @object = FakeModel.new
+    @object.nested = FakeModel.new
+  end
+
+  context 'attribute is not set yet' do
+
+    before do
+      @object.bind_attributes({
+        attribute: @label,
+        nested: { attribute: @label2 }
+      })
+    end
+
+    it 'should update the label on change' do
+      @object.attribute = 'one'
+      @object.nested.attribute = 'two'
+      @label.text.should.equal 'one'
+      @label2.text.should.equal'two'
+    end
+
+  end
+
+  context 'attribute is set first' do
+
+    before do
+      @object.attribute = 'test'
+      @object.nested.attribute = 'test2'
+      @object.bind_attributes({
+        attribute: @label,
+        nested: { attribute: @label2 }
+      })
+    end
+
+    it 'should set the label on bind' do
+      @label.text.should.equal 'test'
+      @label2.text.should.equal 'test2'
+    end
+
+    it 'should change the label when the attribute changes' do
+      @object.attribute = 'changed'
+      @object.nested.attribute = 'changed2'
+      @label.text.should.equal 'changed'
+      @label2.text.should.equal 'changed2'
+    end
+
+  end
+
+end

data/spec/{ui_text_field_strategy_spec.rb → strategies/ui_text_field_spec.rb}

@@ -15,8 +15,8 @@ describe 'MotionBindable::Strategies::UITextField' do
       UITextField
     )
 
-    @app = UIApplication.sharedApplication
     @text_field = UITextField.alloc.initWithFrame [[110, 60], [100, 26]]
+    @text_field2 = UITextField.alloc.initWithFrame [[110, 60], [100, 26]]
   end
 
   context 'nested model' do
@@ -26,6 +26,26 @@ describe 'MotionBindable::Strategies::UITextField' do
       @object.nested = FakeModel.new
     end
 
+    context 'attribute set and bound' do
+
+      before do
+        @object.attribute = 'one'
+        @object.nested.attribute = 'two'
+        @object.bind_attributes({
+          attribute: @text_field,
+          nested: {
+            attribute: @text_field2
+          }
+        })
+      end
+
+      it 'should update the text field' do
+        @text_field.text.should.equal 'one'
+        @text_field2.text.should.equal 'two'
+      end
+
+    end
+
     context 'text set and then bound' do
       before do
         @text_field.text = 'Just testing.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_bindable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nathan Kot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies: []
 description: A simple data binding library for RubyMotion.
 email:
@@ -32,14 +32,16 @@ files:
 - lib/motion_bindable/version.rb
 - lib/strategies/proc.rb
 - lib/strategies/strategies.rb
+- lib/strategies/ui_label.rb
 - lib/strategies/ui_text_field.rb
 - motion_bindable.gemspec
 - resources/Default-568h@2x.png
 - spec/bindable_spec.rb
 - spec/helpers/facon.rb
-- spec/proc_strategy_spec.rb
-- spec/strategy_spec.rb
-- spec/ui_text_field_strategy_spec.rb
+- spec/strategies/proc_spec.rb
+- spec/strategies/strategy_spec.rb
+- spec/strategies/ui_label_spec.rb
+- spec/strategies/ui_text_field_spec.rb
 homepage: https://github.com/nathankot/motion-bindable
 licenses:
 - MIT
@@ -67,6 +69,7 @@ summary: Inspired by RivetsJS
 test_files:
 - spec/bindable_spec.rb
 - spec/helpers/facon.rb
-- spec/proc_strategy_spec.rb
-- spec/strategy_spec.rb
-- spec/ui_text_field_strategy_spec.rb
+- spec/strategies/proc_spec.rb
+- spec/strategies/strategy_spec.rb
+- spec/strategies/ui_label_spec.rb
+- spec/strategies/ui_text_field_spec.rb