RubyGems - tzinfo - Versions diffs - 0.3.20 → 0.3.21 - Mend

@@ -1,5 +1,3 @@
-require 'tzinfo/country_index_definition'
 module TZInfo
   module Indexes
     module Countries
@@ -577,6 +575,7 @@ module TZInfo
         c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Mountain Standard Time - Sonora'
         c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'US Pacific Time - Baja California near US border'
         c.timezone 'America/Santa_Isabel', 303, 10, -1723, 15, 'Mexican Pacific Time - Baja California away from US border'
+        c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Mexican Central Time - Bahia de Banderas'
       end
       country 'MY', 'Malaysia' do |c|
         c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'peninsular Malaysia'

data/lib/tzinfo/indexes/timezones.rb CHANGED

@@ -1,5 +1,3 @@
-require 'tzinfo/timezone_index_definition'
 module TZInfo
   module Indexes
     module Timezones
@@ -81,6 +79,7 @@ module TZInfo
       timezone 'America/Atikokan'
       linked_timezone 'America/Atka'
       timezone 'America/Bahia'
+      timezone 'America/Bahia_Banderas'
       timezone 'America/Barbados'
       timezone 'America/Belem'
       timezone 'America/Belize'

data/lib/tzinfo/info_timezone.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
-require 'tzinfo/timezone'
 module TZInfo
   # A Timezone based on a TimezoneInfo.

data/lib/tzinfo/linked_timezone.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
-require 'tzinfo/info_timezone'
 module TZInfo
   class LinkedTimezone < InfoTimezone #:nodoc:

data/lib/tzinfo/linked_timezone_info.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
-require 'tzinfo/timezone_info'
 module TZInfo
   # Represents a linked timezone defined in a data module.
   class LinkedTimezoneInfo < TimezoneInfo #:nodoc:

data/lib/tzinfo/offset_rationals.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,8 +20,7 @@
 # THE SOFTWARE.
 #++
-require 'rational'
-require 'tzinfo/ruby_core_support'
+require 'rational' unless defined?(Rational)
 module TZInfo

data/lib/tzinfo/ruby_core_support.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008 Philip Ross
+# Copyright (c) 2008-2010 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
@@ -21,7 +21,7 @@
 #++
 require 'date'
-require 'rational'
+require 'rational' unless defined?(Rational)
 module TZInfo

data/lib/tzinfo/time_or_datetime.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -22,7 +22,6 @@
 require 'date'
 require 'time'
-require 'tzinfo/offset_rationals'
 module TZInfo
   # Used by TZInfo internally to represent either a Time, DateTime or integer

data/lib/tzinfo/timezone.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2006 Philip Ross
+# Copyright (c) 2005-2010 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
@@ -21,9 +21,6 @@
 #++
 require 'date'
-require 'tzinfo/country'
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone_period'
 module TZInfo
   # Indicate a specified time in a local timezone has more than one
@@ -78,7 +75,7 @@ module TZInfo
     def self.get(identifier)
       instance = @@loaded_zones[identifier]
       unless instance
-        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-z0-9\+\-_]+(\/[A-z0-9\+\-_]+)*$/
+        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-Za-z0-9\+\-_]+(\/[A-Za-z0-9\+\-_]+)*$/
         identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
         begin
           # Use a temporary variable to avoid an rdoc warning

data/lib/tzinfo/timezone_definition.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -20,9 +20,6 @@
 # THE SOFTWARE.
 #++
-require 'tzinfo/data_timezone_info'
-require 'tzinfo/linked_timezone_info'
 module TZInfo
   # TimezoneDefinition is included into Timezone definition modules.

data/lib/tzinfo/timezone_period.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2006 Philip Ross
+# Copyright (c) 2005-2010 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
@@ -20,9 +20,6 @@
 # THE SOFTWARE.
 #++
-require 'tzinfo/offset_rationals'
-require 'tzinfo/time_or_datetime'
 module TZInfo
   # A period of time in a timezone where the same offset from UTC applies.
   #

data/lib/tzinfo/timezone_proxy.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2006 Philip Ross
+# Copyright (c) 2005-2010 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
@@ -20,8 +20,6 @@
 # THE SOFTWARE.
 #++
-require 'tzinfo/timezone'
 module TZInfo
   # A proxy class representing a timezone with a given identifier. TimezoneProxy

data/lib/tzinfo/timezone_transition_info.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006 Philip Ross
+# Copyright (c) 2006-2010 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
@@ -21,7 +21,6 @@
 #++
 require 'date'
-require 'tzinfo/time_or_datetime'
 module TZInfo
   # Represents an offset defined in a Timezone data file.

data/lib/tzinfo/tzdataparser.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005 Philip Ross
+# Copyright (c) 2005-2010 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
@@ -298,10 +298,8 @@ module TZInfo
         FileUtils.mkdir_p(dir)
         File.open(dir + File::SEPARATOR + 'countries.rb', 'w') {|file|
-          file.binmode
-          file.puts('require \'tzinfo/country_index_definition\'')
-          file.puts('')
+          file.binmode
           file.puts('module TZInfo')
           file.puts('  module Indexes')
           file.puts('    module Countries')
@@ -325,8 +323,6 @@ module TZInfo
         File.open(File.join(dir, 'timezones.rb'), 'w') do |file|
           file.binmode
-          file.puts('require \'tzinfo/timezone_index_definition\'')
-          file.puts('')
           file.puts('module TZInfo')
           file.puts('  module Indexes')
           file.puts('    module Timezones')
@@ -515,9 +511,6 @@ module TZInfo
           super("#{' ' * (@tz_indent || 0)}#{s}")
         end
-        file.puts('require \'tzinfo/timezone_definition\'')
-        file.puts('')
         file.puts('module TZInfo')
         file.indent(2)
         file.puts('module Definitions')