sample_models 1.0.0 → 1.1.0

data/Rakefile

@@ -3,21 +3,31 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rubygems'
 gem 'rspec'
-require 'spec/rake/spectask'
 
-desc 'Default: run specs.'
+ActiveRecordVersions = %w(3.0.1 2.3.10)
+
+desc 'Default: run all tests and specs.'
 task :default => [:test, :spec]
 
 desc "Run all specs"
 task :spec do
-  cmd = "spec spec/sample_models_spec.rb"
-  puts cmd
-  puts `#{cmd}`
+  ActiveRecordVersions.each do |ar_version|
+    ENV['ACTIVE_RECORD_VERSION'] = ar_version
+    cmd = "rspec spec/sample_models_spec.rb"
+    puts ar_version
+    puts cmd
+    puts `#{cmd}`
+  end
 end
 
 desc "Run all tests"
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/*.rb']
+task :test do
+  ActiveRecordVersions.each do |ar_version|
+    cmd = "ACTIVE_RECORD_VERSION=#{ar_version} ruby test/test_sample_models.rb"
+    puts cmd
+    puts `cd . && #{cmd}`
+    puts
+  end
 end
 
 desc 'Generate documentation for the sample_models plugin.'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/sample_models.rb

@@ -1,10 +1,4 @@
 if RAILS_ENV == 'test' # no reason to run this code outside of test mode
-  
-require "#{File.dirname(__FILE__)}/sample_models/creation"
-require "#{File.dirname(__FILE__)}/sample_models/finder"
-require "#{File.dirname(__FILE__)}/sample_models/model"
-require "#{File.dirname(__FILE__)}/sample_models/sampler"
-require "#{File.dirname(__FILE__)}/../vendor/ar_query/lib/ar_query"
 
 module SampleModels
   mattr_reader :models
@@ -20,6 +14,14 @@ module SampleModels
   def self.configure(model_class, opts ={})
     yield ConfigureRecipient.new(model_class) if block_given?
   end
+  
+  def self.hash_with_indifferent_access_class
+    if ActiveSupport.const_defined?('HashWithIndifferentAccess')
+      ActiveSupport::HashWithIndifferentAccess
+    else
+      HashWithIndifferentAccess
+    end
+  end
 
   protected
   
@@ -93,25 +95,37 @@ module ActiveRecord
   class Base
     include SampleModels
   end
-  
-  module Validations
-    module ClassMethods
-      [:validates_email_format_of,
-       :validates_inclusion_of, :validates_presence_of, 
-       :validates_uniqueness_of].each do |validation|
-        if method_defined?(validation)
-          define_method "#{validation}_with_sample_models".to_sym do |*args|
-            send "#{validation}_without_sample_models".to_sym, *args
-            SampleModels.models[self].record_validation(
-              validation, *args
-            )
-          end
-          alias_method_chain validation, :sample_models
-        end
-      end
+end
+
+validation_recipients = [ActiveRecord::Validations::ClassMethods]
+if Object.const_defined?('ActiveModel')
+  validation_recipients << ActiveModel::Validations::HelperMethods
+end
+validations_to_intercept = [
+  :validates_email_format_of, :validates_inclusion_of, :validates_presence_of, 
+  :validates_uniqueness_of
+]
+validations_to_intercept.each do |validation|
+  recipient = validation_recipients.detect { |vr|
+    vr.method_defined?(validation)
+  }
+  if recipient
+    method_name = "#{validation}_with_sample_models".to_sym
+    recipient.send(:define_method, method_name) do |*args|
+      send "#{validation}_without_sample_models".to_sym, *args
+      SampleModels.models[self].record_validation(validation, *args)
     end
+    recipient.alias_method_chain validation, :sample_models
+  else
+    raise "Can't find who defines the validation method #{validation}"
   end
 end
+  
+require "#{File.dirname(__FILE__)}/sample_models/creation"
+require "#{File.dirname(__FILE__)}/sample_models/finder"
+require "#{File.dirname(__FILE__)}/sample_models/model"
+require "#{File.dirname(__FILE__)}/sample_models/sampler"
+require "#{File.dirname(__FILE__)}/../vendor/ar_query/lib/ar_query"
 
 end # if RAILS_ENV == 'test'
 

data/lib/sample_models/creation.rb

@@ -2,7 +2,7 @@ module SampleModels
   class Creation
     def initialize(sampler, attrs)
       @sampler = sampler
-      @orig_attrs = HashWithIndifferentAccess.new attrs
+      @orig_attrs = SampleModels.hash_with_indifferent_access_class.new attrs
       @attrs = Attributes.new(@sampler, attrs)
     end
     
@@ -48,7 +48,7 @@ module SampleModels
       save! if needs_another_save
     end
     
-    class Attributes < HashWithIndifferentAccess
+    class Attributes < SampleModels.hash_with_indifferent_access_class
       def initialize(sampler, hash)
         @sampler = sampler
         hash = Sampler.reify_association_hashes model, hash

data/lib/sample_models/finder.rb

@@ -3,7 +3,7 @@ module SampleModels
     def initialize(model, attrs)
       @model = model
       attrs = Sampler.reify_association_hashes @model, attrs.clone
-      @attrs = HashWithIndifferentAccess.new attrs
+      @attrs = SampleModels.hash_with_indifferent_access_class.new attrs
       @ar_query = ARQuery.new
     end
     

data/lib/sample_models/model.rb

@@ -32,7 +32,11 @@ module SampleModels
     end
     
     def construct_finder_sql(*args)
-      @model_class.send(:construct_finder_sql, *args)
+      if @model_class.method(:scoped).arity == -1
+        @model_class.scoped.apply_finder_options(*args).arel.to_sql
+      else
+        @model_class.send(:construct_finder_sql, *args)
+      end
     end
     
     def has_many_associations

data/lib/sample_models/sampler.rb

@@ -36,8 +36,9 @@ module SampleModels
     def initialize(model_class)
       @model_class = model_class
       @configured_default_attrs = {}
-      @named_sample_attrs = HashWithIndifferentAccess.new
-      @polymorphic_default_classes = HashWithIndifferentAccess.new
+      @named_sample_attrs = SampleModels.hash_with_indifferent_access_class.new
+      @polymorphic_default_classes =
+        SampleModels.hash_with_indifferent_access_class.new
     end
     
     def create_sample(*args)

data/sample_models.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{sample_models}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
-  s.date = %q{2010-11-06}
+  s.date = %q{2010-11-21}
   s.description = %q{
 A library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:
 

data/spec/sample_models_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + "/../spec_or_test/setup"
 require 'test/unit/assertions'
 
-class Spec::Example::ExampleGroup
+class RSpec::Core::ExampleGroup
   include Test::Unit::Assertions
 end
 

data/spec_or_test/setup.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
-require 'active_record'
+gem 'activerecord', ENV['ACTIVE_RECORD_VERSION']
 RAILS_ENV = 'test'
+require 'active_record'
 require 'active_record/base'
+require 'active_support/core_ext/logger'
 require File.dirname(__FILE__) +
         '/vendor/validates_email_format_of/lib/validates_email_format_of'
 require File.dirname(__FILE__) + '/../lib/sample_models'
@@ -105,8 +107,9 @@ class Appointment < ActiveRecord::Base
   
   validates_presence_of :calendar_id, :user_id
   validates_uniqueness_of :start_time
+  validate :validate_calendar_has_same_user_id
   
-  def validate
+  def validate_calendar_has_same_user_id
     if calendar.user_id != user_id
       errors.add "Appointment needs same user as the calendar"
     end
@@ -191,7 +194,9 @@ class Video < ActiveRecord::Base
   belongs_to :network
   belongs_to :episode
   
-  def validate
+  validate :validate_episode_has_same_show_id
+  
+  def validate_episode_has_same_show_id
     if episode && episode.show_id != show_id
       errors.add "Video needs same show as the episode; show_id is #{show_id.inspect} while episode.show_id is #{episode.show_id.inspect}"
     end
@@ -247,3 +252,4 @@ SampleModels.configure Video do |video|
   end
   video.view_count.default 0
 end
+

data/spec_or_test/specs_or_test_cases.rb

@@ -35,8 +35,10 @@ describe "Model.sample" do
   end
   
   it "should raise the standard validation error if you break the model's validates_email_format_of validation" do
-    assert_raise(ActiveRecord::RecordInvalid) do
-      User.sample(:email => 'call.me')
+    unless ENV['ACTIVE_RECORD_VERSION'] =~ /^3\./
+      assert_raise(ActiveRecord::RecordInvalid) do
+        User.sample(:email => 'call.me')
+      end
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sample_models
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Francis Hwang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 -04:00
+date: 2010-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: []