sample_models 2.1.0 → 2.2.0

data/README.markdown

@@ -117,6 +117,13 @@ validates_inclusion_of
 SampleModels will set the attribute to one of the specified values.
 
 
+validates_length_of
+-------------------
+
+SampleModels will set the attribute to a string within the specified
+length constraints.
+
+
 validates_uniqueness_of
 -----------------------
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/lib/sample_models/attribute_sequence.rb

@@ -1,187 +1,196 @@
 module SampleModels
-  class AttributeSequence
-    def self.build(*args)
-      Builder.new(*args).run
+  module AttributeSequence
+    def self.build(pass, model, column, force_unique, force_email_format)
+      sequence = source(pass, model, column, force_email_format)
+      validations = model.validations(column.name)
+      if (v = validations.detect(&:uniqueness?)) || force_unique
+        v ||= Model::Validation.new(:validates_uniqueness_of) 
+        sequence = UniquenessFilter.new(model, column, v, sequence)
+      end 
+      sequence
+    end
+
+    def self.source(pass, model, column, force_email_format)
+      validations = model.validations(column.name)
+      belongs_to_assocs = model.belongs_to_associations
+      if force_email_format
+        EmailSource.new
+      elsif assoc = belongs_to_assocs.detect { |a| a.foreign_key == column.name }
+        if validations.any?(&:presence?)
+          RequiredBelongsToSource.new(assoc)
+        elsif pass == :first
+          FirstPassBelongsToSource.new
+        else
+          SecondPassBelongsToSource.new(model, assoc)
+        end
+      elsif validations.any?(&:email_format?)
+        EmailSource.new
+      elsif v = validations.detect(&:inclusion?)
+        InclusionSource.new(v)
+      elsif v = validations.detect(&:length?)
+        LengthSource.new(v)
+      else
+        SimpleSource.new(column)
+      end
     end
-    
-    def initialize(model, column, validation, input)
-      @model, @column, @validation, @input = model, column, validation, input
-      @number = 0
+
+    class AbstractSource
+      def initialize
+        @number = 0
+      end
+
+      def next
+        @number += 1
+        value
+      end
     end
-    
-    def belongs_to_association
-      @model.belongs_to_associations.detect { |a|
-        a.foreign_key == @column.name
-      }
+
+    class EmailSource < AbstractSource
+      def value
+        "john.doe.#{@number}@example.com"
+      end
     end
-    
-    def next
-      @number += 1
-      @input.next if @input
-      value
+
+    class FirstPassBelongsToSource < AbstractSource
+      def value
+        nil
+      end
     end
-    
-    def value
-      case @column.type
-        when :string, :text
-          "#{@column.name} #{@number}"
-        when :integer
-          belongs_to_association ? belongs_to_assoc_foreign_key_value : @number
-        when :datetime
-          Time.now.utc - @number.minutes
-        when :date
-          Date.today - @number
-        when :float
-          @number.to_f
-        end
+
+    class InclusionSource < AbstractSource
+      def initialize(validation)
+        super()
+        @validation = validation
+      end
+
+      def value
+        @validation.config[:in].first
+      end
     end
     
-    class Builder
-      def initialize(pass, model, column, force_unique, force_email_format)
-        @pass, @model, @column, @force_unique, @force_email_format =
-          pass, model, column, force_unique, force_email_format
+    class LengthSource < AbstractSource
+      def initialize(validation)
+        super()
+        @validation = validation
       end
-      
-      def base
-        base_class = SampleModels.const_get(
-          "#{@pass.to_s.capitalize}PassBaseAttributeSequence"
+
+      def value
+        minimum = @validation.config[:minimum]
+        minimum ||= (
+          @validation.config[:within] && @validation.config[:within].begin
         )
-        base_class.new(@model, @column)
-      end
-  
-      def run
-        input = base
-        if @force_email_format
-          input = ValidatesEmailFormatOfAttributeSequence.new(
-            @model, @column, nil, input
-          )
-        end
-        uniqueness_validation = if @force_unique
-          Model::Validation.new(:validates_uniqueness_of)
-        end
-        @model.validations(@column.name).each do |validation|
-          if validation.type == :validates_uniqueness_of
-            uniqueness_validation = validation
-          elsif s_class = sequence_class(validation)
-            input = s_class.new(@model, @column, validation, input)
-          end
+        minimum ||= (
+          @validation.config[:in] && @validation.config[:in].begin
+        )
+        minimum ||= 1
+        value = 'a' * minimum
+        @number.times do
+          value = value.succ
         end
-        if uniqueness_validation
-          input = ValidatesUniquenessOfAttributeSequence.new(
-            @model, @column, uniqueness_validation, input
+        value
+      end
+    end
+
+    class RequiredBelongsToSource < AbstractSource
+      def initialize(assoc)
+        super()
+        @assoc = assoc
+        @previous_instances = {}
+      end
+
+      def existing_instance_not_previously_returned
+        previous_ids = @previous_instances.values.map(&:id)
+        instance = nil
+        if previous_ids.empty?
+          @assoc.klass.last
+        else
+          @assoc.klass.last(
+            :conditions => ["id not in (?)", previous_ids]
           )
         end
-        input
       end
-      
-      def sequence_class(validation)
-        sequence_name = validation.type.to_s.camelize + 'AttributeSequence'
-        if SampleModels.const_defined?(sequence_name)
-          SampleModels.const_get(sequence_name)
+
+      def set_instance
+        instance = existing_instance_not_previously_returned
+        instance ||= @assoc.klass.sample
+        @previous_instances[@number] = instance
+      end
+
+      def value
+        if @previous_instances[@number]
+          value = @previous_instances[@number]
+          begin
+            value.reload
+            value.id
+          rescue ActiveRecord::RecordNotFound
+            set_instance
+            @previous_instances[@number].id
+          end
+        else
+          set_instance
+          @previous_instances[@number].id
         end
       end
     end
-  end
-  
-  class FirstPassBaseAttributeSequence < AttributeSequence
-    def initialize(model, column)
-      super(model, column, nil, nil)
-    end
-    
-    def belongs_to_assoc_foreign_key_value
-      nil
-    end
-  end
-  
-  class SecondPassBaseAttributeSequence < AttributeSequence
-    def initialize(model, column)
-      super(model, column, nil, nil)
-      @previous_values = {}
-    end
-    
-    def belongs_assoc_value_already_used?(record)
-      @previous_values.any? { |prev_num, prev_record|
-        prev_record == record && prev_num != @number
-      }
-    end
-    
-    def belongs_to_assoc_foreign_key_value
-      assoc_klass = belongs_to_association.klass
-      unless assoc_klass == @model.ar_class
-        record = (assoc_klass.last || assoc_klass.sample)
-        while belongs_assoc_value_already_used?(record)
-          record = assoc_klass.sample
+
+    class SecondPassBelongsToSource < AbstractSource
+      def initialize(model, assoc)
+        super()
+        @model, @assoc = model, assoc
+      end
+
+      def value
+        assoc_klass = @assoc.klass
+        unless assoc_klass == @model.ar_class
+          record = (assoc_klass.last || assoc_klass.sample)
+          record.id
         end
-        @previous_values[@number] = record
-        record.id
       end
     end
-  end
-  
-  class ValidatesEmailFormatOfAttributeSequence < AttributeSequence
-    def value
-      "john.doe.#{@number}@example.com"
-    end
-  end
-  
-  class ValidatesInclusionOfAttributeSequence < AttributeSequence
-    def value
-      @validation.config[:in].first
-    end
-  end
-  
-  class ValidatesPresenceOfAttributeSequence < AttributeSequence
-    def belongs_to_value
-      @previous_belongs_to_instances ||= {}
-      if @previous_belongs_to_instances[@number]
-        value = @previous_belongs_to_instances[@number]
-        begin
-          value.reload
-          value.id
-        rescue ActiveRecord::RecordNotFound
-          set_belongs_to_instance
-          @previous_belongs_to_instances[@number].id
+
+    class SimpleSource < AbstractSource
+      def initialize(column)
+        super()
+        @column = column
+      end
+
+      def value
+        case @column.type
+        when :string, :text
+          "#{@column.name} #{@number}"
+        when :integer
+          @number
+        when :datetime
+          Time.now.utc - @number.minutes
+        when :date
+          Date.today - @number
+        when :float
+          @number.to_f
         end
-      else
-        set_belongs_to_instance
-        @previous_belongs_to_instances[@number].id
       end
     end
-    
-    def existing_instance_not_previously_returned
-      previous_ids = @previous_belongs_to_instances.values.map(&:id)
-      instance = nil
-      if previous_ids.empty?
-        belongs_to_association.klass.last
-      else
-        belongs_to_association.klass.last(
-          :conditions => ["id not in (?)", previous_ids]
-        )
+
+    class UniquenessFilter
+      def initialize(model, column, validation, input)
+        @model, @column, @validation, @input =
+          model, column, validation, input
       end
-    end
-    
-    def set_belongs_to_instance
-      instance = existing_instance_not_previously_returned
-      instance ||= belongs_to_association.klass.sample
-      @previous_belongs_to_instances[@number] = instance
-    end
-    
-    def value
-      belongs_to_association ? belongs_to_value : super
-    end
-  end
-  
-  class ValidatesUniquenessOfAttributeSequence < AttributeSequence
-    def value
-      v = @input.value
-      unless @validation.config[:allow_nil] && v.nil?
-        unless @validation.config[:allow_blank] && v.blank?
-          until @model.unique?(@column.name, v)
-            v = @input.next
+      
+      def next
+        v = @input.next
+        unless @validation.config[:allow_nil] && v.nil?
+          unless @validation.config[:allow_blank] && v.blank?
+            until @model.unique?(@column.name, v)
+              v = @input.next
+            end
           end
         end
+        v
+      end
+
+      def value
+        self.next
       end
-      v
     end
   end
 end

data/lib/sample_models/initializer.rb

@@ -17,7 +17,7 @@ module SampleModels
     def intercept_validation_definitions
       validations_to_intercept = [
         :validates_email_format_of, :validates_inclusion_of,
-        :validates_presence_of, :validates_uniqueness_of
+        :validates_length_of, :validates_presence_of, :validates_uniqueness_of
       ]
       optional_interceptions = [:validates_email_format_of]
       validations_to_intercept.each do |validation|

data/lib/sample_models/model.rb

@@ -88,17 +88,16 @@ module SampleModels
       def initialize(type, config = {})
         @type, @config = type, config
       end
-      
-      def email_format?
-        @type == :validates_email_format_of
-      end
-      
-      def inclusion?
-        @type == :validates_inclusion_of
-      end
-      
-      def presence?
-        @type == :validates_presence_of
+
+      def method_missing(meth, *args, &block)
+        type_predicates = %w(
+          email_format? inclusion? length? presence? uniqueness?
+        )
+        if type_predicates.include?(meth.to_s)
+          @type == "validates_#{meth.to_s.chop}_of".to_sym
+        else
+          super
+        end
       end
     end
   end

data/sample_models.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sample_models"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]
-  s.date = "2012-03-02"
+  s.date = "2012-03-04"
   s.description = "\nA library for making it extremely fast for Rails developers to set up and save ActiveRecord instances when writing test cases. It aims to:\n\n* meet all your validations automatically\n* only make you specify the attributes you care about\n* give you a rich set of features so you can specify associated values as concisely as possible\n* do this with as little configuration as possible\n"
   s.email = "francis.hwang@profitably.com"
   s.extra_rdoc_files = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "test/unit/named_sample_test.rb",
     "test/unit/polymorphic_belongs_to_test.rb",
     "test/unit/sample_test.rb",
+    "test/unit/validations_test.rb",
     "uninstall.rb"
   ]
   s.homepage = "http://github.com/fhwang/sample_models"

data/test/setup/models.rb

@@ -99,6 +99,11 @@ end
 class User2 < ActiveRecord::Base
   validates_presence_of   :login
   validates_uniqueness_of :login
+  validates_length_of     :token1, :minimum => 40
+  validates_length_of     :token2, :maximum => 4
+  validates_uniqueness_of :token2
+  validates_length_of     :token3, :within => (20..40)
+  validates_length_of     :token4, :in => (20..40)
 end
 
 class UserWithPassword < ActiveRecord::Base

data/test/setup/schema.rb

@@ -89,6 +89,10 @@ silence_stream(STDOUT) do
     create_table 'user2s', :force => true do |user2|
       user2.string  'login'
       user2.string  'email'
+      user2.string  'token1'
+      user2.string  'token2'
+      user2.string  'token3'
+      user2.string  'token4'
     end
     
     create_table 'user_with_passwords', :force => true do |user|

data/test/unit/belongs_to_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))
 
 class BelongsToTest < SampleModelsTestCase
   def test_associated_with_belongs_to_recipient_by_default

data/test/unit/configuration_test.rb

@@ -73,13 +73,6 @@ class ConfigurationTest < SampleModelsTestCase
     end
   end
   
-  def test_validate_uniqueness_with_an_allow_nil_allows_nil_configuration
-    User.sample
-    user = User.sample
-    assert_nil user.external_user
-    assert_nil user.external_user_id
-  end
-  
   def test_attr_accessor_can_have_configured_default
     blog_post = BlogPost.sample
     assert_equal('I am an instance attribute', blog_post.instance_attribute)

data/test/unit/sample_test.rb

@@ -31,26 +31,6 @@ class SampleTest < SampleModelsTestCase
     end
   end
   
-  def test_picks_a_value_given_in_a_validates_inclusion_of
-    assert_difference('User.count') do
-      user = User.sample
-      assert(%(m f).include?(user.gender))
-    end
-  end
-  
-  def test_cant_override_validations
-    assert_no_difference('User.count') do
-      assert_raise(ActiveRecord::RecordInvalid) do
-        User.sample(:gender => 'x')
-      end
-    end
-    assert_no_difference('User.count') do
-      assert_raise(ActiveRecord::RecordInvalid) do
-        User.sample(:email => 'call.me')
-      end
-    end
-  end
-  
   def test_set_emails
     assert_difference('User.count') do
       user = User.sample
@@ -110,7 +90,10 @@ class SampleTest < SampleModelsTestCase
   def test_string_which_is_required_to_be_present_and_unique
     # Ensuring that it doesn't get tripped up by a pre-existing record
     User2.destroy_all
-    User2.create!(:login => 'login 1')
+    User2.create!(
+      :login => 'login 1', :token1 => 'a' * 40, :token2 => 'a' * 4,
+      :token3 => 'a' * 20, :token4 => 'a' * 20
+    )
     User2.sample
   end
   

data/test/unit/validations_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))
+
+class ValidationsTest < SampleModelsTestCase
+  def test_validate_uniqueness_with_an_allow_nil_allows_nil_configuration
+    User.sample
+    user = User.sample
+    assert_nil user.external_user
+    assert_nil user.external_user_id
+  end
+  
+  def test_picks_a_value_given_in_a_validates_inclusion_of
+    assert_difference('User.count') do
+      user = User.sample
+      assert(%(m f).include?(user.gender))
+    end
+  end
+  
+  def test_cant_override_validations
+    assert_no_difference('User.count') do
+      assert_raise(ActiveRecord::RecordInvalid) do
+        User.sample(:gender => 'x')
+      end
+    end
+    assert_no_difference('User.count') do
+      assert_raise(ActiveRecord::RecordInvalid) do
+        User.sample(:email => 'call.me')
+      end
+    end
+  end
+
+  def test_validates_length_of
+    token2s = []
+    50.times do
+      user2 = User2.sample
+      assert(user2.token1.length >= 40)
+      assert(user2.token2.length <= 4)
+      token2s << user2.token2
+      assert(user2.token3.length >= 20 && user2.token3.length <= 40)
+      assert(user2.token4.length >= 20 && user2.token4.length <= 40)
+    end
+    assert_equal(token2s.size, token2s.uniq.size)
+  end
+end
+  

metadata

@@ -2,7 +2,7 @@
 name: sample_models
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Francis Hwang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -97,6 +97,7 @@ files:
 - test/unit/named_sample_test.rb
 - test/unit/polymorphic_belongs_to_test.rb
 - test/unit/sample_test.rb
+- test/unit/validations_test.rb
 - uninstall.rb
 homepage: http://github.com/fhwang/sample_models
 licenses: