timespan 0.2.7 → 0.2.8

data/README.md

@@ -18,6 +18,10 @@ Will calculate time diff between two dates, then allow you to get the time diffe
 
   t = Timespan.new("3 hrs").from(2.days.from_now)
 
+  t = Timespan.new(:from => 2.days.ago)
+
+  t = Timespan.new(:end_date => 4.days.from_now)
+
 	t = Timespan.new(:from => Date.today, :to => "6 weeks from now")	
 
 	t = Timespan.new(:from => Date.today, :duration => "7 weeks 3 days")	

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/timespan.rb

@@ -25,8 +25,8 @@ class Timespan
 	alias_method :start_date, :start_time
 	alias_method :end_date, 	:end_time
 
-	START_KEYS 			= [:start, :from]
-	END_KEYS 				= [:to, :end]
+	START_KEYS 			= [:start, :from, :start_date]
+	END_KEYS 				= [:to, :end, :end_date]
 	DURATION_KEYS 	= [:duration, :lasting]
 
 	ALL_KEYS = START_KEYS + END_KEYS + DURATION_KEYS
@@ -102,16 +102,15 @@ class Timespan
 
 	# 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]
+		from 	= options[first_from(START_KEYS, options)]
+		to 		= options[first_from(END_KEYS, options)]
+		dur 	= options[first_from(DURATION_KEYS, options)]
 
 		self.duration 		= dur if dur
 		self.start_time 	= from if from
 		self.end_time 		= to if to
 
-		default_from_now! unless start_time || end_time
-
+		default_from_now!
 		calculate_miss!
 	rescue ArgumentError => e
 		raise TimeParseError, e.message
@@ -121,7 +120,8 @@ class Timespan
 	end		
 
 	def default_from_now!
-		self.start_time = Time.now
+		self.start_time = Time.now unless start_time || (end_time && duration)
+		self.end_time = Time.now unless end_time || (start_time && duration)
 	end
 
 	def validate!

data/spec/timespan_init_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Timespan do
+  subject { timespan }
+
+  let(:from) { Chronic.parse("1 day ago") }
+  let(:to)   { Time.now }
+
+  context 'End date only - use Today as from (start_date)' do
+    let(:timespan) { Timespan.new :to => 1.day.from_now}
+
+    describe '.start_date' do
+      it 'should default to today' do
+        DateTime.parse(subject.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
+      end
+    end
+
+    describe '.duration' do
+      specify { subject.duration.should_not be_nil }
+
+      it 'should be 1 day' do
+        subject.to_d.should == 1
+      end
+    end    
+  end
+
+  context 'Start date only - use Today as to (end_date)' do
+    let(:timespan) { Timespan.new :from => 1.day.ago}
+
+    describe '.end_date' do
+      it 'should default to today' do
+        DateTime.parse(subject.end_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
+      end
+    end
+
+    describe '.duration' do
+      specify { subject.duration.should_not be_nil }
+
+      it 'should be 1 day' do
+        subject.to_d.should == 1
+      end
+    end
+  end
+end

data/spec/timespan_spec.rb

@@ -38,6 +38,7 @@ describe Timespan do
     end
   end
 
+
   context '3 hrs duration from now 2 days from now' do
     let(:timespan) { Timespan.new("3 hrs").from(2.days.from_now) }
 

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-05-17"
+  s.date = "2012-05-29"
   s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "spec/timespan/printer_spec.rb",
     "spec/timespan/span_spec.rb",
     "spec/timespan/units_spec.rb",
+    "spec/timespan_init_spec.rb",
     "spec/timespan_spec.rb",
     "timespan.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -237,6 +237,7 @@ files:
 - spec/timespan/printer_spec.rb
 - spec/timespan/span_spec.rb
 - spec/timespan/units_spec.rb
+- spec/timespan_init_spec.rb
 - spec/timespan_spec.rb
 - timespan.gemspec
 homepage: http://github.com/kristianmandrup/timespan
@@ -254,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1077927940562943309
+      hash: 43834805566888461
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: