mleung-koujou 0.0.5 → 0.0.6

data/lib/koujou.rb

@@ -11,7 +11,7 @@ require 'koujou/validation_reflection'
 require 'koujou/custom_validation'
 
 module Koujou
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end
 
 if ENV["RAILS_ENV"] == "test"

data/lib/koujou/builder.rb

@@ -101,7 +101,6 @@ module Koujou #:nodoc:
               end
             end
           end
-          
 
           def set_confirmation_attributes!(instance, attributes)
             instance.class.confirmation_validations.each do |v|
@@ -111,7 +110,6 @@ module Koujou #:nodoc:
             end
           end
           
-          
           def create_associations(instance, recursed_from_model = nil)
             # We loop through all the has_one or belongs_to associations on the current instance 
             # using introspection, and build up and assign some models to each, if the user has 
@@ -181,19 +179,26 @@ module Koujou #:nodoc:
             
             options = instance.class.length_validations.select{|v| v.name == validation.name }.first.options
             
+            retval = nil
             # If the validation is validates_length_of :name, :within => 1..20 (or in, which is an alias),
             # let's just return the minimum value of the range. 
-            %w(within in).each { |o| return options[o.to_sym].entries.first if options.has_key?(o.to_sym) }
-            # These other validations should just return the value set.
-            %w(is minimum maximum).each { |o| return options[o.to_sym] if options.has_key?(o.to_sym)  }
-            
-            nil
+            %w(within in).each do |o| 
+              retval = options[o.to_sym].entries.first if options.has_key?(o.to_sym)
+              break
+            end
+            if retval.nil?
+              # These other validations should just return the value set.
+              %w(is minimum maximum).each do |o| 
+                retval = options[o.to_sym] if options.has_key?(o.to_sym)  
+                break
+              end
+            end
+            retval
           end
           
           def get_inclusion_values(instance, validation)
             return unless has_inclusion_validation?(instance, validation) 
             options = instance.class.inclusion_validations.select{|v| v.name == validation.name }.first.options
-            return unless options.has_key?(:in)
             options[:in]
           end
           

data/lib/koujou/data_generator.rb

@@ -31,20 +31,32 @@ module Koujou #:nodoc:
     end
     
     def generate_string
-      return format_if_sequenced(Faker::Internet.email)     if @validation.name.to_s.match(/email/)
-      return format_if_sequenced(Faker::Name.first_name)    if @validation.name.to_s == 'first_name'
-      return format_if_sequenced(Faker::Name.last_name)     if @validation.name.to_s == 'last_name'
-      return format_if_sequenced(Faker::Internet.user_name) if @validation.name.to_s.match(/login|user_name/)
-      return format_if_sequenced(Faker::Address.city)       if @validation.name.to_s.match(/city/)
-      return format_if_sequenced(Faker::Address.us_state)   if @validation.name.to_s.match(/state|province/)
-      return format_if_sequenced(Faker::Address.zip_code)   if @validation.name.to_s.match(/zip|postal/)
-
-      # If we don't match any standard stuff, just return a regular bs lorem string comprised of 10 words.
-      # 10 is sort of a "magic number" I might make a constant for that.
-      standard_text = format_if_sequenced(Faker::Lorem.words(10).to_s)
-      # So if there's a length validation set, we need to return just that amount of data.
-      standard_text = standard_text[0..@required_length - 1].to_s  if @required_length
-      standard_text
+      retval = ''
+      # I don't really like all these elsif's but, apparently
+      # it's more efficient than the numerous explicit returns
+      # we used to have. SEE: http://gist.github.com/160718
+      if @validation.name.to_s.match(/email/)
+        retval = format_if_sequenced(Faker::Internet.email)     
+      elsif @validation.name.to_s == 'first_name'
+        retval = format_if_sequenced(Faker::Name.first_name)
+      elsif @validation.name.to_s == 'last_name'
+        retval = format_if_sequenced(Faker::Name.last_name)
+      elsif @validation.name.to_s.match(/login|user_name/)
+        retval = format_if_sequenced(Faker::Internet.user_name)
+      elsif @validation.name.to_s.match(/city/)
+        retval = format_if_sequenced(Faker::Address.city) 
+      elsif @validation.name.to_s.match(/state|province/)
+        retval = format_if_sequenced(Faker::Address.us_state)
+      elsif @validation.name.to_s.match(/zip|postal/)
+        retval =  format_if_sequenced(Faker::Address.zip_code)
+      else
+        # If we don't match any standard stuff, just return a regular bs lorem string comprised of 10 words.
+        # 10 is sort of a "magic number" I might make a constant for that.
+        standard_text = format_if_sequenced(Faker::Lorem.words(10).to_s)
+        # So if there's a length validation set, we need to return just that amount of data.
+        retval = @required_length ? standard_text[0..@required_length - 1].to_s : standard_text
+      end
+      retval
     end
     
     def generate_text

data/lib/koujou/validation_reflection.rb

@@ -62,9 +62,9 @@ module Koujou # :nodoc:
           ignore_subvalidations = false
           base.class_eval <<-"end_eval"
             class << self
-              def #{validation_type}_with_reflection(*attr_names)
+              def #{validation_type}_with_reflection(*attr_names, &block)
                 ignoring_subvalidations(#{ignore_subvalidations}) do
-                  #{validation_type}_without_reflection(*attr_names)
+                  #{validation_type}_without_reflection(*attr_names, &block)
                   remember_validation_metadata(:#{validation_type}, *attr_names)
                 end
               end

data/test/test_builder.rb

@@ -90,7 +90,11 @@ class TestBuilder < Test::Unit::TestCase
       p = Post.koujou_build(:name => clever)
       assert_equal clever, p.name
     end
-    
+
+    should 'cause a model to be invalid if you override a field that has validates_presence_of with a nil value' do
+      u = User.koujou_build(:email => nil)
+      assert !u.valid?
+    end
   end
   
   context 'associations' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mleung-koujou
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Leung