fabrication 0.8.1 → 0.8.3

data/README.markdown

@@ -14,9 +14,9 @@ By default it will lazily generate active record associations. So if you have a
 
 If you are fabricating an activerecord backed object and it has attributes that are not columns in the underlying table, Fabrication will lazily generate them even if they are not defined associations. You can easily work around this by adding a "!" to the end of the attribute definition in the Fabricator.
 
-Fabricator(:user) do
-  some_delegated_something_or_other! { Fabricate(:something) }
-end
+    Fabricator(:user) do
+      some_delegated_something_or_other! { Fabricate(:something) }
+    end
 
 ### Installation ###
 

data/lib/fabrication/fabricator.rb

@@ -14,7 +14,7 @@ class Fabrication::Fabricator
     end
 
     def schematics
-      @@schematics ||= {}
+      @schematics ||= {}
     end
 
     private

data/lib/fabrication/generator/active_record.rb

@@ -4,12 +4,17 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
     defined?(ActiveRecord) && klass.ancestors.include?(ActiveRecord::Base)
   end
 
+  def associations
+    @associations ||= klass.reflections.keys
+  end
+
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
     if block_given?
       options = args.first || {}
-      count = options[:count] || 0
-      unless options[:force] || instance.class.columns.map(&:name).include?(method_name)
+      if !options[:force] && associations.include?(method_name.to_sym)
+        count = options[:count] || 0
+
         # copy the original getter
         instance.instance_variable_set("@__#{method_name}_original", instance.method(method_name).clone)
 

data/lib/fabrication/generator/base.rb

@@ -3,16 +3,18 @@ class Fabrication::Generator::Base
   def self.supports?(klass); true end
 
   def generate(options={:save => true}, attributes=[], callbacks={})
+    self.instance = klass.new
     process_attributes(attributes)
 
     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]
+
     instance
   end
 
   def initialize(klass)
-    self.instance = klass.new
+    self.klass = klass
   end
 
   def method_missing(method_name, *args, &block)
@@ -21,7 +23,7 @@ class Fabrication::Generator::Base
 
   protected
 
-  attr_accessor :instance
+  attr_accessor :klass, :instance
 
   def after_generation(options); end
 
@@ -36,6 +38,8 @@ class Fabrication::Generator::Base
     instance.send("#{method_name}=", value)
   end
 
+  def post_initialize; end
+
   def process_attributes(attributes)
     attributes.each do |attribute|
       if Proc === attribute.value

data/lib/fabrication/schematic.rb

@@ -108,7 +108,7 @@ class Fabrication::Schematic
   def to_hash(attrs, overrides)
     hash = defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess.new : {}
     attributes.inject(hash) do |hash, attribute|
-      value = attribute.value.respond_to?(:call) ? attribute.value.call : attribute.value
+      value = Proc === attribute.value ? attribute.value.call : attribute.value
       hash.merge(attribute.name => value)
     end.merge(overrides)
   end

data/lib/fabrication/sequencer.rb

@@ -11,7 +11,7 @@ class Fabrication::Sequencer
     end
 
     def sequences
-      @@sequences ||= {}
+      @sequences ||= {}
     end
 
   end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.8.1'
+  VERSION = '0.8.3'
 end

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

@@ -4,11 +4,11 @@ module Fabrication
   module Generators
     class ModelGenerator < Base
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :dir, :type => :string, :default => "test/fabricators", :desc => "The directory where the fabricators should go"
+      class_option :dir, :type => :string, :default => "spec/fabricators", :desc => "The directory where the fabricators should go"
       class_option :extension, :type => :string, :default => "rb", :desc => "file extension name"
-        
+
       def create_fabrication_file
-        template 'fabricator.rb', File.join(options[:dir], "#{table_name}.#{options[:extension].to_s}")
+        template 'fabricator.rb', File.join(options[:dir], "#{table_name}_fabricator.#{options[:extension].to_s}")
       end
     end
   end

data/lib/rails/generators/fabrication/model/templates/fabricator.rb

@@ -1,4 +1,4 @@
-Fabricator :<%= singular_name %> do
+Fabricator(:<%= singular_name %>) do
 <% attributes.each do |attribute| -%>
   <%= attribute.name %> <%= attribute.default.inspect %>
 <% end -%>

data/spec/fabrication/generator/active_record_spec.rb

@@ -17,7 +17,7 @@ describe Fabrication::Generator::ActiveRecord do
 
   describe "#after_generation" do
     let(:instance) { mock(:instance) }
-    let(:generator) { Fabrication::Generator::ActiveRecord.new(Object) }
+    let(:generator) { Fabrication::Generator::ActiveRecord.new(Company) }
 
     before { generator.send(:instance=, instance) }
 

data/spec/fabrication_spec.rb

@@ -167,6 +167,7 @@ describe Fabrication do
       Fabricator(:company) do
         name { Faker::Company.name }
         divisions!(:count => 4)
+        non_field { "hi" }
         after_create { |o| o.update_attribute(:city, "Jacksonville Beach") }
       end
 
@@ -187,6 +188,10 @@ describe Fabrication do
       Division.find_all_by_company_id(company.id).count.should == 4
     end
 
+    it 'generates non-database backed fields immediately' do
+      company.instance_variable_get(:@non_field).should == 'hi'
+    end
+
     it 'executes after build blocks' do
       other_company.name.should == 'Crazysauce'
     end

data/spec/support/active_record.rb

@@ -29,6 +29,8 @@ end
 
 class Company < ActiveRecord::Base
   has_many :divisions
+
+  attr_accessor :non_field
 end
 
 class Division < ActiveRecord::Base

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabrication
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Paul Elliott
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -04:00
+date: 2010-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196427
         segments: 
         - 2
         - 0
@@ -42,6 +44,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -57,6 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -72,6 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -85,13 +90,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 4
+        version: 1.0.4
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -100,15 +106,16 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196423
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 17
-        version: 2.0.0.beta.17
+        - 18
+        version: 2.0.0.beta.18
   type: :development
   version_requirements: *id006
 description: Fabrication is an object generation framework for ActiveRecord and Mongoid. It has a flexible syntax and lazily generates ActiveRecord associations!
@@ -167,6 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -175,6 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"