logical_model 0.2.11 → 0.2.12

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.12

data/lib/logical_model.rb

@@ -48,8 +48,13 @@ class LogicalModel
   include ActiveModel::Validations
   include ActiveModel::MassAssignmentSecurity
 
+  extend ActiveModel::Callbacks
+  define_model_callbacks :create, :save, :update, :destroy
+
   self.include_root_in_json = false
 
+  # TODO clean this file refactoring into modules
+
   def self.attribute_keys=(keys)
     @attribute_keys = keys
     attr_accessor *keys
@@ -230,6 +235,37 @@ class LogicalModel
     end
   end
 
+  def create(params={})
+    run_callbacks :save do
+      run_callbacks :create do
+        _create(params)
+      end
+    end
+  end
+
+  def update(attribute_params)
+    run_callbacks :save do
+      run_callbacks :update do
+        _update(attribute_params)
+      end
+    end
+
+  end
+
+  def save
+    run_callbacks :save do
+      run_callbacks new_record?? :create : :update do
+        _save
+      end
+    end
+  end
+
+  def delete(id, params={})
+    run_callbacks :destroy do
+      _delete(id, params={})
+    end
+  end
+
   #  ============================================================================================================
   #  Following methods are API specific.
   #  They assume we are using a RESTfull API.
@@ -391,7 +427,7 @@ class LogicalModel
   # @example Usage:
   #   @person = Person.new(params[:person])
   #   @person.create( non_attribute_param: "value" )
-  def create(params = {})
+  def _create(params = {})
     return false unless valid?
 
     params = { self.json_root => self.attributes }.merge(params)
@@ -429,7 +465,7 @@ class LogicalModel
   #
   # Usage:
   #   @person.update(params[:person])
-  def update(attribute_params)
+  def _update(attribute_params)
 
     self.attributes = attribute_params[self.json_root]
 
@@ -474,7 +510,7 @@ class LogicalModel
   #
   # Usage:
   #   @person.save
-  def save
+  def _save
     self.attributes = attributes
 
     return false unless valid?
@@ -509,7 +545,7 @@ class LogicalModel
   #
   # Usage:
   #   Person.delete(params[:id])
-  def self.delete(id, params={})
+  def self._delete(id, params={})
 
     params = self.merge_key(params)
 

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.2.11"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2012-01-17"
+  s.date = "2012-01-25"
   s.description = "LogicalModel allows to use a resource as a model. It is based on web presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3"
   s.email = "dwaynemac@gmail.com"
   s.extra_rdoc_files = [

data/spec/client_spec.rb

@@ -154,4 +154,31 @@ describe "LogicalModel User client" do
       end
     end
   end
+
+  describe "callbacks" do
+    describe "before_save" do
+      before do
+        class User < LogicalModel
+          before_save :raise_message
+
+          def raise_message
+            raise 'before_save_called'
+          end
+        end
+      end
+      it "should be called on #save" do
+        u = User.new
+        expect{u.save}.to raise_error('before_save_called')
+      end
+      it "should be called on #create" do
+        u = User.new
+        expect{u.create}.to raise_error('before_save_called')
+      end
+      it "should be called on #update" do
+        u = User.new
+        expect{u.update(id: 1)}.to raise_error('before_save_called')
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &79777970 !ruby/object:Gem::Requirement
+  requirement: &85369270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79777970
+  version_requirements: *85369270
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &79777350 !ruby/object:Gem::Requirement
+  requirement: &85368680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79777350
+  version_requirements: *85368680
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &79776880 !ruby/object:Gem::Requirement
+  requirement: &85368130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *79776880
+  version_requirements: *85368130
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &79776350 !ruby/object:Gem::Requirement
+  requirement: &85367470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *79776350
+  version_requirements: *85367470
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &79775710 !ruby/object:Gem::Requirement
+  requirement: &85367000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79775710
+  version_requirements: *85367000
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &79774980 !ruby/object:Gem::Requirement
+  requirement: &85366330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79774980
+  version_requirements: *85366330
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &79774320 !ruby/object:Gem::Requirement
+  requirement: &85365440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *79774320
+  version_requirements: *85365440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &79773570 !ruby/object:Gem::Requirement
+  requirement: &85364770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *79773570
+  version_requirements: *85364770
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &79772870 !ruby/object:Gem::Requirement
+  requirement: &85364210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79772870
+  version_requirements: *85364210
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &79743610 !ruby/object:Gem::Requirement
+  requirement: &85333950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79743610
+  version_requirements: *85333950
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &79742900 !ruby/object:Gem::Requirement
+  requirement: &85332410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *79742900
+  version_requirements: *85332410
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &79741620 !ruby/object:Gem::Requirement
+  requirement: &85331880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79741620
+  version_requirements: *85331880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &79740370 !ruby/object:Gem::Requirement
+  requirement: &85331510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79740370
+  version_requirements: *85331510
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &79739390 !ruby/object:Gem::Requirement
+  requirement: &85330640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79739390
+  version_requirements: *85330640
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &79738470 !ruby/object:Gem::Requirement
+  requirement: &85329900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79738470
+  version_requirements: *85329900
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &79737780 !ruby/object:Gem::Requirement
+  requirement: &85329310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79737780
+  version_requirements: *85329310
 description: LogicalModel allows to use a resource as a model. It is based on web
   presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3
 email: dwaynemac@gmail.com
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 788754387
+      hash: 550676079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: