Refactoring tests and Validation callbacks

lib/couchrest/model/base.rb

@@ -7,7 +7,6 @@ module CouchRest
       include CouchRest::Model::Configuration
       include CouchRest::Model::Connection
       include CouchRest::Model::Persistence
-      include CouchRest::Model::Callbacks
       include CouchRest::Model::DocumentQueries
       include CouchRest::Model::Views
       include CouchRest::Model::DesignDoc
@@ -18,6 +17,7 @@ module CouchRest
       include CouchRest::Model::PropertyProtection
       include CouchRest::Model::Associations
       include CouchRest::Model::Validations
+      include CouchRest::Model::Callbacks
       include CouchRest::Model::Designs
       include CouchRest::Model::CastedBy
       include CouchRest::Model::Dirty

lib/couchrest/model/callbacks.rb

@@ -5,21 +5,23 @@ module CouchRest #:nodoc:
 
     module Callbacks
       extend ActiveSupport::Concern
+
+      CALLBACKS = [
+        :before_validation, :after_validation,
+        :after_initialize,
+        :before_create, :around_create, :after_create,
+        :before_destroy, :around_destroy, :after_destroy,
+        :before_save, :around_save, :after_save,
+        :before_update, :around_update, :after_update,
+      ]
+
       included do
         extend ActiveModel::Callbacks
+        include ActiveModel::Validations::Callbacks
 
-        define_model_callbacks \
+        define_model_callbacks :initialize, :only => :after
-          :create,
+        define_model_callbacks :create, :destroy, :save, :update
-          :destroy,
-          :save,
-          :update
-
       end
-
-      def valid?(*) #nodoc
-        _run_validation_callbacks { super }
-      end
-
     end
 
   end

lib/couchrest/model/casted_model.rb

@@ -5,11 +5,11 @@ module CouchRest::Model
 
     included do
       include CouchRest::Model::Configuration
-      include CouchRest::Model::Callbacks
       include CouchRest::Model::Properties
       include CouchRest::Model::PropertyProtection
       include CouchRest::Model::Associations
       include CouchRest::Model::Validations
+      include CouchRest::Model::Callbacks
       include CouchRest::Model::CastedBy
       include CouchRest::Model::Dirty
       class_eval do

lib/couchrest/model/validations.rb

@@ -13,18 +13,29 @@ module CouchRest
     # Validations may be applied to both Model::Base and Model::CastedModel
     module Validations
       extend ActiveSupport::Concern
-      included do
       include ActiveModel::Validations
-        include ActiveModel::Validations::Callbacks
-      end
 
+      # Determine if the document is valid.
+      #
+      # @example Is the document valid?
+      #   person.valid?
+      #
+      # @example Is the document valid in a context?
+      #   person.valid?(:create)
+      #
+      # @param [ Symbol ] context The optional validation context.
+      #
+      # @return [ true, false ] True if valid, false if not.
+      #
+      def valid?(context = nil)
+        super context ? context : (new? ? :create : :update)
+      end
 
       module ClassMethods
 
         # Validates the associated casted model. This method should not be
         # used within your code as it is automatically included when a CastedModel
         # is used inside the model.
-        #
         def validates_casted_model(*args)
           validates_with(CastedModelValidator, _merge_attributes(args))
         end

lib/couchrest_model.rb

@@ -60,8 +60,8 @@ require "couchrest/model/core_extensions/time_parsing"
 # Base libraries
 require "couchrest/model/casted_model"
 require "couchrest/model/base"
-# Add rails support *after* everything has loaded
 
+# Add rails support *after* everything has loaded
 if defined?(Rails)
   require "couchrest/railtie"
 end

spec/fixtures/models/card.rb

@@ -1,3 +1,5 @@
+require 'person'
+
 class Card < CouchRest::Model::Base 
   # Set the default database to use
   use_database DB

spec/fixtures/models/course.rb

@@ -1,5 +1,5 @@
-require File.join(FIXTURE_PATH, 'more', 'question')
+require 'question'
-require File.join(FIXTURE_PATH, 'more', 'person')
+require 'person'
 
 class Course < CouchRest::Model::Base
   use_database TEST_SERVER.default_database

spec/fixtures/models/membership.rb

@@ -0,0 +1,4 @@
+class Membership < Hash
+  include CouchRest::Model::CastedModel
+
+end

spec/fixtures/models/person.rb

@@ -1,3 +1,5 @@
+require 'cat'
+
 class Person < Hash
   include ::CouchRest::Model::CastedModel
   property :pet, Cat

spec/fixtures/models/sale_invoice.rb

@@ -1,5 +1,6 @@
-require File.join(FIXTURE_PATH, 'more', 'client')
+require 'client'
-require File.join(FIXTURE_PATH, 'more', 'sale_entry')
+require 'sale_entry'
+
 class SaleInvoice < CouchRest::Model::Base  
   use_database DB
 

spec/functional/validations_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe CouchRest::Model::Validations do
+
+  let(:invoice) do
+    Invoice.new()
+  end
+end

spec/spec_helper.rb

@@ -1,9 +1,14 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+MODELS = File.join(File.dirname(__FILE__), "fixtures", "models")
+$LOAD_PATH.unshift(MODELS)
+
 require "bundler/setup"
 require "rubygems"
-require "rspec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "rspec"
 
-require File.join(File.dirname(__FILE__), '..','lib','couchrest_model')
+require 'couchrest_model'
-# check the following file to see how to use the spec'd features.
 
 unless defined?(FIXTURE_PATH)
   FIXTURE_PATH = File.join(File.dirname(__FILE__), '/fixtures')
@@ -16,17 +21,6 @@ unless defined?(FIXTURE_PATH)
   DB = TEST_SERVER.database(TESTDB)
 end
 
-class Basic < CouchRest::Model::Base
-  use_database TEST_SERVER.default_database
-end
-
-def reset_test_db!
-  DB.recreate! rescue nil 
-  # Reset the Design Cache
-  Thread.current[:couchrest_design_cache] = {}
-  DB
-end
-
 RSpec.configure do |config|
   config.before(:all) { reset_test_db! }
 
@@ -39,6 +33,21 @@ RSpec.configure do |config|
   end
 end
 
+# Require each of the fixture models
+Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
+
+class Basic < CouchRest::Model::Base
+  use_database TEST_SERVER.default_database
+end
+
+def reset_test_db!
+  DB.recreate! rescue nil 
+  # Reset the Design Cache
+  Thread.current[:couchrest_design_cache] = {}
+  DB
+end
+
+
 def couchdb_lucene_available?
   lucene_path = "http://localhost:5985/"
   url = URI.parse(lucene_path)

spec/unit/active_model_lint_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'test/unit/assertions'
+require 'active_model/lint'
+
+class CompliantModel < CouchRest::Model::Base
+end
+
+
+describe CouchRest::Model::Base do
+  include Test::Unit::Assertions
+  include ActiveModel::Lint::Tests
+
+  before :each do
+    @model = CompliantModel.new
+  end
+
+  describe "active model lint tests" do
+    ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+      example m.gsub('_',' ') do
+        send m
+      end
+    end
+  end
+
+  def model
+    @model
+  end
+
+end

spec/unit/assocations_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
-require File.join(FIXTURE_PATH, 'more', 'sale_invoice')
-
 
 describe "Assocations" do
 

spec/unit/attachment_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 describe "Model attachments" do
   

spec/unit/base_spec.rb

@@ -1,11 +1,5 @@
 # encoding: utf-8
-
+require "spec_helper"
-require File.expand_path("../../spec_helper", __FILE__)
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'article')
-require File.join(FIXTURE_PATH, 'more', 'course')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'base')
 
 describe "Model Base" do
   

spec/unit/casted_model_spec.rb

@@ -1,12 +1,5 @@
 # encoding: utf-8
-
+require "spec_helper"
-require File.expand_path('../../spec_helper', __FILE__)
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'person')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'more', 'question')
-require File.join(FIXTURE_PATH, 'more', 'course')
-
 
 class WithCastedModelMixin < Hash
   include CouchRest::Model::CastedModel

spec/unit/casted_spec.rb

@@ -1,7 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require "spec_helper"
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'person')
-require File.join(FIXTURE_PATH, 'more', 'card')
 
 class Driver < CouchRest::Model::Base
   use_database TEST_SERVER.default_database

spec/unit/class_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
 
 class UnattachedDoc < CouchRest::Model::Base
   # Note: no use_database here

spec/unit/collection_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
-require File.join(FIXTURE_PATH, 'more', 'article')
 
 describe "Collections" do
 

spec/unit/configuration_spec.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
+require "spec_helper"
-require File.join(FIXTURE_PATH, 'more', 'cat')
 
-describe CouchRest::Model::Base do
+describe CouchRest::Model::Configuration do
 
   before do
     @class = Class.new(CouchRest::Model::Base)

spec/unit/connection_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
-describe CouchRest::Model::Base do
+describe CouchRest::Model::Connection do
 
   before do
     @class = Class.new(CouchRest::Model::Base)

spec/unit/design_doc_spec.rb

@@ -1,10 +1,7 @@
 # encoding: utf-8
+require 'spec_helper'
 
-require File.expand_path("../../spec_helper", __FILE__)
+describe CouchRest::Model::DesignDoc do
-require File.join(FIXTURE_PATH, 'base')
-require File.join(FIXTURE_PATH, 'more', 'article')
-
-describe "Design Documents" do
 
   before :all do
     reset_test_db!

spec/unit/designs_spec.rb

@@ -1,10 +1,9 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
 
 class DesignModel < CouchRest::Model::Base
-  
 end
 
-describe "Design" do
+describe CouchRest::Model::Designs do
 
   it "should accessable from model" do
     DesignModel.respond_to?(:design).should be_true

spec/unit/dirty_spec.rb

@@ -1,10 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
-
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'article')
-require File.join(FIXTURE_PATH, 'more', 'course')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'base')
 
 class WithCastedModelMixin < Hash
   include CouchRest::Model::CastedModel

spec/unit/inherited_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
 
 class PlainParent
   class_inheritable_accessor :foo

spec/unit/persistence_spec.rb

@@ -1,13 +1,7 @@
 # encoding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
-require File.join(FIXTURE_PATH, 'base')
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'article')
-require File.join(FIXTURE_PATH, 'more', 'course')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'more', 'event')
 
-describe "Model Persistence" do
+describe CouchRest::Model::Persistence do
 
   before(:each) do
     @obj = WithDefaultValues.new

spec/unit/property_protection_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
 
 describe "Model Attributes" do
 

spec/unit/property_spec.rb

@@ -1,18 +1,7 @@
 # encoding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
-require File.join(FIXTURE_PATH, 'more', 'article')
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'person')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'more', 'invoice')
-require File.join(FIXTURE_PATH, 'more', 'service')
-require File.join(FIXTURE_PATH, 'more', 'event')
-require File.join(FIXTURE_PATH, 'more', 'user')
-require File.join(FIXTURE_PATH, 'more', 'course')
-require File.join(FIXTURE_PATH, "more", "key_chain")
 
-
+describe CouchRest::Model::Property do
-describe "Model properties" do
 
   before(:each) do
     reset_test_db!

spec/unit/proxyable_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
-
-require File.join(FIXTURE_PATH, 'more', 'cat')
 
 class DummyProxyable < CouchRest::Model::Base
   proxy_database_method :db
@@ -12,7 +10,7 @@ end
 class ProxyKitten < CouchRest::Model::Base
 end
 
-describe "Proxyable" do
+describe CouchRest::Model::Proxyable do
 
   describe "#proxy_database" do
 

spec/unit/subclass_spec.rb

@@ -1,8 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'person')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'more', 'course')
 
 # add a default value
 Card.property :bg_color, :default => '#ccc'

spec/unit/typecast_spec.rb

@@ -1,8 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
+require 'spec_helper'
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'person')
-require File.join(FIXTURE_PATH, 'more', 'course')
 
 describe "Type Casting" do
 

spec/unit/validations_spec.rb

@@ -1,14 +1,6 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
 
-require File.join(FIXTURE_PATH, 'more', 'cat')
+describe CouchRest::Model::Validations do
-require File.join(FIXTURE_PATH, 'more', 'article')
-require File.join(FIXTURE_PATH, 'more', 'course')
-require File.join(FIXTURE_PATH, 'more', 'card')
-require File.join(FIXTURE_PATH, 'base')
-
-# TODO Move validations from other specs to here
-
-describe "Validations" do
 
   describe "Uniqueness" do
 

spec/unit/view_spec.rb

@@ -1,10 +1,6 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
-require File.join(FIXTURE_PATH, 'more', 'cat')
-require File.join(FIXTURE_PATH, 'more', 'person')
-require File.join(FIXTURE_PATH, 'more', 'article')
-require File.join(FIXTURE_PATH, 'more', 'course')
 
-describe "Model views" do
+describe CouchRest::Model::Views do
 
   class Unattached < CouchRest::Model::Base
     property :title
@@ -18,7 +14,6 @@ describe "Model views" do
     end
   end
 
-
   describe "ClassMethods" do
     # NOTE! Add more unit tests!