sample_models 2.0.1 → 2.1.0

data/README.markdown

@@ -280,6 +280,18 @@ By default, SampleModels fills polymorphic associations with any record, chosen
       bookmark.bookmarkable.default_class BlogPost
     end
 
+force_email_format
+------------------
+
+Use `force_email_format` if you want to ensure that for every newly
+created instance, the field will be a valid email. This has the same
+effect as `validates_email_format_of`, but won't change the behavior of
+production code.
+
+    SampleModels.configure(User) do |user|
+      user.email.force_email_format
+    end
+
 force_unique
 ------------
 Use `force_unique` if you want to ensure that for every newly created instance, the field will be unique. This has the same effect as `validates_uniqueness_of`, but won't change how production code behaves.

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/lib/sample_models/attribute_sequence.rb

@@ -37,9 +37,9 @@ module SampleModels
     end
     
     class Builder
-      def initialize(pass, model, column, force_unique)
-        @pass, @model, @column, @force_unique =
-          pass, model, column, force_unique
+      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
       end
       
       def base
@@ -51,6 +51,11 @@ module SampleModels
   
       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

data/lib/sample_models/sampler.rb

@@ -8,6 +8,7 @@ module SampleModels
       @attribute_sequences = Hash.new { |h,k| h[k] = {} }
       @defaults = HashWithIndifferentAccess.new
       @forced_unique = []
+      @forced_email_format = []
       @named_samples = HashWithIndifferentAccess.new
       @polymorphic_default_classes = HashWithIndifferentAccess.new
     end
@@ -15,7 +16,8 @@ module SampleModels
     def attribute_sequence(pass, column)
       @attribute_sequences[pass][column.name] ||= begin
         AttributeSequence.build(
-          pass, model, column, @forced_unique.include?(column.name)
+          pass, model, column, @forced_unique.include?(column.name),
+          @forced_email_format.include?(column.name)
         )
       end
     end
@@ -29,10 +31,18 @@ module SampleModels
       attribute_sequence(:first, column)
     end
     
+    def force_email_format(attr)
+      @forced_email_format << attr.to_s
+    end
+
     def force_unique(attr)
       @forced_unique << attr.to_s
     end
 
+    def force_email_format(attr)
+      @forced_email_format << attr.to_s
+    end
+
     def model
       SampleModels.models[@model_class]
     end
@@ -81,6 +91,10 @@ module SampleModels
         def default_class(dc)
           @sampler.polymorphic_default_classes[@attribute] = dc
         end
+
+        def force_email_format
+          @sampler.force_email_format(@attribute)
+        end
         
         def force_unique
           @sampler.force_unique(@attribute)

data/sample_models.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sample_models"
-  s.version = "2.0.1"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Hwang"]

data/test/setup/models.rb

@@ -190,6 +190,10 @@ SampleModels.configure(User) do |user|
   user.external_user_id.default nil
 end
 
+SampleModels.configure(User2) do |user2|
+  user2.email.force_email_format
+end
+
 SampleModels.configure(Video) do |video|
   video.before_save do |v, sample_attrs|
     if v.episode && v.episode.show != v.show

data/test/setup/schema.rb

@@ -88,6 +88,7 @@ silence_stream(STDOUT) do
 
     create_table 'user2s', :force => true do |user2|
       user2.string  'login'
+      user2.string  'email'
     end
     
     create_table 'user_with_passwords', :force => true do |user|

data/test/unit/configuration_test.rb

@@ -42,6 +42,13 @@ class ConfigurationTest < SampleModelsTestCase
     assert_nil bp.published_at
   end
 
+  def test_force_email_format
+    10.times do
+      user2 = User2.sample
+      assert_match /^.*@.*\..*/, user2.email
+    end
+  end
+
   def test_before_save
     assert_difference('Video.count') do
       assert_difference('Episode.count') do

data/test/unit/sample_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))
 
 class SampleTest < SampleModelsTestCase
   def test_fills_non_validated_non_configured_fields_with_a_non_blank_value
@@ -109,6 +109,7 @@ 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.sample
   end

metadata

@@ -2,7 +2,7 @@
 name: sample_models
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors: 
 - Francis Hwang