csv_record 1.7.0 → 1.8.0

data/README.md

@@ -57,7 +57,7 @@ car.new_record? # checks if the record is new
 ```
 
 ##Retrieving
-Records can be queried through the following methds:
+Records can be queried through the following methods:
 
 ```ruby
 Car.all # retrieves all saved records
@@ -113,9 +113,9 @@ Extending the previous example, you can use the `has_many` method to establish t
 class Company
   include CsvRecord::Document
 
-  has_many :cars
-
   attr_accessor :name
+
+  has_many :cars
 end
 
 company = Company.create :name => 'Chutz'
@@ -132,34 +132,37 @@ Callbacks can be used to execute code on predetermined moments.
 
 ####Usage
 ```ruby
-after_create do |obj|
-  obj.do_something
+after_create do
+  self.do_something
 end
 ```
-`obj` refers to the instance you are in
+`self` refers to the instance you are in
 
 ###Avaiable Callbacks
 Here is a list with all the available callbacks, listed in the same order in which they will get called during the respective operations:
 
 ####Creating an Object
-* before_create
+* after_initialize
 * before_validation
 * after_validation
+* before_create
 * after_create
 
 ####Updating an Object
 * before_validation
 * after_validation
+* before_update
+* after_update
 
 ##Validations
 
 Helpers available:
 
-`validates_presence_of`: Ensures if the specified attributes were filled
+`validates_presence_of`: Ensures if the specified attribute(s) were filled
 
 `validates_uniqueness_of`: Ensures that the specified attribute(s) are unique within the database
 
-`validate`: Uses custom methods to validate the model
+`validate`: Uses custom method(s) to validate the model
 
 ```ruby
 class Company
@@ -178,14 +181,11 @@ class Company
 end
 
 company = Company.create
-company.save
-# => false
+company.save # => false
 
 company = Company.create
-company.valid?
-# => false
-company.invalid?
-# => true
+company.valid? # => false
+company.invalid? # => true
 
 ```
 

data/lib/csv_record/callbacks.rb

@@ -4,10 +4,12 @@ module CsvRecord
       :after_initialize,
       :before_validation,
       :after_validation,
-      :before_create,
       :before_save,
+      :after_save,
+      :before_create,
       :after_create,
-      :after_save
+      :before_update,
+      :after_update
     ].freeze
 
     module ClassMethods
@@ -27,11 +29,47 @@ module CsvRecord
           if self.class.const_defined? const_variable
             callbacks_collection = self.class.const_get("#{callback}_callbacks".upcase)
             callbacks_collection.each do |callback_proc|
-              callback_proc.call self
+              self.instance_eval &callback_proc
             end
           end
         end
       end
+
+      [:build, :initialize].each do |initialize_method|
+        define_method initialize_method do |*args|
+          result = super(*args)
+          self.run_after_initialize_callbacks
+          result
+        end
+      end
+
+      def valid?
+        self.run_before_validation_callbacks
+        is_valid = super
+        self.run_after_validation_callbacks if is_valid
+        is_valid
+      end
+
+      def save(*args)
+        self.run_before_save_callbacks
+        is_saved = super
+        self.run_after_save_callbacks if is_saved
+        is_saved
+      end
+
+      def append_registry
+        self.run_before_create_callbacks
+        is_saved = super
+        self.run_after_create_callbacks if is_saved
+        is_saved
+      end
+
+      def update_registry
+        self.run_before_update_callbacks
+        saved = super
+        self.run_after_update_callbacks if saved
+        saved
+      end
     end
 
     def self.included(receiver)

data/lib/csv_record/version.rb

@@ -1,3 +1,3 @@
 module CsvRecord
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/lib/csv_record/writer.rb

@@ -3,9 +3,7 @@ module CsvRecord
     module ClassMethods
       def __create__(attributes={})
         instance = self.build attributes
-        instance.run_before_create_callbacks
         result = instance.save
-        instance.run_after_create_callbacks if result
         instance
       end
 
@@ -25,16 +23,12 @@ module CsvRecord
         receiver.send :attr_accessor, :id
       end
 
-      def __save__
-        result = nil
-        self.run_before_validation_callbacks
-        if self.valid?
-          result = self.new_record? ? self.append_registry : self.update_registry
+      def __save__(validate=true)
+        if (not validate) || self.valid?
+          self.new_record? ? self.append_registry : self.update_registry
         else
-          result = false
+          false
         end
-        self.run_after_validation_callbacks
-        result
       end
 
       def new_record?
@@ -43,14 +37,17 @@ module CsvRecord
 
       def __update_attribute__(field, value)
         self.public_send "#{field}=", value
-        self.save
+        self.save false
       end
 
-      def __update_attributes__(params={})
+      def __update_attributes__(params={validate: true})
+        validate = params[:validate]
+        params.delete(:validate)
+
         params.each do |field, value|
           self.public_send "#{field}=", value
         end
-        self.save
+        self.save validate
       end
 
       def __destroy__

data/test/csv_record/callbacks_test.rb

@@ -24,10 +24,20 @@ describe CsvRecord::Callbacks do
     it ('run before_save callbacks') { klass.must_respond_to(:run_before_save_callbacks) }
     it ('run after_save callbacks') { klass.must_respond_to(:run_after_save_callbacks) }
     it ('run after_initialize callbacks') { klass.must_respond_to(:run_after_initialize_callbacks) }
+    it ('run before_update callbacks') { klass.must_respond_to(:run_before_update_callbacks) }
+    it ('run after_update callbacks') { klass.must_respond_to(:run_after_update_callbacks) }
   end
 
   describe 'Checking the callbacks execution' do
     let (:object_created) { CallbackTestClass.create }
+    let (:object_updated) do
+      object_created.update_attribute :sample_field, 'something'
+      object_created
+    end
+
+    it 'after_initialize' do
+      CallbackTestClass.new.after_initialize_called.must_equal true
+    end
 
     it 'before_create' do
       object_created.before_create_called.must_equal true
@@ -42,7 +52,23 @@ describe CsvRecord::Callbacks do
     end
 
     it 'after_validation' do
-      object_created.after_create_called.must_equal true
+      object_created.after_validation_called.must_equal true
+    end
+
+    it 'before_update' do
+      object_updated.before_update_called.must_equal true
+    end
+
+    it 'after_update' do
+      object_updated.after_update_called.must_equal true
+    end
+
+    it 'before_save' do
+      object_created.before_save_called.must_equal true
+    end
+
+    it 'after_update' do
+      object_created.after_save_called.must_equal true
     end
   end
 end

data/test/csv_record/validation_test.rb

@@ -4,6 +4,8 @@ require_relative '../models/jedi'
 require_relative '../models/jedi_order'
 
 describe CsvRecord::Validations do
+  let (:invalid_jedi) { Jedi.new }
+
   describe 'initializing class methods' do
     it ('responds to validates_presence_of') { Jedi.must_respond_to :validates_presence_of }
     it ('responds to validates_uniqueness_of') { Jedi.must_respond_to :validates_uniqueness_of }
@@ -51,8 +53,6 @@ describe CsvRecord::Validations do
   end
 
   describe 'default methods' do
-    let (:invalid_jedi) { Jedi.new }
-
     describe 'invalid?' do
       it 'invalid object' do
         invalid_jedi.invalid?.must_equal true
@@ -107,4 +107,23 @@ describe CsvRecord::Validations do
       yoda.custom_validator_checker_with_block.must_equal true
     end
   end
+
+  describe 'skip validations' do
+    it 'on save' do
+      invalid_jedi.save(false)
+      invalid_jedi.new_record?.must_equal false
+    end
+
+    it 'on update_attributes' do
+      yoda.save
+      yoda.update_attributes name: nil, validate: false
+      yoda.name.must_be_nil
+    end
+
+    it 'update_attribute by default skips validations' do
+      yoda.save
+      yoda.update_attribute :name, nil
+      Jedi.last.name.must_be_nil
+    end
+  end
 end

data/test/models/callback_test_class.rb

@@ -1,25 +1,47 @@
 class CallbackTestClass
   include CsvRecord::Document
 
-  def initialize(*args)
-  end
+  attr_accessor :sample_field
 
+  attr_accessor :after_initialize_called
   attr_accessor :before_create_called, :after_create_called
   attr_accessor :before_validation_called, :after_validation_called
+  attr_accessor :before_update_called, :after_update_called
+  attr_accessor :before_save_called, :after_save_called
+
+  after_initialize do
+    self.after_initialize_called = true
+  end
+
+  before_create do
+    self.before_create_called = true
+  end
+
+  after_create do
+    self.after_create_called = true
+  end
+
+  before_validation do
+    self.before_validation_called = true
+  end
+
+  after_validation do
+    self.after_validation_called = true
+  end
 
-  before_create do |obj|
-    obj.before_create_called = true
+  before_update do
+    self.before_update_called = true
   end
 
-  before_validation do |obj|
-    obj.before_validation_called = true
+  after_update do
+    self.after_update_called = true
   end
 
-  after_validation do |obj|
-    obj.after_validation_called = true
+  before_save do
+    self.before_save_called = true
   end
 
-  after_create do |obj|
-    obj.after_create_called = true
+  after_save do
+    self.after_save_called = true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_record
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport