sample_models 1.2.3 → 1.2.4

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/lib/sample_models/model.rb

@@ -175,11 +175,17 @@ module SampleModels
       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
+          unless @config[:allow_nil] && value.nil?
+            unless @config[:allow_blank] && value.blank?
+              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
             end
           end
           value

data/sample_models.gemspec

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

@@ -69,6 +69,9 @@ def initialize_db
         episode.date    'original_air_date'
       end
       
+      create_table 'external_users', :force => true do |external_user|
+      end
+      
       create_table 'networks', :force => true do |network|
         network.string 'name'
       end
@@ -88,7 +91,7 @@ def initialize_db
       end
 
       create_table 'users', :force => true do |user|
-        user.integer 'favorite_blog_post_id'
+        user.integer 'favorite_blog_post_id', 'external_user_id'
         user.string  'email', 'gender', 'homepage', 'login', 'password'
       end
       
@@ -171,6 +174,9 @@ class Episode < ActiveRecord::Base
   validates_presence_of :show_id, :original_air_date
 end
 
+class ExternalUser < ActiveRecord::Base
+end
+
 class Network < ActiveRecord::Base
 end
 
@@ -193,10 +199,12 @@ end
 class User < ActiveRecord::Base
   belongs_to :favorite_blog_post,
              :class_name => 'BlogPost', :foreign_key => 'favorite_blog_post_id'
+  belongs_to :external_user
 
   validates_email_format_of :email
   validates_inclusion_of    :gender, :in => %w(f m)
   validates_uniqueness_of   :email, :login, :case_sensitive => false
+  validates_uniqueness_of   :external_user_id, :allow_nil => true
 end
 
 class User2 < ActiveRecord::Base
@@ -261,6 +269,10 @@ SampleModels.configure Subscription do |sub|
   sub.subscribable.default_class BlogPost
 end
 
+SampleModels.configure User do |user|
+  user.external_user_id.default nil
+end
+
 SampleModels.configure Video do |video|
   video.before_save do |v, sample_attrs|
     if v.episode && v.episode.show != v.show

data/spec_or_test/specs_or_test_cases.rb

@@ -576,3 +576,11 @@ describe 'Model which validates the presence and uniqueness of a string field' d
   end
 end
 
+describe 'Model that validates uniqueness with an allow-nil constraint' do
+  it 'should let you configure the default to be nil' do
+    User.sample
+    user = User.create_sample
+    assert_nil user.external_user
+    assert_nil user.external_user_id
+  end
+end

metadata

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