timeliness 0.3.1 → 0.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= 0.3.2 - 2010-11-26
+* Catch all errors for ActiveSupport not being loaded for more helpful error
+
 = 0.3.1 - 2010-11-27
 * Fix issue with 2nd argument options being overidden
 

data/lib/timeliness/parser.rb

@@ -16,8 +16,8 @@ module Timeliness
 
         make_time(time_array[0..7], options[:zone])
       rescue NoMethodError => ex
-        raise ex unless ex.message =~ /zone/
-        raise MissingTimezoneSupport, "ActiveSupport must be loaded to use timezones other than :utc and :local."
+        raise ex unless ex.message =~ /undefined method `(zone|use_zone|current)' for Time:Class/
+        raise MissingTimezoneSupport, "ActiveSupport timezone support must be loaded to use timezones other than :utc and :local."
       end
 
       def make_time(time_array, zone_option=nil)

data/lib/timeliness/version.rb

@@ -1,3 +1,3 @@
 module Timeliness
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/timeliness/parser_spec.rb

@@ -164,9 +164,19 @@ describe Timeliness::Parser do
 
       context "without ActiveSupport loaded" do
         it 'should output message' do
-          lambda {
+          expect {
             Time.should_receive(:zone).and_raise(NoMethodError.new("undefined method `zone' for Time:Class"))
-            time = parse("2000-06-01 12:13:14", :datetime, :zone => :current)
+            parse("2000-06-01 12:13:14", :zone => :current)
+          }.should raise_error(Timeliness::Parser::MissingTimezoneSupport)
+
+          expect {
+            Time.should_receive(:current).and_raise(NoMethodError.new("undefined method `current' for Time:Class"))
+            parse("12:13:14", :zone => :current)
+          }.should raise_error(Timeliness::Parser::MissingTimezoneSupport)
+
+          expect {
+            Time.should_receive(:use_zone).and_raise(NoMethodError.new("undefined method `use_zone' for Time:Class"))
+            parse("2000-06-01 12:13:14", :zone => 'London')
           }.should raise_error(Timeliness::Parser::MissingTimezoneSupport)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timeliness
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +11:00
+date: 2010-11-28 00:00:00 +11:00
 default_executable: 
 dependencies: []