factory_girl 1.1.4 → 1.1.5

data/CONTRIBUTION_GUIDELINES.rdoc

@@ -0,0 +1,10 @@
+We're using GitHub[http://github.com/thoughtbot/factory_girl/tree/master] and Lighthouse[http://thoughtbot.lighthouseapp.com/projects/14354], and we've been getting any combination of github pull requests, Lighthouse tickets, patches, emails, etc.  We need to normalize this workflow to make sure we don't miss any fixes. 
+
+* Make sure you're accessing the source from the {official repository}[http://github.com/thoughtbot/factory_girl/tree/master].
+* We prefer git branches over patches, but we can take either. 
+* If you're using git, please make a branch for each separate contribution.  We can cherry pick your commits, but pulling from a branch is easier. 
+* If you're submitting patches, please cut each fix or feature into a separate patch.
+* There should be a Lighthouse[http://thoughtbot.lighthouseapp.com/projects/14354] ticket for any submission.  If you've found a bug and want to fix it, open a new ticket at the same time. 
+* Please <b>don't send pull requests</b>  Just update the lighthouse ticket with the url for your fix (or attach the patch) when it's ready.  The github pull requests pretty much get dropped on the floor until someone with commit rights notices them in the mailbox. 
+* Contributions without tests won't be accepted.
+* Please don't submit patches or branches that update the Gem version.

data/Changelog

@@ -1,3 +1,13 @@
+1.1.4 (November 28, 2008)
+  Factory.build now uses Factory.create for associations of the built object
+  Factory definitions are now detected in subdirectories, such as
+		factories/person_factory.rb (thanks to Josh Nichols)
+  Factory definitions are now loaded after the environment in a Rails project
+		(fixes some issues with dependencies being loaded too early) (thanks to
+		Josh Nichols)
+  Factory names ending in 's' no longer cause problems (thanks to Alex Sharp
+		and Josh Owens)
+  
 1.1.3 (September 12, 2008)
   Automatically pull in definitions from factories.rb, test/factories.rb, or
 	spec/factories.rb

data/README.textile

@@ -19,6 +19,10 @@ config.gem "thoughtbot-factory_girl",
            :lib    => "factory_girl",
            :source => "http://gems.github.com"
 
+h2. Contributing
+
+Please read the contribution guidelines before submitting patches or pull requests.
+
 h2. Defining factories
 
 <pre><code># This will guess the User class

data/Rakefile

@@ -39,7 +39,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{factory_girl}
-  s.version     = "1.1.4"
+  s.version     = "1.1.5"
   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
@@ -58,7 +58,6 @@ spec = Gem::Specification.new do |s|
   s.email   = %q{jferris@thoughtbot.com}
 
   s.platform = Gem::Platform::RUBY
-  s.add_dependency(%q<activesupport>, [">= 1.0"])
 end
 
 Rake::GemPackageTask.new spec do |pkg|

data/lib/factory_girl/aliases.rb

@@ -1,6 +1,8 @@
 class Factory
 
-  cattr_accessor :aliases #:nodoc:
+  class << self
+    attr_accessor :aliases #:nodoc:
+  end
   self.aliases = [
     [/(.*)_id/, '\1'],
     [/(.*)/, '\1_id']

data/lib/factory_girl/factory.rb

@@ -1,13 +1,16 @@
 class Factory
   
-  cattr_accessor :factories #:nodoc:
-  self.factories = {}
+  class << self
+    attr_accessor :factories #:nodoc:
+
+    # An Array of strings specifying locations that should be searched for
+    # factory definitions. By default, factory_girl will attempt to require
+    # "factories," "test/factories," and "spec/factories." Only the first
+    # existing file will be loaded.
+    attr_accessor :definition_file_paths
+  end
 
-  # An Array of strings specifying locations that should be searched for
-  # factory definitions. By default, factory_girl will attempt to require
-  # "factories," "test/factories," and "spec/factories." Only the first
-  # existing file will be loaded.
-  cattr_accessor :definition_file_paths
+  self.factories = {}
   self.definition_file_paths = %w(factories test/factories spec/factories)
 
   attr_reader :factory_name
@@ -36,7 +39,7 @@ class Factory
   end
 
   def initialize (name, options = {}) #:nodoc:
-    options.assert_valid_keys(:class)
+    assert_valid_options(options)
     @factory_name = factory_name_for(name)
     @options      = options
     @attributes   = []
@@ -111,7 +114,7 @@ class Factory
   #       default use the "user" factory.
   def association (name, options = {})
     name    = name.to_sym
-    options = options.symbolize_keys
+    options = symbolize_keys(options)
     association_factory = options[:factory] || name
 
     add_attribute(name) {|a| a.association(association_factory) }
@@ -203,7 +206,7 @@ class Factory
   private
 
   def build_attributes_hash (values, strategy)
-    values = values.symbolize_keys
+    values = symbolize_keys(values)
     passed_keys = values.keys.collect {|key| Factory.aliases_for(key) }.flatten
     @attributes.each do |attribute|
       unless passed_keys.include?(attribute.name)
@@ -225,7 +228,7 @@ class Factory
 
   def class_for (class_or_to_s)
     if class_or_to_s.respond_to?(:to_sym)
-      class_or_to_s.to_s.pluralize.classify.constantize
+      Object.const_get(variable_name_to_class_name(class_or_to_s))
     else
       class_or_to_s
     end
@@ -235,7 +238,7 @@ class Factory
     if class_or_to_s.respond_to?(:to_sym)
       class_or_to_s.to_sym
     else
-      class_or_to_s.to_s.underscore.to_sym
+      class_name_to_variable_name(class_or_to_s).to_sym
     end
   end
 
@@ -243,4 +246,35 @@ class Factory
     !@attributes.detect {|attr| attr.name == name }.nil?
   end
 
+  def assert_valid_options(options)
+    invalid_keys = options.keys - [:class] 
+    unless invalid_keys == []
+      raise ArgumentError, "Unknown arguments: #{invalid_keys.inspect}"
+    end
+  end
+
+  # Based on ActiveSupport's underscore inflector
+  def class_name_to_variable_name(name)
+    name.to_s.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end
+
+  # Based on ActiveSupport's camelize inflector
+  def variable_name_to_class_name(name)
+    name.to_s.
+      gsub(/\/(.?)/) { "::#{$1.upcase}" }.
+      gsub(/(?:^|_)(.)/) { $1.upcase }
+  end
+
+  # From ActiveSupport
+  def symbolize_keys(hash)
+    hash.inject({}) do |options, (key, value)|
+      options[(key.to_sym rescue key) || key] = value
+      options
+    end
+  end
+
 end

data/lib/factory_girl/sequence.rb

@@ -15,7 +15,9 @@ class Factory
 
   end
 
-  cattr_accessor :sequences #:nodoc:
+  class << self
+    attr_accessor :sequences #:nodoc:
+  end
   self.sequences = {}
 
   # Defines a new sequence that can be used to generate unique values in a specific format.

data/test/factory_test.rb

@@ -337,7 +337,7 @@ class FactoryTest < Test::Unit::TestCase
 
       end
 
-      should "raise an ActiveRecord::RecordInvalid error for invalid instances" do
+      should "raise an error for invalid instances" do
         assert_raise(ActiveRecord::RecordInvalid) do
           @factory.create(:first_name => nil)
         end

data/test/integration_test.rb

@@ -28,7 +28,7 @@ class IntegrationTest < Test::Unit::TestCase
   end
 
   def teardown
-    Factory.send(:class_variable_get, "@@factories").clear
+    Factory.factories.clear
   end
 
   context "a generated attributes hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Joe Ferris
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-28 00:00:00 -05:00
+date: 2008-12-11 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
+dependencies: []
+
 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: []
@@ -32,6 +23,7 @@ extra_rdoc_files:
 - README.textile
 files: 
 - Changelog
+- CONTRIBUTION_GUIDELINES.rdoc
 - LICENSE
 - Rakefile
 - README.textile