simple_model 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_model (0.2.6)
+    simple_model (1.0.0)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
 

data/lib/simple_model/base.rb

@@ -105,16 +105,22 @@ module SimpleModel
     def self.update(*methods)
       define_model_action(methods,:update)
     end
-    
-    def self.destroy(*methods)
-      define_model_action(methods,:destroy)
+      
+    #Destroy does not run normal validation by default.
+    def self.destroy(*methods)   
+      define_model_action(methods,:destroy, {:validate => false})
     end 
     
     private
     
+    
+    # Skeleton for action instance methods
     def run_model_action(methods,options)
       completed = true
-      if self.valid?
+      if !options[:validate] ||
+          (options[:validation_methods] && valid_using_other?(options[:validation_methods])) || 
+          self.valid?
+        
         methods.each do |method|
           ran = self.send(method)
           completed = ran unless ran
@@ -130,9 +136,26 @@ module SimpleModel
       completed
     end
     
-    def self.define_model_action(methods,action)
-      options = methods.extract_options!
-      define_method(action) do
+    
+    # Run supplied methods as valdation. Each method should return a boolean
+    # If using this option, to see if errors are present use object_name.errors.blank?,
+    # otherwise if you run object_name.valid? you will over write the errors 
+    # generated here.
+    def valid_using_other?(methods)
+      valid = true
+      methods.each do |method|
+        valid = false unless self.send(method)
+      end
+      valid
+    end
+    
+    
+    # Defines the model action's instantace methods and applied defaults.
+    # Defines methods with :validate options as true by default.
+    def self.define_model_action(methods,action,default_options={:validate => true})
+      default_options.merge!(methods.extract_options!)
+      define_method(action) do |opts={}|
+        options = default_options.merge(opts)
         self.run_callbacks(action) do  
           run_model_action(methods,options)
         end

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/simple_model_spec.rb

@@ -1,24 +1,59 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe SimpleModel do
-  
-  describe "save" do
+  context 'action methods' do
+    describe "save" do
     
-    it "should perform the supplied methods" do
-      class TestStuff < SimpleModel::Base
-        save :test
+      it "should perform the supplied methods" do
+        class TestStuff < SimpleModel::Base
+          save :test
         
-        attr_accessor :foo
+          attr_accessor :foo
         
-        def test
-          self.foo = "test"
-          return true
+          def test
+            self.foo = "test"
+            return true
+          end
         end
+      
+        t = TestStuff.new
+        t.save
+        t.foo.should eql("test")
+      end
+      
+      it "should be false if validation fails" do
+        class TestStuff < SimpleModel::Base
+          save :test
+          has_decimal :price
+          validates_inclusion_of :price, :in => 10..25
+          validates :price, :presence => true
+          
+        
+          def test
+            true
+          end
+        end
+      
+        t = TestStuff.new
+        t.save.should be_false
       end
+    end
+  
+    describe "destroy" do
+    
+      it "should not preform validation by default" do
+        class TestStuff < SimpleModel::Base
+          destroy :test
+          attr_accessor :foo
+          validate :foo, :presence => true
+          def test
+            return true
+          end
+        end
       
-      t = TestStuff.new
-      t.save
-      t.foo.should eql("test")
+        t = TestStuff.new
+        t.destroy.should be_true
+      end
     end
   end
   
@@ -83,12 +118,9 @@ describe SimpleModel do
     t.bar.should eql('bar')
   end
   
-  it "should run call backs on save" do
+  it "should run save and validation callbacks on save" do
     class TestStuff < SimpleModel::Base
-      save do
-        puts "saved"
-        true
-      end
+      save :my_save_method
       before_save :set_foo   
       after_validation :set_bar
       attr_accessor :foo,:bar

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70349578811140 !ruby/object:Gem::Requirement
+  requirement: &70355814091020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349578811140
+  version_requirements: *70355814091020
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70349578810640 !ruby/object:Gem::Requirement
+  requirement: &70355814090520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349578810640
+  version_requirements: *70355814090520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70349578810260 !ruby/object:Gem::Requirement
+  requirement: &70355814090140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349578810260
+  version_requirements: *70355814090140
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70349578809800 !ruby/object:Gem::Requirement
+  requirement: &70355814089680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349578809800
+  version_requirements: *70355814089680
 description: Simpifies building tableless models or models backed by webservices.
   Create data type specific attributes with default if values.
 email: