thoughtbot-factory_girl 1.2.0 → 1.2.1

data/README.rdoc

@@ -188,7 +188,7 @@ And it's also possible to define an in-line sequence that is only used in
 a particular factory:
 
   Factory.define :user do |f|
-    f.sequence :email {|n| "person#{n}@example.com" }
+    f.sequence(:email) {|n| "person#{n}@example.com" }
   end
 
 == Alternate Syntaxes

data/Rakefile

@@ -28,7 +28,7 @@ desc 'Generate documentation for the factory_girl plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Factory Girl'
-  rdoc.options << '--line-numbers' << '--inline-source' << "--main" << "README.rdoc"
+  rdoc.options << '--line-numbers' << "--main" << "README.rdoc"
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('CONTRIBUTION_GUIDELINES.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -45,7 +45,7 @@ spec = Gem::Specification.new do |s|
   s.summary     = %q{factory_girl provides a framework and DSL for defining and
                      using model instance factories.}
   s.description = %q{factory_girl provides a framework and DSL for defining and
-                     using factories - less error-prone, more explicit, and 
+                     using factories - less error-prone, more explicit, and
                      all-around easier to work with than fixtures.}
 
   s.files        = FileList['[A-Z]*', 'lib/**/*.rb', 'test/**/*.rb']
@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
 
   s.has_rdoc         = true
   s.extra_rdoc_files = ["README.rdoc"]
-  s.rdoc_options = ['--line-numbers', '--inline-source', "--main", "README.rdoc"]
+  s.rdoc_options = ['--line-numbers', "--main", "README.rdoc"]
 
   s.authors = ["Joe Ferris"]
   s.email   = %q{jferris@thoughtbot.com}

data/lib/factory_girl/factory.rb

@@ -70,7 +70,7 @@ class Factory
   end
   
   def inherit_from(parent) #:nodoc:
-    @options[:class] = parent.class_name
+    @options[:class] ||= parent.class_name
     parent.attributes.each do |attribute|
       unless attribute_defined?(attribute.name)
         @attributes << attribute.clone

data/lib/factory_girl/proxy/stub.rb

@@ -10,7 +10,7 @@ class Factory
       end
       
       def set(attribute, value)
-        unless @mock.respond_to?("attribute=")
+        unless @mock.respond_to?("#{attribute}=")
           class << @mock; self end.send(:attr_accessor, attribute)
         end
         @mock.send("#{attribute}=", value)

data/test/factory_test.rb

@@ -413,6 +413,13 @@ factory = Factory.new(:post)
       child = Factory.define(:child, :parent => :object) {}
       assert_equal @parent.build_class, child.build_class
     end
+
+    should 'create a new factory while overriding the parent class' do
+      class Other; end
+
+      child = Factory.define(:child, :parent => :object, :class => Other) {}
+      assert_equal Other, child.build_class
+    end
     
     should 'create a new factory with attributes of the parent' do
       child = Factory.define(:child, :parent => :object) {}

data/test/stub_strategy_test.rb

@@ -35,6 +35,15 @@ class StubProxyTest < Test::Unit::TestCase
       assert_kind_of Object, @proxy.result
     end
 
+    context "setting an attribute" do
+      should "define attributes even if attribute= is defined" do
+        @proxy.set('attribute', nil)
+        assert_nothing_raised do
+          @proxy.set('age', 18)
+        end
+      end
+    end
+
     context "after setting an attribute" do
       setup do
         @proxy.set(:attribute, 'value')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Joe Ferris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-04-09 00:00:00 -07:00
 default_executable: 
 dependencies: []