fixjour 0.1.0 → 0.1.2

data/lib/fixjour/definitions.rb

@@ -3,7 +3,7 @@ module Fixjour
     # Defines the new_* method
     def define_new(klass, &block)
       define_method("new_#{name_for(klass)}") do |*args|
-        Generator.new(klass, block).call(self, args.extract_options!)
+        Generator.new(klass, block).call(self, args.extract_options!.symbolize_keys!)
       end
     end
   
@@ -19,14 +19,10 @@ module Fixjour
     # Defines the valid_*_attributes method
     def define_valid_attributes(name)
       define_method("valid_#{name}_attributes") do |*args|
-        if instance_variable_get("@__valid_#{name}_attrs").nil?
-          valid_attributes = send("new_#{name}").attributes
-          valid_attributes.delete_if { |key, value| value.nil? }
-          instance_variable_set("@__valid_#{name}_attrs", valid_attributes)
-        end
-
+        valid_attributes = send("new_#{name}").attributes
+        valid_attributes.delete_if { |key, value| value.nil? }
         overrides = args.extract_options!
-        attrs = instance_variable_get("@__valid_#{name}_attrs").merge(overrides)
+        attrs = valid_attributes.merge(overrides)
         attrs.stringify_keys!
         attrs.make_indifferent!
         attrs

data/lib/fixjour/deprecation.rb

@@ -0,0 +1,24 @@
+module Fixjour
+  module Deprecation
+    module MergingProxy
+      def process(*args)
+        raise DeprecatedMergeAttempt.new(<<-END
+        You are attempting to call process on the class proxy.
+        This behavior was recently deprecated. In order to process
+        the overrides hash, pass two block arguments:
+
+          define_builder(Foo) do |klass, overrides|
+            overrides.process(:bar) do |bar|
+              overrides[:bar] = 'overridden'
+            end
+
+            klass.new(:name => 'fizz')
+          end
+        END
+        )
+      end
+    end
+  end
+end
+
+Fixjour::MergingProxy.send :include, Fixjour::Deprecation::MergingProxy

data/lib/fixjour/errors.rb

@@ -23,4 +23,11 @@ module Fixjour
   # 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

data/lib/fixjour/generator.rb

@@ -19,7 +19,7 @@ module Fixjour
   
     def args(overrides)
       case block.arity
-      when 1 then [overrides]
+      when 1 then [MergingProxy.new(klass, overrides)]
       when 2 then [MergingProxy.new(klass, overrides), overrides]
       end
     end

data/lib/fixjour/merging_proxy.rb

@@ -20,6 +20,7 @@ module Fixjour
     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)

data/lib/fixjour.rb

@@ -12,6 +12,7 @@ require 'fixjour/errors'
 require 'fixjour/generator'
 require 'fixjour/definitions'
 require 'fixjour/builders'
+require 'fixjour/deprecation'
 
 # This method is just for prettiness
 def Fixjour(options={}, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fixjour
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -37,6 +37,7 @@ files:
 - lib/fixjour
 - lib/fixjour/builders.rb
 - lib/fixjour/definitions.rb
+- lib/fixjour/deprecation.rb
 - lib/fixjour/errors.rb
 - lib/fixjour/generator.rb
 - lib/fixjour/merging_proxy.rb