fabrication 2.2.3 → 2.3.0

data/lib/fabrication.rb

@@ -62,7 +62,7 @@ class Fabricate
     end
   end
 
-  def self.sequence(name=Fabrication::Sequencer::DEFAULT, start=0, &block)
+  def self.sequence(name=Fabrication::Sequencer::DEFAULT, start=nil, &block)
     Fabrication::Sequencer.sequence(name, start, &block)
   end
 end

data/lib/fabrication/config.rb

@@ -5,7 +5,11 @@ module Fabrication
     def configure; yield self end
 
     def reset_defaults
-      @fabricator_path = @path_prefix = @active_support = nil
+      @fabricator_path =
+        @path_prefix =
+        @active_support =
+        @sequence_start =
+        nil
     end
 
     def fabricator_path
@@ -18,6 +22,9 @@ module Fabrication
     end
     alias fabricator_dir= fabricator_path=
 
+    attr_writer :sequence_start
+    def sequence_start; @sequence_start ||= 0 end
+
     attr_writer :path_prefix
     def path_prefix
       @path_prefix ||= defined?(Rails) ? Rails.root : "."

data/lib/fabrication/schematic/definition.rb

@@ -56,7 +56,9 @@ class Fabrication::Schematic::Definition
     Fabrication.schematics.build_stack << self
     merge(overrides, &block).instance_eval do
       generator.new(klass).build(attributes, callbacks)
-    end.tap { Fabrication.schematics.build_stack.pop }
+    end
+  ensure
+    Fabrication.schematics.build_stack.pop
   end
 
   def fabricate(overrides={}, &block)
@@ -98,7 +100,6 @@ class Fabrication::Schematic::Definition
   end
 
   def method_missing(method_name, *args, &block)
-    method_name = parse_method_name(method_name)
     params = Fabrication::Support.extract_options!(args)
     value = args.first
     block = generate_value(method_name, params) if args.empty? && !block_given?
@@ -113,21 +114,13 @@ class Fabrication::Schematic::Definition
     callbacks[:initialize_with] = block
   end
 
-  def parse_method_name(method_name)
-    if method_name.to_s.end_with?("!")
-      warn("DEPRECATION WARNING: Using the \"!\" in Fabricators is no longer supported. Please remove all occurrances")
-      method_name = method_name.to_s.chomp("!").to_sym
-    end
-    method_name
-  end
-
   def transient(*field_names)
     field_names.each do |field_name|
       append_or_update_attribute(field_name, nil, transient: true)
     end
   end
 
-  def sequence(name=Fabrication::Sequencer::DEFAULT, start=0, &block)
+  def sequence(name=Fabrication::Sequencer::DEFAULT, start=nil, &block)
     name = "#{self.klass.to_s.downcase.gsub(/::/, '_')}_#{name}"
     Fabrication::Sequencer.sequence(name, start, &block)
   end
@@ -135,13 +128,11 @@ class Fabrication::Schematic::Definition
   private
 
   def generate_value(name, params)
-    name = name.to_s
-    name = name.singularize if name.respond_to?(:singularize)
-    if name != name.to_s
-      params[:count] ||= 1 if !params[:count]
-      Proc.new { Fabricate.build(params[:fabricator] || name.to_sym) }
+    if params[:count]
+      name = name.to_s.singularize if name.to_s.respond_to?(:singularize)
+      Proc.new { Fabricate.build(params[:fabricator] || name) }
     else
-      Proc.new { Fabricate(params[:fabricator] || name.to_sym) }
+      Proc.new { Fabricate(params[:fabricator] || name) }
     end
   end
 end

data/lib/fabrication/sequencer.rb

@@ -2,8 +2,8 @@ class Fabrication::Sequencer
 
   DEFAULT = :_default
 
-  def self.sequence(name=DEFAULT, start=0, &block)
-    idx = sequences[name] ||= start
+  def self.sequence(name=DEFAULT, start=nil, &block)
+    idx = sequences[name] ||= start || Fabrication::Config.sequence_start
     if block_given?
       sequence_blocks[name] = block.to_proc
     else
@@ -20,4 +20,10 @@ class Fabrication::Sequencer
   def self.sequence_blocks
     @sequence_blocks ||= {}
   end
+
+  def self.reset
+    Fabrication::Config.sequence_start = nil
+    @sequences = nil
+    @sequence_blocks = nil
+  end
 end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.2.3'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord