0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* TZInfo: Removing unneeded TimezoneProxy class [Geoff Buesing]
0
+
0
 * TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not including Indexes::Timezones [Geoff Buesing] 
0
 
0
 * Removing unnecessary uses_tzinfo helper from tests, given that TZInfo is now bundled [Geoff Buesing]

0
@@ -170,7 +170,7 @@
0
   end
0
   
0
   def excluded_classes
0
-    %w(country country_index_definition country_info country_timezone timezone_index_definition t tzdataparser)
0
+    %w(country country_index_definition country_info country_timezone timezone_index_definition timezone_proxy tzdataparser)
0
   end
0
 end

0
@@ -28,7 +28,7 @@
0
 require 'tzinfo/timezone'
0
 # require 'tzinfo/country'
0
 # require 'tzinfo/tzdataparser'
0
-require 'tzinfo/timezone_proxy'
0
+# require 'tzinfo/timezone_proxy'
0
 require 'tzinfo/data_timezone'
0
 require 'tzinfo/linked_timezone'

0
@@ -1,86 +1 @@
0
-#--
0
-# Copyright (c) 2005-2006 Philip Ross
0
-# 
0
-# Permission is hereby granted, free of charge, to any person obtaining a copy
0
-# of this software and associated documentation files (the "Software"), to deal
0
-# in the Software without restriction, including without limitation the rights
0
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
0
-# copies of the Software, and to permit persons to whom the Software is
0
-# furnished to do so, subject to the following conditions:
0
-# 
0
-# The above copyright notice and this permission notice shall be included in all
0
-# copies or substantial portions of the Software.
0
-#
0
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
0
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
0
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
0
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
0
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
0
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
0
-# THE SOFTWARE.
0
-#++
0
-
0
-require 'tzinfo/timezone'
0
-
0
-module TZInfo
0
-
0
-  # A proxy class representing a timezone with a given identifier. TimezoneProxy
0
-  # inherits from Timezone and can be treated like any Timezone loaded with
0
-  # Timezone.get.
0
-  #
0
-  # The first time an attempt is made to access the data for the timezone, the 
0
-  # real Timezone is loaded. If the proxy's identifier was not valid, then an 
0
-  # exception will be raised at this point.  
0
-  class TimezoneProxy < Timezone
0
-    # Construct a new TimezoneProxy for the given identifier. The identifier
0
-    # is not checked when constructing the proxy. It will be validated on the
0
-    # when the real Timezone is loaded.
0
-    def self.new(identifier)
0
-      # Need to override new to undo the behaviour introduced in Timezone#new.
0
-      tzp = super()
0
-      tzp.send(:setup, identifier)
0
-      tzp
0
-    end
0
-        
0
-    # The identifier of the timezone, e.g. "Europe/Paris".
0
-    def identifier
0
-      @real_timezone ? @real_timezone.identifier : @identifier
0
-    end
0
-    
0
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
0
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
0
-    # information in utc is ignored (it is treated as a UTC time).        
0
-    def period_for_utc(utc)            
0
-      real_timezone.period_for_utc(utc)            
0
-    end
0
-    
0
-    # Returns the set of TimezonePeriod instances that are valid for the given
0
-    # local time as an array. If you just want a single period, use 
0
-    # period_for_local instead and specify how abiguities should be resolved.
0
-    # Returns an empty array if no periods are found for the given time.
0
-    def periods_for_local(local)
0
-      real_timezone.periods_for_local(local)
0
-    end
0
-    
0
-    # Dumps this TimezoneProxy for marshalling.
0
-    def _dump(limit)
0
-      identifier
0
-    end
0
-    
0
-    # Loads a marshalled TimezoneProxy.
0
-    def self._load(data)
0
-      TimezoneProxy.new(data)
0
-    end
0
-    
0
-    private
0
-      def setup(identifier)
0
-        @identifier = identifier
0
-        @real_timezone = nil
0
-      end  
0
-    
0
-      def real_timezone
0
-        @real_timezone ||= Timezone.get(@identifier)
0
-      end     
0
-  end 
0
-end