timespan 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/timespan.rb

@@ -111,6 +111,8 @@ class Timespan
 		default_from_now! unless start_time || end_time
 
 		calculate_miss!
+	rescue ArgumentError => e
+		raise TimeParseError, e.message
 	rescue Exception => e
 		calculate_miss!
 		validate!

data/lib/timespan/span.rb

@@ -5,18 +5,22 @@ class Timespan
 		attr_reader :duration
 
 		def duration= duration
-			@duration = case duration
-			when Timespan
-				duration.duration
-			when Duration
-				duration
-			when Numeric, Hash
-				Duration.new duration
-			when String
-				Duration.new parse_duration(duration)
+			@duration = if duration.kind_of? Numeric
+				 Duration.new duration
 			else
-				raise ArgumentError, "Unsupported duration type: #{duration}"
-			end	
+				case duration
+				when Timespan
+					duration.duration
+				when Duration
+					duration
+				when Hash
+					Duration.new duration
+				when String
+					Duration.new parse_duration(duration)
+				else
+					raise ArgumentError, "Unsupported duration type: #{duration.inspect} of class #{duration.class}"
+				end	
+			end
 			unless is_new?
 				add_dirty :duration
 				refresh!

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -18,6 +18,17 @@ describe Timespan do
     end
   end
 
+  context '2 days duration using integer' do
+    let(:account) do 
+      Account.create :period => {:duration => 2.days }
+    end
+
+    describe '.start_date' do
+      it 'should default to today' do
+        DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
+      end
+    end
+  end
 
   context '2 days duration (from now - default)' do
     let(:account) do 

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -254,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -867346219046105956
+      hash: -2757811782922718549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: