factory_girl 2.6.4 → 3.0.0.rc1

data/.travis.yml

@@ -1,13 +1,10 @@
 rvm:
-  - ree-1.8.7
-  - 1.8.7
   - 1.9.2
   - 1.9.3
 before_install:
   - gem update --system
 script: "bundle exec rake spec:unit spec:acceptance features"
 gemfile:
-  - gemfiles/2.3.gemfile
   - gemfiles/3.0.gemfile
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "2.3" do
-  gem "activerecord", "~> 2.3"
-end
-
 appraise "3.0" do
   gem "activerecord", "~> 3.0"
 end

data/Changelog

@@ -1,7 +1,3 @@
-2.6.4 (March 16, 2012)
-  Do not ignore names of transient attributes
-  Ensure attributes set on instance are calculated uniquely
-
 2.6.3 (March 9, 2012)
   Fix issue with traits not being present the first time a factory is accessed
   Update available Cucumber step definitions to not require a trialing colon

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0.rc1)
+      activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -55,7 +55,6 @@ GEM
     multi_json (1.0.3)
     rack (1.3.3)
     rake (0.9.2)
-    rcov (0.9.10)
     rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -65,6 +64,10 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -85,8 +88,8 @@ DEPENDENCIES
   cucumber (~> 1.0.0)
   factory_girl!
   mocha
-  rcov
   rspec (~> 2.0)
+  simplecov
   sqlite3-ruby
   timecop
   yard

data/Rakefile

@@ -5,7 +5,6 @@ require 'appraisal'
 require 'yard'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
-require 'rcov/rcovtask'
 
 Bundler::GemHelper.install_tasks
 
@@ -29,17 +28,6 @@ end
 desc "Run the unit and acceptance specs"
 task :spec => ['spec:unit', 'spec:acceptance']
 
-desc 'Performs code coverage on the factory_girl plugin.'
-RSpec::Core::RakeTask.new(:rcov) do |task|
-  task.pattern = 'spec/**/*_spec.rb'
-  task.rcov = true
-  task.rspec_opts = "--format progress"
-  task.rcov_opts = %{--exclude osx\/objc,spec,gems\/ --aggregate coverage/coverage.data}
-end
-
-desc "Clean files generated by rake tasks"
-task :clobber => [:clobber_rcov]
-
 Cucumber::Rake::Task.new(:features) do |t|
   t.fork = true
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]

data/factory_girl.gemspec

@@ -14,19 +14,19 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split("\n")
 
   s.require_paths = ['lib']
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
 
   s.authors = ["Josh Clayton", "Joe Ferris"]
   s.email   = ["jclayton@thoughtbot.com", "jferris@thoughtbot.com"]
 
   s.homepage = "https://github.com/thoughtbot/factory_girl"
 
-  s.add_dependency("activesupport", ">= 2.3.9")
+  s.add_dependency("activesupport", ">= 3.0.0")
 
   s.add_development_dependency("rspec",    "~> 2.0")
   s.add_development_dependency("cucumber", "~> 1.0.0")
   s.add_development_dependency("timecop")
-  s.add_development_dependency("rcov")
+  s.add_development_dependency("simplecov")
   s.add_development_dependency("aruba")
   s.add_development_dependency("mocha")
   s.add_development_dependency("bourne")

data/features/support/env.rb

@@ -1,5 +1,8 @@
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
+require "simplecov"
+SimpleCov.start
+
 $: << File.join(PROJECT_ROOT, 'lib')
 
 require 'active_record'

data/gemfiles/3.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0.rc1)
+      activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -45,8 +45,8 @@ GEM
     json (1.5.3)
     mocha (0.9.8)
       rake
+    multi_json (1.1.0)
     rake (0.9.2)
-    rcov (0.9.9)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -55,6 +55,10 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -75,8 +79,8 @@ DEPENDENCIES
   cucumber (~> 1.0.0)
   factory_girl!
   mocha
-  rcov
   rspec (~> 2.0)
+  simplecov
   sqlite3-ruby
   timecop
   yard

data/gemfiles/3.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0.rc1)
+      activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -55,7 +55,6 @@ GEM
     multi_json (1.0.3)
     rack (1.3.2)
     rake (0.9.2)
-    rcov (0.9.10)
     rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -65,6 +64,10 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -85,8 +88,8 @@ DEPENDENCIES
   cucumber (~> 1.0.0)
   factory_girl!
   mocha
-  rcov
   rspec (~> 2.0)
+  simplecov
   sqlite3-ruby
   timecop
   yard

data/gemfiles/3.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
+    factory_girl (3.0.0.rc1)
+      activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -53,7 +53,6 @@ GEM
     multi_json (1.0.4)
     rack (1.4.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
     rdiscount (1.6.8)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -63,6 +62,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -83,8 +86,8 @@ DEPENDENCIES
   cucumber (~> 1.0.0)
   factory_girl!
   mocha
-  rcov
   rspec (~> 2.0)
+  simplecov
   sqlite3-ruby
   timecop
   yard

data/lib/factory_girl.rb

@@ -24,7 +24,6 @@ require 'factory_girl/definition_proxy'
 require 'factory_girl/syntax'
 require 'factory_girl/find_definitions'
 require 'factory_girl/reload'
-require 'factory_girl/deprecated'
 require 'factory_girl/version'
 
 if defined?(Rails) && Rails::VERSION::MAJOR == 2

data/lib/factory_girl/attribute_assigner.rb

@@ -37,7 +37,7 @@ module FactoryGirl
     end
 
     def attributes_to_set_on_instance
-      (attribute_names_to_assign - @attribute_names_assigned).uniq
+      attribute_names_to_assign - @attribute_names_assigned
     end
 
     def attributes_to_set_on_hash
@@ -66,7 +66,7 @@ module FactoryGirl
 
     def alias_names_to_ignore
       @attribute_list.reject(&:ignored).map do |attribute|
-        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
+        override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override }
       end.flatten.compact
     end
   end

data/lib/factory_girl/declaration.rb

@@ -12,11 +12,6 @@ module FactoryGirl
       @ignored = ignored
     end
 
-    def ignore
-      $stderr.puts "DEPRECATION WARNING: Use ignore block syntax instead of calling #ignore"
-      @ignored = true
-    end
-
     def to_attributes
       build
     end

data/lib/factory_girl/definition.rb

@@ -12,7 +12,7 @@ module FactoryGirl
       @constructor       = nil
     end
 
-    delegate :declare_attribute, :to => :declarations
+    delegate :declare_attribute, to: :declarations
 
     def attributes
       @attributes ||= declarations.attribute_list

data/lib/factory_girl/definition_proxy.rb

@@ -122,7 +122,7 @@ module FactoryGirl
     #   end
     #
     #   factory :post do
-    #     association :author, :factory => :user
+    #     association :author, factory: :user
     #   end
     #
     # Arguments:

data/lib/factory_girl/errors.rb

@@ -8,7 +8,7 @@ module FactoryGirl
   # Raised when a factory is defined with the same name as a previously-defined factory.
   class DuplicateDefinitionError < RuntimeError; end
 
-  # Raised when calling Factory.sequence from a dynamic attribute block
+  # Raised when attempting to register a sequence from a dynamic attribute block
   class SequenceAbuseError < RuntimeError; end
 
   # Raised when defining an invalid attribute:

data/lib/factory_girl/evaluator.rb

@@ -31,17 +31,14 @@ module FactoryGirl
     end
 
     def association(factory_name, overrides = {})
-      build_strategy = if overrides.has_key?(:method)
-                         $stderr.puts "DEPRECATION WARNING: using :method to specify a build strategy is deprecated; use :strategy instead"
-                         overrides[:method]
-                       elsif overrides.has_key?(:strategy)
+      build_strategy = if overrides.has_key?(:strategy)
                          overrides[:strategy]
                        else
                          Strategy::Create
                        end
 
       build_strategy = StrategyCalculator.new(build_strategy).strategy
-      runner = FactoryRunner.new(factory_name, build_strategy, [overrides.except(:method, :strategy)])
+      runner = FactoryRunner.new(factory_name, build_strategy, [overrides.except(:strategy)])
       @build_strategy.association(runner)
     end
 

data/lib/factory_girl/factory.rb

@@ -11,18 +11,12 @@ module FactoryGirl
       @parent           = options[:parent]
       @aliases          = options[:aliases] || []
       @class_name       = options[:class]
-      @default_strategy = options[:default_strategy]
       @definition       = Definition.new(@name, options[:traits] || [])
       @compiled         = false
     end
 
     delegate :add_callback, :declare_attribute, :to_create, :define_trait,
-             :defined_traits, :inherit_traits, :processing_order, :to => :@definition
-
-    def factory_name
-      $stderr.puts "DEPRECATION WARNING: factory.factory_name is deprecated; use factory.name instead."
-      name
-    end
+             :defined_traits, :inherit_traits, :processing_order, to: :@definition
 
     def build_class #:nodoc:
       @build_class ||= if class_name.is_a? Class
@@ -32,10 +26,6 @@ module FactoryGirl
       end
     end
 
-    def default_strategy #:nodoc:
-      @default_strategy || parent.default_strategy
-    end
-
     def run(strategy_class, overrides, &block) #:nodoc:
       block ||= lambda {|result| result }
       compile
@@ -60,7 +50,7 @@ module FactoryGirl
     #
     # Example:
     #
-    #   factory :user, :aliases => [:author] do
+    #   factory :user, aliases: [:author] do
     #     # ...
     #   end
     #
@@ -71,7 +61,7 @@ module FactoryGirl
     # association with the same name, this allows associations to be defined
     # without factories, such as:
     #
-    #   factory :user, :aliases => [:author] do
+    #   factory :user, aliases: [:author] do
     #     # ...
     #   end
     #
@@ -130,13 +120,7 @@ module FactoryGirl
     private
 
     def assert_valid_options(options)
-      options.assert_valid_keys(:class, :parent, :default_strategy, :aliases, :traits)
-
-      if options[:default_strategy]
-        Strategy.ensure_strategy_exists!(options[:default_strategy])
-        $stderr.puts "DEPRECATION WARNING: default_strategy is deprecated."
-        $stderr.puts "Override to_create if you need to prevent a call to #save!."
-      end
+      options.assert_valid_keys(:class, :parent, :aliases, :traits)
     end
 
     def parent

data/lib/factory_girl/null_factory.rb

@@ -6,11 +6,10 @@ module FactoryGirl
       @definition = Definition.new
     end
 
-    delegate :defined_traits, :callbacks, :attributes, :constructor, :to => :definition
+    delegate :defined_traits, :callbacks, :attributes, :constructor, to: :definition
 
     def compile; end
     def class_name; end
-    def default_strategy; :create; end
     def evaluator_class; FactoryGirl::Evaluator; end
   end
 end

data/lib/factory_girl/null_object.rb

@@ -1,19 +1,7 @@
 module FactoryGirl
-  if defined?(::BasicObject)
-    class NullObject < ::BasicObject
-      def method_missing(*args)
-        nil
-      end
-    end
-  else
-    class NullObject
-      instance_methods.each do |m|
-        undef_method(m) if m.to_s !~ /(?:^__|^nil\?$|^send$|^object_id$)/
-      end
-
-      def method_missing(*args)
-        nil
-      end
+  class NullObject < ::BasicObject
+    def method_missing(*args)
+      nil
     end
   end
 end