nakajima-fixjour 0.1.2 → 0.1.3

data/lib/fixjour/builders.rb

@@ -17,8 +17,8 @@ module Fixjour
       if block_given?
         define_new(klass, &block)
       else
-        define_new(klass) do |overrides|
-          klass.new(options.merge(overrides))
+        define_new(klass) do |proxy, overrides|
+          proxy.new(options.merge(overrides))
         end
       end
 

data/lib/fixjour/definitions.rb

@@ -19,13 +19,11 @@ module Fixjour
     # Defines the valid_*_attributes method
     def define_valid_attributes(name)
       define_method("valid_#{name}_attributes") do |*args|
-        valid_attributes = send("new_#{name}").attributes
+        valid_attributes = send("new_#{name}", *args).attributes
         valid_attributes.delete_if { |key, value| value.nil? }
-        overrides = args.extract_options!
-        attrs = valid_attributes.merge(overrides)
-        attrs.stringify_keys!
-        attrs.make_indifferent!
-        attrs
+        valid_attributes.stringify_keys!
+        valid_attributes.make_indifferent!
+        valid_attributes
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Pat Nakajima