fixture_builder 0.3.0 → 0.3.1

data/fixture_builder.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['Ryan Dy', 'David Stevenson']
-  s.date = %q{2011-04-29}
   s.description = %q{FixtureBuilder allows testers to use their existing factories, like FactoryGirl, to generate high performance fixtures that can be shared across all your tests}
   s.email = %q{mail@ryandy.com}
   s.extra_rdoc_files = [

data/lib/fixture_builder/namer.rb

@@ -6,7 +6,7 @@ module FixtureBuilder
       @configuration = configuration
       @custom_names = {}
       @model_name_procs = {}
-      @record_names = []
+      @record_names = {}
     end
 
     def name_model_with(model_class, &block)
@@ -44,7 +44,8 @@ module FixtureBuilder
                else
                  inferred_record_name(record_hash, table_name, row_index)
              end
-      @record_names << name
+      @record_names[table_name] ||= []
+      @record_names[table_name] << name
       name.to_s
     end
 
@@ -53,8 +54,10 @@ module FixtureBuilder
       record_name_fields.each do |try|
         if name = record_hash[try]
           inferred_name = name.underscore.gsub(/\W/, ' ').squeeze(' ').tr(' ', '_')
-          count = @record_names.select { |name| name.to_s.starts_with?(inferred_name) }.size
-            # CHANGED == to starts_with?
+          count = 0          
+          if @record_names[table_name]
+            count = @record_names[table_name].select {|name| name.to_s.starts_with?(inferred_name) }.size
+          end
           return count.zero? ? inferred_name : "#{inferred_name}_#{count}"
         end
       end

data/lib/fixture_builder/version.rb

@@ -1,3 +1,3 @@
 module FixtureBuilder
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/namer_test.rb

@@ -6,6 +6,12 @@ class Model
   end
 end
 
+class AnotherModel
+  def self.table_name
+    'another_models'
+  end
+end
+
 class NamerTest < Test::Unit::TestCase
   def setup
     configuration = FixtureBuilder::Configuration.new
@@ -41,4 +47,18 @@ class NamerTest < Test::Unit::TestCase
     }
     assert_equal 'foo', @namer.record_name(hash, Model.table_name, '000')
   end
+  
+  def test_name_not_unique_across_tables
+    hash = {
+      'id' => 1,
+      'title' => 'foo'
+    }
+    hash_with_same_title = {
+      'id' => 2,
+      'title' => 'foo'
+    }
+    assert_equal 'foo', @namer.record_name(hash, Model.table_name, '000')
+    assert_equal 'foo', @namer.record_name(hash, AnotherModel.table_name, '000')
+    assert_equal 'foo_1', @namer.record_name(hash_with_same_title, Model.table_name, '000')
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fixture_builder
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Ryan Dy
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -07:00
+date: 2011-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,7 +107,6 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - fixture_builder.gemspec
 - lib/fixture_builder.rb
 - lib/fixture_builder/builder.rb

data/VERSION

@@ -1 +0,0 @@
-0.2.2