fabrication 2.12.2 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 976a84a363881df56a3f0f18dca2e05ba63a66c2
-  data.tar.gz: a8f5a55c6ef0eddf7824a0698c3737b64ec17fe3
+  metadata.gz: 63f6c7600246d2a616c443cfe4f1f40d97dfdfc7
+  data.tar.gz: df342015cfb8dd239fa9fbab926772d4ba06f023
 SHA512:
-  metadata.gz: c904f38dda03158e9bf2b1d951eb00dc4166704ed7da9390509ff82158c15607ae4894b3fb20c7ca04783e7a36e5d37b992d8eaa7adf4a82c4df707a8017e46d
-  data.tar.gz: a6b0447ef77a116fd159a09db9d9ced493866a63085b57003d1a28180997c41a3da75cb2c63f4ed5f1e8eeb807675a82a9fa49856e8f14b0f8bc07dd3961e0c6
+  metadata.gz: d1913a5783bbfc4989a912f3483612fa9dea69548c02a08bc365576395eec0ce64713f5104afea0cceeafa9fa1a1ca00f95676e35a85005da628943dbf8b9e9d
+  data.tar.gz: dfff237fd6789080b8713f12e2ace38d273cc7e3191e35b40b6b16995836fd9c2ae54e35bb1389cbc2b69ec62e38d8d5127e83a650f66cf145c4211e02ab6eac

data/lib/fabrication/cucumber/step_fabricator.rb

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

data/lib/fabrication/schematic/definition.rb

@@ -8,10 +8,18 @@ class Fabrication::Schematic::Definition
     Fabrication::Generator::Base
   ]
 
-  attr_accessor :klass
-  def initialize(klass, &block)
-    self.klass = klass
-    process_block(&block)
+  attr_accessor :name, :options
+  def initialize(name, options={}, &block)
+    self.name = name
+    self.options = options
+
+    if parent
+      merge_result = parent.merge(&block)
+      @attributes = merge_result.attributes
+      @callbacks = merge_result.callbacks
+    else
+      process_block(&block)
+    end
   end
 
   def process_block(&block)
@@ -118,4 +126,19 @@ class Fabrication::Schematic::Definition
       proc { Fabricate(params[:fabricator] || name) }
     end
   end
+
+  protected
+
+  def parent
+    @parent ||= Fabrication.manager[options[:from].to_s] if options[:from]
+  end
+
+  def klass
+    @klass ||= Fabrication::Support.class_for(
+      options[:class_name] ||
+        (parent && parent.klass) ||
+        options[:from] ||
+        name
+    )
+  end
 end

data/lib/fabrication/schematic/manager.rb

@@ -61,28 +61,8 @@ class Fabrication::Schematic::Manager
   end
 
   def store(name, aliases, options, &block)
-    schematic = schematics[name] = schematic_for(name, options, &block)
+    schematic = schematics[name] = Fabrication::Schematic::Definition.new(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) ||
-        options[:from] ||
-        name
-    )
-  end
-
-  def schematic_for(name, options, &block)
-    parent = self[options[:from].to_s] if 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/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.12.2'
+  VERSION = '2.13.0'
 end

data/lib/rails/generators/fabrication/model/model_generator.rb

@@ -8,12 +8,26 @@ module Fabrication
       class_option :extension, :type => :string, :default => "rb", :desc => "file extension name"
 
       def create_fabrication_file
-        template 'fabricator.rb', File.join(options[:dir], "#{singular_table_name}_fabricator.#{options[:extension].to_s}")
+        copy_attributes_from_model if attributes.empty?
+        template 'fabricator.erb', File.join(options[:dir], "#{singular_table_name}_fabricator.#{options[:extension].to_s}")
       end
 
       def self.source_root
         @_fabrication_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
+
+      private
+
+      def copy_attributes_from_model
+        model = class_name.constantize
+        if defined?(ActiveRecord) && model < ActiveRecord::Base
+          self.attributes = model.columns_hash.map { |name, column|
+            Rails::Generators::GeneratedAttribute.new(name, column.type)
+          }
+        end
+      rescue NameError
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.13.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
@@ -47,7 +47,7 @@ files:
 - lib/rails/generators/fabrication/cucumber_steps/cucumber_steps_generator.rb
 - 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/rails/generators/fabrication/model/templates/fabricator.erb
 - lib/tasks/defined_fabricators.rake
 homepage: http://fabricationgem.org
 licenses:
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Implementing the factory pattern in Ruby so you don't have to.