TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not including Indexes::Timezones

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9152 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 3 insertions, 73 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index c50a78b31e..3de6a21247 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not including Indexes::Timezones [Geoff Buesing] 
+
 * Removing unnecessary uses_tzinfo helper from tests, given that TZInfo is now bundled [Geoff Buesing]
 
 * Bundling abbreviated version of TZInfo gem 0.3.8: only the classes and zone definitions required to support Rails time zone features are included. If a recent version of the full TZInfo gem is installed, this will take precedence over the bundled version [Geoff Buesing]
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index c108d5e57a..f89a7d500d 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -170,6 +170,6 @@ namespace :tzinfo do
   end
   
   def excluded_classes
-    %w(country country_index_definition country_info country_timezone tzdataparser)
+    %w(country country_index_definition country_info country_timezone timezone_index_definition tzdataparser)
   end
 end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.8/tzinfo/timezone_index_definition.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.8/tzinfo/timezone_index_definition.rb
deleted file mode 100644
index 1f005e3d7f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.8/tzinfo/timezone_index_definition.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  # The timezone index file includes TimezoneIndexDefinition which provides
-  # methods used to define timezones in the index.
-  module TimezoneIndexDefinition #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-    
-    module ClassMethods #:nodoc:
-      # Defines a timezone based on data.
-      def timezone(identifier)
-        @timezones = [] unless @timezones
-        @data_timezones = [] unless @data_timezones
-        @timezones << identifier
-        @data_timezones << identifier
-      end
-      
-      # Defines a timezone which is a link to another timezone.
-      def linked_timezone(identifier)
-        @timezones = [] unless @timezones
-        @linked_timezones = [] unless @linked_timezones
-        @timezones << identifier
-        @linked_timezones << identifier
-      end
-      
-      # Returns a frozen array containing the identifiers of all the timezones.
-      # Identifiers appear in the order they were defined in the index.
-      def timezones
-        @timezones = [] unless @timezones
-        @timezones.freeze
-      end
-      
-      # Returns a frozen array containing the identifiers of all data timezones.
-      # Identifiers appear in the order they were defined in the index.
-      def data_timezones
-        @data_timezones = [] unless @data_timezones
-        @data_timezones.freeze
-      end
-      
-      # Returns a frozen array containing the identifiers of all linked
-      # timezones. Identifiers appear in the order they were defined in 
-      # the index.
-      def linked_timezones
-        @linked_timezones = [] unless @linked_timezones
-        @linked_timezones.freeze
-      end      
-    end
-  end
-end