fabrication 2.9.3 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d930b692979d30d6a650770510fd500e7aaa24a6
-  data.tar.gz: d87145180ccca5bc06f330b7d515095ca345587b
+  metadata.gz: 60ffbcf29301152a8dafc8037856a47f52680f78
+  data.tar.gz: e02c67ec746e96b5c9649dc64d116a83736922e1
 SHA512:
-  metadata.gz: 11e14b064efdf85febee306ff937efa7e64afb26472661d5c24403e6c9c626aa3a2d6cbb80334cc2f3a5d9a28b89786ce35d1a2326ac83ee9f04edcf2d093c8a
-  data.tar.gz: dacff28966109aea4f14851bcddf7f24e36f8fd6a791d4ed5180f98ea235255b4a9b82477f0ffda7bc95613035fa53e684becd5536e5b6a92b079aba8640dc55
+  metadata.gz: e4fd4365c2eeb9aa1bdf8e7af6ec6529b6980678364b50602b23983509307ddd22f920318a31446054df76276ba0b8067f50a9f4c40710f9fb4e3b3b1ee2cd45
+  data.tar.gz: dd8f177414850efdbc18593b4a6c555c135d4513773fdf185f844987d9e57841cd28a5ff2830948767196750987e2dad3584ce4735050786c08ddf5d06f94585

data/lib/{fabrication/fabricator.rb → fabricate.rb}

@@ -1,16 +1,13 @@
-class Fabrication::Fabricator
-
-  def self.build(name, overrides={}, &block)
-    fail_if_initializing(name)
-    schematic(name).build(overrides, &block)
+class Fabricate
+  def self.times(count, name, overrides={}, &block)
+    count.times.map { Fabricate(name, overrides, &block) }
   end
 
-  def self.fabricate(name, overrides={}, &block)
-    fail_if_initializing(name)
-    schematic(name).fabricate(overrides, &block)
+  def self.build_times(count, name, overrides={}, &block)
+    count.times.map { Fabricate.build(name, overrides, &block) }
   end
 
-  def self.to_attributes(name, overrides={}, &block)
+  def self.attributes_for(name, overrides={}, &block)
     fail_if_initializing(name)
     schematic(name).to_attributes(overrides, &block)
   end
@@ -20,6 +17,22 @@ class Fabrication::Fabricator
     schematic(name).to_params(overrides, &block)
   end
 
+  def self.build(name, overrides={}, &block)
+    fail_if_initializing(name)
+    schematic(name).build(overrides, &block).tap do |object|
+      Fabrication::Cucumber::Fabrications[name] = object if Fabrication::Config.register_with_steps?
+    end
+  end
+
+  def self.create(name, overrides={}, &block)
+    fail_if_initializing(name)
+    schematic(name).fabricate(overrides, &block)
+  end
+
+  def self.sequence(name=Fabrication::Sequencer::DEFAULT, start=nil, &block)
+    Fabrication::Sequencer.sequence(name, start, &block)
+  end
+
   def self.schematic(name)
     Fabrication::Support.find_definitions if Fabrication.manager.empty?
     Fabrication.manager[name] || raise(Fabrication::UnknownFabricatorError.new(name))

data/lib/fabrication.rb

@@ -1,3 +1,7 @@
+autoload :Fabricate, 'fabricate'
+
+Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')].each { |f| load f } if defined?(Rake)
+
 module Fabrication
   autoload :DuplicateFabricatorError, 'fabrication/errors/duplicate_fabricator_error'
   autoload :UnfabricatableError,      'fabrication/errors/unfabricatable_error'
@@ -13,7 +17,6 @@ module Fabrication
   end
 
   autoload :Config,     'fabrication/config'
-  autoload :Fabricator, 'fabrication/fabricator'
   autoload :Sequencer,  'fabrication/sequencer'
   autoload :Support,    'fabrication/support'
   autoload :Transform,  'fabrication/transform'
@@ -30,7 +33,7 @@ module Fabrication
   end
 
   def self.clear_definitions
-    @manager = nil
+    manager.clear
     Sequencer.sequences.clear
   end
 
@@ -39,7 +42,7 @@ module Fabrication
   end
 
   def self.manager
-    @manager ||= Fabrication::Schematic::Manager.new
+    @manager ||= Fabrication::Schematic::Manager.instance
   end
 
   def self.schematics
@@ -53,39 +56,11 @@ def Fabricator(name, options={}, &block)
 end
 
 def Fabricate(name, overrides={}, &block)
-  Fabrication::Fabricator.fabricate(name, overrides, &block).tap do |object|
+  Fabricate.create(name, overrides, &block).tap do |object|
     Fabrication::Cucumber::Fabrications[name] = object if Fabrication::Config.register_with_steps?
   end
 end
 
-class Fabricate
-  def self.times(count, name, overrides={}, &block)
-    count.times.map { Fabricate(name, overrides, &block) }
-  end
-
-  def self.build_times(count, name, overrides={}, &block)
-    count.times.map { Fabricate.build(name, overrides, &block) }
-  end
-
-  def self.attributes_for(name, overrides={}, &block)
-    Fabrication::Fabricator.to_attributes(name, overrides, &block)
-  end
-
-  def self.to_params(name, overrides={}, &block)
-    Fabrication::Fabricator.to_params(name, overrides, &block)
-  end
-
-  def self.build(name, overrides={}, &block)
-    Fabrication::Fabricator.build(name, overrides, &block).tap do |object|
-      Fabrication::Cucumber::Fabrications[name] = object if Fabrication::Config.register_with_steps?
-    end
-  end
-
-  def self.sequence(name=Fabrication::Sequencer::DEFAULT, start=nil, &block)
-    Fabrication::Sequencer.sequence(name, start, &block)
-  end
-end
-
 module FabricationMethods
   def fabrications
     Fabrication::Cucumber::Fabrications

data/lib/fabrication/cucumber/step_fabricator.rb

@@ -36,7 +36,7 @@ module Fabrication
       end
 
       def klass
-        Fabrication::Fabricator.schematic(@fabricator).klass
+        Fabricate.schematic(@fabricator).klass
       end
 
       private

data/lib/fabrication/errors/duplicate_fabricator_error.rb

@@ -1 +1,5 @@
-class Fabrication::DuplicateFabricatorError < StandardError; end
+class Fabrication::DuplicateFabricatorError < StandardError
+  def initialize(string)
+    super("'#{string}' is already defined")
+  end
+end

data/lib/fabrication/generator/active_record.rb

@@ -5,7 +5,7 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
   end
 
   def build_instance
-    if self.class.without_protection?
+    if _klass.respond_to?(:protected_attributes)
       self._instance = _klass.new(_attributes, without_protection: true)
     else
       self._instance = _klass.new(_attributes)
@@ -14,11 +14,6 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
 
   protected
 
-  def self.without_protection?
-    @without_protection = Gem::Version.new(ActiveRecord::VERSION::STRING).between?(Gem::Version.new('3.1.0'), Gem::Version.new('3.9')) if @without_protection.nil?
-    @without_protection
-  end
-
   def validate_instance
     _instance.valid?
   end

data/lib/fabrication/generator/mongoid.rb

@@ -5,7 +5,7 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
   end
 
   def build_instance
-    if Gem::Version.new(Mongoid::VERSION).between?(Gem::Version.new('2.3.0'), Gem::Version.new('3.9'))
+    if _klass.respond_to?(:protected_attributes)
       self._instance = _klass.new(_attributes, without_protection: true)
     else
       self._instance = _klass.new(_attributes)

data/lib/fabrication/schematic/manager.rb

@@ -1,4 +1,5 @@
 class Fabrication::Schematic::Manager
+  include Singleton
 
   def preinitialize
     @initializing = true
@@ -7,16 +8,13 @@ class Fabrication::Schematic::Manager
 
   def initializing?; @initializing end
 
-  def freeze
-    @initializing = false
-  end
-
-  def clear
-    schematics.clear
+  def schematics
+    @schematics ||= {}
   end
+  delegate :clear, :empty?, to: :schematics
 
-  def empty?
-    schematics.empty?
+  def freeze
+    @initializing = false
   end
 
   def register(name, options, &block)
@@ -29,10 +27,6 @@ class Fabrication::Schematic::Manager
     schematics[name.to_sym]
   end
 
-  def schematics
-    @schematics ||= {}
-  end
-
   def build_stack
     @build_stack ||= []
   end
@@ -44,9 +38,7 @@ class Fabrication::Schematic::Manager
   protected
 
   def raise_if_registered(name)
-    if self[name]
-      raise Fabrication::DuplicateFabricatorError, "'#{name}' is already defined"
-    end
+    (raise Fabrication::DuplicateFabricatorError, name) if self[name]
   end
 
   def store(name, aliases, options, &block)
@@ -60,7 +52,7 @@ class Fabrication::Schematic::Manager
         (parent && parent.klass) ||
         options[:from] ||
         name
-    ) || (raise Fabrication::UnfabricatableError.new(name))
+    )
   end
 
   def schematic_for(name, options, &block)

data/lib/fabrication/support.rb

@@ -7,15 +7,13 @@ class Fabrication::Support
     end
 
     def class_for(class_or_to_s)
-      if class_or_to_s.respond_to?(:to_sym)
-        class_name = variable_name_to_class_name(class_or_to_s)
-        class_name.split('::').inject(Object) do |object, string|
-          object.const_get(string)
-        end
-      else
-        class_or_to_s
+      class_name = variable_name_to_class_name(class_or_to_s)
+      klass = class_name.split('::').inject(Object) do |object, string|
+        object.const_get(string)
       end
     rescue NameError
+    ensure
+      raise Fabrication::UnfabricatableError.new(class_or_to_s) unless klass
     end
 
     def extract_options!(args)

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.9.3'
+  VERSION = '2.9.4'
 end

data/lib/tasks/defined_fabricators.rake

@@ -0,0 +1,30 @@
+namespace :fabrication do
+  desc "Display all registered fabricators by class"
+  task :list => :environment do
+    Fabrication::Support.find_definitions if Fabrication.manager.empty?
+
+    if Fabrication.manager.schematics.none?
+      puts "No fabricators found"
+      next
+    end
+
+    groups = Fabrication.manager.schematics.group_by do |name, fabdef|
+      fabdef.klass.name
+    end
+
+    fabricators = {}
+    groups.sort_by { |klass, _| klass }.each do |klass, groups|
+      fabricators[klass] = groups.map(&:first).sort.join(", ")
+    end
+
+    class_width = fabricators.keys.max_by { |v| v.size }.size + 3 # padding
+    names_width = fabricators.values.max_by { |v| v.size }.size
+    say = lambda do |f1, f2|
+      printf "%-#{class_width}s%-#{names_width}s\n", f1, f2
+    end
+
+    say["Class", "Fabricator"]
+    puts "-" * (names_width + class_width)
+    fabricators.each { |klass, names| say[klass,names] }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.4
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,16 +140,16 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -214,13 +214,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/fabricate.rb
 - lib/fabrication/config.rb
 - lib/fabrication/cucumber/step_fabricator.rb
 - lib/fabrication/errors/duplicate_fabricator_error.rb
 - lib/fabrication/errors/misplaced_fabricate_error.rb
 - lib/fabrication/errors/unfabricatable_error.rb
 - lib/fabrication/errors/unknown_fabricator_error.rb
-- lib/fabrication/fabricator.rb
 - lib/fabrication/generator/active_record.rb
 - lib/fabrication/generator/base.rb
 - lib/fabrication/generator/data_mapper.rb
@@ -241,6 +241,7 @@ files:
 - lib/rails/generators/fabrication/cucumber_steps/templates/fabrication_steps.rb
 - lib/rails/generators/fabrication/model/model_generator.rb
 - lib/rails/generators/fabrication/model/templates/fabricator.rb
+- lib/tasks/defined_fabricators.rake
 - LICENSE
 - README.markdown
 - Rakefile
@@ -264,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Fabrication provides a simple solution for test object generation.