fixjour 0.1.2 → 0.1.4

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

data/lib/fixjour/verify.rb

@@ -21,18 +21,22 @@ module Fixjour
           error(klass, WrongBuilderType, "must return an instance of #{klass}")
         end
         
-        begin
-          result.save!
-        rescue => e
-          error(klass, UnsavableBuilder, "raises #{e.inspect} when saved to the database")
-        end
+        klass.transaction do
+          begin
+            result.save!
+          rescue => e
+            error(klass, UnsavableBuilder, "raises #{e.inspect} when saved to the database")
+          end
         
-        unless new_record(klass).valid?
-          msg = ""
-          msg << "returns invalid an invalid object after another object has been saved.\n"
-          msg << "This could be caused by a validates_uniqueness_of validation in your model.\n"
-          msg << "Use something like the faker gem to alleviate this issue."
-          error(klass, DangerousBuilder, msg)
+          unless new_record(klass).valid?
+            msg = ""
+            msg << "returns invalid an invalid object after another object has been saved.\n"
+            msg << "This could be caused by a validates_uniqueness_of validation in your model.\n"
+            msg << "Use something like the faker gem to alleviate this issue."
+            error(klass, DangerousBuilder, msg)
+          end
+          
+          raise ActiveRecord::Rollback
         end
       end
     end

metadata

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