enumerate_by 0.4.3 → 0.4.4

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 == master
 
+== 0.4.4 / 2010-03-07
+
+* Fix serialization failing when ActiveRecord models have been defined prior to this plugin being loaded
+* Fix cached enumeration records not being isolated from external modifications that don't sweep the cache
+* Respect custom primary_key configurations in ActiveRecord models [Martin Honermeyer]
+* Fix tests failing on Rails 2.3.3+
+* Release gems via rake-gemcutter instead of rubyforge
+
 == 0.4.3 / 2009-06-14
 
 * Add support for looking up enumerators by their symbol equivalent

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Aaron Pfeifer
+Copyright (c) 2006-2010 Aaron Pfeifer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -38,7 +38,7 @@ associations.  The important thing to remember, however, is that while the
 associations exist, the enumerator is always used outside of the application,
 while either the enumerator or the enumerator's record would be referenced
 *within* the application.  This means that you would reference a Color record
-via it's enumerator (such as "red") everywhere in the code (conditions,
+via its enumerator (such as "red") everywhere in the code (conditions,
 assigning associations, forms, etc.), but it would always be stored in the
 database as a true association with the integer value of 1.
 
@@ -75,9 +75,9 @@ database as a true association with the integer value of 1.
 
 Each of the above models is backed by the database with its own table.  Both
 the Color and ColorGroup enumerations automatically synchronize with the
-records in the database based on what's define in their bootstrap data.
+records in the database based on what's defined in their bootstrap data.
 
-The enumerations and their associations can be then be used like so:
+The enumerations and their associations can then be used like so:
 
   car = Car.create(:color => 'red')   # => #<Car id: 1, color_id: 1>
   car.color                           # => #<Color id: 1, name: "red">

data/Rakefile

@@ -1,11 +1,12 @@
+require 'rubygems'
+require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'enumerate_by'
-  s.version           = '0.4.3'
+  s.version           = '0.4.4'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for declaring an ActiveRecord class as an enumeration'
   s.description       = s.summary
@@ -63,17 +64,17 @@ end
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
 end
 
 desc 'Publish the beta gem.'
 task :pgem => [:package] do
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new('aaron@pluginaweek.org', '/home/aaron/gems.pluginaweek.org/public/gems', 'pkg', "#{spec.name}-#{spec.version}.gem").upload
 end
 
 desc 'Publish the API documentation.'
 task :pdoc => [:rdoc] do
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new('aaron@pluginaweek.org', "/home/aaron/api.pluginaweek.org/public/#{spec.name}", 'rdoc').upload
 end
 
@@ -82,15 +83,8 @@ task :publish => [:pgem, :pdoc, :release]
 
 desc 'Publish the release files to RubyForge.'
 task :release => [:gem, :package] do
-  require 'rubyforge'
+  require 'rake/gemcutter'
   
-  ruby_forge = RubyForge.new.configure
-  ruby_forge.login
-  
-  %w(gem tgz zip).each do |ext|
-    file = "pkg/#{spec.name}-#{spec.version}.#{ext}"
-    puts "Releasing #{File.basename(file)}..."
-    
-    ruby_forge.add_release(spec.rubyforge_project, spec.name, spec.version, file)
-  end
+  Rake::Gemcutter::Tasks.new(spec)
+  Rake::Task['gem:push'].invoke
 end

data/lib/enumerate_by.rb

@@ -17,7 +17,11 @@ module EnumerateBy
         # Tracks which associations are backed by an enumeration
         # {"foreign key" => "association name"}
         class_inheritable_accessor :enumeration_associations
-        self.enumeration_associations = {}
+        
+        # Fix existing models not getting the default value
+        ([self] + subclasses).each do |model|
+          model.enumeration_associations = {}
+        end
       end
     end
     
@@ -178,7 +182,7 @@ module EnumerateBy
     [:find_by_sql, :exists?, :calculate].each do |method|
       define_method(method) do |*args|
         if EnumerateBy.perform_caching && perform_enumerator_caching
-          enumerator_cache_store.fetch([method] + args) { super(*args) }
+          shallow_clone(enumerator_cache_store.fetch([method] + args) { super(*args) })
         else
           super(*args)
         end
@@ -209,6 +213,16 @@ module EnumerateBy
           enumerator.is_a?(Symbol) ? enumerator.to_s : enumerator
         end
       end
+      
+      # Generates a copy of the given record(s), keeping intact the original id
+      def shallow_clone(result)
+        case result
+        when Array
+          result.map {|item| shallow_clone(item)}
+        when ActiveRecord::Base
+          result.class.send(:instantiate, result.instance_variable_get(:@attributes))
+        end
+      end
   end
   
   module Bootstrapped
@@ -265,13 +279,15 @@ module EnumerateBy
     # Otherwise, any changes to that column remain there.
     def bootstrap(*records)
       uncached do
+        primary_key = self.primary_key.to_sym
+        
         # Remove records that are no longer being used
         records.flatten!
-        ids = records.map {|record| record[:id]}.compact
-        delete_all(ids.any? ? ['id NOT IN (?)', ids] : nil)
+        ids = records.map {|record| record[primary_key]}.compact
+        delete_all(ids.any? ? ["#{primary_key} NOT IN (?)", ids] : nil)
         
         # Find remaining existing records (to be updated)
-        existing = all.inject({}) {|existing, record| existing[record.id] = record; existing}
+        existing = all.inject({}) {|existing, record| existing[record.send(primary_key)] = record; existing}
         
         records.map! do |attributes|
           attributes.symbolize_keys!
@@ -279,7 +295,7 @@ module EnumerateBy
           
           # Update with new attributes
           record =
-            if record = existing[attributes[:id]]
+            if record = existing[attributes[primary_key]]
               attributes.merge!(defaults.delete_if {|attribute, value| record.send("#{attribute}?")}) if defaults
               record.attributes = attributes
               record
@@ -287,7 +303,7 @@ module EnumerateBy
               attributes.merge!(defaults) if defaults
               new(attributes)
             end
-          record.id = attributes[:id]
+          record.send("#{primary_key}=", attributes[primary_key])
           
           # Force failed saves to stop execution
           record.save!
@@ -317,14 +333,16 @@ module EnumerateBy
     # 
     # See EnumerateBy::Bootstrapped#bootstrap for information about usage.
     def fast_bootstrap(*records)
+      primary_key = self.primary_key.to_sym
+      
       # Remove records that are no longer being used
       records.flatten!
-      ids = records.map {|record| record[:id]}.compact
-      delete_all(ids.any? ? ['id NOT IN (?)', ids] : nil)
+      ids = records.map {|record| record[primary_key]}.compact
+      delete_all(ids.any? ? ["#{primary_key} NOT IN (?)", ids] : nil)
       
       # Find remaining existing records (to be updated)
       quoted_table_name = self.quoted_table_name
-      existing = connection.select_all("SELECT * FROM #{quoted_table_name}").inject({}) {|existing, record| existing[record['id'].to_i] = record; existing}
+      existing = connection.select_all("SELECT * FROM #{quoted_table_name}").inject({}) {|existing, record| existing[record[primary_key.to_s].to_i] = record; existing}
       
       records.each do |attributes|
         attributes.stringify_keys!
@@ -332,12 +350,12 @@ module EnumerateBy
           defaults.stringify_keys!
         end
         
-        id = attributes['id']
+        id = attributes[primary_key.to_s]
         if existing_attributes = existing[id]
           # Record exists: Update attributes
-          attributes.delete('id')
+          attributes.delete(primary_key.to_s)
           attributes.merge!(defaults.delete_if {|attribute, value| !existing_attributes[attribute].nil?}) if defaults
-          update_all(attributes, :id => id)
+          update_all(attributes, primary_key => id)
         else
           # Record doesn't exist: create new one
           attributes.merge!(defaults) if defaults

data/lib/enumerate_by/extensions/associations.rb

@@ -75,18 +75,19 @@ module EnumerateBy
           primary_key_name = reflection.primary_key_name
           class_name = reflection.class_name
           klass = reflection.klass
+          klass_primary_key = klass.primary_key.to_sym
           
           # Inclusion scopes
           %W(with_#{name} with_#{name.to_s.pluralize}).each do |scope_name|
             named_scope scope_name.to_sym, lambda {|*enumerators| {
-              :conditions => {primary_key_name => klass.find_all_by_enumerator!(enumerators).map(&:id)}
+              :conditions => {primary_key_name => klass.find_all_by_enumerator!(enumerators).map(&klass_primary_key)}
             }}
           end
           
           # Exclusion scopes
           %W(without_#{name} without_#{name.to_s.pluralize}).each do |scope_name|
             named_scope scope_name.to_sym, lambda {|*enumerators| {
-              :conditions => ["#{primary_key_name} NOT IN (?)", klass.find_all_by_enumerator!(enumerators).map(&:id)]
+              :conditions => ["#{primary_key_name} NOT IN (?)", klass.find_all_by_enumerator!(enumerators).map(&klass_primary_key)]
             }}
           end
           

data/lib/enumerate_by/extensions/base_conditions.rb

@@ -104,11 +104,12 @@ module EnumerateBy
         def enumerator_options_for(name, enumerator, allow_multiple = true)
           if reflection = reflect_on_enumeration(name)
             klass = reflection.klass
+            klass_primary_key = klass.primary_key.to_sym
             attribute = reflection.primary_key_name
             id = if allow_multiple && enumerator.is_a?(Array)
-              klass.find_all_by_enumerator!(enumerator).map(&:id)
+              klass.find_all_by_enumerator!(enumerator).map(&klass_primary_key)
             else
-              klass.find_by_enumerator!(enumerator).id
+              klass.find_by_enumerator!(enumerator).send(klass_primary_key)
             end
             
             {attribute => id}

data/test/app_root/app/models/car.rb

@@ -1,4 +1,5 @@
 class Car < ActiveRecord::Base
   belongs_to :color
+  belongs_to :legacy_color
   belongs_to :feature, :polymorphic => true
 end

data/test/app_root/app/models/color.rb

@@ -1,3 +1,5 @@
 class Color < ActiveRecord::Base
   enumerate_by :name
+  
+  has_many :cars
 end

data/test/app_root/app/models/legacy_color.rb

@@ -0,0 +1,5 @@
+class LegacyColor < ActiveRecord::Base
+  set_primary_key :uid
+  
+  enumerate_by :name
+end

data/test/app_root/config/environment.rb

@@ -0,0 +1,8 @@
+require 'config/boot'
+
+Rails::Initializer.run do |config|
+  config.plugins = %w(plugin_with_model enumerate_by)
+  config.cache_classes = false
+  config.whiny_nils = true
+  config.action_controller.session = {:key => 'rails_session', :secret => 'd229e4d22437432705ab3985d4d246'}
+end

data/test/app_root/db/migrate/002_create_cars.rb

@@ -2,7 +2,7 @@ class CreateCars < ActiveRecord::Migration
   def self.up
     create_table :cars do |t|
       t.string :name
-      t.references :color
+      t.references :color, :legacy_color
       t.references :feature, :class_name => 'Color', :polymorphic => true
     end
   end

data/test/app_root/db/migrate/005_create_legacy_colors.rb

@@ -0,0 +1,12 @@
+class CreateLegacyColors < ActiveRecord::Migration
+  def self.up
+    create_table :legacy_colors, :primary_key => 'uid' do |t|
+      t.string :name, :null => false
+      t.string :html
+    end
+  end
+  
+  def self.down
+    drop_table :legacy_colors
+  end
+end

data/test/app_root/db/migrate/006_create_tags.rb

@@ -0,0 +1,11 @@
+class CreateTags < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+  end
+  
+  def self.down
+    drop_table :tags
+  end
+end

data/test/app_root/vendor/plugins/plugin_with_model/init.rb

@@ -0,0 +1 @@
+require 'plugin_with_model'

data/test/app_root/vendor/plugins/plugin_with_model/lib/plugin_with_model.rb

@@ -0,0 +1,2 @@
+class Tag < ActiveRecord::Base
+end

data/test/factory.rb

@@ -34,7 +34,6 @@ module Factory
   end
   
   build Car do |attributes|
-    attributes[:color] = create_color unless attributes.include?(:color)
     attributes.reverse_merge!(
       :name => 'Ford Mustang'
     )
@@ -52,10 +51,22 @@ module Factory
     )
   end
   
+  build LegacyColor do |attributes|
+    attributes.reverse_merge!(
+      :name => 'red'
+    )
+  end
+  
   build Order do |attributes|
     attributes[:car_part] = create_car_part unless attributes.include?(:car_part)
     attributes.reverse_merge!(
       :state => 'pending'
     )
   end
+  
+  build Tag do |attributes|
+    attributes.reverse_merge!(
+      :name => 'rails'
+    )
+  end
 end

data/test/unit/{assocations_test.rb → associations_test.rb}

@@ -17,7 +17,7 @@ class ModelWithBelongsToAssociationTest < ActiveRecord::TestCase
     assert_equal @green, @car.color
   end
   
-  def test_should_find_assocation_from_record
+  def test_should_find_association_from_record
     @car.color = @green
     assert_equal @green, @car.color
   end
@@ -33,7 +33,7 @@ class ModelWithBelongsToAssociationTest < ActiveRecord::TestCase
   end
   
   def test_should_track_associations
-    expected = {'color_id' => 'color'}
+    expected = {'color_id' => 'color', 'legacy_color_id' => 'legacy_color'}
     assert_equal expected, Car.enumeration_associations
   end
 end
@@ -73,3 +73,30 @@ class ModelWithPolymorphicBelongsToAssociationTest < ActiveRecord::TestCase
     assert !Car.respond_to?(:without_features)
   end
 end
+
+class ModelWithEnumerationScopesUsingCustomPrimaryKeyTest < ActiveRecord::TestCase
+  def setup
+    @red = create_legacy_color(:name => 'red')
+    @blue = create_legacy_color(:name => 'blue')
+    @red_car = create_car(:name => 'Ford Mustang', :legacy_color => @red)
+    @blue_car = create_car(:name => 'Ford Mustang', :legacy_color => @blue)
+  end
+  
+  def test_should_have_inclusion_scope_for_single_enumerator
+    assert_equal [@red_car], Car.with_legacy_color('red')
+    assert_equal [@blue_car], Car.with_legacy_color('blue')
+  end
+  
+  def test_should_have_inclusion_scope_for_multiple_enumerators
+    assert_equal [@red_car, @blue_car], Car.with_legacy_color('red', 'blue')
+  end
+  
+  def test_should_have_exclusion_scope_for_single_enumerator
+    assert_equal [@blue_car], Car.without_legacy_color('red')
+    assert_equal [@red_car], Car.without_legacy_color('blue')
+  end
+  
+  def test_should_have_exclusion_scope_for_multiple_enumerators
+    assert_equal [], Car.without_legacy_colors('red', 'blue')
+  end
+end

data/test/unit/base_conditions_test.rb

@@ -57,6 +57,23 @@ class EnumerationWithFinderConditionsTest < ActiveRecord::TestCase
   end
 end
 
+class EnumerationWithCustomPrimaryKeyAndFinderConditionsTest < ActiveRecord::TestCase
+  def setup
+    @red = create_legacy_color(:name => 'red')
+    @blue = create_legacy_color(:name => 'blue')
+    @red_car = create_car(:name => 'Ford Mustang', :legacy_color => @red)
+    @blue_car = create_car(:name => 'Ford Mustang', :legacy_color => @blue)
+  end
+  
+  def test_should_replace_enumerations_in_dynamic_finders
+    assert_equal @red_car, Car.find_by_legacy_color('red')
+  end
+  
+  def test_should_replace_enumerations_in_find_conditions
+    assert_equal @red_car, Car.first(:conditions => {:legacy_color => 'red'})
+  end
+end
+
 class EnumerationWithFinderUpdatesTest < ActiveRecord::TestCase
   def setup
     @red = create_color(:name => 'red')
@@ -86,3 +103,17 @@ class EnumerationWithFinderUpdatesTest < ActiveRecord::TestCase
     assert_equal @red, @red_car.color
   end
 end
+
+class EnumerationWithCustomPrimaryKeyAndFinderUpdatesTest < ActiveRecord::TestCase
+  def setup
+    @red = create_legacy_color(:name => 'red')
+    @blue = create_legacy_color(:name => 'blue')
+    @red_car = create_car(:name => 'Ford Mustang', :legacy_color => @red)
+  end
+  
+  def test_should_replace_enumerations_in_update_conditions
+    Car.update_all({:legacy_color => 'blue'}, :name => 'Ford Mustang')
+    @red_car.reload
+    assert_equal @blue, @red_car.legacy_color
+  end
+end

data/test/unit/enumerate_by_test.rb

@@ -284,6 +284,14 @@ class EnumerationWithCachingTest < ActiveRecord::TestCase
     assert Color.perform_enumerator_caching
   end
   
+  def test_should_not_return_same_objects
+    assert_not_same Color.find(@red.id), Color.find(@red.id)
+  end
+  
+  def test_should_not_return_same_collections
+    assert_not_same Color.find_all_by_id(@red.id), Color.find_all_by_id(@red.id)
+  end
+  
   def test_should_cache_all_finder_queries
    assert_queries(1) { Color.find(@red.id) }
    assert_queries(0) { Color.find(@red.id) }
@@ -310,6 +318,7 @@ class EnumerationWithCachingTest < ActiveRecord::TestCase
   end
   
   def teardown
+    Color.enumerator_cache_store.clear
     EnumerateBy.perform_caching = false
   end
 end
@@ -347,6 +356,33 @@ class EnumerationWithoutCachingTest < ActiveRecord::TestCase
   end
 end
 
+class EnumerationWithAssociationsTest < ActiveRecord::TestCase
+  def setup
+    EnumerateBy.perform_caching = true
+    
+    @red = create_color(:name => 'red')
+    @blue = create_color(:name => 'blue')
+    @red_car = create_car(:name => 'Ford Mustang', :color => @red)
+    @blue_car = create_car(:name => 'Ford Mustang', :color => @blue)
+  end
+  
+  def test_should_find_associated_records
+    assert_equal [@red_car], Color['red'].cars
+  end
+  
+  def test_should_not_cache_association_on_subsequent_usage
+    assert_equal [@red_car], Color['red'].cars
+    
+    @second_red_car = create_car(:name => 'Ford Mustang', :color => @red)
+    assert_equal [@red_car, @second_red_car], Color['red'].cars
+  end
+  
+  def teardown
+    Color.enumerator_cache_store.clear
+    EnumerateBy.perform_caching = false
+  end
+end
+
 class EnumerationBootstrappedTest < ActiveRecord::TestCase
   def setup
     @red, @green = Color.bootstrap(
@@ -448,6 +484,28 @@ class EnumerationBootstrappedWithDefaultsTest < ActiveRecord::TestCase
   end
 end
 
+class EnumerationWithCustomPrimaryKeyBootstrappedTest < ActiveRecord::TestCase
+  def setup
+    @red, @green = LegacyColor.bootstrap(
+      {:uid => 1, :name => 'red'},
+      {:uid => 2, :name => 'green'}
+    )
+  end
+  
+  def test_should_not_raise_exception_if_primary_key_not_specified
+    assert_nothing_raised { LegacyColor.bootstrap({:name => 'red'}, {:name => 'green'}) }
+    assert_equal 2, LegacyColor.count
+  end
+  
+  def test_should_create_records
+    assert_equal @red, LegacyColor.find(1)
+    assert_equal 'red', @red.name
+    
+    assert_equal @green, LegacyColor.find(2)
+    assert_equal 'green', @green.name
+  end
+end
+
 class EnumerationFastBootstrappedTest < ActiveRecord::TestCase
   def setup
     @result = Color.fast_bootstrap(
@@ -546,3 +604,23 @@ class EnumerationFastBootstrappedWithDefaultsTest < ActiveRecord::TestCase
     assert_equal '#00ff00', @green.html
   end
 end
+
+class EnumerationWithCustomPrimaryKeyFastBootstrappedTest < ActiveRecord::TestCase
+  def setup
+    @result = LegacyColor.fast_bootstrap(
+      {:uid => 1, :name => 'red'},
+      {:uid => 2, :name => 'green'}
+    )
+  end
+  
+  def test_should_not_raise_exception_if_primary_key_not_specified
+    assert_nothing_raised { LegacyColor.fast_bootstrap({:name => 'red'}, {:name => 'green'}) }
+    assert_equal 2, LegacyColor.count
+  end
+  
+  def test_should_create_records
+    assert @result
+    assert_not_nil LegacyColor.find_by_name('red')
+    assert_not_nil LegacyColor.find_by_name('green')
+  end
+end

data/test/unit/json_serializer_test.rb

@@ -8,11 +8,21 @@ class JSONSerializerTest < ActiveRecord::TestCase
   end
   
   def test_should_include_enumeration_in_json
-    assert_match %r{"color": "red"}, @json
+    assert_match %r{"color":\s*"red"}, @json
   end
   
   def test_should_render_other_attributes
-    assert_match %r{"id": #{@car.id}}, @json
-    assert_match %r{"name": "Ford Mustang"}, @json
+    assert_match %r{"id":\s*#{@car.id}}, @json
+    assert_match %r{"name":\s*"Ford Mustang"}, @json
+  end
+end
+
+class JSONSerializerForPluginModelTest < ActiveRecord::TestCase
+  def setup
+    @tag = create_tag(:name => 'rails')
+  end
+  
+  def test_should_serialize
+    assert_match %r{"name":\s*"rails"}, @tag.to_json
   end
 end

data/test/unit/serializer_test.rb

@@ -8,7 +8,7 @@ class SerializerByDefaultTest < ActiveRecord::TestCase
   end
   
   def test_should_include_enumerations_in_serializable_attribute_names
-    assert_equal %w(color feature_id feature_type id name), @serializer.serializable_attribute_names
+    assert_equal %w(color feature_id feature_type id legacy_color name), @serializer.serializable_attribute_names
   end
   
   def test_should_typecast_serializable_record
@@ -16,6 +16,7 @@ class SerializerByDefaultTest < ActiveRecord::TestCase
       'color' => 'red',
       'feature_id' => nil,
       'feature_type' => nil,
+      'legacy_color' => nil,
       'id' => @car.id,
       'name' => 'Ford Mustang'
     }
@@ -32,7 +33,7 @@ class SerializerWithoutEnumerationsTest < ActiveRecord::TestCase
   end
   
   def test_should_not_include_enumerations_in_serializable_attribute_names
-    assert_equal %w(color_id feature_id feature_type id name), @serializer.serializable_attribute_names
+    assert_equal %w(color_id feature_id feature_type id legacy_color_id name), @serializer.serializable_attribute_names
   end
   
   def test_should_not_typecast_serializable_record
@@ -40,6 +41,7 @@ class SerializerWithoutEnumerationsTest < ActiveRecord::TestCase
       'color_id' => @red.id,
       'feature_id' => nil,
       'feature_type' => nil,
+      'legacy_color_id' => nil,
       'id' => @car.id,
       'name' => 'Ford Mustang'
     }
@@ -98,13 +100,14 @@ class SerializerWithExceptEnumerationAttributeTest < ActiveRecord::TestCase
   end
   
   def test_should_not_include_enumeration_in_serializable_attribute_names
-    assert_equal %w(feature_id feature_type id name), @serializer.serializable_attribute_names
+    assert_equal %w(feature_id feature_type id legacy_color name), @serializer.serializable_attribute_names
   end
   
   def test_should_not_include_enumeration_in_serializable_record
     expected = {
       'feature_id' => nil,
       'feature_type' => nil,
+      'legacy_color' => nil,
       'id' => @car.id,
       'name' => 'Ford Mustang'
     }
@@ -121,13 +124,14 @@ class SerializerWithExceptEnumerationAssociationTest < ActiveRecord::TestCase
   end
   
   def test_should_not_include_enumeration_in_serializable_attribute_names
-    assert_equal %w(feature_id feature_type id name), @serializer.serializable_attribute_names
+    assert_equal %w(feature_id feature_type id legacy_color name), @serializer.serializable_attribute_names
   end
   
   def test_should_not_include_enumeration_in_serializable_record
     expected = {
       'feature_id' => nil,
       'feature_type' => nil,
+      'legacy_color' => nil,
       'id' => @car.id,
       'name' => 'Ford Mustang'
     }
@@ -144,7 +148,7 @@ class SerializerWithIncludeEnumerationTest < ActiveRecord::TestCase
   end
   
   def test_should_not_include_enumeration_in_serializable_attribute_names
-    assert_equal %w(color_id feature_id feature_type id name), @serializer.serializable_attribute_names
+    assert_equal %w(color_id feature_id feature_type id legacy_color name), @serializer.serializable_attribute_names
   end
   
   def test_should_include_entire_enumeration_in_serializable_record
@@ -157,6 +161,7 @@ class SerializerWithIncludeEnumerationTest < ActiveRecord::TestCase
       'color_id' => @red.id,
       'feature_id' => nil,
       'feature_type' => nil,
+      'legacy_color' => nil,
       'id' => @car.id,
       'name' => 'Ford Mustang'
     }

data/test/unit/xml_serializer_test.rb

@@ -62,6 +62,7 @@ class XmlSerializerTest < ActiveRecord::TestCase
   <feature-id type="integer" nil="true"></feature-id>
   <feature-type nil="true"></feature-type>
   <id type="integer">#{@car.id}</id>
+  <legacy-color nil="true"></legacy-color>
   <name>Ford Mustang</name>
 </car>
     eos
@@ -89,3 +90,21 @@ class XmlSerializerWithNumericEnumeratorAttributeTest < ActiveRecord::TestCase
     assert_equal expected, @order.to_xml
   end
 end
+
+class XMLSerializerForPluginModelTest < ActiveRecord::TestCase
+  def setup
+    @tag = create_tag(:name => 'rails')
+  end
+  
+  def test_should_serialize
+    expected = <<-eos
+<?xml version="1.0" encoding="UTF-8"?>
+<tag>
+  <id type="integer">#{@tag.id}</id>
+  <name>rails</name>
+</tag>
+    eos
+    
+    assert_equal expected, @tag.to_xml
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: enumerate_by
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-14 00:00:00 -04:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -22,35 +22,33 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/enumerate_by.rb
-- lib/enumerate_by
-- lib/enumerate_by/extensions
-- lib/enumerate_by/extensions/base_conditions.rb
 - lib/enumerate_by/extensions/associations.rb
 - lib/enumerate_by/extensions/serializer.rb
 - lib/enumerate_by/extensions/xml_serializer.rb
-- test/unit
+- lib/enumerate_by/extensions/base_conditions.rb
+- lib/enumerate_by.rb
+- test/unit/serializer_test.rb
+- test/unit/base_conditions_test.rb
 - test/unit/xml_serializer_test.rb
 - test/unit/enumerate_by_test.rb
-- test/unit/serializer_test.rb
-- test/unit/assocations_test.rb
 - test/unit/json_serializer_test.rb
-- test/unit/base_conditions_test.rb
-- test/factory.rb
-- test/app_root
-- test/app_root/app
-- test/app_root/app/models
-- test/app_root/app/models/order.rb
-- test/app_root/app/models/color.rb
-- test/app_root/app/models/car.rb
-- test/app_root/app/models/car_part.rb
-- test/app_root/db
-- test/app_root/db/migrate
-- test/app_root/db/migrate/003_create_car_parts.rb
+- test/unit/associations_test.rb
+- test/app_root/vendor/plugins/plugin_with_model/init.rb
+- test/app_root/vendor/plugins/plugin_with_model/lib/plugin_with_model.rb
+- test/app_root/db/migrate/005_create_legacy_colors.rb
 - test/app_root/db/migrate/001_create_colors.rb
-- test/app_root/db/migrate/002_create_cars.rb
+- test/app_root/db/migrate/006_create_tags.rb
+- test/app_root/db/migrate/003_create_car_parts.rb
 - test/app_root/db/migrate/004_create_orders.rb
+- test/app_root/db/migrate/002_create_cars.rb
+- test/app_root/app/models/car.rb
+- test/app_root/app/models/color.rb
+- test/app_root/app/models/legacy_color.rb
+- test/app_root/app/models/car_part.rb
+- test/app_root/app/models/order.rb
+- test/app_root/config/environment.rb
 - test/test_helper.rb
+- test/factory.rb
 - CHANGELOG.rdoc
 - init.rb
 - LICENSE
@@ -58,6 +56,8 @@ files:
 - README.rdoc
 has_rdoc: true
 homepage: http://www.pluginaweek.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -78,14 +78,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Adds support for declaring an ActiveRecord class as an enumeration
 test_files: 
+- test/unit/serializer_test.rb
+- test/unit/base_conditions_test.rb
 - test/unit/xml_serializer_test.rb
 - test/unit/enumerate_by_test.rb
-- test/unit/serializer_test.rb
-- test/unit/assocations_test.rb
 - test/unit/json_serializer_test.rb
-- test/unit/base_conditions_test.rb
+- test/unit/associations_test.rb