dummy_data 0.9.5 → 0.9.6

data/lib/generators/common.rb

@@ -12,18 +12,16 @@ module Dummy
             assoc_name = assoc.name.to_s.camelcase
             assoc_options = assoc.options
 
-            if assoc_options.empty?
+            if !assoc_options.has_key?(:foreign_key)
               @models[model][:associations].push({
                 :model  => assoc_name.constantize,
                 :foreign_key => "#{assoc_name.underscore}_id"
               })
-            elsif assoc_options.has_key?(:class_name) and assoc_options.has_key?(:foreign_key)
+            else
               @models[model][:associations].push({
-                :model => assoc_options[:class_name].constantize, # TODO: handle class_name
+                :model => assoc.class_name.constantize,
                 :foreign_key => assoc_options[:foreign_key]
               })
-            else
-              next
             end
 
             assoc_model = @models[model][:associations].last[:model]
@@ -36,17 +34,17 @@ module Dummy
       def generate_record_data(name, info, column, fixtures=true)
         column_name = String.new(column.name) # this shouldn't be needed, ruby bug?
         if((column_name == "id") or (["created_at", "created_on", "updated_at", "updated_on"].include?(column_name) and column.type == :datetime))
-           return
+          return
         end
 
         associated_model = associated_class_name(info, column_name)
 
         if associated_model
           if fixtures
+            val = ActiveRecord::Fixtures.identify(generate_association_data(associated_model))
+          else
             val = generate_association_data(associated_model)
             column_name.gsub!(/_id$/, "")
-          else
-            val = Fixtures.identify(generate_association_data(associated_model))
           end
         else
 	        val = generate_regular_data(column)

data/lib/generators/data/data_generator.rb

@@ -104,7 +104,7 @@ module Dummy
               fixture_data.merge!(key_value) unless key_value.nil?
             end
             
-            data[model.table_name] = Hash.new if data[model.table_name].nil?
+            data[model.table_name] ||= Hash.new
             data[model.table_name].merge!({ "#{name}_#{num}" => fixture_data })
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dummy_data
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dummy
-  requirement: &70167432360500 !ruby/object:Gem::Requirement
+  requirement: &70279314576120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70167432360500
+  version_requirements: *70279314576120
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70167432360020 !ruby/object:Gem::Requirement
+  requirement: &70279314575380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70167432360020
+  version_requirements: *70279314575380
 description: Uses dummy to generate consistent fake data for your models (including
   associations) and provides a rake task to import it into the database
 email: