factory_girl 1.3.1 → 1.3.2

data/lib/factory_girl.rb

@@ -21,7 +21,7 @@ def Factory (name, attrs = {})
 end
 
 class Factory
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end
 
 if defined?(Rails) && Rails::VERSION::MAJOR == 2

data/lib/factory_girl/aliases.rb

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

data/lib/factory_girl/factory.rb

@@ -303,11 +303,12 @@ class Factory
 
   def self.find_definitions #:nodoc:
     definition_file_paths.each do |path|
-      require("#{path}.rb") if File.exists?("#{path}.rb")
+      full_path = File.expand_path(path)
+      require("#{full_path}.rb") if File.exists?("#{full_path}.rb")
 
-      if File.directory? path
-        Dir[File.join(path, '*.rb')].each do |file|
-          require file
+      if File.directory?(full_path)
+        Dir[File.join(full_path, '*.rb')].each do |file|
+          require(file)
         end
       end
     end

data/spec/factory_girl/aliases_spec.rb

@@ -14,6 +14,10 @@ describe Factory, "aliases" do
     Factory.aliases_for(:test).should include(:test_id)
   end
 
+  it "should NOT include an attribute as an alias when it starts with underscore" do
+    Factory.aliases_for(:_id).should_not include(:id)
+  end
+
   describe "after adding an alias" do
 
     before do

data/spec/factory_girl/factory_spec.rb

@@ -586,7 +586,7 @@ describe Factory do
       files.each do |file|
         FileUtils.mkdir_p File.dirname(file)
         FileUtils.touch file
-        stub(Factory).require(file)
+        stub(Factory).require
       end
     end
 
@@ -598,7 +598,8 @@ describe Factory do
 
   def require_definitions_from(file)
     simple_matcher do |given, matcher|
-      has_received = have_received.method_missing(:require, file)
+      full_path = File.expand_path(file)
+      has_received = have_received.method_missing(:require, full_path)
       result = has_received.matches?(given)
       matcher.description = "require definitions from #{file}"
       matcher.failure_message = has_received.failure_message

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Joe Ferris
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -04:00
+date: 2010-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -71,9 +80,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 299253627
         segments: 
         - 3
         - 0
@@ -86,9 +97,11 @@ dependencies:
   name: rr
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,9 +111,11 @@ dependencies:
   name: sqlite3
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -182,23 +197,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance factories.