cowtech-extensions 2.0.1 → 2.1.0

data/lib/cowtech-extensions/datetime.rb

@@ -78,6 +78,35 @@ module Cowtech
         def rational_offset(tz = ::Time.zone)
           Rational((tz.tzinfo.current_period.utc_offset / 3600), 24)
         end
+
+        def parameterize_zone(tz)
+          tz = tz.to_s if !tz.is_a?(String)
+
+          if tz =~ /^(\([a-z]+([+-])(\d{2}):(\d{2})\)\s(.+))$/i then
+            "#{$2}#{$3}#{$4}@#{$5.parameterize}"
+          else
+            tz.parameterize
+          end
+        end
+
+        def find_parameterized_zone(tz, as_string = false)
+          tz = tz.to_s if !tz.is_a?(String)
+          tz.gsub!(/^(.\d{4}@)?/, "")
+
+          rv = catch(:zone) do
+            ActiveSupport::TimeZone::MAPPING.each_key do |zone|
+              throw(:zone, zone) if ::DateTime.parameterize_zone(zone) == tz
+            end
+
+            nil
+          end
+
+          if rv then
+            (as_string ? rv : ActiveSupport::TimeZone[rv])
+          else
+            nil
+          end
+        end
       end
 
       def utc_time
@@ -111,6 +140,8 @@ module Cowtech
                 mrv = names[:short_months][self.month - 1]
               when "%B"
                 mrv = names[:long_months][self.month - 1]
+              when "%Z"
+                mrv = self.formatted_offset(true)  if RUBY_VERSION =~ /^1\.8/ # This is to fix ruby 1.8 bug in OSX
               when "%z"
                 mrv = self.formatted_offset(false)  if RUBY_VERSION =~ /^1\.8/ # This is to fix ruby 1.8 bug in OSX
             end

data/lib/cowtech-extensions/version.rb

@@ -8,8 +8,8 @@ module Cowtech
 	module Extensions
 		module Version
 			MAJOR = 2
-			MINOR = 0
-			PATCH = 1
+			MINOR = 1
+			PATCH = 0
 
 			STRING = [MAJOR, MINOR, PATCH].compact.join(".")
 		end

data/spec/cowtech-extensions/datetime_spec.rb

@@ -94,6 +94,22 @@ describe Cowtech::Extensions::DateTime do
     end
   end
 
+  describe "#parameterize_zone" do
+    it "should return the parameterized version of the zone" do
+      DateTime.parameterize_zone("Mountain Time (US & Canada)").should == "mountain-time-us-canada"
+      DateTime.parameterize_zone("(GMT-07:00) Mountain Time (US & Canada)").should == "-0700@mountain-time-us-canada"
+      DateTime.parameterize_zone(ActiveSupport::TimeZone["Mountain Time (US & Canada)"]).should == "-0700@mountain-time-us-canada"
+    end
+  end
+
+  describe "#find_parameterize_zone" do
+    it "should return the parameterized version of the zone" do
+      DateTime.find_parameterized_zone("-0700@mountain-time-us-canada").should == ActiveSupport::TimeZone["Mountain Time (US & Canada)"]
+      DateTime.find_parameterized_zone("-0700@mountain-time-us-canada", true).should == "Mountain Time (US & Canada)"
+      DateTime.find_parameterized_zone("foo").should be_nil
+    end
+  end
+
   describe "#utc_time" do
     it "should convert to UTC Time" do random_reference.utc_time.should be_kind_of(Time) end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cowtech-extensions
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Shogun
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack