mleung-koujou 0.0.2 → 0.0.3

data/lib/koujou/builder.rb

@@ -63,7 +63,6 @@ module Koujou #:nodoc:
                 # or if this is a validates_presence_of :some_id. The ids will be set
                 # when we create the association.
                 next if overridden_attribute?(attributes, v.name)
-                # has_required_id_validation?(instance, v.name)
                 
                 generate_and_set_data(instance, v, false)
               end
@@ -121,7 +120,7 @@ module Koujou #:nodoc:
             instance.class.reflect_on_all_associations.each do |a|
               # We only want to create the association if the user has required the id field. 
               # This will build the minimum valid requirements. 
-              next unless has_required_id_validation?(instance, a.name)
+              next unless has_required_id_validation?(instance, a)
               
               if a.macro == :has_one || a.macro == :belongs_to
                 # If there's a two way association here (user has_one profile, profile belongs_to user)
@@ -198,7 +197,8 @@ module Koujou #:nodoc:
             options[:in]
           end
           
-          def has_required_id_validation?(instance, name)
+          def has_required_id_validation?(instance, association)
+            name = association.options.has_key?(:class_name) ? association.options[:class_name].downcase : association.name
             !instance.class.required_validations.select{|v| v.name.to_s  == "#{name}_id" }.empty?
           end
           

data/lib/koujou/data_generator.rb

@@ -7,6 +7,8 @@ module Koujou #:nodoc:
       @sequenced = sequenced
       # Validation is actually a ActiveRecord::Reflection::MacroReflection
       @validation = validation
+      @required_length = nil
+      @inclusion_values = nil
     end
 
     def generate_data_for_column_type

data/lib/koujou/validation_reflection.rb

@@ -60,10 +60,6 @@ module Koujou # :nodoc:
         reflected_validations.each do |validation_type|
           next if base.respond_to?("#{validation_type}_with_reflection")
           ignore_subvalidations = false
-          if validation_type.kind_of?(Hash)
-            ignore_subvalidations = validation_type[:ignore_subvalidations]
-            validation_type = validation_type[:method]
-          end
           base.class_eval <<-"end_eval"
             class << self
               def #{validation_type}_with_reflection(*attr_names)
@@ -118,7 +114,7 @@ module Koujou # :nodoc:
 
         def custom_validations
           # We don't want to get anything like: validate_associated_records_for_posts.
-          reflect_on_all_validations.select{|v| v.macro == :validate && !v.macro.to_s.match("_associated_") }
+          reflect_on_all_validations.select{|v| v.macro == :validate && v.name.to_s.match("_associated_").nil? }
         end
         
         private

data/test/lib/active_record_test_connector.rb

@@ -35,6 +35,7 @@ class ActiveRecordTestConnector
       ActiveRecord::Schema.define do
         create_table "users", :force => true do |t|
           t.string "name", "email", "first_name", "last_name", "hashed_password"
+          t.text "about"
           t.integer "age"
           t.float "salary"
           t.datetime "hired_on"

data/test/test_builder.rb

@@ -106,9 +106,12 @@ class TestBuilder < Test::Unit::TestCase
     end
     
     should 'find custom validations' do
-      User.reflect_on_all_validations.each do |v|
-        puts v.inspect if v.macro == :validate
-      end
+      assert_equal 2, User.custom_validations.size
+    end
+    
+    should 'car should have an owner association to user via class_name' do
+      c = Car.koujou
+      assert_not_nil c.owner
     end
     
   end

data/test/test_data_generator.rb

@@ -35,6 +35,12 @@ class TestDataGenerator < Test::Unit::TestCase
       assert_match(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, email)
     end
     
+    should 'genreate valid text field values' do
+      @validation.expects(:name).twice.returns('about')
+      body = Koujou::DataGenerator.new(false, @validation).generate_data_for_column_type
+      assert_not_nil body
+    end
+    
     should 'generate a valid datetime' do
       @validation.expects(:name).twice.returns('hired_on')
       dt = Koujou::DataGenerator.new(false, @validation).generate_data_for_column_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mleung-koujou
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Leung
@@ -69,6 +69,7 @@ files:
 - test/test_sequence.rb
 has_rdoc: true
 homepage: http://github.com/mleung/koujou
+licenses: 
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: koujou
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Koujou is a fixture replacement that requires no effort to use