motion_bindable 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f463cb26ed789a3715bf0d6527bd87356dc7112f
-  data.tar.gz: 97b54d01d66b4f65fc5debbda78e2ecfbe9d430f
+  metadata.gz: 22f69831469c0aae59f8af6aa599f586276bd23c
+  data.tar.gz: 61181ef1e9254eb8378bc229eacc396851480867
 SHA512:
-  metadata.gz: 157772a475b474b87df0e0060f6ead78d9f98b3e13f53c457ffaf9c1cd7e8725d6be891dc196aa37d606b14a89f64922b28b729534863fe16f9dd6ec45911a7f
-  data.tar.gz: 27f4376256b12d9ef4e2d6be2266c5bf4e2f426a210ec53a9e5ce81bd6371c06bbbb464e52cfffab285f98c6cde0797791bc97565e71659265135f89216d0e3f
+  metadata.gz: 9581949f1fe049307b10aeb65e26ac65976662c1e5ad51e18c741ebe46340774c5d6296ac41a417ee17a7f2ef1bb957c5075eb590c586b674b1978957aac5283
+  data.tar.gz: 1f28ee9528235b42e9e4282e116e5fa54a279fad178f32977a6e34ffec35e4c78ff590faff1a763d9532170c4fc04ac483190d438abb0fbd35a46c5a51dba772

data/Gemfile

@@ -4,3 +4,4 @@ gem 'rake'
 # Add your dependencies here:
 gem 'webstub'
 gem 'motion-stump'
+gem 'bubble-wrap', '~> 1.4.0'

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    bubble-wrap (1.4.0)
     motion-stump (0.3.0)
     rake (10.1.0)
     webstub (1.0.1)
@@ -9,6 +10,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bubble-wrap (~> 1.4.0)
   motion-stump
   rake
   webstub

data/lib/motion_bindable/bindable.rb

@@ -15,7 +15,9 @@ module MotionBindable
 
     def bind_attributes(attrs, object = self)
       attrs.each_pair do |k, v|
-        if v.is_a?(Hash) then bind_attributes(v, object.send(k)) 
+        case v
+        when Hash then bind_attributes(v, object.send(k))
+        when Array then v.each { |v| bind strategy_for(v).new(object, k).bind(v) }
         else bind strategy_for(v).new(object, k).bind(v)
         end
       end
@@ -27,25 +29,20 @@ module MotionBindable
       self
     end
 
+    def unbind_all
+      @bindings.each { |b| b.unbind }
+      @bindings = []
+    end
+
     def refresh
       @bindings.each { |b| b.refresh }
       self
     end
 
-    private
-
     def strategy_for(reference)
       Strategy.find_by_reference(reference)
     end
 
-    def underscore(str)
-      str.gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-      .gsub(/([a-z\d])([A-Z])/,'\1_\2')
-      .tr("-", "_")
-      .downcase
-    end
-
   end
 
 end

data/lib/motion_bindable/strategy.rb

@@ -20,9 +20,9 @@ module MotionBindable
     attr_accessor :object
     attr_accessor :bound
 
-    def initialize(object, attribute)
-      @attribute = attribute.to_sym
-      self.object = WeakRef.new(object)
+    def initialize(object, attr_name)
+      @attr_name = attr_name.to_sym
+      self.object = object
     end
 
     def bind(bound)
@@ -32,6 +32,9 @@ module MotionBindable
       self
     end
 
+    def unbind
+    end
+
     # You can either choose to just override `#refresh` for objects that can't
     # be bound with callbacks. Or override `#on_bind` for objects that can be
     # bound with a callback.
@@ -41,11 +44,11 @@ module MotionBindable
     end
 
     def attribute
-      object.send(@attribute)
+      object.send(@attr_name)
     end
 
     def attribute=(value)
-      object.send(:"#{@attribute.to_s}=", value)
+      object.send(:"#{@attr_name.to_s}=", value)
     end
 
   end

data/lib/motion_bindable/version.rb

@@ -1,3 +1,3 @@
 module MotionBindable
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/strategies/ui_text_field.rb

@@ -2,28 +2,37 @@ module MotionBindable::Strategies
 
   class UITextField < ::MotionBindable::Strategy
 
+    include BW::KVO
+
     def on_bind
-      update_attribute
+      refresh
+
+      # Observe the bound object
       NSNotificationCenter.defaultCenter.addObserver(
-        self,
-        selector: :on_change,
-        name: UITextFieldTextDidChangeNotification,
-        object: bound
+        self, selector: :on_bound_change,
+        name: UITextFieldTextDidChangeNotification, object: bound
       )
-    end
 
-    def on_change
-      update_attribute
+      # Observe the attribute
+      observe(object, @attr_name) { |_, _| on_object_change }
     end
 
-    alias_method :refresh, :on_change
+    def on_bound_change
+      self.attribute = bound.text
+    end
 
-    private
+    def on_object_change
+      @bound.text = attribute
+    end
 
-    def update_attribute
-      self.attribute = bound.text
+    def unbind
+      App.notification_center.unobserve(@bound_observer)
+      unobserve(object, @attr_name)
     end
 
+    # Text field takes precedence
+    alias_method :refresh, :on_bound_change
+
   end
 
 end

data/motion_bindable.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+
+  spec.add_dependency 'bubble-wrap', '~> 1.4.0'
 end

data/spec/bindable_spec.rb

@@ -11,50 +11,77 @@ describe 'MotionBindable::Bindable' do
 
   before do
     @object = FakeBindable.new
-    @bound = Object.new
+    @object.nested = FakeBindable.new
     @object.stub!(:strategy_for) { |_| FakeStrategy }
-    @strategy = FakeStrategy.new(@object, :attribute)
+    @bound = Object.new
+    FakeStrategy.stub!(:new) { |_, _| @strategy }
   end
 
   describe '#bind_attributes' do
-    before do
-      @object.nested = FakeBindable.new
-    end
 
-    it 'accepts nested attributes' do
-      FakeStrategy.stub!(:bind) do |attribute|
-        @attribute = attribute
+    context 'un-nested' do
+      before do
+        @strategy = FakeStrategy.new(@object, :attribute)
       end
 
-      @object.bind_attributes({
-        attribute: @bound,
-        nested: {
-          attribute: @bound
-        }
-      })
+      it 'accepts an array of objects' do
+        @attributes = []
+        @strategy.stub!(:bind) { |attribute| @attributes << attribute }
+        @bound2 = Object.new
+        @object.bind_attributes(attribute: [@bound, @bound2])
+        @attributes.length.should.equal 2
+      end
 
-      @attribute.should.equal @object.nested.attribute
+      it 'passes the strategy to bind' do
+        @called = false
+        @object.stub!(:bind) { |_| @called = true }
+        @object.bind_attributes({ attribute: @bound })
+        @called.should.equal true
+      end
     end
 
-    it 'passes the strategy to bind' do
-      @called = false
-      @object.stub!(:bind) { |_| @called = true }
-      @object.bind_attributes({ attribute: @bound })
-      @called.should.equal true
+    context 'nested' do
+      before do
+        @strategy = FakeStrategy.new(@object.nested, :attribute)
+      end
+
+      it 'accepts nested attributes' do
+        @strategy.stub!(:bind) { |bound| @bounded = bound }
+        @object.bind_attributes nested: { attribute: @bound }
+        @bounded.should.equal @bound
+      end
     end
 
   end
 
   describe '#bind' do
+    before do
+      @strategy = FakeStrategy.new(@object, :attribute)
+      @strategy.bind(@bound)
+    end
+
     it 'should be chainable' do
       @object.bind(@strategy).should.equal @object
     end
   end
 
-  describe '#refresh' do
-    it 'should be chainable' do
-      @object.bind(@strategy)
-      @object.refresh.should.equal @object
+  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)
+    end
+
+    it 'should send unbind to all strategies' do
+      @called = 0
+      @strategy1.stub!(:unbind) { @called += 1 }
+      @strategy2.stub!(:unbind) { @called += 1 }
+      @object.unbind_all
+      @called.should.equal 2
     end
   end
 

data/spec/strategy_spec.rb

@@ -62,6 +62,12 @@ describe 'MotionBindable::Strategy' do
       end
     end
 
+    describe '#unbind' do
+      it 'should respond' do
+        @strategy.respond_to?(:unbind).should.equal true
+      end
+    end
+
   end
 
 end

data/spec/ui_text_field_strategy_spec.rb

@@ -1,7 +1,10 @@
 class FakeModel
   include MotionBindable::Bindable
-  attr_accessor :attribute
   attr_accessor :nested
+  attr_accessor :attribute
+  def attribute
+    @attribute
+  end
 end
 
 describe 'MotionBindable::Strategies::UITextField' do
@@ -24,14 +27,11 @@ describe 'MotionBindable::Strategies::UITextField' do
     end
 
     context 'text set and then bound' do
-
       before do
         @text_field.text = 'Just testing.'
         @object.bind_attributes({
           attribute: @text_field,
-          nested: {
-            attribute: @text_field
-          }
+          nested: { attribute: @text_field }
         })
       end
 
@@ -48,9 +48,10 @@ describe 'MotionBindable::Strategies::UITextField' do
         before do
           @text_field.text = 'Updated.'
           NSNotificationCenter.defaultCenter.postNotificationName(
-            UITextFieldTextDidChangeNotification, 
-            object: @text_field
+            UITextFieldTextDidChangeNotification, object: @text_field
           )
+          # BW puts observer cb's into this queue
+          NSOperationQueue.mainQueue.waitUntilAllOperationsAreFinished
         end
 
         it 'should update the root attribute' do
@@ -60,12 +61,20 @@ describe 'MotionBindable::Strategies::UITextField' do
         it 'should update the nested attribute' do
           @object.nested.attribute.should.equal 'Updated.'
         end
+      end
+
+      context 'bound attribute is updated' do
+        before do
+          @object.attribute = 'Reverse'
+        end
 
+        it 'should update the text field' do
+          @text_field.text.should.equal 'Reverse'
+        end
       end
 
     end
 
   end
 
-
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: motion_bindable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Nathan Kot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
-dependencies: []
+date: 2013-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bubble-wrap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: A simple data binding library for RubyMotion.
 email:
 - nk@nathankot.com