timespan 0.1.3 → 0.1.4

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
 gem 'chronic'
+gem 'spanner'
 gem 'ruby-duration'
 
 group :test, :development do

data/Gemfile.lock

@@ -45,6 +45,7 @@ GEM
       multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    spanner (0.0.2)
     tzinfo (0.3.33)
 
 PLATFORMS
@@ -58,3 +59,4 @@ DEPENDENCIES
   rspec (>= 2.8.0)
   ruby-duration
   simplecov (>= 0.5)
+  spanner

data/README.md

@@ -1,22 +1,30 @@
-= Timespan
+# Timespan
 
 Use TimeSpans in Ruby :)
 
 Will calculate time diff in milliseconds between to dates, then allow you to get the time difference in some time unit as a number.
 
 ```ruby
-	t = TimeSpan.new(Date.today, 3.days.ago)
+	t = TimeSpan.new(:start => Date.today, :duration => 3.days.ago)
 	t.to_days # => 3
 	t.to_weeks # => 0
 	t.to_secs # => 259200
 	t.to_hours = 10800
+
+	t = TimeSpan.new(:from => Date.today, :to => "6 weeks from now")	
+
+	t = TimeSpan.new(:from => Date.today, :duration => "7 weeks 3 days")	
+	t = TimeSpan.new(:from => 2.days.ago, :duration => "5 months and 2 weeks")	
 ``
 
-== TODO
+See specs for more examples of usage
+
+## TODO
 
-Should use Duration for duration calculations!
+* use Duration for duration calculations!
+* Calculate start_time and end_time based on duration if not set explicitly!
 
-== Contributing to timespan
+## Contributing to timespan
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/timespan.rb

@@ -1,6 +1,9 @@
 require 'duration'
+require 'spanner'
 
 class TimeSpan
+	class ParseError < StandardError; end
+
 	attr_reader :start_time, :end_time, :seconds
 
 	alias_method :start_date, :start_time
@@ -36,8 +39,20 @@ class TimeSpan
 	end
 
 	def duration= duration
-		raise ArgumentError, "the duration option must be set to a Duration instance" unless duration.kind_of? Duration
-		@duration = duration
+		@duration = case duration
+		when Duration
+			duration
+		when Integer, Hash
+			Duration.new duration
+		when String
+			begin				
+				Duration.new Spanner.parse(duration.gsub /and/, '')
+			rescue Exception => e
+				raise ParseError, "Internal error: Spanner couldn't parse String '#{duration}'"
+			end
+		else
+			raise ArgumentError, "the duration option must be set to any of: #{valid_duration_types}"
+		end		 
 		refresh! unless is_new?
 	end
 		
@@ -80,39 +95,57 @@ class TimeSpan
 	def to_milliseconds
 		@to_seconds ||= (seconds * 1000.0).round
 	end
-	alias_method :to_mils, 	 :to_milliseconds
-	alias_method :millis, 	 :to_mils
+	alias_method :to_mils, 	 			:to_milliseconds
+	alias_method :millis, 	 			:to_mils
+	alias_method :milliseconds, 	:to_mils
 
 	def to_minutes
 		@to_minutes ||= (to_seconds / 60.0).round
 	end
 	alias_method :to_m, 		:to_minutes
 	alias_method :to_mins, 	:to_minutes
+	alias_method :minutes, 	:to_minutes
 
 	def to_hours
 		@to_hours ||= (to_minutes / 60.0).round
 	end
-	alias_method :to_h, :to_hours
+	alias_method :to_h, 	:to_hours
+	alias_method :hrs, 		:to_hours
+	alias_method :hours, 	:to_hours
 
 	def to_days
-		@to_days ||= (to_hours / 24).round
+		@to_days ||= (to_hours / 24.0).round
 	end	
 	alias_method :to_d, :to_days
+	alias_method :days, :to_days
 
 	def to_weeks
-		@to_weeks ||= (to_days / 7).round
+		@to_weeks ||= (to_days / 7.0).round
 	end	
-	alias_method :to_w, :to_weeks
+	alias_method :to_w, 	:to_weeks
+	alias_method :weeks, 	:to_days
 
 	def to_months
-		@to_months ||= (to_days / 30).round
+		@to_months ||= (to_days / 30.0).round
 	end	
 	alias_method :to_mon, :to_months
+	alias_method :months, :to_months
 
 	def to_years
 		@to_years ||= (to_days.to_f / 365.25).round
 	end	
-	alias_method :to_y, :to_years
+	alias_method :to_y, 	:to_years
+	alias_method :years, 	:to_years
+
+	def to_decades
+		@to_decades ||= (to_years / 10.0).round
+	end	
+	alias_method :decades, 	:to_decades
+
+	def to_centuries
+		@to_centuries ||= (to_decades / 10.0).round
+	end	
+	alias_method :centuries, 	:to_centuries
 
 	def units
 		%w{seconds minutes hours days weeks months years}
@@ -120,13 +153,14 @@ class TimeSpan
 
 	protected
 
-	def set_with_options options = {}
+	def set_with_options options = {}		
 		case options
 		when Hash
 			duration 		= options[:duration]
-			@start_time = options[:from]
-			@end_time 	= options[:to]
-		when Integer
+			@start_time = options[:from] || options[:start]
+			@end_time 	= options[:to] || options[:end]
+		when Integer, String
+			duration   = options
 		else
 			raise ArgumentError, "Timespan must take Hash or Integer, was: #{options}"
 		end
@@ -169,6 +203,10 @@ class TimeSpan
 		set_seconds
 	end
 
+	def valid_duration_types
+		[Duration, String, Integer, Hash]
+	end
+
 	def valid_compare? time
 		valid_compare_types.any? {|type| time.kind_of? type }
 	end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'timespan'
 

data/spec/timespan_spec.rb

@@ -30,6 +30,23 @@ describe "Timespan" do
   	end
   end
 
+  describe 'set duration with String' do
+		let(:timespan)  { TimeSpan.new :from => from, :duration => "3 days" }
+
+  	it 'should be 3 days' do
+  		timespan.to_d.should == 3
+  	end
+  end
+
+  describe 'set duration with Spanner String including and' do
+		let(:timespan)  { TimeSpan.new :from => from, :duration => "3 days and 2 hours" }
+
+  	it 'should be 3 days and 2 hrs' do
+  		timespan.to_h.should == (24 * 3) + 2
+  	end
+  end
+
+
   describe 'set start_time to new' do
 		let(:timespan) { TimeSpan.new :from => from, :to => to }  	
 

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-04-26"
+  s.date = "2012-04-30"
   s.description = "Easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kristianmandrup/timespan"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.22"
+  s.rubygems_version = "1.8.24"
   s.summary = "Use TimeSpans in ruby"
 
   if s.respond_to? :specification_version then
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
+      s.add_runtime_dependency(%q<spanner>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-duration>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
       s.add_dependency(%q<chronic>, [">= 0"])
+      s.add_dependency(%q<spanner>, [">= 0"])
       s.add_dependency(%q<ruby-duration>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<chronic>, [">= 0"])
+    s.add_dependency(%q<spanner>, [">= 0"])
     s.add_dependency(%q<ruby-duration>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spanner
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-duration
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2204981981511614855
+      hash: 4198297860052493168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use TimeSpans in ruby