timespan 0.1.0 → 0.1.2

data/Gemfile

@@ -1,5 +1,10 @@
 source :rubygems
 
+group :test do
+	gem 'chronic'
+	gem 'ruby-duration'
+end
+
 group :development do
   gem "rspec", 		">= 2.8.0"
   gem "rdoc", 		">= 3.12"

data/Gemfile.lock

@@ -1,14 +1,30 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bson (1.6.2)
+    builder (3.0.0)
+    chronic (0.6.7)
     diff-lcs (1.1.3)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.6.6)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.9)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
     multi_json (1.3.2)
     rake (0.9.2.2)
     rdoc (3.12)
@@ -21,17 +37,24 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    ruby-duration (2.1.3)
+      activesupport (>= 3.0.0)
+      i18n
+      mongoid (~> 2.4.0)
     simplecov (0.6.2)
       multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  chronic
   jeweler (>= 1.8.3)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)
+  ruby-duration
   simplecov (>= 0.5)

data/README.md

@@ -12,6 +12,10 @@ Will calculate time diff in milliseconds between to dates, then allow you to get
 	t.to_hours = 10800
 ``
 
+== TODO
+
+Should use Duration for duration calculations!
+
 == 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.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/timespan.rb

@@ -1,47 +1,179 @@
+require 'duration'
+
 class TimeSpan
-	attr_reader :start_time, :end_time, :millis
+	attr_reader :start_time, :end_time, :seconds
+
+	alias_method :start_date, :start_time
+	alias_method :end_date, 	:end_time
+
+	def initialize options = {}
+		@is_new = true
+
+		set_with_options options		
+		
+		@is_new = false
+	end
 
-	def initialize start_time, end_time, options = {}
+	def start_time= start_time
 		@start_time = start_time
-		@end_time 	= end_time
+		refresh!
+	end
+	alias_method :start_date=, :start_time=
 
-		@millis = start_time - end_time
+	def end_time= start_time
+		@start_time = start_time
+		refresh!
 	end
+	alias_method :end_date=, :end_time=
+
+	def seconds= seconds 
+		@seconds = seconds
+		refresh!	
+	end
+
+	def duration
+		@duration ||= Duration.new(seconds)
+	end
+
+	def duration= duration
+		raise ArgumentError, "the duration option must be set to a Duration instance" unless duration.kind_of? Duration
+		@duration = duration
+		refresh! unless is_new?
+	end
+		
+	def to_s
+		if duration
+			"TimeSpan: from #{start_time} lasting #{duration} = #{seconds} secs" if start_time
+			"TimeSpan: from #{end_time} to #{duration} before = #{seconds} secs" if end_time
+			return
+		end
+
+		if start_time && end_time
+			"TimeSpan: #{start_time} to #{end_time} = #{seconds} secs"			
+			return
+		end
+
+		if seconds
+			"TimeSpan: #{seconds} seconds"
+		end
+	end
+
+	include Comparable
+
+  def <=> time
+  	raise ArgumentError, "Not a valid argument for timespan comparison, was #{time}" unless valid_compare?(time)
+  	case time
+  	when TimeSpan
+  		millis <=> time.seconds
+  	when Time  		
+    	millis <=> time.to_i
+    when Date, DateTime
+    	time.to_time.to_i
+    when Integer
+    	millis <=> time
+    end
+  end
+
+	alias_method :to_secs, 		:seconds
+	alias_method :to_seconds, :seconds
 
-	def to_seconds
-		@to_seconds ||= millis * 1000
+	def to_milliseconds
+		@to_seconds ||= (seconds * 1000.0).round
 	end
-	alias_method :to_s, 	 :to_seconds
-	alias_method :to_secs, :to_seconds
+	alias_method :to_mils, 	 :to_milliseconds
+	alias_method :millis, 	 :to_mils
 
 	def to_minutes
-		@to_minutes ||= to_seconds * 60
+		@to_minutes ||= (to_seconds / 60.0).round
 	end
 	alias_method :to_m, 		:to_minutes
 	alias_method :to_mins, 	:to_minutes
 
 	def to_hours
-		@to_hours ||= to_minutes * 60
+		@to_hours ||= (to_minutes / 60.0).round
 	end
 	alias_method :to_h, :to_hours
 
 	def to_days
-		@to_days ||= to_hours * 24
+		@to_days ||= (to_hours / 24).round
 	end	
 	alias_method :to_d, :to_days
 
 	def to_weeks
-		@to_weeks ||= to_days * 7
+		@to_weeks ||= (to_days / 7).round
 	end	
 	alias_method :to_w, :to_weeks
 
 	def to_months
-		@to_months ||= to_days * 30
+		@to_months ||= (to_days / 30).round
 	end	
 	alias_method :to_mon, :to_months
 
 	def to_years
-		@to_years ||= (to_days.to_f * 365.25).round
+		@to_years ||= (to_days.to_f / 365.25).round
 	end	
 	alias_method :to_y, :to_years
+
+	def units
+		%w{seconds minutes hours days weeks months years}
+	end
+
+	protected
+
+	def set_with_options options = {}
+		case options
+		when Hash
+			duration 		= options[:duration]
+			@start_time = options[:from]
+			@end_time 	= options[:to]
+		when Integer
+		else
+			raise ArgumentError, "Timespan must take Hash or Integer, was: #{options}"
+		end
+
+		set_seconds options
+	end		
+
+	def set_seconds options = nil
+		set_seconds_opts(options)
+
+		unless @duration
+			if @end_time && @start_time
+				@seconds 	||= (@end_time - @start_time).to_i
+			end
+		else
+			@seconds 	||= @duration.total
+		end
+	end
+
+	def set_seconds_opts options = {}
+		case options
+		when Integer
+			@seconds = options
+		when Hash
+			@seconds = options[:seconds] if options[:seconds]
+			self.duration = options[:duration] if options[:duration]
+		end
+	end
+
+	def is_new?
+		@is_new
+	end
+
+	# reset all stored instance vars for units
+	def refresh!
+		units.each do |unit| 
+			var_name = :"@#{unit}"
+			instance_variable_set var_name, nil
+		end
+		set_seconds
+	end
+
+	def valid_compare? time
+		valid_compare_types.any? {|type| time.kind_of? type }
+	end
+
+	def valid_compare_types
+		[TimeSpan, Time, Date, DateTime, Integer]
+	end
 end

data/spec/timespan_spec.rb

@@ -1,7 +1,46 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
+require 'chronic'
 
 describe "Timespan" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+	subject { timespan }
+
+	let(:timespan) { TimeSpan.new :from => from, :to => to}
+
+	let(:from) { Chronic.parse("1 day ago") }
+	let(:to) { Time.now }
+
+  it "spans 1 day" do
+		timespan.to_d.should == 1
+  end
+
+  it "spans 86400 sec" do
+		timespan.to_secs.should == 86400
+  end
+
+  it "spans 86400 sec" do
+		timespan.to_mils.should be_within(10).of(86400000)
   end
+
+  describe 'set with duration' do
+  	let(:duration) { Duration.new(:days => 3)  }
+		let(:timespan)  { TimeSpan.new :from => from, :duration => duration }
+
+  	it 'should be 3 days' do
+  		timespan.to_d.should == 3
+  	end
+  end
+
+  describe 'set start_time to new' do
+		let(:timespan) { TimeSpan.new :from => from, :to => to }  	
+
+		before :each do
+			@old_timespan = timespan.clone
+			@new_timespan = timespan.clone
+			@new_timespan.start_date = Chronic.parse("2 days ago")
+		end
+
+		it 'should have diff timespans' do
+			@old_timespan.to_d.should_not == @new_timespan.to_d
+		end
+  end  
 end

data/timespan.gemspec

@@ -0,0 +1,63 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "timespan"
+  s.version = "0.1.2"
+
+  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.description = "Easy to calculate time distance in different units"
+  s.email = "kmandrup@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/timespan.rb",
+    "spec/spec_helper.rb",
+    "spec/timespan_spec.rb",
+    "timespan.gemspec"
+  ]
+  s.homepage = "http://github.com/kristianmandrup/timespan"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.22"
+  s.summary = "Use TimeSpans in ruby"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.5"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_dependency(%q<simplecov>, [">= 0.5"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<rdoc>, [">= 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+    s.add_dependency(%q<simplecov>, [">= 0.5"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -110,6 +110,7 @@ files:
 - lib/timespan.rb
 - spec/spec_helper.rb
 - spec/timespan_spec.rb
+- timespan.gemspec
 homepage: http://github.com/kristianmandrup/timespan
 licenses:
 - MIT
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4606494975038225470
+      hash: -3842705630649213426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: