fabrication 0.9.0 → 0.9.1

data/README.markdown

@@ -7,6 +7,7 @@ Currently supported object types are...
 * Plain old Ruby objects
 * ActiveRecord objects
 * Mongoid Documents
+* Sequel Models
 
 By default it will lazily generate active record associations. So if you have a has_many :widgets defined, it will not actually generate the widgets until the association is accessed. You can override this by appending "!" to the name of the parameter when defining the field in the Fabricator.
 
@@ -167,3 +168,4 @@ To run rake successfully:
 * Justin Smestad (jsmestad)
 * Christopher Hanks (chanks) - Chained callbacks
 * monsterlabs - Rails 3 Generators
+* Brandon Weiss (brandonweiss) - Sequal Model support

data/lib/fabrication.rb

@@ -13,6 +13,7 @@ module Fabrication
   module Generator
     autoload :ActiveRecord, 'fabrication/generator/active_record'
     autoload :Mongoid,      'fabrication/generator/mongoid'
+    autoload :Sequel,      'fabrication/generator/sequel'
     autoload :Base,         'fabrication/generator/base'
   end
 

data/lib/fabrication/attribute.rb

@@ -8,9 +8,4 @@ class Fabrication::Attribute
     self.value = value
   end
 
-  def update!(attrs)
-    self.params = attrs[:params] if attrs.has_key?(:params)
-    self.value = attrs[:value] if attrs.has_key?(:value)
-  end
-
 end

data/lib/fabrication/generator/active_record.rb

@@ -8,47 +8,8 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
     @associations ||= klass.reflections.keys
   end
 
-  def method_missing(method_name, *args, &block)
-    method_name = method_name.to_s
-    if block_given?
-      options = args.first || {}
-      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)
-
-        # 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
-              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
-            end
-            original_value
-          end
-        >
-      else
-        assign(method_name, options, &block)
-      end
-    else
-      assign(method_name, args.first)
-    end
-  end
-
-  protected
-
-  def after_generation(options)
-    instance.save if options[:save]
+  def association?(method_name)
+    associations.include?(method_name.to_sym)
   end
 
 end

data/lib/fabrication/generator/base.rb

@@ -22,15 +22,51 @@ class Fabrication::Generator::Base
     self.klass = klass
   end
 
+  def association?(method_name); false end
+
   def method_missing(method_name, *args, &block)
-    assign(method_name, args.first, &block)
+    if block_given?
+      options = args.first || {}
+      if !options[:force] && association?(method_name)
+        method_name = method_name.to_s
+        count = options[:count] || 0
+
+        # copy the original getter
+        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)
+
+        # redefine the getter
+        instance.instance_eval %<
+          def #{method_name}
+            original_value = @__#{method_name}_original.call
+            if @__#{method_name}_block
+              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
+            end
+            original_value
+          end
+        >
+      else
+        assign(method_name, options, &block)
+      end
+    else
+      assign(method_name, args.first)
+    end
   end
 
   protected
 
   attr_accessor :klass, :instance
 
-  def after_generation(options); end
+  def after_generation(options)
+    instance.save if options[:save] && instance.respond_to?(:save)
+  end
 
   def assign(method_name, param)
     if param.is_a?(Hash) && param.has_key?(:count)

data/lib/fabrication/generator/mongoid.rb

@@ -4,8 +4,4 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
     defined?(Mongoid) && klass.ancestors.include?(Mongoid::Document)
   end
 
-  def after_generation(options)
-    instance.save if options[:save]
-  end
-
 end

data/lib/fabrication/generator/sequel.rb

@@ -0,0 +1,7 @@
+class Fabrication::Generator::Sequel < Fabrication::Generator::Base
+
+  def self.supports?(klass)
+    defined?(Sequel) && klass.ancestors.include?(Sequel::Model)
+  end
+
+end

data/lib/fabrication/schematic.rb

@@ -3,6 +3,7 @@ class Fabrication::Schematic
   GENERATORS = [
     Fabrication::Generator::ActiveRecord,
     Fabrication::Generator::Mongoid,
+    Fabrication::Generator::Sequel,
     Fabrication::Generator::Base
   ]
 
@@ -27,6 +28,10 @@ class Fabrication::Schematic
     attributes.select { |a| a.name == name }.first
   end
 
+  def delete_attribute(name)
+    attributes.reject! { |a| a.name == name }
+  end
+
   attr_writer :attributes
   def attributes
     @attributes ||= []
@@ -41,7 +46,7 @@ class Fabrication::Schematic
     new_schematic = merge(overrides, &block)
     new_schematic.instance_eval do
       if options[:attributes]
-        to_hash(attributes, overrides)
+        to_hash(generator.new(klass).generate({:save => false}, attributes, callbacks))
       else
         generator.new(klass).generate(options, attributes, callbacks)
       end
@@ -54,9 +59,7 @@ class Fabrication::Schematic
       self.callbacks[type] = callbacks.clone
     end
 
-    self.attributes = original.attributes.map do |a|
-      Fabrication::Attribute.new(a.name, a.params, a.value)
-    end
+    self.attributes = original.attributes.clone
   end
 
   def init_with(*args)
@@ -67,11 +70,8 @@ class Fabrication::Schematic
     clone.tap do |schematic|
       schematic.instance_eval(&block) if block_given?
       overrides.each do |name, value|
-        if attribute = schematic.attribute(name)
-          attribute.update!(:params => nil, :value => value)
-        else
-          schematic.attributes << Fabrication::Attribute.new(name, nil, value)
-        end
+        schematic.delete_attribute(name)
+        schematic.attributes << Fabrication::Attribute.new(name, nil, value)
       end
     end
   end
@@ -86,11 +86,8 @@ class Fabrication::Schematic
       value = args.first
     end
 
-    if attr = attribute(method_name)
-      attr.update!(:params => params, :value => value)
-    else
-      attributes.push(Fabrication::Attribute.new(method_name, params, value))
-    end
+    delete_attribute(method_name)
+    attributes.push(Fabrication::Attribute.new(method_name, params, value))
   end
 
   def on_init(&block)
@@ -115,12 +112,12 @@ class Fabrication::Schematic
     Proc.new { Fabricate(name.to_sym) }
   end
 
-  def to_hash(attrs, overrides)
-    hash = defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess.new : {}
-    attributes.inject(hash) do |hash, attribute|
-      value = Proc === attribute.value ? attribute.value.call : attribute.value
-      hash.merge(attribute.name => value)
-    end.merge(overrides)
+  def to_hash(object)
+    (defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess.new : {}).tap do |hash|
+      attributes.map do |attribute|
+        hash[attribute.name] = object.send(attribute.name)
+      end
+    end
   end
 
 end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

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

@@ -8,7 +8,7 @@ module Fabrication
       class_option :extension, :type => :string, :default => "rb", :desc => "file extension name"
 
       def create_fabrication_file
-        template 'fabricator.rb', File.join(options[:dir], "#{table_name}_fabricator.#{options[:extension].to_s}")
+        template 'fabricator.rb', File.join(options[:dir], "#{singular_table_name}_fabricator.#{options[:extension].to_s}")
       end
     end
   end

data/spec/fabrication/attribute_spec.rb

@@ -50,58 +50,4 @@ describe Fabrication::Attribute do
 
   end
 
-  describe "#update!" do
-
-    let(:attr) do
-      Fabrication::Attribute.new("a", nil, nil)
-    end
-
-    context "with name, params, and a static value" do
-
-      subject { attr }
-      before do
-        attr.update!(:params => { :b => :c }, :value => "d")
-      end
-
-      its(:params) { should == { :b => :c } }
-      its(:value)  { should == "d" }
-
-    end
-
-    context "with a block value" do
-
-      before do
-        attr.update!(:value => Proc.new { "c" })
-      end
-
-      it "has a proc for a value" do
-        Proc.should === attr.value
-      end
-
-    end
-
-    context "with a nil value" do
-
-      subject { attr }
-      before do
-        attr.update!(:value => nil)
-      end
-
-      its(:value) { should be_nil }
-
-    end
-
-    context "with nil params" do
-
-      subject { attr }
-      before do
-        attr.update!(:params => nil)
-      end
-
-      its(:params) { should be_nil }
-
-    end
-
-  end
-
 end

data/spec/fabrication/generator/sequel_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Fabrication::Generator::Sequel do
+
+  describe ".supports?" do
+    subject { Fabrication::Generator::Sequel }
+    it "returns true for sequel objects" do
+      subject.supports?(Artist).should be_true
+    end
+    it "returns false for non-sequel objects" do
+      subject.supports?(Person).should be_false
+    end
+  end
+
+  describe "#after_generation" do
+    let(:instance) { mock(:instance) }
+    let(:generator) { Fabrication::Generator::Sequel.new(Object) }
+
+    before { generator.send(:instance=, instance) }
+
+    it "saves with a true save flag" do
+      instance.should_receive(:save)
+      generator.send(:after_generation, {:save => true})
+    end
+
+    it "does not save without a true save flag" do
+      instance.should_not_receive(:save)
+      generator.send(:after_generation, {})
+    end
+  end
+
+end

data/spec/fabrication/schematic_spec.rb

@@ -10,6 +10,24 @@ describe Fabrication::Schematic do
     end
   end
 
+  describe "generator selection" do
+    context "for an activerecord object" do
+      it "uses the activerecord generator" do
+        Fabrication::Schematic.new(Division).generator.should == Fabrication::Generator::ActiveRecord
+      end
+    end
+    context "for a mongoid object" do
+      it "uses the mongoid generator" do
+        Fabrication::Schematic.new(Author).generator.should == Fabrication::Generator::Mongoid
+      end
+    end
+    context "for a sequel object" do
+      it "uses the sequel generator" do
+        Fabrication::Schematic.new(Artist).generator.should == Fabrication::Generator::Sequel
+      end
+    end
+  end
+
   describe ".new" do
     it "stores the klass" do
       schematic.klass.should == OpenStruct
@@ -31,6 +49,16 @@ describe Fabrication::Schematic do
     end
   end
 
+  describe "#delete_attribute" do
+    it "deletes the requested attribute if it exists" do
+      schematic.delete_attribute(:name).should_not be_nil
+      schematic.attribute(:name).should be_nil
+    end
+    it "returns nil if it does not exist" do
+      schematic.delete_attribute(:not_there).should be_nil
+    end
+  end
+
   describe "#attributes" do
     it "always returns an empty array" do
       schematic.attributes = nil

data/spec/fabrication_spec.rb

@@ -125,6 +125,7 @@ describe Fabrication do
       Fabricate(:person) do
         first_name "Paul"
         last_name { |person| "#{person.first_name}#{person.age}" }
+        age 50
       end
     end
 
@@ -382,6 +383,10 @@ describe Fabrication do
       person[:last_name].should == "Smith"
     end
 
+    it 'has the fabricator provided attributes' do
+      person[:shoes].length.should == 10
+    end
+
   end
 
 end

data/spec/support/sequel.rb

@@ -0,0 +1,13 @@
+require 'sequel'
+
+DB = Sequel.sqlite # in memory
+
+class Artist < Sequel::Model
+  one_to_many :albums
+
+  attr_accessor :non_field
+end
+
+class Album < Sequel::Model
+  many_to_one :artist
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fabrication
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Paul Elliott
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -04:00
+date: 2010-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196427
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 4
@@ -60,12 +55,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 1
+        version: 3.0.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,12 +70,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        - 1
+        version: 1.3.1
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -92,12 +85,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
-        - 0
-        - 4
-        version: 1.0.4
+        - 1
+        - 2
+        version: 1.1.2
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -108,17 +100,31 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196423
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 18
-        version: 2.0.0.beta.18
+        - 20
+        version: 2.0.0.beta.20
   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!
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 16
+        - 0
+        version: 3.16.0
+  type: :development
+  version_requirements: *id007
+description: Fabrication is an object generation framework for ActiveRecord, Mongoid, and Sequel. It has a sensible syntax and lazily generates ActiveRecord associations!
 email: 
 - paul@hashrocket.com
 executables: []
@@ -136,6 +142,7 @@ files:
 - lib/fabrication/generator/active_record.rb
 - lib/fabrication/generator/base.rb
 - lib/fabrication/generator/mongoid.rb
+- lib/fabrication/generator/sequel.rb
 - lib/fabrication/schematic.rb
 - lib/fabrication/sequencer.rb
 - lib/fabrication/support.rb
@@ -149,6 +156,7 @@ files:
 - spec/fabrication/generator/active_record_spec.rb
 - spec/fabrication/generator/base_spec.rb
 - spec/fabrication/generator/mongoid_spec.rb
+- spec/fabrication/generator/sequel_spec.rb
 - spec/fabrication/schematic_spec.rb
 - spec/fabrication/sequence_spec.rb
 - spec/fabrication/support_spec.rb
@@ -159,6 +167,7 @@ files:
 - spec/support/active_record.rb
 - spec/support/helper_objects.rb
 - spec/support/mongoid.rb
+- spec/support/sequel.rb
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/paulelliott/fabrication
@@ -174,7 +183,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -183,7 +191,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"