motion-resource 0.1.1 → 0.1.2

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "bubble-wrap", "1.3.0.osx"
-gem "motion-support"
+gem "motion-support", ">= 0.2.4"
 gem "webstub", :git => 'git://github.com/mattgreen/webstub.git'
 
 # Specify your gem's dependencies in motion-support.gemspec

data/lib/motion-resource/callbacks.rb

@@ -0,0 +1,17 @@
+module MotionResource
+  class Base
+    include MotionSupport::Callbacks
+    
+    define_callbacks :create, :save, :update, :destroy
+
+    [:create, :save, :update, :destroy].each do |callback|
+      define_singleton_method "before_#{callback}" do |*filters, &blk|
+        set_callback(callback, :before, *filters, &blk)
+      end
+
+      define_singleton_method "after_#{callback}" do |*filters, &blk|
+        set_callback(callback, :after, *filters, &blk)
+      end
+    end
+  end
+end

data/lib/motion-resource/crud.rb

@@ -1,26 +1,40 @@
 module MotionResource
   class Base
     def save(&block)
-      @new_record ? create(&block) : update(&block)
+      run_callbacks :save do
+        @new_record ? create(&block) : update(&block)
+      end
     end
     
     def update(&block)
-      self.class.put(member_url, :payload => { self.class.name.underscore => attributes }) do |response, json|
-        self.class.request_block_call(block, json.blank? ? self : self.class.instantiate(json), response) if block
+      run_callbacks :update do
+        self.class.put(member_url, :payload => { self.class.name.underscore => attributes }) do |response, json|
+          self.class.request_block_call(block, json.blank? ? self : self.class.instantiate(json), response) if block
+        end
       end
     end
   
     def create(&block)
       # weird heisenbug: Specs crash without that line :(
       dummy = self
-      self.class.post(collection_url, :payload => { self.class.name.underscore => attributes }) do |response, json|
-        self.class.request_block_call(block, json.blank? ? self : self.class.instantiate(json), response) if block
+      run_callbacks :create do
+        self.class.post(collection_url, :payload => { self.class.name.underscore => attributes }) do |response, json|
+          self.class.request_block_call(block, json.blank? ? self : self.class.instantiate(json), response) if block
+        end
+      end
+    end
+    
+    def self.create(attributes = {}, &block)
+      new(attributes).tap do |model|
+        model.create(&block)
       end
     end
   
     def destroy(&block)
-      self.class.delete(member_url) do |response, json|
-        self.class.request_block_call(block, json.blank? ? nil : self.class.instantiate(json), response) if block
+      run_callbacks :destroy do
+        self.class.delete(member_url) do |response, json|
+          self.class.request_block_call(block, json.blank? ? nil : self.class.instantiate(json), response) if block
+        end
       end
     end
     

data/lib/motion-resource/requests.rb

@@ -48,10 +48,11 @@ module MotionResource
         if self.default_url_options
           options.merge!(self.default_url_options)
         end
-        logger.log "#{method.upcase} #{url}"
 
         url.insert_extension!(self.extension)
 
+        logger.log "#{method.upcase} #{url}"
+
         BubbleWrap::HTTP.send(method, url, options) do |response|
           if response.ok?
             body = response.body.to_str.strip rescue nil

data/lib/motion-resource/version.rb

@@ -1,3 +1,3 @@
 module MotionResource
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/motion-resource/callbacks_spec.rb

@@ -0,0 +1,70 @@
+module CallbackSpec
+  class Model < MotionResource::Base
+    self.member_url = 'models/:id'
+    self.collection_url = 'models'
+    
+    before_create { |m| m.history << "before_create" }
+    after_create { |m| m.history << "after_create" }
+    before_save { |m| m.history << "before_save" }
+    after_save { |m| m.history << "after_save" }
+    before_update { |m| m.history << "before_update" }
+    after_update { |m| m.history << "after_update" }
+    before_destroy { |m| m.history << "before_destroy" }
+    after_destroy { |m| m.history << "after_destroy" }
+    
+    def history
+      @history ||= []
+    end
+  end
+end
+
+describe "base" do
+  extend WebStub::SpecHelpers
+  extend MotionResource::SpecHelpers
+
+  describe "callbacks" do
+    it "should run create callbacks" do
+      stub_request(:post, "http://example.com/models.json").to_return(json: {})
+      @model = CallbackSpec::Model.create { |obj| resume }
+      wait_max 1.0 do
+        @model.history.should == ['before_create', 'after_create']
+      end
+    end
+
+    it "should run create and save callbacks on first save" do
+      stub_request(:post, "http://example.com/models.json").to_return(json: {})
+      @model = CallbackSpec::Model.new
+      @model.save { |obj| resume }
+      wait_max 1.0 do
+        @model.history.should == ['before_save', 'before_create', 'after_create', 'after_save']
+      end
+    end
+
+    it "should run update and save callbacks on subsequent save" do
+      stub_request(:put, "http://example.com/models/10.json").to_return(json: {})
+      @model = CallbackSpec::Model.instantiate(:id => 10)
+      @model.save { |obj| resume }
+      wait_max 1.0 do
+        @model.history.should == ['before_save', 'before_update', 'after_update', 'after_save']
+      end
+    end
+
+    it "should run update callbacks" do
+      stub_request(:put, "http://example.com/models/10.json").to_return(json: {})
+      @model = CallbackSpec::Model.instantiate(:id => 10)
+      @model.update { |obj| resume }
+      wait_max 1.0 do
+        @model.history.should == ['before_update', 'after_update']
+      end
+    end
+    
+    it "should run destroy callbacks" do
+      stub_request(:delete, "http://example.com/models/10.json").to_return(json: {})
+      @model = CallbackSpec::Model.instantiate(:id => 10)
+      @model.destroy { |obj| resume }
+      wait_max 1.0 do
+        @model.history.should == ['before_destroy', 'after_destroy']
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -84,6 +84,7 @@ files:
 - lib/motion-resource/associations.rb
 - lib/motion-resource/attributes.rb
 - lib/motion-resource/base.rb
+- lib/motion-resource/callbacks.rb
 - lib/motion-resource/crud.rb
 - lib/motion-resource/find.rb
 - lib/motion-resource/logger.rb
@@ -100,6 +101,7 @@ files:
 - spec/motion-resource/associations/scope_spec.rb
 - spec/motion-resource/attributes_spec.rb
 - spec/motion-resource/base_spec.rb
+- spec/motion-resource/callbacks_spec.rb
 - spec/motion-resource/crud_spec.rb
 - spec/motion-resource/find_spec.rb
 - spec/motion-resource/requests_spec.rb
@@ -119,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -124098762633124978
+      hash: 4144364702470032416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -124098762633124978
+      hash: 4144364702470032416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -143,6 +145,7 @@ test_files:
 - spec/motion-resource/associations/scope_spec.rb
 - spec/motion-resource/attributes_spec.rb
 - spec/motion-resource/base_spec.rb
+- spec/motion-resource/callbacks_spec.rb
 - spec/motion-resource/crud_spec.rb
 - spec/motion-resource/find_spec.rb
 - spec/motion-resource/requests_spec.rb