fabrication 1.3.2 → 1.4.0

data/lib/fabrication.rb

@@ -5,11 +5,15 @@ module Fabrication
   autoload :UnknownFabricatorError,   'fabrication/errors/unknown_fabricator_error'
   autoload :MisplacedFabricateError,   'fabrication/errors/misplaced_fabricate_error'
 
-  autoload :Attribute,  'fabrication/attribute'
+  module Schematic
+    autoload :Attribute,  'fabrication/schematic/attribute'
+    autoload :Definition, 'fabrication/schematic/definition'
+    autoload :Manager,    'fabrication/schematic/manager'
+  end
+
   autoload :Config,     'fabrication/config'
   autoload :Fabricator, 'fabrication/fabricator'
   autoload :Sequencer,  'fabrication/sequencer'
-  autoload :Schematic,  'fabrication/schematic'
   autoload :Support,    'fabrication/support'
   autoload :Transform,  'fabrication/transform'
 
@@ -19,13 +23,14 @@ module Fabrication
 
   module Generator
     autoload :ActiveRecord, 'fabrication/generator/active_record'
+    autoload :DataMapper,   'fabrication/generator/data_mapper'
     autoload :Mongoid,      'fabrication/generator/mongoid'
     autoload :Sequel,       'fabrication/generator/sequel'
     autoload :Base,         'fabrication/generator/base'
   end
 
   def self.clear_definitions
-    Fabricator.schematics.clear
+    @schematics = nil
     Sequencer.sequences.clear
   end
 
@@ -41,10 +46,14 @@ module Fabrication
     @initializing
   end
 
+  def self.schematics
+    @schematics ||= Fabrication::Schematic::Manager.new
+  end
+
 end
 
 def Fabricator(name, options={}, &block)
-  Fabrication::Fabricator.define(name, options, &block)
+  Fabrication.schematics.register(name, options, &block)
 end
 
 def Fabricate(name, overrides={}, &block)

data/lib/fabrication/cucumber/step_fabricator.rb

@@ -12,7 +12,7 @@ module Fabrication
       def from_table(table, extra={})
         hashes = singular? ? [table.rows_hash] : table.hashes
         hashes.map do |hash|
-          transformed_hash = Fabrication::Transform.apply(parameterize_hash(hash))
+          transformed_hash = Fabrication::Transform.apply_to(@model, parameterize_hash(hash))
           make(transformed_hash.merge(extra))
         end.tap {|o| remember(o) }
       end
@@ -54,7 +54,7 @@ module Fabrication
       end
 
       def schematic
-        Fabrication::Fabricator.schematics[@fabricator]
+        Fabrication.schematics[@fabricator]
       end
 
       def dehumanize(string)

data/lib/fabrication/fabricator.rb

@@ -1,55 +1,10 @@
 class Fabrication::Fabricator
 
-  class << self
-
-    def define(name, options={}, &block)
-      raise Fabrication::DuplicateFabricatorError, "'#{name}' is already defined" if schematics.include?(name)
-      aliases = Array(options.delete(:aliases))
-      schematic = schematics[name] = schematic_for(name, options, &block)
-      Array(aliases).each do |as|
-        schematics[as.to_sym] = schematic
-      end
-      schematic
-    end
-
-    def generate(name, options={}, overrides={}, &block)
-      Fabrication::Support.find_definitions if schematics.empty?
-      raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{name}'" unless schematics.has_key?(name)
-      schematics[name].generate(options, overrides, &block)
-    end
-
-    def schematics
-      @schematics ||= {}
-    end
-
-    private
-
-    def class_name_for(name, parent, options)
-      options[:class_name] ||
-        (parent && parent.klass.name) ||
-        options[:from] ||
-        name
-    end
-
-    def schematic_for(name, options, &block)
-      parent = schematics[options[:from]]
-      class_name = class_name_for(name, parent, options)
-      klass = Fabrication::Support.class_for(class_name)
-      raise Fabrication::UnfabricatableError, "No class found for '#{name}'" unless klass
-      if parent
-        parent.merge(&block).tap { |s| s.klass = klass }
-      else
-        Fabrication::Schematic.new(klass, &block)
-      end
-    end
-
+  def self.generate(name, options={}, overrides={}, &block)
+    Fabrication::Support.find_definitions if Fabrication.schematics.empty?
+    schematic = Fabrication.schematics[name]
+    raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{name}'" unless schematic
+    schematic.generate(options, overrides, &block)
   end
 
 end
-
-# Adds support for reload! in the Rails 2.3.x console
-if defined? ActionController::Dispatcher and ActionController::Dispatcher.respond_to? :reload_application
-  ActionController::Dispatcher.to_prepare :fabrication do
-    Fabrication.clear_definitions
-  end
-end

data/lib/fabrication/generator/active_record.rb

@@ -5,7 +5,7 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
   end
 
   def associations
-    @associations ||= klass.reflections.keys
+    @associations ||= __klass.reflections.keys
   end
 
   def association?(method_name)

data/lib/fabrication/generator/base.rb

@@ -1,25 +1,25 @@
 class Fabrication::Generator::Base
 
-  def self.supports?(klass); true end
+  def self.supports?(__klass); true end
 
   def generate(options={:save => true}, attributes=[], callbacks={})
     if callbacks[:on_init]
-      self.instance = klass.new(*callbacks[:on_init].call)
+      self.__instance = __klass.new(*callbacks[:on_init].call)
     else
-      self.instance = klass.new
+      self.__instance = __klass.new
     end
 
     process_attributes(attributes)
 
-    callbacks[:after_build].each { |callback| callback.call(instance) } if callbacks[:after_build]
+    callbacks[:after_build].each { |callback| callback.call(__instance) } if callbacks[:after_build]
     after_generation(options)
-    callbacks[:after_create].each { |callback| callback.call(instance) } if callbacks[:after_create] && options[:save]
+    callbacks[:after_create].each { |callback| callback.call(__instance) } if callbacks[:after_create] && options[:save]
 
-    instance
+    __instance
   end
 
   def initialize(klass)
-    self.klass = klass
+    self.__klass = klass
   end
 
   def association?(method_name); false end
@@ -32,13 +32,13 @@ class Fabrication::Generator::Base
         count = options[:count] || 0
 
         # copy the original getter
-        instance.instance_variable_set("@__#{method_name}_original", instance.method(method_name))
+        __instance.instance_variable_set("@__#{method_name}_original", __instance.method(method_name))
 
         # store the block for lazy generation
-        instance.instance_variable_set("@__#{method_name}_block", block)
+        __instance.instance_variable_set("@__#{method_name}_block", block)
 
         # redefine the getter
-        instance.instance_eval %<
+        __instance.instance_eval %<
           def #{method_name}
             original_value = @__#{method_name}_original.call
             if @__#{method_name}_block
@@ -62,21 +62,21 @@ class Fabrication::Generator::Base
 
   protected
 
-  attr_accessor :klass, :instance
+  attr_accessor :__klass, :__instance
 
   def after_generation(options)
-    instance.save! if options[:save] && instance.respond_to?(:save!)
+    __instance.save! if options[:save] && __instance.respond_to?(:save!)
   end
 
   def assign(method_name, options, raw_value=nil)
     if options.has_key?(:count)
       value = (1..options[:count]).map do |i|
-        block_given? ? yield(instance, i) : raw_value
+        block_given? ? yield(__instance, i) : raw_value
       end
     else
-      value = block_given? ? yield(instance) : raw_value
+      value = block_given? ? yield(__instance) : raw_value
     end
-    instance.send("#{method_name}=", value)
+    __instance.send("#{method_name}=", value)
   end
 
   def post_initialize; end

data/lib/fabrication/generator/data_mapper.rb

@@ -0,0 +1,14 @@
+class Fabrication::Generator::DataMapper < Fabrication::Generator::Base
+
+  class << self
+    def supports?(klass)
+      defined?(DataMapper) && klass.ancestors.include?(DataMapper::Hook)
+    end
+  end
+
+  protected
+
+  def after_generation(options)
+    __instance.save if options[:save] && __instance.respond_to?(:save)
+  end
+end

data/lib/fabrication/generator/mongoid.rb

@@ -6,16 +6,16 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
   def assign(method_name, options, raw_value=nil)
     if options.has_key?(:count)
       value = (1..options[:count]).map do |i|
-        block_given? ? yield(instance, i) : raw_value
+        block_given? ? yield(__instance, i) : raw_value
       end
     else
-      value = block_given? ? yield(instance) : raw_value
+      value = block_given? ? yield(__instance) : raw_value
     end
 
-    if instance.respond_to?("#{method_name}=")
-      instance.send("#{method_name}=", value)
+    if Mongoid.allow_dynamic_fields && !__instance.respond_to?("#{method_name}=")
+      __instance[method_name] = value
     else
-      instance[method_name] = value
+      __instance.send("#{method_name}=", value)
     end
   end
 end

data/lib/fabrication/generator/sequel.rb

@@ -5,7 +5,7 @@ class Fabrication::Generator::Sequel < Fabrication::Generator::Base
   end
 
   def after_generation(options)
-    instance.save if options[:save]
+    __instance.save if options[:save]
   end
 
 end

data/lib/fabrication/{attribute.rb → schematic/attribute.rb}

@@ -1,4 +1,4 @@
-class Fabrication::Attribute
+class Fabrication::Schematic::Attribute
 
   attr_accessor :name, :params, :value
 

data/lib/fabrication/{schematic.rb → schematic/definition.rb}

@@ -1,7 +1,8 @@
-class Fabrication::Schematic
+class Fabrication::Schematic::Definition
 
   GENERATORS = [
     Fabrication::Generator::ActiveRecord,
+    Fabrication::Generator::DataMapper,
     Fabrication::Generator::Sequel,
     Fabrication::Generator::Mongoid,
     Fabrication::Generator::Base
@@ -74,7 +75,7 @@ class Fabrication::Schematic
     clone.tap do |schematic|
       schematic.instance_eval(&block) if block_given?
       overrides.each do |name, value|
-        schematic.append_or_update_attribute(Fabrication::Attribute.new(name.to_sym, nil, value))
+        schematic.append_or_update_attribute(Fabrication::Schematic::Attribute.new(name.to_sym, nil, value))
       end
     end
   end
@@ -89,7 +90,7 @@ class Fabrication::Schematic
       value = args.first
     end
 
-    append_or_update_attribute(Fabrication::Attribute.new(method_name, params, value))
+    append_or_update_attribute(Fabrication::Schematic::Attribute.new(method_name, params, value))
   end
 
   def on_init(&block)
@@ -122,7 +123,12 @@ class Fabrication::Schematic
   def to_hash(object)
     (defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess.new : {}).tap do |hash|
       attributes.map do |attribute|
-        hash[attribute.name] = object.send(attribute.name)
+        value = object.send(attribute.name)
+        if value.respond_to? :id
+          hash["#{attribute.name}_id"] = value.id
+        else
+          hash[attribute.name] = value
+        end
       end
     end
   end

data/lib/fabrication/schematic/manager.rb

@@ -0,0 +1,59 @@
+class Fabrication::Schematic::Manager
+
+  def clear
+    schematics.clear
+  end
+
+  def empty?
+    schematics.empty?
+  end
+
+  def register(name, options, &block)
+    name = name.to_sym
+    raise_if_registered(name)
+    store(name, Array(options.delete(:aliases)), options, &block)
+  end
+
+  def [](name)
+    schematics[name.to_sym]
+  end
+
+  def schematics
+    @schematics ||= {}
+  end
+
+  protected
+
+  def raise_if_registered(name)
+    if self[name]
+      raise Fabrication::DuplicateFabricatorError, "'#{name}' is already defined"
+    end
+  end
+
+  def store(name, aliases, options, &block)
+    schematic = schematics[name] = schematic_for(name, options, &block)
+    aliases.each { |as| schematics[as.to_sym] = schematic }
+  end
+
+  def resolve_class(name, parent, options)
+    Fabrication::Support.class_for(
+      options[:class_name] ||
+        (parent && parent.klass.name) ||
+        options[:from] ||
+        name
+    ).tap do |klass|
+      raise Fabrication::UnfabricatableError, "No class found for '#{name}'" unless klass
+    end
+  end
+
+  def schematic_for(name, options, &block)
+    parent = schematics[options[:from]]
+    klass = resolve_class(name, parent, options)
+
+    if parent
+      parent.merge(&block).tap { |s| s.klass = klass }
+    else
+      Fabrication::Schematic::Definition.new(klass, &block)
+    end
+  end
+end

data/lib/fabrication/support.rb

@@ -3,7 +3,7 @@ class Fabrication::Support
   class << self
 
     def fabricatable?(name)
-      Fabrication::Fabricator.schematics.include?(name) || class_for(name)
+      Fabrication.schematics[name] || class_for(name)
     end
 
     def class_for(class_or_to_s)

data/lib/fabrication/transform.rb

@@ -2,21 +2,34 @@ class Fabrication::Transform
 
   class << self
 
-    def apply(attributes_hash)
-      Fabrication::Support.find_definitions if Fabrication::Fabricator.schematics.empty?
-      attributes_hash.inject({}) {|h,(k,v)| h.update(k => transforms[k].call(v)) }
+    def apply_to(schematic, attributes_hash)
+      Fabrication::Support.find_definitions if Fabrication.schematics.empty?
+      attributes_hash.inject({}) {|h,(k,v)| h.update(k => apply_transform(schematic, k, v)) }
     end
 
     def clear_all
       @transforms = nil
+      @overrides = nil
     end
 
     def define(attribute, transform)
       transforms[attribute] = transform
     end
 
+    def only_for(schematic, attribute, transform)
+      overrides[schematic] = (overrides[schematic] || {}).merge!(attribute => transform)
+    end
+
     private
 
+    def overrides
+      @overrides ||= {}
+    end
+
+    def apply_transform(schematic, attribute, value)
+      overrides.fetch(schematic, transforms)[attribute].call(value)
+    end
+
     def transforms
       @transforms ||= Hash.new(lambda {|value| value})
     end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

data/lib/rails/generators/fabrication/cucumber_steps/templates/fabrication_steps.rb

@@ -41,5 +41,5 @@ end
 
 Then /^I should see the following (.*) in the database:$/ do |model_name, table|
   klass = Fabrication::Cucumber::StepFabricator.new(model_name).klass
-  klass.where(table.rows_hash).count.should == 1
+  klass.where(table.rows_hash.symbolize_keys).count.should == 1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70293264110260 !ruby/object:Gem::Requirement
+  requirement: &70248489649880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264110260
+  version_requirements: *70248489649880
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70293264109540 !ruby/object:Gem::Requirement
+  requirement: &70248489648640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264109540
+  version_requirements: *70248489648640
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70293264108380 !ruby/object:Gem::Requirement
+  requirement: &70248489647020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,65 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264108380
+  version_requirements: *70248489647020
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70248489646320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70248489646320
+- !ruby/object:Gem::Dependency
+  name: dm-active_model
+  requirement: &70248489645760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70248489645760
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: &70248489644760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70248489644760
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: &70248489643740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70248489643740
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: &70248489629400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70248489629400
 - !ruby/object:Gem::Dependency
   name: turnip
-  requirement: &70293264107760 !ruby/object:Gem::Requirement
+  requirement: &70248489628020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +109,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70293264107760
+  version_requirements: *70248489628020
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70293264107080 !ruby/object:Gem::Requirement
+  requirement: &70248489627440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264107080
+  version_requirements: *70248489627440
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70293264106400 !ruby/object:Gem::Requirement
+  requirement: &70248489626520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264106400
+  version_requirements: *70248489626520
 - !ruby/object:Gem::Dependency
   name: fuubar-cucumber
-  requirement: &70293264105560 !ruby/object:Gem::Requirement
+  requirement: &70248489626020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264105560
+  version_requirements: *70248489626020
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70293264104580 !ruby/object:Gem::Requirement
+  requirement: &70248489625400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264104580
+  version_requirements: *70248489625400
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70293264102800 !ruby/object:Gem::Requirement
+  requirement: &70248489624900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264102800
+  version_requirements: *70248489624900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70293264101080 !ruby/object:Gem::Requirement
+  requirement: &70248489624300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264101080
+  version_requirements: *70248489624300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70293264099340 !ruby/object:Gem::Requirement
+  requirement: &70248489623680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,21 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264099340
+  version_requirements: *70248489623680
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70293264098720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70293264098720
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70293264097860 !ruby/object:Gem::Requirement
+  requirement: &70248489623160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293264097860
+  version_requirements: *70248489623160
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   and Sequel. It has a sensible syntax and lazily generates ActiveRecord associations!
 email:
@@ -162,7 +206,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fabrication/attribute.rb
 - lib/fabrication/config.rb
 - lib/fabrication/cucumber/step_fabricator.rb
 - lib/fabrication/errors/duplicate_fabricator_error.rb
@@ -172,9 +215,12 @@ files:
 - lib/fabrication/fabricator.rb
 - lib/fabrication/generator/active_record.rb
 - lib/fabrication/generator/base.rb
+- lib/fabrication/generator/data_mapper.rb
 - lib/fabrication/generator/mongoid.rb
 - lib/fabrication/generator/sequel.rb
-- lib/fabrication/schematic.rb
+- lib/fabrication/schematic/attribute.rb
+- lib/fabrication/schematic/definition.rb
+- lib/fabrication/schematic/manager.rb
 - lib/fabrication/sequencer.rb
 - lib/fabrication/support.rb
 - lib/fabrication/syntax/make.rb