motion_bindable 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8fecf48e97819f07047c4d906ac09db46aa92da
-  data.tar.gz: 3ab8cce360df5457b93e6d1e4d7a41da5d86b901
+  metadata.gz: 4a89a39aab018219f267f3eff32cde82ac521544
+  data.tar.gz: 1447ebff62c07174943bb0cb3bf30c48794b8267
 SHA512:
-  metadata.gz: 2b929c021c2f8b99a00867c8da1b9e976dd4d29e7d6b5b185d30e3ebe1d2da72b25c5d28e55c585f1e7ea6d49f9de1248f855d0b91d9b36cbd4a71a04a614af5
-  data.tar.gz: ffdfe46d6554d279a2f7e79002e1e45384a7f6077286192fa4ed8e1bec30bcba688edf93f827c2bf4cad300fa76002b29bb55b312aef1103a0e53048a232ad73
+  metadata.gz: 3bccfc36a62b72c7fe972263f465ea6b14985a215077f51018ffdc1d99e336097f5e0d21b126ccdd276d7862ce154d3c57c1aaeb43e21e86d4e461e27baa4b72
+  data.tar.gz: 256257f81086382161edc6b8462d4129946628cd0d801128be7b26f2802f92c098e926c4aa6e29ef36c65db67e8ba6e47c8a12ea4130dc0b615989777598a59f

data/Gemfile

@@ -3,5 +3,4 @@ source 'https://rubygems.org'
 gem 'rake'
 # Add your dependencies here:
 gem 'webstub'
-gem 'motion-stump'
-gem 'bubble-wrap', '~> 1.4.0'
+gem 'motion-facon'

data/Gemfile.lock

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

data/README.md

@@ -79,48 +79,22 @@ end
 
 When `@name_field.text` or `@address_field.text` changes, so will your model!
 
-### Refresh
-
-To refresh the values on your bindable object use this:
-
-```ruby
-@bindable.refresh
-```
-
-Some strategies only make an update when a `#refresh` is called. See the
-_Frequency_ column in the table below.
-
 ### Custom Strategies
 
-The above example uses the `MotionBindable::Strategies::UITextField`.
-which comes with MotionBindable. Take a look in
-`lib/motion_bindable/strategies` for the available defaults. You can implement
-your own strategies by extending `MotionBindable::Strategy` like so:
-
-```ruby
-class CustomBindableStrategy < MotionBindable::Strategy
-
-  def on_bind
-    # This runs once when the object is bound.
-  end
-
-  def refresh
-    # This runs when the object is bound, and each time `@bindable.refresh`
-    # is called.
-  end
-
-end
-```
+The above example uses the `MotionBindable::Strategies::UITextField`.  which
+comes with MotionBindable. Take a look in `lib/motion_bindable/strategies` for
+the available defaults. You can implement your own strategies by extending
+`MotionBindable::Strategy`. Please use the existing strategies as a guideline.
 
 ### Defaults Strategies
 
 The following strategies come with motion-bindable and are setup when
 `MotionBindable::Strategies.use` is called.
 
-| Name                                      | Object Candidates | Direction | Frequency  |
-| ----------------------------------------- | ----------------- | --------- | ---------- |
-| `MotionBindable::Strategies::UITextField` | Any `UITextField` | Two-way   | On Change  |
-| `MotionBindable::Strategies::Proc`        | Any `Proc`        | One-way   | On Refresh |
+| Name                                      | Object Candidates | Direction |
+| ----------------------------------------- | ----------------- | --------- |
+| `MotionBindable::Strategies::UITextField` | Any `UITextField` | Two-way   |
+| `MotionBindable::Strategies::Proc`        | Any `Proc`        | One-way   |
 
 ## Contributing
 

data/lib/motion_bindable/bindable.rb

@@ -34,11 +34,6 @@ module MotionBindable
       @bindings = []
     end
 
-    def refresh
-      @bindings.each { |b| b.refresh }
-      self
-    end
-
     def strategy_for(reference)
       Strategy.find_by_reference(reference)
     end

data/lib/motion_bindable/strategy.rb

@@ -1,10 +1,9 @@
 module MotionBindable
 
-  #
-  # Represents a binding strategy. Designed to be as flexible as possible.
-  #
   class Strategy
 
+    WATCH_TICK = 0.2
+
     @strategies_map = [{ class: Strategy, candidates: [Object] }]
 
     def self.register_strategy(strategy, *objects)
@@ -25,24 +24,31 @@ module MotionBindable
       self.object = object
     end
 
+    public # Methods to override
+
+    # def start_observing_bound; end
+    # def start_observing_object; end
+    # def refresh_bound; end
+    # def on_object_change; end
+    # def on_bound_change; end
+
     def bind(bound)
       self.bound = bound
-      on_bind
-
+      initial_state
+      start_listen
       self
     end
 
-    def unbind
+    def refresh_object
+      attribute
     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.
-    def refresh; end
-    def on_bind
-      refresh
+    def unbind
+      @watch_bound, @watch_object = nil
     end
 
+    private # Methods to leave alone
+
     def attribute
       object.send(@attr_name)
     end
@@ -51,6 +57,52 @@ module MotionBindable
       object.send(:"#{@attr_name.to_s}=", value)
     end
 
+    def initial_state
+      if attribute.nil?
+        if respond_to?(:refresh_bound) then on_bound_change(refresh_bound)
+        else on_bound_change
+        end if respond_to?(:on_bound_change)
+      else
+        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
+
+    def start_listen
+      if respond_to?(:start_observing_bound) then start_observing_bound
+      elsif respond_to?(:refresh_bound) && respond_to?(:on_bound_change)
+        watch_bound
+      end
+
+      if respond_to?(:start_observing_object) then start_observing_object
+      elsif respond_to?(:refresh_object) && respond_to?(:on_object_change)
+        watch_object
+      end
+    end
+
+    def watch_bound
+      @watch_bound = dispatcher.async do
+        result = refresh_bound
+        on_bound_change(result) if result
+        dispatcher.after(WATCH_TICK) { watch_bound } unless @watch_bound
+      end
+    end
+
+    def watch_object
+      @watch_object = dispatcher.async do
+        result = refresh_object
+        on_object_change(result) if result
+        dispatcher.after(WATCH_TICK) { watch_object } unless @watch_object
+      end
+    end
+
+    def dispatcher
+      @dispatcher ||= begin
+        Dispatch::Queue.concurrent 'motion.bindable'
+      end
+    end
+
   end
 
 end

data/lib/motion_bindable/version.rb

@@ -1,3 +1,3 @@
 module MotionBindable
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/strategies/proc.rb

@@ -2,14 +2,12 @@ module MotionBindable::Strategies
 
   class Proc < ::MotionBindable::Strategy
 
-    def refresh
-      update_attribute
+    def refresh_bound
+      bound.call
     end
 
-    private
-
-    def update_attribute
-      self.attribute = bound.call
+    def on_bound_change(new = nil)
+      self.attribute = new || bound.call
     end
 
   end

data/lib/strategies/ui_text_field.rb

@@ -2,38 +2,44 @@ module MotionBindable::Strategies
 
   class UITextField < ::MotionBindable::Strategy
 
-    include BW::KVO
-
-    def on_bind
-      refresh
-
-      # Observe the bound object
-      NSNotificationCenter.defaultCenter.addObserver(
-        self,
-        selector: :on_bound_change,
-        name: UITextFieldTextDidChangeNotification,
-        object: bound
+    def start_observing_bound
+      NSNotificationCenter.defaultCenter.addObserverForName(
+        UITextFieldTextDidChangeNotification,
+        object: bound,
+        queue: nil,
+        usingBlock: proc { |_| on_bound_change }
       )
+    end
 
+    def start_observing_object
       # Observe the attribute
-      observe(object, @attr_name) { |_, _| on_object_change }
+      object.addObserver(
+        self,
+        forKeyPath: @attr_name,
+        options: NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld,
+        context: nil
+      )
     end
 
-    def on_bound_change
-      self.attribute = bound.text unless bound.text.empty?
+    def on_bound_change(new = nil)
+      self.attribute = new || bound.text
     end
 
-    def on_object_change
-      @bound.text = attribute
+    def on_object_change(new = nil)
+      @bound.text = new || attribute
     end
 
     def unbind
       App.notification_center.unobserve(@bound_observer)
       unobserve(object, @attr_name)
+      super
     end
 
-    # Text field takes precedence
-    alias_method :refresh, :on_bound_change
+    # NSKeyValueObserving Protocol
+
+    def observeValueForKeyPath(_, ofObject: _, change: _, context: _)
+      on_object_change
+    end
 
   end
 

data/motion_bindable.gemspec

@@ -17,6 +17,4 @@ 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

@@ -12,9 +12,10 @@ describe 'MotionBindable::Bindable' do
   before do
     @object = FakeBindable.new
     @object.nested = FakeBindable.new
-    @object.stub!(:strategy_for) { |_| FakeStrategy }
     @bound = Object.new
-    FakeStrategy.stub!(:new) { |_, _| @strategy }
+    @object.should.receive(:strategy_for) do
+      mock('FakeStrategy', new: @strategy)
+    end.times(:any)
   end
 
   describe '#bind_attributes' do
@@ -25,18 +26,14 @@ describe 'MotionBindable::Bindable' do
       end
 
       it 'accepts an array of objects' do
-        @attributes = []
-        @strategy.stub!(:bind) { |attribute| @attributes << attribute }
         @bound2 = Object.new
+        @strategy.should.receive(:bind).times(2)
         @object.bind_attributes(attribute: [@bound, @bound2])
-        @attributes.length.should.equal 2
       end
 
       it 'passes the strategy to bind' do
-        @called = false
-        @object.stub!(:bind) { |_| @called = true }
+        @strategy.should.receive(:bind).once
         @object.bind_attributes({ attribute: @bound })
-        @called.should.equal true
       end
     end
 
@@ -46,7 +43,7 @@ describe 'MotionBindable::Bindable' do
       end
 
       it 'accepts nested attributes' do
-        @strategy.stub!(:bind) { |bound| @bounded = bound }
+        @strategy.should.receive(:bind) { |bound| @bounded = bound }.times(:any)
         @object.bind_attributes nested: { attribute: @bound }
         @bounded.should.equal @bound
       end
@@ -77,11 +74,9 @@ describe 'MotionBindable::Bindable' do
     end
 
     it 'should send unbind to all strategies' do
-      @called = 0
-      @strategy1.stub!(:unbind) { @called += 1 }
-      @strategy2.stub!(:unbind) { @called += 1 }
+      @strategy1.should.receive(:unbind).once
+      @strategy2.should.receive(:unbind).once
       @object.unbind_all
-      @called.should.equal 2
     end
   end
 

data/spec/helpers/facon.rb

@@ -0,0 +1,3 @@
+describe do
+  extend Facon::SpecHelpers
+end

data/spec/proc_strategy_spec.rb

@@ -42,10 +42,11 @@ describe 'MotionBindable::Strategies::Proc' do
         @object.nested.attribute.should.equal 'Testing.'
       end
 
-      it 'can refresh manually' do
-        @bound.attribute = 'Updated.'
-        @object.refresh.attribute.should.equal 'Updated.'
-        @object.refresh.nested.attribute.should.equal 'Updated.'
+      it 'attribute is updated when the bound object is updated' do
+        @bound.attribute = 'updated'
+        wait(0.5) do
+          @object.attribute.should.equal 'updated'
+        end
       end
 
     end

data/spec/strategy_spec.rb

@@ -32,6 +32,8 @@ describe 'MotionBindable::Strategy' do
       @object = ObjectOne.new
       @bound = Object.new
       @strategy = Strategy.new(@object, :attribute)
+      @strategy.stub!(:watch_bound)
+      @strategy.stub!(:watch_object)
     end
 
     describe '#bind' do
@@ -47,18 +49,24 @@ describe 'MotionBindable::Strategy' do
       it 'should return self' do
         @strategy.bind(@bound).should.equal @strategy
       end
-    end
 
-    describe '#refresh' do
-      it 'should respond' do
-        @strategy.respond_to?(:refresh).should.equal true
+      it 'should call on_object_change if the attribute is not nil' do
+        @object.attribute = 'Test'
+        @strategy.should.receive(:on_object_change).and_return(true)
+        @strategy.bind(@bound)
+      end
+
+      it 'should call on_bound_change if the attribute is nil' do
+        @object.attribute = nil
+        @strategy.should.receive(:on_bound_change).and_return(true)
+        @strategy.bind(@bound)
       end
     end
 
     describe '#attribute=' do
       it 'should be a proxy to set the attribute on the bound object' do
-        @strategy.attribute = 'test'
-        @object.attribute.should.equal 'test'
+        @strategy.send(:attribute=, 'test')
+        @object.send(:attribute).should.equal 'test'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion_bindable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Kot
@@ -9,21 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-12-23 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
+dependencies: []
 description: A simple data binding library for RubyMotion.
 email:
 - nk@nathankot.com
@@ -50,6 +36,7 @@ files:
 - 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
@@ -79,6 +66,7 @@ specification_version: 4
 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