fabrication 0.2.3 → 0.2.4

data/README.markdown

@@ -53,3 +53,16 @@ So you already have a company fabricator, but you need one that specifically gen
     end
 
 Setting the :from option will inherit the class and all the attributes from the named Fabricator. Even if you haven't defined a :company Fabricator yet, it will still work as long as it references an actual class name.
+
+
+
+
+Fabricator(:atlanta_hub, :from => :hub) do
+  city "Atlanta"
+  state "GA"
+  location [33.755, -84.39]
+  hardwares(:hardware, :as => :headend, :count => 4) {
+    name 'something'
+  }
+end
+

data/lib/fabrication.rb

@@ -1,7 +1,9 @@
 module Fabrication
 
   require 'fabrication/errors'
+
   autoload :Fabricator, 'fabrication/fabricator'
+  autoload :Schematic,  'fabrication/schematic'
 
   module Generator
     autoload :ActiveRecord, 'fabrication/generator/active_record'

data/lib/fabrication/fabricator.rb

@@ -6,14 +6,15 @@ class Fabrication::Fabricator
     Fabrication::Generator::Base
   ]
 
-  attr_accessor :class_name
+  attr_accessor :class_name, :schematic
 
   def initialize(class_name, parent=nil, &block)
     self.class_name = class_name
     klass = class_for(class_name)
+    self.schematic = parent ? parent.schematic.clone.merge!(&block) : Fabrication::Schematic.new(&block)
     self.generator = GENERATORS.detect do |gen|
       gen.supports?(klass)
-    end.new(klass, parent, &block)
+    end.new(klass, schematic)
   end
 
   def fabricate(options={})

data/lib/fabrication/generator/active_record.rb

@@ -6,38 +6,36 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
 
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
-    unless options.include?(method_name.to_sym)
-      if block_given?
-        count = (args && args.first && args.first[:count]) || 0
-        unless (args.first && args.first[:force]) || instance.class.columns.map(&:name).include?(method_name)
-          # copy the original getter
-          instance.instance_variable_set("@__#{method_name}_original", instance.method(method_name).clone)
+    if block_given?
+      count = (args && args.first && args.first[:count]) || 0
+      unless (args.first && args.first[:force]) || instance.class.columns.map(&:name).include?(method_name)
+        # copy the original getter
+        instance.instance_variable_set("@__#{method_name}_original", instance.method(method_name).clone)
 
-          # store the block for lazy generation
-          instance.instance_variable_set("@__#{method_name}_block", block)
+        # store the block for lazy generation
+        instance.instance_variable_set("@__#{method_name}_block", block)
 
-          # redefine the getter
-          instance.instance_eval %<
-            def #{method_name}
-              original_value = @__#{method_name}_original.call
-              if @__#{method_name}_block.present?
-                if #{count} \>= 1
-                  original_value = #{method_name}= (1..#{count}).map { |i| @__#{method_name}_block.call(self, i) }
-                else
-                  original_value = #{method_name}= @__#{method_name}_block.call(self)
-                end
-                @__#{method_name}_block = nil
-                @__#{method_name}_original.call
+        # redefine the getter
+        instance.instance_eval %<
+          def #{method_name}
+            original_value = @__#{method_name}_original.call
+            if @__#{method_name}_block.present?
+              if #{count} \>= 1
+                original_value = #{method_name}= (1..#{count}).map { |i| @__#{method_name}_block.call(self, i) }
+              else
+                original_value = #{method_name}= @__#{method_name}_block.call(self)
               end
-              original_value
+              @__#{method_name}_block = nil
+              @__#{method_name}_original.call
             end
-          >
-        else
-          assign(instance, method_name, args.first, &block)
-        end
+            original_value
+          end
+        >
       else
-        assign(instance, method_name, args.first)
+        assign(method_name, args.first, &block)
       end
+    else
+      assign(method_name, args.first)
     end
   end
 

data/lib/fabrication/generator/base.rb

@@ -7,23 +7,20 @@ class Fabrication::Generator::Base
   end
 
   def generate(options={})
-    self.instance = parent ? parent.fabricate : klass.new
-    self.options = options
-    instance_eval(&block)
-    options.each { |k,v| assign(instance, k, v) }
+    self.instance = klass.new
+    process_attributes(options)
     after_generation
     after_create_block.call(instance) if after_create_block
     instance
   end
 
-  def initialize(klass, parent=nil, &block)
+  def initialize(klass, schematic=nil)
     self.klass = klass
-    self.parent = parent
-    self.block = block
+    self.schematic = schematic
   end
 
   def method_missing(method_name, *args, &block)
-    assign(instance, method_name.to_s, args.first, &block)
+    assign(method_name.to_s, args.first, &block)
   end
 
   protected
@@ -32,9 +29,9 @@ class Fabrication::Generator::Base
 
   private
 
-  attr_accessor :after_create_block, :block, :instance, :klass, :options, :parent
+  attr_accessor :after_create_block, :instance, :klass, :schematic
 
-  def assign(instance, method_name, param)
+  def assign(method_name, param)
     value = nil
     if param.is_a?(Hash) && param[:count] && param[:count] > 1
       value = (1..param[:count]).map do |i|
@@ -46,4 +43,18 @@ class Fabrication::Generator::Base
     instance.send("#{method_name.to_s}=", value)
   end
 
+  def process_attributes(options)
+    schematic.merge(options).attributes.each do |attribute|
+      if attribute.name == :after_create
+        after_create(&attribute.value)
+      else
+        if Proc === attribute.value
+          method_missing(attribute.name, attribute.params, &attribute.value)
+        else
+          method_missing(attribute.name, attribute.value)
+        end
+      end
+    end
+  end
+
 end

data/lib/fabrication/schematic.rb

@@ -0,0 +1,70 @@
+class Fabrication::Schematic
+
+  def initialize(&block)
+    instance_eval(&block) if block_given?
+  end
+
+  def attribute(name)
+    attributes.select { |a| a.name == name }.first
+  end
+
+  def clone
+    Fabrication::Schematic.new.tap do |dup|
+      dup.attributes = attributes.map do |a|
+        Attribute.new(a.name, a.params, a.value)
+      end
+    end
+  end
+
+  def merge(options)
+    schematic = clone
+    options.each do |name, value|
+      if attribute = schematic.attribute(name)
+        attribute.params = nil
+        attribute.value = value
+      else
+        schematic.attributes << Attribute.new(name, nil, value)
+      end
+    end
+    schematic
+  end
+
+  def merge!(&block)
+    instance_eval(&block)
+    self
+  end
+
+  def method_missing(method_name, *args, &block)
+    if (attr = attribute(method_name)).present?
+      if block_given?
+        attr.params = args.first
+        attr.value = block
+      else
+        attr.params = nil
+        attr.value = args.first
+      end
+    else
+      if block_given?
+        attributes.push(Attribute.new(method_name, args.first, block))
+      else
+        attributes.push(Attribute.new(method_name, nil, args.first))
+      end
+    end
+  end
+
+  class Attribute
+    attr_accessor :name, :params, :value
+
+    def initialize(name, params, value)
+      self.name = name
+      self.params = params
+      self.value = value
+    end
+  end
+
+  attr_writer :attributes
+  def attributes
+    @attributes ||= []
+  end
+
+end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/fabrication_spec.rb

@@ -114,9 +114,6 @@ describe Fabrication do
 
   context 'with an active record object' do
 
-    before(:all) { TestMigration.up }
-    after(:all) { TestMigration.down }
-
     before(:all) do
       Fabricator(:company) do
         name { Faker::Company.name }
@@ -124,11 +121,18 @@ describe Fabrication do
         after_create { |o| o.update_attribute(:city, "Jacksonville Beach") }
       end
 
+      Fabricator(:other_company, :from => :company) do
+        divisions(:count => 2) { Fabricate(:division) }
+      end
+
       Fabricator(:division) do
         name "Awesome Division"
       end
     end
 
+    before { TestMigration.up }
+    after { TestMigration.down }
+
     let(:company) { Fabricate(:company, :name => "Hashrocket") }
 
     it 'generates field blocks immediately' do
@@ -139,12 +143,17 @@ describe Fabrication do
       Division.find_all_by_company_id(company.id).count.should == 4
     end
 
+    it 'executes after create blocks' do
+      company.city.should == 'Jacksonville Beach'
+    end
+
     it 'overrides associations' do
       Fabricate(:company, :divisions => []).divisions.should == []
     end
 
-    it 'executes after create blocks' do
-      company.city.should == 'Jacksonville Beach'
+    it 'overrides inherited associations' do
+      Fabricate(:other_company).divisions.count.should == 2
+      Division.count.should == 2
     end
 
   end
@@ -154,7 +163,13 @@ describe Fabrication do
     before(:all) do
       Fabricator(:author) do
         name "George Orwell"
-        books(:count => 4) { |author, i| "book title #{i}" }
+        books(:count => 4) do |author, i|
+          Fabricate(:book, :title => "book title #{i}", :author => author)
+        end
+      end
+
+      Fabricator(:book) do
+        title "1984"
       end
     end
 
@@ -165,7 +180,7 @@ describe Fabrication do
     end
 
     it 'generates four books' do
-      author.books.should == (1..4).map { |i| "book title #{i}" }
+      author.books.map(&:title).should == (1..4).map { |i| "book title #{i}" }
     end
   end
 
@@ -176,9 +191,10 @@ describe Fabrication do
       let(:ernie) { Fabricate(:hemingway) }
 
       before(:all) do
+        Fabricator(:book)
         Fabricator(:author) do
           name 'George Orwell'
-          books { ['1984'] }
+          books { |author| [Fabricate(:book, :title => '1984', :author => author)] }
         end
 
         Fabricator(:hemingway, :from => :author) do
@@ -187,7 +203,7 @@ describe Fabrication do
       end
 
       it 'has the values from the parent' do
-        ernie.books.should == ['1984']
+        ernie.books.map(&:title).should == ['1984']
       end
 
       it 'overrides specified values from the parent' do
@@ -211,7 +227,7 @@ describe Fabrication do
       end
 
       it 'not have any books' do
-        ernie.books.should be_nil
+        ernie.books.should == []
       end
 
     end
@@ -253,7 +269,11 @@ describe Fabrication do
 
   context 'defining a fabricator without a block' do
 
-    it 'works fine'
+    before(:all) { Fabricator(:author) }
+
+    it 'works fine' do
+      Fabricate(:author).should be
+    end
 
   end
 

data/spec/generator/active_record_spec.rb

@@ -5,14 +5,18 @@ describe Fabrication::Generator::ActiveRecord do
   before(:all) { TestMigration.up }
   after(:all) { TestMigration.down }
 
-  let(:generator) do
-    Fabrication::Generator::ActiveRecord.new(Company) do
+  let(:schematic) do
+    Fabrication::Schematic.new do
       name 'Company Name'
       city { |c| c.name.reverse.downcase.titleize }
       divisions(:count => 2) { |c, i| Fabricate(:division, :company => c, :name => "Division #{i}") }
     end
   end
 
+  let(:generator) do
+    Fabrication::Generator::ActiveRecord.new(Company, schematic)
+  end
+
   context 'active record object' do
 
     let(:company) do

data/spec/generator/base_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Fabrication::Generator::Base do
 
-  let(:generator) do
-    Fabrication::Generator::Base.new(Person) do
+  let(:schematic) do
+    Fabrication::Schematic.new do
       first_name 'Some'
       last_name { |person| person.first_name.reverse.capitalize }
       age 40
@@ -11,12 +11,14 @@ describe Fabrication::Generator::Base do
     end
   end
 
+  let(:generator) { Fabrication::Generator::Base.new(Person, schematic) }
+
   let(:person) do
     generator.generate({:first_name => 'Body'})
   end
 
   it 'passes the object to blocks' do
-    person.last_name.should == 'Emos'
+    person.last_name.should == 'Ydob'
   end
 
   it 'passes the object and count to blocks' do
@@ -32,7 +34,7 @@ describe Fabrication::Generator::Base do
   end
 
   it 'generates the last name immediately' do
-    person.instance_variable_get(:@last_name).should == 'Emos'
+    person.instance_variable_get(:@last_name).should == 'Ydob'
   end
 
   it 'generates the age immediately' do

data/spec/generator/mongoid_spec.rb

@@ -2,14 +2,20 @@ require 'spec_helper'
 
 describe Fabrication::Generator::Mongoid do
 
-  let(:generator) do
-    Fabrication::Generator::Mongoid.new(Author) do
+  before(:all) do
+    Fabricator(:book) { title "book title" }
+  end
+
+  let(:schematic) do
+    Fabrication::Schematic.new do
       name 'Name'
       handle { |author| author.name.downcase }
-      books(:count => 3) { |author, index| "#{author.name} #{index}" }
+      books(:count => 3) { |author, index| Fabricate(:book, :title => "#{author.name} #{index}", :author => author) }
     end
   end
 
+  let(:generator) { Fabrication::Generator::Mongoid.new(Author, schematic) }
+
   context 'mongoid object' do
 
     before { generator.generate(:name => 'Something') }
@@ -19,7 +25,7 @@ describe Fabrication::Generator::Mongoid do
     end
 
     it 'passes the object and count to blocks' do
-      generator.generate({}).books.should == ["Name 1","Name 2","Name 3"]
+      generator.generate({}).books.map(&:title).should == ["Name 1","Name 2","Name 3"]
     end
 
     it 'persists the author upon creation' do

data/spec/schematic_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Fabrication::Schematic do
+
+  let(:schematic) do
+    Fabrication::Schematic.new do
+      name "Orgasmo"
+      something(:param => 2) { "hi!" }
+      another_thing { 25 }
+    end
+  end
+
+  context "without inheritance" do
+
+    subject { schematic }
+
+    it "stored 'name' correctly" do
+      attribute = subject.attribute(:name)
+      attribute.name.should == :name
+      attribute.params.should be_nil
+      attribute.value.should == "Orgasmo"
+    end
+
+    it "stored 'something' correctly" do
+      attribute = subject.attribute(:something)
+      attribute.name.should == :something
+      attribute.params.should == { :param => 2 }
+      Proc.should === attribute.value
+      attribute.value.call.should == "hi!"
+    end
+
+    it "stored 'another_thing' correctly" do
+      attribute = subject.attribute(:another_thing)
+      attribute.name.should == :another_thing
+      attribute.params.should be_nil
+      Proc.should === attribute.value
+      attribute.value.call.should == 25
+    end
+
+  end
+
+  context "with inheritance" do
+
+    subject do
+      schematic.merge! do
+        name { "Willis" }
+        something "Else!"
+        another_thing(:thats_what => 'she_said') { "Boo-ya!" }
+      end
+    end
+
+    it "stored 'name' correctly" do
+      attribute = subject.attribute(:name)
+      attribute.name.should == :name
+      attribute.params.should be_nil
+      Proc.should === attribute.value
+      attribute.value.call.should == "Willis"
+    end
+
+    it "stored 'something' correctly" do
+      attribute = subject.attribute(:something)
+      attribute.name.should == :something
+      attribute.params.should be_nil
+      attribute.value.should == "Else!"
+    end
+
+    it "stored 'another_thing' correctly" do
+      attribute = subject.attribute(:another_thing)
+      attribute.name.should == :another_thing
+      attribute.params.should == { :thats_what => 'she_said' }
+      Proc.should === attribute.value
+      attribute.value.call.should == "Boo-ya!"
+    end
+
+  end
+
+  it 'is deep clonable' do
+    schematic2 = schematic.clone
+    schematic.merge! do
+      name "Henry"
+    end
+    schematic.attribute(:name).value.should == 'Henry'
+    schematic2.attribute(:name).value.should == 'Orgasmo'
+  end
+
+  it 'allows temporary parameter overrides' do
+    schematic2 = schematic.merge(:name => 'Henry')
+    schematic.attribute(:name).value.should == 'Orgasmo'
+    schematic2.attribute(:name).value.should == 'Henry'
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,12 +6,9 @@ require 'spec'
 require 'spec/autorun'
 require 'fabrication'
 require 'ffaker'
-require 'active_record'
-require 'mongoid'
 
 Spec::Runner.configure do |config|
   config.before(:all) do
     Fabrication.clear_definitions
-    Author.delete_all
   end
 end

data/spec/support/{active_record_setup.rb → active_record.rb}

@@ -1,3 +1,5 @@
+require 'active_record'
+
 # change this if sqlite is unavailable
 dbconfig = {
   :adapter => 'sqlite3',

data/spec/support/mongoid.rb

@@ -0,0 +1,33 @@
+require 'mongoid'
+
+Mongoid.configure do |config|
+  config.allow_dynamic_fields = true
+  config.master = Mongo::Connection.new.db("fabrication_test")
+end
+
+def clear_mongodb
+  Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+end
+
+Spec::Runner.configure do |config|
+  config.before(:all) do
+    clear_mongodb
+  end
+end
+
+class Author
+  include Mongoid::Document
+
+  embeds_many :books
+
+  field :name
+  field :handle
+end
+
+class Book
+  include Mongoid::Document
+
+  field :title
+
+  embedded_in :author, :inverse_of => :books
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabrication
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Paul Elliott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -04:00
+date: 2010-07-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - lib/fabrication/generator/active_record.rb
 - lib/fabrication/generator/base.rb
 - lib/fabrication/generator/mongoid.rb
+- lib/fabrication/schematic.rb
 - lib/fabrication/version.rb
 - lib/fabrication.rb
 - spec/fabrication_spec.rb
@@ -120,11 +121,12 @@ files:
 - spec/generator/active_record_spec.rb
 - spec/generator/base_spec.rb
 - spec/generator/mongoid_spec.rb
+- spec/schematic_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/active_record_setup.rb
+- spec/support/active_record.rb
 - spec/support/helper_objects.rb
-- spec/support/mongoid_setup.rb
+- spec/support/mongoid.rb
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/paulelliott/fabrication

data/spec/support/mongoid_setup.rb

@@ -1,11 +0,0 @@
-Mongoid.configure do |config|
-  config.allow_dynamic_fields = true
-  config.master = Mongo::Connection.new.db("fabrication_test")
-end
-
-class Author
-  include Mongoid::Document
-  field :name
-  field :handle
-  field :books, :type => Array
-end