Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not in…

…cluding Indexes::Timezones

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9152 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 9c124a98b37f9ae121dd39e90ad5775460c64f73 1 parent c3ce27f
@gbuesing gbuesing authored
View
2  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]
View
2  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
View
72 activesupport/lib/active_support/vendor/tzinfo-0.3.8/tzinfo/timezone_index_definition.rb
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.