factory_girl 2.2.0 → 2.3.0

data/spec/support/matchers/delegate.rb

@@ -0,0 +1,44 @@
+RSpec::Matchers.define :delegate do |delegated_method|
+  chain :to do |target_method|
+    @target_method = target_method
+  end
+
+  chain :as do |method_on_target|
+    @method_on_target = method_on_target
+  end
+
+  chain :with_arguments do |args|
+    @args = args
+  end
+
+  match do |instance|
+    extend Mocha::API
+
+    @instance = instance
+    @args ||= []
+    return_value = 'stubbed return value'
+    method_on_target = @method_on_target || delegated_method
+    stubbed_target = stub('stubbed_target', method_on_target => return_value)
+    @instance.stubs(@target_method => stubbed_target)
+    begin
+      @instance.send(delegated_method, *@args).should == return_value
+    rescue NoMethodError
+      false
+    end
+  end
+
+  failure_message do
+    if Class === @instance
+      message = "expected #{@instance.name} "
+      prefix = '.'
+    else
+      message = "expected #{@instance.class.name} "
+      prefix = '#'
+    end
+    message << "to delegate #{prefix}#{delegated_method} to #{prefix}#{@target_method}"
+    if @method_on_target
+      message << ".#{@method_on_target}"
+    end
+    message
+  end
+end

data/spec/support/matchers/trait.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_trait do |trait_name|
+  match do |instance|
+    instance.defined_traits.include?(FactoryGirl::Trait.new(trait_name, &@block))
+  end
+
+  chain :with_block do |block|
+    @block = block
+  end
+end

data/spec/support/shared_examples/proxy.rb

@@ -111,15 +111,14 @@ shared_examples_for "proxy with standard getters and setters" do |attribute, val
 end
 
 shared_examples_for "proxy with callbacks" do |callback_name|
-  let(:callback) { stub("#{callback_name} callback", :foo => nil) }
+  let(:callback_instance) { stub("#{callback_name} callback", :foo => nil) }
+  let(:callback) { FactoryGirl::Callback.new(callback_name, proc { callback_instance.foo }) }
 
-  before do
-    subject.add_callback(FactoryGirl::Callback.new(callback_name, proc { callback.foo }))
-  end
+  subject        { described_class.new(proxy_class, [callback]) }
 
   it "runs the #{callback_name} callback" do
     subject.result(nil)
-    callback.should have_received(:foo).once
+    callback_instance.should have_received(:foo).once
   end
 
   it "returns the proxy instance" do

metadata

@@ -1,157 +1,208 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: factory_girl
-version: !ruby/object:Gem::Version
-  version: 2.2.0
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 2
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
-authors:
+authors: 
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000 -04:00
+
+date: 2011-11-18 00:00:00 -05:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2152932580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2152932580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2152931520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *2152931520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &2152928620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *2152928620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &2152926840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152926840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &2152922800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152922800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: &2152916020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152916020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2152910800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152910800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: bourne
-  requirement: &2152908620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152908620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: appraisal
-  requirement: &2152906500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 3
+        - 8
         version: 0.3.8
   type: :development
-  prerelease: false
-  version_requirements: *2152906500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &2152904880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152904880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &2152897180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152897180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: bluecloth
-  requirement: &2152895440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152895440
-description: ! "factory_girl provides a framework and DSL for defining and\n                       using
-  factories - less error-prone, more explicit, and\n                       all-around
-  easier to work with than fixtures."
+  version_requirements: *id012
+description: |-
+  factory_girl provides a framework and DSL for defining and
+                         using factories - less error-prone, more explicit, and
+                         all-around easier to work with than fixtures.
 email: jferris@thoughtbot.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rspec
@@ -179,10 +230,13 @@ files:
 - lib/factory_girl/declaration/dynamic.rb
 - lib/factory_girl/declaration/implicit.rb
 - lib/factory_girl/declaration/static.rb
+- lib/factory_girl/declaration_list.rb
+- lib/factory_girl/definition.rb
 - lib/factory_girl/definition_proxy.rb
 - lib/factory_girl/deprecated.rb
 - lib/factory_girl/factory.rb
 - lib/factory_girl/find_definitions.rb
+- lib/factory_girl/null_factory.rb
 - lib/factory_girl/proxy.rb
 - lib/factory_girl/proxy/attributes_for.rb
 - lib/factory_girl/proxy/build.rb
@@ -255,10 +309,13 @@ files:
 - spec/factory_girl/attribute_spec.rb
 - spec/factory_girl/callback_spec.rb
 - spec/factory_girl/declaration/implicit_spec.rb
+- spec/factory_girl/declaration_list_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
+- spec/factory_girl/definition_spec.rb
 - spec/factory_girl/deprecated_spec.rb
 - spec/factory_girl/factory_spec.rb
 - spec/factory_girl/find_definitions_spec.rb
+- spec/factory_girl/null_factory_spec.rb
 - spec/factory_girl/proxy/attributes_for_spec.rb
 - spec/factory_girl/proxy/build_spec.rb
 - spec/factory_girl/proxy/create_spec.rb
@@ -269,34 +326,46 @@ files:
 - spec/factory_girl_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/define_constant.rb
+- spec/support/matchers/callback.rb
+- spec/support/matchers/declaration.rb
+- spec/support/matchers/delegate.rb
+- spec/support/matchers/trait.rb
 - spec/support/shared_examples/proxy.rb
 has_rdoc: true
 homepage: https://github.com/thoughtbot/factory_girl
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: factory_girl provides a framework and DSL for defining and using model instance
-  factories.
-test_files:
+summary: factory_girl provides a framework and DSL for defining and using model instance factories.
+test_files: 
 - Appraisals
 - cucumber.yml
 - features/factory_girl_steps.feature
@@ -349,10 +418,13 @@ test_files:
 - spec/factory_girl/attribute_spec.rb
 - spec/factory_girl/callback_spec.rb
 - spec/factory_girl/declaration/implicit_spec.rb
+- spec/factory_girl/declaration_list_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
+- spec/factory_girl/definition_spec.rb
 - spec/factory_girl/deprecated_spec.rb
 - spec/factory_girl/factory_spec.rb
 - spec/factory_girl/find_definitions_spec.rb
+- spec/factory_girl/null_factory_spec.rb
 - spec/factory_girl/proxy/attributes_for_spec.rb
 - spec/factory_girl/proxy/build_spec.rb
 - spec/factory_girl/proxy/create_spec.rb
@@ -363,4 +435,8 @@ test_files:
 - spec/factory_girl_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/define_constant.rb
+- spec/support/matchers/callback.rb
+- spec/support/matchers/declaration.rb
+- spec/support/matchers/delegate.rb
+- spec/support/matchers/trait.rb
 - spec/support/shared_examples/proxy.rb