fixjour 0.3.0 → 0.4.0

data/lib/fixjour/builders.rb

@@ -22,7 +22,7 @@ module Fixjour
 
     # The list of classes that have builders defined.
     def builders
-      @builders ||= Set.new
+      @builders ||= {}
     end
 
     # This method should always return a valid instance of
@@ -49,7 +49,8 @@ module Fixjour
         module_eval(&block)
       rescue NameError => e
         if e.name && evaluator.respond_to?(e.name)
-          raise NonBlockBuilderReference.new("You must use a builder block in order to reference other Fixjour creation methods.")
+          raise NonBlockBuilderReference.new \
+            "You must use a builder block in order to reference other Fixjour creation methods."
         else
           raise e
         end
@@ -59,14 +60,14 @@ module Fixjour
     # Checks to see whether or not a builder is defined. Duh.
     def builder_defined?(builder)
       case builder
-      when Class  then builders.map(&:klass).include?(builders)
-      when String then builders.map(&:name).include?(builder)
-      when Symbol then builders.map(&:name).include?(builder.to_s)
+      when Class  then builders.values.map(&:klass).include?(builders)
+      when String then builders.values.map(&:name).include?(builder)
+      when Symbol then builders.values.map(&:name).include?(builder.to_s)
       end
     end
 
-    def remove(builder)
-      builders.delete(Builder.new(builder))
+    def remove(klass)
+      builders.delete(Builder.new(klass).name)
     end
 
     private
@@ -75,8 +76,10 @@ module Fixjour
     # redundant builders aren't defined, which can lead to confusion
     # when trying to figure out where objects are being created.
     def add_builder(builder)
-      unless builders.add?(builder) or Fixjour.allow_redundancy?
+      if builders.has_key?(builder.name) and not Fixjour.allow_redundancy?
         raise RedundantBuilder.new("You already defined a builder for #{builder.klass.inspect}")
+      else
+        builders[builder.name] = builder
       end
     end
 

data/lib/fixjour/verify.rb

@@ -6,7 +6,7 @@ module Fixjour
     # * The new_* methods return new records
     # * The creation methods return objects of the proper type
     def verify!
-      builders.each do |builder|
+      builders.each do |name, builder|
         klass = builder.klass
         result = new_record(builder)
 

metadata

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