ttilley-factory_girl 1.2.2.1 → 1.2.2.2

data/Rakefile

@@ -37,7 +37,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{factory_girl}
-  s.version     = "1.2.2.1"
+  s.version     = "1.2.2.2"
   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

data/lib/factory_girl/syntax/make.rb

@@ -35,10 +35,11 @@ class Factory
         module ClassMethods #:nodoc:
 
           def make(*args)
+            overrides = args.last.is_a?(Hash) ? args.pop : {}
+            name = args.first.is_a?(Symbol) ? args.shift : 'master'
+                        
             scope = self.name.underscore
-            name = args.shift if args.first.is_a?(Symbol)
-            name ||= 'master'
-            overrides = args.pop || {}
+
             Factory.create("#{scope}[#{name}]", overrides)
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ttilley-factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.2.2.1
+  version: 1.2.2.2
 platform: ruby
 authors: 
 - Joe Ferris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -66,7 +66,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://thoughtbot.com/projects/factory_girl
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -89,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance factories.