motion_bindable 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3237a0dad5569ddc2cb3d1e6837d3c03ce003d
-  data.tar.gz: 5a0371d71ae7ea0f4e0f2bc47647055e570d8c2f
+  metadata.gz: 52e8be3ba802d2d3a4a0f1bdddbac59a32eea455
+  data.tar.gz: 6c14152e5fee498b339fe107141b0cf86aa778a3
 SHA512:
-  metadata.gz: 30e5198ad5b05b8c07d81b75c41d91df7f94f46f7f446af8d8683f3e531c2469a7aa7a0f4733be3bf5e42852279bcc5845d50c176d95d8a87d6f3d91a0a34086
-  data.tar.gz: 95d8af588526663ecd785e45763f54e61d58d7350dea424a6b9e78aa3be1ee0acd152fb9ba124dadbdc039ff15849718f62e95d98048442b4c479c6def498c45
+  metadata.gz: 089f88fb16423348824e9e04d3f5384e7f1cf9ced50c82779cd17cb3d3433783de8a8ec060abe40b4524375e6df3e84aff77da6b2d01db62393ae4f8ddccad89
+  data.tar.gz: ea79259bdcc11b2d20b75f53a4a11b95733b1691b1aab7ab2e77fb18141fd1b7b576655094befe3c3550f4f1faf6463467676f6270bb2f95e65396b042a3773c

data/lib/motion_bindable/bindable.rb

@@ -6,11 +6,6 @@ module MotionBindable
   # Allow attributes of an object to be bound to other arbitrary objects
   # through unique strategies.
   #
-  # ## One-way binding
-  #
-  # Currently bindings are only one-way, i.e change in the arbitrary object
-  # affects the bindable object but not vice-versa.
-  #
   module Bindable
 
     def bind_attributes(attrs, object = self)
@@ -30,6 +25,7 @@ module MotionBindable
     end
 
     def unbind_all
+      @bindings ||= []
       @bindings.each { |b| b.unbind }
       @bindings = []
     end

data/lib/motion_bindable/strategy.rb

@@ -41,7 +41,7 @@ module MotionBindable
     end
 
     def unbind
-      @watching = nil
+      @watching = false
     end
 
     private # Methods to leave alone
@@ -78,16 +78,19 @@ module MotionBindable
         sides << :object
       end
 
+      @watching = true
       watch(sides)
     end
 
     def watch(sides)
-      @watching = dispatcher.async do
-        bound_result = refresh_bound if sides.include?(:bound)
-        object_result = refresh_object if sides.include?(:object)
-        on_bound_change(bound_result) if bound_result
-        on_object_change(object_result) if object_result
-        dispatcher.after(WATCH_TICK) { watch(sides) } unless @watching
+      dispatcher.async do
+        if @watching
+          bound_result = refresh_bound if sides.include?(:bound)
+          object_result = refresh_object if sides.include?(:object)
+          on_bound_change(bound_result) if bound_result
+          on_object_change(object_result) if object_result
+          dispatcher.after(WATCH_TICK) { watch(sides) }
+        end
       end
     end
 

data/lib/motion_bindable/version.rb

@@ -1,3 +1,3 @@
 module MotionBindable
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/strategies/proc.rb

@@ -14,6 +14,11 @@ module MotionBindable::Strategies
       self.attribute = new || bound.call
     end
 
+    def unbind
+      @watching = false
+      super
+    end
+
   end
 
 end

data/lib/strategies/ui_label.rb

@@ -21,6 +21,11 @@ module MotionBindable::Strategies
       on_object_change
     end
 
+    def unbind
+      object.removeObserver(self, forKeyPath: attr_name)
+      super
+    end
+
   end
 
 end

data/spec/bindable_spec.rb

@@ -33,7 +33,7 @@ describe 'MotionBindable::Bindable' do
 
       it 'passes the strategy to bind' do
         @strategy.should.receive(:bind).once
-        @object.bind_attributes({ attribute: @bound })
+        @object.bind_attributes(attribute: @bound)
       end
     end
 
@@ -63,21 +63,28 @@ describe 'MotionBindable::Bindable' do
   end
 
   describe '#unbind_all' do
-    before do
-      @strategy1 = FakeStrategy.new(@object, :attribute)
-      @strategy1.bind(@bound)
-      @object.bind(@strategy1)
 
-      @strategy2 = FakeStrategy.new(@object.nested, :attribute)
-      @strategy2.bind(@bound)
-      @object.bind(@strategy2)
+    it 'can be called even if object isnt bound' do
+      lambda { @object.unbind_all }.should.not.raise(Exception)
     end
 
-    it 'should send unbind to all strategies' do
-      @strategy1.should.receive(:unbind).once
-      @strategy2.should.receive(:unbind).once
-      @object.unbind_all
+    context 'object is bound' do
+      before do
+        @strategy1 = FakeStrategy.new(@object, :attribute)
+        @strategy1.bind(@bound)
+        @object.bind(@strategy1)
+        @strategy2 = FakeStrategy.new(@object.nested, :attribute)
+        @strategy2.bind(@bound)
+        @object.bind(@strategy2)
+      end
+
+      it 'should send unbind to all strategies' do
+        @strategy1.should.receive(:unbind).once
+        @strategy2.should.receive(:unbind).once
+        @object.unbind_all
+      end
     end
+
   end
 
 end

data/spec/strategies/proc_spec.rb

@@ -16,12 +16,12 @@ describe 'MotionBindable::Strategies::Proc' do
     context 'is bound' do
 
       before do
-        @object.bind_attributes({
+        @object.bind_attributes(
           attribute: proc { @bound.attribute },
           nested: {
             attribute: proc { @bound.attribute }
           }
-        })
+        )
       end
 
       it 'should refresh upon bind' do
@@ -33,12 +33,28 @@ describe 'MotionBindable::Strategies::Proc' do
         @bound.attribute = 'updated'
         wait(0.5) do
           @object.attribute.should.equal 'updated'
+          @object.nested.attribute.should.equal 'updated'
         end
       end
 
+      context 'unbind is called' do
+
+        before do
+          @object.unbind_all
+        end
+
+        it 'should not longer update the attribute when the proc changes' do
+          @bound.attribute = 'hello'
+          wait(0.5) do
+            @object.attribute.should.not.equal 'hello'
+            @object.nested.attribute.should.not.equal 'hello'
+          end
+        end
+
+      end
+
     end
 
   end
 
-
 end

data/spec/strategies/ui_label_spec.rb

@@ -10,10 +10,10 @@ describe 'MotionBindable::Strategies::UILabel' do
   context 'attribute is not set yet' do
 
     before do
-      @object.bind_attributes({
+      @object.bind_attributes(
         attribute: @label,
         nested: { attribute: @label2 }
-      })
+      )
     end
 
     it 'should update the label on change' do
@@ -30,10 +30,10 @@ describe 'MotionBindable::Strategies::UILabel' do
     before do
       @object.attribute = 'test'
       @object.nested.attribute = 'test2'
-      @object.bind_attributes({
+      @object.bind_attributes(
         attribute: @label,
         nested: { attribute: @label2 }
-      })
+      )
     end
 
     it 'should set the label on bind' do
@@ -48,6 +48,17 @@ describe 'MotionBindable::Strategies::UILabel' do
       @label2.text.should.equal 'changed2'
     end
 
+    context 'unbind is called' do
+      before do
+        @object.unbind_all
+      end
+
+      it 'should no longer update when the label changed' do
+        @object.attribute = 'hello'
+        @label.text.should.not.equal 'hello'
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_bindable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Nathan Kot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies: []
 description: A simple data binding library for RubyMotion.
 email: