timespan 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/timespan.rb

@@ -34,12 +34,15 @@ class Timespan
 	def initialize options = {}
 		@is_new = true
 
+		@init_options = options
+		validate! if options == {}
+
 		case options
 		when Numeric, Duration, String
 			options = {:duration => options}
 		end
 		
-		configure options		
+		configure! options
 		
 		@is_new = false
 	end
@@ -89,11 +92,14 @@ class Timespan
 
 	protected
 
+	attr_reader :init_options
+
 	def first_from keys, options = {}
 		keys.select {|key| options[key] }.first
 	end
 
-	def configure options = {}		
+	# uses init_options to configure
+	def configure! options = {}
 		from 	= options[first_from START_KEYS, options]
 		to 		= options[first_from END_KEYS, options]
 		dur 	= options[first_from DURATION_KEYS, options]
@@ -114,12 +120,12 @@ class Timespan
 		self.start_time = Time.now
 	end
 
-	def validate!	
-		raise ArgumentError, "#{valid_requirement}, was: #{current_config}" unless valid?
+	def validate!
+		raise ArgumentError, "#{valid_requirement}, was: #{init_options.inspect} resulting in state: #{current_config}" unless valid?
 	end
 
 	def valid_requirement
-		"Timespan must take a :start and :end time or any of :start and :end time and a :duration"
+		"Timespan must take 1-2 of :start_time, :end_time or :duration or simply a duration as number of seconds or a string"
 	end
 
 	def current_config

data/spec/timespan/printer_spec.rb

@@ -16,9 +16,12 @@ describe Timespan::Span do
   describe 'print in danish - multiple modes' do
     let(:timespan) { Timespan.new :from => from, :to => to }    
 
-    its(:to_s) { should == 'fra 03 May 2012 til 04 May 2012 der varer ialt 1 dag' }
+    let(:today)     { Date.today.strftime('%d %b %Y') }
+    let(:yesterday) { 1.day.ago.strftime('%d %b %Y') }
 
-    specify { subject.to_s(:dates).should == 'fra 03 May 2012 til 04 May 2012' }
+    its(:to_s) { should == "fra #{yesterday} til #{today} der varer ialt 1 dag" }
+
+    specify { subject.to_s(:dates).should == "fra #{yesterday} til #{today}" }
     specify { subject.to_s(:duration).should == '1 dag' }
   end
 end

data/spec/timespan_spec.rb

@@ -6,6 +6,19 @@ describe Timespan do
   let(:from) { Chronic.parse("1 day ago") }
   let(:to)   { Time.now }
 
+  context 'Invalid params' do
+    describe 'error msg' do
+      specify do
+        expect { Timespan.new }.to raise_error(ArgumentError)
+      end
+
+      specify do
+        expect { Timespan.new(nil) }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+
   context '2 days duration (from now - default)' do
     let(:timespan) { Timespan.new :duration => "2 days"}
 

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   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.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -254,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1064045562578048664
+      hash: -867346219046105956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: