nakajima-fixjour 0.1.6 → 0.1.7

data/lib/core_ext/hash.rb

@@ -6,4 +6,4 @@ class Hash
     replace(indifferent)
     merge!(keys_values)
   end
-end
+end

data/lib/core_ext/object.rb

@@ -3,4 +3,4 @@ class Object
     yield self
     self
   end
-end
+end

data/lib/fixjour.rb

@@ -1,6 +1,5 @@
 $LOAD_PATH << File.dirname(__FILE__)
 
-require 'rubygems'
 require 'activerecord'
 require 'core_ext/hash'
 require 'core_ext/object'

data/lib/fixjour/definitions.rb

@@ -6,7 +6,7 @@ module Fixjour
         Generator.new(builder.klass, block).call(self, args.extract_options!.symbolize_keys!)
       end
     end
-  
+
     # Defines the create_* method
     def define_create(builder)
       define_method("create_#{builder.name}") do |*args|
@@ -15,16 +15,40 @@ module Fixjour
         model
       end
     end
-  
+
     # Defines the valid_*_attributes method
     def define_valid_attributes(builder)
       define_method("valid_#{builder.name}_attributes") do |*args|
-        valid_attributes = send("new_#{builder.name}", *args).attributes
+        record = send("new_#{builder.name}", *args)
+        valid_attributes = record.attributes
         valid_attributes.delete_if { |key, value| value.nil? }
+
+        transfer_singular_ids = proc { |reflection|
+          if associated = record.send(reflection.name)
+            associated.new_record? && associated.save!
+            key = reflection.options[:foreign_key] || reflection.name.to_s + '_id'
+            valid_attributes[key] = associated.id
+          end
+        }
+
+        record.class.reflect_on_all_associations(:has_one).each(&transfer_singular_ids)
+        record.class.reflect_on_all_associations(:belongs_to).each(&transfer_singular_ids)
+
+        transfer_plural_ids = proc { |reflection|
+          if associated = record.send(reflection.name)
+            associated.each { |rec| rec.new_record? && rec.save! }
+            key = reflection.options[:foreign_key] || reflection.name.to_s + '_id'
+            valid_attributes[key.to_s + 's'] = associated.map(&:id)
+            valid_attributes.delete(reflection.name)
+          end
+        }
+
+        record.class.reflect_on_all_associations(:has_many).each(&transfer_plural_ids)
+
         valid_attributes.stringify_keys!
         valid_attributes.make_indifferent!
         valid_attributes
       end
     end
   end
-end
+end

data/lib/fixjour/deprecation.rb

@@ -21,4 +21,4 @@ module Fixjour
   end
 end
 
-Fixjour::MergingProxy.send :include, Fixjour::Deprecation::MergingProxy
+Fixjour::MergingProxy.send :include, Fixjour::Deprecation::MergingProxy

data/lib/fixjour/errors.rb

@@ -1,33 +1,33 @@
 module Fixjour
   # Raised when a builder returns an invalid object.
   class InvalidBuilder < StandardError; end
-  
+
   # Raised when a builder will return an invalid object
   # due to a validates_uniqueness_of validation.
   class DangerousBuilder < StandardError; end
-  
+
   # Raised when a builder returns an object that cannot
   # be saved the database.
   class UnsavableBuilder < StandardError; end
-  
+
   # Raised when a builder returns an object of the wrong type
   class WrongBuilderType < StandardError; end
-  
+
   # Raised when a builder block saves the object.
   class BuilderSavedRecord < StandardError; end
-  
+
   # Raised when a Fixjour creation method is called in
   # the wrong context.
   class NonBlockBuilderReference < StandardError; end
-  
+
   # Raised when a builder is defined for a class that already
   # has one.
   class RedundantBuilder < StandardError; end
-  
+
   # Raised when a builder is defined with one block argument and
   # the user assumes that it's the overrides hash. This used to
   # be the standard behavior, but now blocks with one argument
   # are passed the class proxy, and getting access to the overrides
   # hash requires you pass two block arguments.
   class DeprecatedMergeAttempt < StandardError; end
-end
+end

data/lib/fixjour/generator.rb

@@ -1,13 +1,13 @@
 module Fixjour
-  # This generates a new instance of a model object for 
+  # This generates a new instance of a model object for
   # the new_[model] method.
   class Generator
     attr_reader :klass, :block
-  
+
     def initialize(klass, block)
       @klass, @block = klass, block
     end
-  
+
     def call(context, overrides={})
       overrides = OverridesHash.new(overrides)
       result = block.bind(context).call(*args(overrides))
@@ -16,7 +16,7 @@ module Fixjour
       else result
       end
     end
-  
+
     def args(overrides)
       case block.arity
       when 1 then [MergingProxy.new(klass, overrides)]
@@ -24,4 +24,4 @@ module Fixjour
       end
     end
   end
-end
+end

data/lib/fixjour/merging_proxy.rb

@@ -4,36 +4,36 @@ module Fixjour
   # the #new method is called.
   class MergingProxy
     instance_methods.each { |m| undef_method(m) unless m =~ /__|inspect/ }
-    
+
     def initialize(klass, overrides)
       @klass = klass
       @overrides = overrides
     end
-    
+
     def protected(*attrs)
       attrs = attrs.empty? ?
         @protected :
         @protected = attrs
       Set.new(attrs)
     end
-  
+
     def new(defaults={})
       attrs = defaults.merge(@overrides)
       accessible, inaccessible = partition(attrs)
-      
+
       returning @klass.new(accessible) do |instance|
         inaccessible.each do |key,val|
           instance.send("#{key}=", val)
         end
       end
     end
-    
+
     def method_missing(sym, *args, &block)
       @klass.respond_to?(sym) ? @klass.send(sym, *args, &block) : super
     end
-    
+
     private
-    
+
     def partition(attrs)
       accessible = attrs.keys.inject({ }) do |m, key|
         next m if protected.include?(key)
@@ -43,4 +43,4 @@ module Fixjour
       [accessible, attrs]
     end
   end
-end
+end

data/lib/fixjour/overrides_hash.rb

@@ -4,11 +4,11 @@ module Fixjour
   # method private and add the ability to process.
   class OverridesHash < Hash
     private :delete
-    
+
     def initialize(hash)
       replace(hash)
     end
-    
+
     # Allows for processing of the overrides hash. Deletes
     # the option when it's present, then yields the value.
     def process(option)
@@ -17,4 +17,4 @@ module Fixjour
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: faker
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: acts_as_fu
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: patnakajima@gmail.com
 executables: []