sample_models 1.2.2 → 1.2.3

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
+    activerecord (2.3.5)
+      activesupport (= 2.3.5)
+    activesupport (2.3.5)
     git (1.2.5)
     jeweler (1.6.0)
       bundler (~> 1.0.0)
@@ -17,8 +17,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 2.3.10)
-  activesupport (= 2.3.10)
+  activerecord (= 2.3.5)
+  activesupport (= 2.3.5)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
   sqlite3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rubygems'
 
-ActiveRecordVersions = %w(3.0.1 2.3.10)
+ActiveRecordVersions = %w(3.0.1 2.3.10 2.3.5)
 
 desc "Run all tests"
 task :test do

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/sample_models/model.rb

@@ -32,8 +32,9 @@ module SampleModels
     end
     
     def construct_finder_sql(*args)
-      if @model_class.method(:scoped).arity == -1
-        @model_class.scoped.apply_finder_options(*args).arel.to_sql
+      if @model_class.method(:scoped).arity == -1 && 
+         @model_class.scoped(nil).respond_to?(:apply_finder_options)
+        @model_class.scoped(nil).apply_finder_options(*args).arel.to_sql
       else
         @model_class.send(:construct_finder_sql, *args)
       end
@@ -57,82 +58,131 @@ module SampleModels
     def validates_presence_of?(attr)
       @validation_collections[attr].includes_presence?
     end
-  
+    
+    def unique?(field, value)
+      !@model_class.first(:conditions => {field => value})
+    end
+    
     class ValidationCollection
       def initialize(model, field)
         @model, @field = model, field
-        @sequence_number = 0
-        @validations = {}
+        @value_streams = []
       end
       
-      def add(type, config)
-        @validations[type] = config
+      def add(validation_method, config)
+        stream_class_name = validation_method.to_s.camelize + 'ValueStream'
+        if ValidationCollection.const_defined?(stream_class_name)
+          stream_class = ValidationCollection.const_get(stream_class_name)
+          if stream_class == ValidatesUniquenessOfValueStream
+            @validates_uniqueness_config = config
+          else
+            input = @value_streams.last
+            @value_streams << stream_class.new(@model, @field, config, input)
+          end
+        end
       end
       
-      def association
-        @model.belongs_to_associations.detect { |a|
-          a.association_foreign_key.to_sym == @field.to_sym
-        }
+      def includes_presence?
+        @value_streams.any? { |vs| vs.is_a?(ValidatesPresenceOfValueStream) }
       end
       
-      def column
-        @model.columns.detect { |c| c.name == @field.to_s }
+      def includes_uniqueness?
+        @value_streams.any? { |vs| vs.is_a?(ValidatesUniquenessOfValueStream) }
       end
       
-      def includes_presence?
-        @validations.has_key?(:validates_presence_of)
+      def satisfying_value
+        if @validates_uniqueness_config
+          input = @value_streams.last
+          @value_streams << ValidatesUniquenessOfValueStream.new(
+            @model, @field, @validates_uniqueness_config, input
+          )
+          @validates_uniqueness_config = nil
+        end
+        @value_streams.last.satisfying_value if @value_streams.last
       end
       
-      def includes_uniqueness?
-        @validations.has_key?(:validates_uniqueness_of)
+      class ValueStream
+        attr_reader :input
+        
+        def initialize(model, field, config, input)
+          @model, @field, @config, @input = model, field, config, input
+          @sequence_number = 0
+        end
+      
+        def column
+          @model.columns.detect { |c| c.name == @field.to_s }
+        end
+        
+        def increment
+          @sequence_number += 1
+          input.increment if input
+        end
       end
       
-      def satisfying_present_associated_value
-        value = if includes_uniqueness?
-          association.klass.create_sample
-        else
-          association.klass.first || association.klass.sample
+      class ValidatesEmailFormatOfValueStream < ValueStream
+        def satisfying_value
+          "john.doe#{@sequence_number}@example.com"
         end
-        value = value.id if value
-        value
       end
       
-      def satisfying_present_value(prev_value)
-        if association
-          satisfying_present_associated_value
-        else
-          if prev_value.present?
-            prev_value
-          elsif column && column.type == :date
-            Date.today
+      class ValidatesInclusionOfValueStream < ValueStream
+        def satisfying_value
+          @config[:in].first
+        end
+      end
+      
+      class ValidatesPresenceOfValueStream < ValueStream
+        def association
+          @model.belongs_to_associations.detect { |a|
+            a.association_foreign_key.to_sym == @field.to_sym
+          }
+        end
+        
+        def increment
+          if association
+            association.klass.create_sample
           else
-            "#{@field} #{@sequence_number}"
+            super
           end
         end
-      end
       
-      def satisfying_value
-        @sequence_number += 1 if includes_uniqueness?
-        value = nil
-        @validations.each do |type, config|
-          case type
-          when :validates_email_format_of
-            value = "john.doe#{@sequence_number}@example.com"
-          when :validates_inclusion_of
-            value = config[:in].first
-          when :validates_presence_of
-            value = satisfying_present_value(value)
+        def satisfying_associated_value
+          value = association.klass.last || association.klass.sample
+          value = value.id if value
+          value
+        end
+      
+        def satisfying_value
+          prev_value = input.satisfying_value if input
+          if association
+            satisfying_associated_value
+          else
+            if prev_value.present?
+              prev_value
+            elsif column && column.type == :date
+              Date.today + @sequence_number
+            elsif column && column.type == :datetime
+              Time.utc(1970, 1, 1) + @sequence_number.days
+            elsif column && column.type == :integer
+              @sequence_number
+            else
+              "#{@field} #{@sequence_number}"
+            end
           end
         end
-        value = unique_value if value.nil? && includes_uniqueness?
-        value
       end
       
-      def unique_value
-        if column.type == :string
-          "#{@field.to_s.capitalize} #{@sequence_number}"
-        elsif column.type == :datetime
-          Time.utc(1970, 1, 1) + @sequence_number.days
+      class ValidatesUniquenessOfValueStream < ValueStream
+        def satisfying_value
+          value = input.satisfying_value if input
+          if !@model.unique?(@field, value)
+            my_input = input || ValidatesPresenceOfValueStream.new(@model, @field, nil, @input)
+            until @model.unique?(@field, value)
+              my_input.increment
+              value = my_input.satisfying_value
+            end
+          end
+          value
         end
       end
     end

data/sample_models.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sample_models}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
-  s.date = %q{2011-05-29}
+  s.date = %q{2011-06-11}
   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_or_test/setup.rb

@@ -92,6 +92,10 @@ def initialize_db
         user.string  'email', 'gender', 'homepage', 'login', 'password'
       end
       
+      create_table 'user2s', :force => true do |user2|
+        user2.string  'login'
+      end
+      
       create_table 'user_with_passwords', :force => true do |user|
       end
       
@@ -195,6 +199,11 @@ class User < ActiveRecord::Base
   validates_uniqueness_of   :email, :login, :case_sensitive => false
 end
 
+class User2 < ActiveRecord::Base
+  validates_presence_of   :login
+  validates_uniqueness_of :login
+end
+
 class UserWithPassword < ActiveRecord::Base
   attr_accessor :password
   

data/spec_or_test/specs_or_test_cases.rb

@@ -91,6 +91,7 @@ describe "Model.sample" do
   end
 end
 
+
 describe 'Model with a belongs_to association' do
   it 'should be associated with the belongs_to recipient by default' do
     blog_post = BlogPost.sample
@@ -333,7 +334,6 @@ describe 'Model with a unique associated attribute' do
   end
 end
 
-
 describe 'Model with a unique scoped associated attribute' do
   it 'should create a new instance when you create_sample with the same scope variable as before' do
     video_fav1 = VideoFavorite.sample
@@ -541,13 +541,13 @@ describe 'Model with a named sample' do
     assert_equal 'Funny haha', bp.title
     assert_equal 3.0, bp.average_rating
   end
-  
+
   it 'should allow you to override fields' do
     bp = BlogPost.sample :funny, :average_rating => 4.0
     assert_equal 'Funny haha', bp.title
     assert_equal 4.0, bp.average_rating
   end
-  
+
   it 'should let you create_sample too' do
     bp1 = BlogPost.sample :funny
     bp2 = BlogPost.create_sample :funny
@@ -569,3 +569,10 @@ describe 'Model with a required accessor' do
   end
 end
 
+describe 'Model which validates the presence and uniqueness of a string field' do
+  it "should not get tripped up by a pre-existing record" do
+    User2.create!(:login => 'login 1')
+    User2.create_sample
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sample_models
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Francis Hwang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 -04:00
+date: 2011-06-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency