csv_record 1.8.0 → 1.9.0

data/README.md

@@ -1,6 +1,6 @@
 # CsvRecord
 
-[![Build Status](https://secure.travis-ci.org/lukasalexandre/csv_record.png)](http://travis-ci.org/lukasalexandre/csv_record) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lukasalexandre/csv_record)
+[![Build Status](https://secure.travis-ci.org/lukasalexandre/csv_record.png)](http://travis-ci.org/lukasalexandre/csv_record) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/lukasalexandre/csv_record) [![Dependency Status](https://gemnasium.com/lukasalexandre/csv_record.png)](https://gemnasium.com/lukasalexandre/csv_record)
 
 CSV Record connects Ruby classes to CSV documents database to establish an almost zero-configuration persistence layer for applications.
 
@@ -126,6 +126,26 @@ car.save
 company.cars # [#<Car:0x007f9b249b24d8>]
 ```
 
+###Has One
+The same as has_many but limited to one associated record.
+
+```ruby
+class Company
+  include CsvRecord::Document
+
+  attr_accessor :name
+
+  has_one :car
+end
+
+company = Company.create :name => 'Chutz'
+
+car.save
+company.car = car
+
+company.car # #<Car:0x007f9b249b24d8>
+```
+
 ##Callbacks
 ###Overview
 Callbacks can be used to execute code on predetermined moments.
@@ -141,18 +161,30 @@ end
 ###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:
 
+####Finding an Object
+* after_initialize
+* after_find
+
 ####Creating an Object
 * after_initialize
 * before_validation
 * after_validation
+* before_save
 * before_create
 * after_create
+* after_save
 
 ####Updating an Object
 * before_validation
 * after_validation
+* before_save
 * before_update
 * after_update
+* after_save
+
+####Destroying an Object
+* before_destroy
+* after_destroy
 
 ##Validations
 
@@ -175,8 +207,12 @@ class Company
 
   validate :my_custom_validator_method
 
+  validate do
+    self.errors.add :attribute
+  end
+
   def my_custom_validator_method
-    @errors = self.errors.add attribute
+    self.errors.add :attribute
   end
 end
 

data/csv_record.gemspec

@@ -8,6 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{CSV Record connects Ruby classes to CSV documents database to establish an almost zero-configuration persistence layer for applications.}
   gem.homepage      = "https://github.com/lukasalexandre/csv_record"
 
+  gem.license = 'MIT'
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/lib/csv_record/associations.rb

@@ -19,11 +19,21 @@ module CsvRecord
     end
 
     def has_many(klass)
-      klass_name = klass.to_s
+      self.class_eval do
+        define_method klass do
+          klass.to_s.to_class.where :"#{self.underscored_class_name}_id" => self.id
+        end
+      end
+    end
 
+    def has_one(klass)
       self.class_eval do
+        define_method "#{klass}=" do |obj|
+          obj.send "#{self.underscored_class_name}_id=", self.id
+          obj.save
+        end
         define_method klass do
-          klass_name.to_class.where :"#{self.underscored_class_name}_id" => self.id
+          klass.to_s.to_class.where("#{self.underscored_class_name}_id" => self.id).first
         end
       end
     end

data/lib/csv_record/callbacks.rb

@@ -2,10 +2,13 @@ module CsvRecord
   module Callbacks
     CALLBACKS = [
       :after_initialize,
+      :after_find,
       :before_validation,
       :after_validation,
       :before_save,
       :after_save,
+      :after_destroy,
+      :before_destroy,
       :before_create,
       :after_create,
       :before_update,
@@ -20,6 +23,12 @@ module CsvRecord
           const_get(const_variable) << block if block
         end
       end
+
+      def __where__(*args)
+        results = super
+        results.each &:run_after_find_callbacks
+        results
+      end
     end
 
     module InstanceMethods
@@ -50,6 +59,13 @@ module CsvRecord
         is_valid
       end
 
+      def destroy
+        self.run_before_destroy_callbacks
+        is_destroyed = super
+        self.run_after_destroy_callbacks if is_destroyed
+        is_destroyed
+      end
+
       def save(*args)
         self.run_before_save_callbacks
         is_saved = super
@@ -67,6 +83,7 @@ module CsvRecord
       def update_registry
         self.run_before_update_callbacks
         saved = super
+        self.run_after_destroy_callbacks if saved
         self.run_after_update_callbacks if saved
         saved
       end

data/lib/csv_record/helpers.rb

@@ -32,10 +32,4 @@ class String
     tr("-", "_").
     downcase
   end
-end
-
-class Array
-  def add(obj)
-    self << obj
-  end
 end

data/lib/csv_record/reader.rb

@@ -46,6 +46,22 @@ module CsvRecord
         end
       end
 
+      def method_missing(meth, *args, &block)
+        if meth.to_s =~ DYNAMIC_FINDER_PATTERN
+          dynamic_finder $1, *args, &block
+        else
+          super # You *must* call super if you don't handle the
+                # method, otherwise you'll mess up Ruby's method
+                # lookup.
+        end
+      end
+
+      def respond_to?(meth)
+        (meth.to_s =~ DYNAMIC_FINDER_PATTERN) || super
+      end
+
+      protected
+
       def search_for(csv, params)
         conditions = handle_params params
         csv.entries.select do |attributes|
@@ -64,22 +80,6 @@ module CsvRecord
         conditions
       end
 
-      def method_missing(meth, *args, &block)
-        if meth.to_s =~ DYNAMIC_FINDER_PATTERN
-          dynamic_finder $1, *args, &block
-        else
-          super # You *must* call super if you don't handle the
-                # method, otherwise you'll mess up Ruby's method
-                # lookup.
-        end
-      end
-
-      def respond_to?(meth)
-        (meth.to_s =~ DYNAMIC_FINDER_PATTERN) || super
-      end
-
-      protected
-
       def dynamic_finder(meth, *args, &block)
         properties = meth.split '_and_'
         conditions = Hash[properties.zip args]
@@ -102,7 +102,7 @@ module CsvRecord
       end
 
       def __to_param__
-        self.id
+        self.id.to_s
       end
 
       def ==(obj)

data/lib/csv_record/validations.rb

@@ -14,12 +14,12 @@ module CsvRecord
       end
 
       def custom_validators
-        @custom_validators || []
+        @custom_validators ||= []
       end
 
       def validate(*args, &block)
         @custom_validators ||= []
-        args.each { |arg| @custom_validators << arg }
+        @custom_validators += args
         @custom_validators << block if block_given?
       end
     end
@@ -37,7 +37,14 @@ module CsvRecord
       end
 
       def errors
-        @errors || []
+        unless @errors
+          @errors = []
+          def @errors.add(attribute)
+            self << attribute
+          end
+        end
+
+        @errors
       end
 
       alias :valid? :__valid__?
@@ -46,7 +53,7 @@ module CsvRecord
       def trigger_presence_validations
         self.class.fields_to_validate_presence.each do |attribute|
           if self.public_send(attribute).nil?
-            @errors = self.errors.add attribute
+            self.errors.add attribute
           end
         end
       end
@@ -57,7 +64,7 @@ module CsvRecord
           condition[attribute] = self.public_send attribute
           records = self.class.__where__ condition
           if records.any? { |record| record != self }
-            @errors = self.errors.add attribute
+            self.errors.add attribute
           end
         end
       end
@@ -67,7 +74,7 @@ module CsvRecord
           if not validator.is_a? Proc
             self.send validator
           else
-            validator.call self
+            self.instance_eval &validator
           end
         end
       end

data/lib/csv_record/version.rb

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

data/test/csv_record/associations_test.rb

@@ -1,19 +1,21 @@
 require_relative '../test_helper'
 require_relative '../models/jedi'
 require_relative '../models/jedi_order'
+require_relative '../models/padawan'
 
 describe CsvRecord::Associations do
-  describe 'initializing class methods' do
+  describe 'belongs_to' do
     it ('responds to belongs_to') { Jedi.must_respond_to :belongs_to }
+
     it ('responds to jedi_order') { Jedi.new.must_respond_to :jedi_order }
     it ('responds to jedi_order=') { Jedi.new.must_respond_to :jedi_order= }
     it ('responds to jedi_order_id') { Jedi.new.must_respond_to :jedi_order_id }
-    it ('responds to has_many') { JediOrder.must_respond_to :has_many }
-  end
 
-  describe 'belongs_to behavior' do
-    it 'checking to param extraction' do
+    before do
       jedi_council.save
+    end
+
+    it 'checking to param extraction' do
       luke.save
       luke.jedi_order = jedi_council
       luke.jedi_order_id.wont_be_nil
@@ -22,7 +24,6 @@ describe CsvRecord::Associations do
     end
 
     it 'has a single jedi order associated' do
-      jedi_council.save
       luke.jedi_order = jedi_council
       luke.save.must_equal true
       first_jedi = Jedi.first
@@ -32,7 +33,9 @@ describe CsvRecord::Associations do
     end
   end
 
-  describe 'has_many behavior' do
+  describe 'has_many' do
+    it ('responds to has_many') { JediOrder.must_respond_to :has_many }
+
     it 'has many jedis associated' do
       jedi_council.save
       yoda.jedi_order = jedi_council
@@ -44,4 +47,16 @@ describe CsvRecord::Associations do
       jedis.first.must_be_instance_of Jedi
     end
   end
+
+  describe 'has_one' do
+    it ('responds to has_one') { Jedi.must_respond_to :has_one }
+
+    it 'has_one padawan' do
+      qui_gon_jinn.save
+      obi_wan_kenobi_padawan.save
+      qui_gon_jinn.padawan = obi_wan_kenobi_padawan
+      qui_gon_jinn.padawan.must_equal obi_wan_kenobi_padawan
+      qui_gon_jinn.padawan.must_be_instance_of Padawan
+    end
+  end
 end

data/test/csv_record/callbacks_test.rb

@@ -1,5 +1,4 @@
 require_relative '../test_helper'
-
 require_relative '../models/car'
 require_relative '../models/callback_test_class'
 
@@ -10,15 +9,20 @@ describe CsvRecord::Callbacks do
     it ('before_create callback') { klass.must_respond_to(:before_create) }
     it ('after_create callback') { klass.must_respond_to(:after_create) }
     it ('before_save callback') { klass.must_respond_to(:before_save) }
+    it ('before_destroy callback') {klass.must_respond_to(:before_destroy)}
     it ('after_save callback') { klass.must_respond_to(:after_save) }
+    it ('before_update callback') { klass.must_respond_to(:before_update) }
+    it ('after_update callback') { klass.must_respond_to(:after_update) }
     it ('after_initialize callback') { klass.must_respond_to(:after_initialize) }
+    it ('after_destroy callback') { klass.must_respond_to(:after_destroy) }
+    it ('after_find callback') { klass.must_respond_to(:after_find) }
   end
 
   describe "Check the run callback definitions" do
     let (:klass) { CallbackTestClass.new }
-
     it ('run before_create callbacks') { klass.must_respond_to(:run_before_create_callbacks) }
     it ('run after_create callbacks') { klass.must_respond_to(:run_after_create_callbacks) }
+    it ('run after_destroy callback') { klass.must_respond_to(:run_after_destroy_callbacks) }
     it ('run before_validation callbacks') { klass.must_respond_to(:run_before_validation_callbacks) }
     it ('run after_validation callbacks') { klass.must_respond_to(:run_after_validation_callbacks) }
     it ('run before_save callbacks') { klass.must_respond_to(:run_before_save_callbacks) }
@@ -26,6 +30,8 @@ describe CsvRecord::Callbacks do
     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) }
+    it ('run before_destroy callbacks ') { klass.must_respond_to(:run_before_destroy_callbacks) }
+    it ('run after_find callbacks') { klass.must_respond_to(:run_after_find_callbacks) }
   end
 
   describe 'Checking the callbacks execution' do
@@ -35,6 +41,11 @@ describe CsvRecord::Callbacks do
       object_created
     end
 
+    let (:object_destroyed) do
+      object_created.destroy
+      object_created
+    end
+
     it 'after_initialize' do
       CallbackTestClass.new.after_initialize_called.must_equal true
     end
@@ -70,5 +81,17 @@ describe CsvRecord::Callbacks do
     it 'after_update' do
       object_created.after_save_called.must_equal true
     end
+
+    it 'after_destroy' do
+      object_destroyed.after_destroy_called.must_equal true
+    end
+    it 'before_destroy' do
+      object_destroyed.before_destroy_called.must_equal true
+    end
+
+    it 'after_find using FIND' do
+      object_found = CallbackTestClass.find(object_created)
+      object_found.after_find_called.must_equal true
+    end
   end
 end

data/test/csv_record/reader_test.rb

@@ -70,8 +70,7 @@ describe CsvRecord::Reader do
     it 'checking to_param' do
       car.save
       car.to_param.wont_be_nil
-      car.to_param.must_be_instance_of Fixnum
-      car.to_param.must_equal 1
+      car.to_param.must_equal '1'
     end
 
     describe '==' do

data/test/csv_record/validation_test.rb

@@ -2,6 +2,7 @@ require_relative '../test_helper'
 require 'pry'
 require_relative '../models/jedi'
 require_relative '../models/jedi_order'
+require_relative '../models/custom_errors_class'
 
 describe CsvRecord::Validations do
   let (:invalid_jedi) { Jedi.new }
@@ -9,8 +10,12 @@ describe CsvRecord::Validations do
   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 }
+  end
+
+  describe 'initializing instance methods' do
     it ('responds to valid?') { Jedi.new.must_respond_to :valid? }
     it ('responds to invalid?') { Jedi.new.must_respond_to :invalid? }
+    it ('responds to errors') { Jedi.new.must_respond_to :errors }
   end
 
   describe 'validates_presence_of :name and :age behavior' do
@@ -50,34 +55,45 @@ describe CsvRecord::Validations do
       yoda.valid?.wont_equal true
       yoda.save.wont_equal true
     end
+
   end
 
-  describe 'default methods' do
-    describe 'invalid?' do
-      it 'invalid object' do
-        invalid_jedi.invalid?.must_equal true
-      end
+  describe 'invalid?' do
+    it 'invalid object' do
+      invalid_jedi.invalid?.must_equal true
+    end
 
-      it 'valid object' do
-        yoda.invalid?.must_equal false
-      end
+    it 'valid object' do
+      yoda.invalid?.must_equal false
+    end
+  end
+
+  describe 'errors' do
+    it 'wont be empty when invalid' do
+      invalid_jedi.valid?
+      invalid_jedi.errors.wont_be_empty
     end
 
-    describe 'errors' do
-      it 'wont be empty when invalid' do
-        invalid_jedi.valid?
-        invalid_jedi.errors.wont_be_empty
-      end
+    it 'should have two erros' do
+      invalid_jedi.valid?
+      invalid_jedi.errors.length.must_equal 2
+    end
 
-      it 'should have two erros' do
-        invalid_jedi.valid?
-        invalid_jedi.errors.length.must_equal 2
-      end
+    it 'should contain the errors found' do
+      invalid_jedi.valid?
+      invalid_jedi.errors.must_include :name
+      invalid_jedi.errors.must_include :age
+    end
+
+    describe 'add' do
+      it ('responds to add') { invalid_jedi.errors.must_respond_to :add }
 
-      it 'should contain the errors found' do
-        invalid_jedi.valid?
-        invalid_jedi.errors.must_include :name
-        invalid_jedi.errors.must_include :age
+      it 'adding' do
+        invalid_jedi.instance_eval do
+          self.errors.add(:testing)
+          self.errors.wont_be_empty
+          self.errors.last.must_equal :testing
+        end
       end
     end
   end
@@ -95,16 +111,17 @@ describe CsvRecord::Validations do
   end
 
   describe 'custom_validator' do
-    it ('responds to validate') { Jedi.must_respond_to :validate }
+    it ('responds to validate') { CustomErrorsClass.must_respond_to :validate }
 
-    before { yoda.valid? }
+    let(:custom_error_class) { CustomErrorsClass.new }
+    before { custom_error_class.valid? }
 
     it 'adding a custom validator' do
-      yoda.custom_validator_checker.must_equal true
+      custom_error_class.errors.must_include :custom_error
     end
 
     it 'validate can have a block' do
-      yoda.custom_validator_checker_with_block.must_equal true
+      custom_error_class.errors.must_include :custom_error_with_block
     end
   end
 

data/test/models/callback_test_class.rb

@@ -8,11 +8,17 @@ class CallbackTestClass
   attr_accessor :before_validation_called, :after_validation_called
   attr_accessor :before_update_called, :after_update_called
   attr_accessor :before_save_called, :after_save_called
+  attr_accessor :before_destroy_called, :after_destroy_called
+  attr_accessor :after_find_called, :after_where_called
 
   after_initialize do
     self.after_initialize_called = true
   end
 
+  after_find do
+    self.after_find_called = true
+  end
+
   before_create do
     self.before_create_called = true
   end
@@ -44,4 +50,13 @@ class CallbackTestClass
   after_save do
     self.after_save_called = true
   end
+
+  after_destroy do
+    self.after_destroy_called = true
+  end
+
+  before_destroy do
+    self.before_destroy_called = true
+  end
+
 end

data/test/models/custom_errors_class.rb

@@ -0,0 +1,13 @@
+class CustomErrorsClass
+  include CsvRecord::Document
+
+  validate :my_custom_validator_method
+  validate do
+    self.errors.add :custom_error_with_block
+  end
+
+  private
+  def my_custom_validator_method
+    self.errors.add :custom_error
+  end
+end

data/test/models/jedi.rb

@@ -2,20 +2,16 @@ class Jedi
   include CsvRecord::Document
 
   attr_accessor :name, :age, :midi_chlorians
-  attr_reader :custom_validator_checker, :custom_validator_checker_with_block
+  attr_reader :custom_validator_checker, :custom_validator_checker_with_block, :after_destroy_value, :after_save_value
 
+  after_destroy :my_after_destroy_method
+  after_save :my_after_save_method
   belongs_to :jedi_order
+  has_one :padawan
 
   validates_presence_of :name, :age
   validates_uniqueness_of :name
 
-  validate :my_custom_validator_method
-  validate do |obj|
-    obj.instance_eval do
-      @custom_validator_checker_with_block = true
-    end
-  end
-
   def initialize(params={})
     params.each do |key, value|
       self.public_send("#{key}=", value)
@@ -26,4 +22,11 @@ class Jedi
   def my_custom_validator_method
     @custom_validator_checker = true
   end
+  def my_after_destroy_method
+    @after_destroy_value = true
+  end
+  def my_after_save_method
+    @after_save_value = true
+  end
+
 end

data/test/models/padawan.rb

@@ -0,0 +1,7 @@
+class Padawan
+  include CsvRecord::Document
+
+  attr_accessor :name, :age, :midi_chlorians
+
+  belongs_to :jedi
+end

data/test/test_helper.rb

@@ -48,4 +48,11 @@ class MiniTest::Spec
       midi_chlorians: '3k'
     )
   end
+  let(:obi_wan_kenobi_padawan) do
+    Padawan.build(
+      name: 'Qui-Gon Jinn',
+      age: 22,
+      midi_chlorians: '4k'
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv_record
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,13 +128,15 @@ files:
 - test/csv_record/writer_test.rb
 - test/models/callback_test_class.rb
 - test/models/car.rb
+- test/models/custom_errors_class.rb
 - test/models/jedi.rb
 - test/models/jedi_order.rb
-- test/monkey_patches/array_test.rb
+- test/models/padawan.rb
 - test/monkey_patches/object_test.rb
 - test/test_helper.rb
 homepage: https://github.com/lukasalexandre/csv_record
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -171,8 +173,9 @@ test_files:
 - test/csv_record/writer_test.rb
 - test/models/callback_test_class.rb
 - test/models/car.rb
+- test/models/custom_errors_class.rb
 - test/models/jedi.rb
 - test/models/jedi_order.rb
-- test/monkey_patches/array_test.rb
+- test/models/padawan.rb
 - test/monkey_patches/object_test.rb
 - test/test_helper.rb

data/test/monkey_patches/array_test.rb

@@ -1,14 +0,0 @@
-require_relative '../test_helper'
-
-describe Array do
-  describe 'add' do
-    it ('responds to add') { Object.new.must_respond_to :integer? }
-
-    it 'adding' do
-      arr = Array.new
-      arr.add(:testing)
-      arr.wont_be_empty
-      arr.last.must_equal :testing
-    end
-  end
-end