timespan 0.1.4 → 0.2.0

data/spec/timespan/units_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Timespan::Units do
+	subject { timespan }
+
+  context 'From and To with 1 day apart' do
+  	let(:timespan) { Timespan.new :from => from, :to => to}
+
+  	let(:from) { Chronic.parse("1 day ago") }
+  	let(:to)   { Time.now }
+
+		describe '.weeks' do
+	    it "spans 0 weeks" do
+	  		timespan.to_w.should == 0
+	    end
+	    its(:weeks) { should == 0 }
+	  end
+
+		describe '.days' do
+	    it "spans 1 day" do
+	  		timespan.to_d.should == 1
+	    end
+	    its(:days) { seconds.should == 1 }
+	  end
+
+		describe '.hours' do
+	    it "spans 24 hours" do
+	  		timespan.to_hrs.should == 24
+	    end
+	    its(:hours) { should == 24 }
+	  end
+
+		describe '.minutes' do
+	    it "spans 60*24 minutes" do
+	  		timespan.to_hrs.should == 24
+	    end
+	    its(:minutes) { should == 24*60 }
+	  end
+
+		describe '.seconds' do
+	    it "spans 86400 sec" do
+	  		timespan.seconds.should == 86400
+	    end
+	    its(:secs) { should == 86400 }
+	  end
+
+    describe '.milliseconds' do
+	    it "spans 86400 sec" do
+	  		timespan.milliseconds.should be_within(10).of(86400000)
+	    end
+	    its(:millis) { should be_within(10).of(86400000) }
+	  end
+  end
+end

data/spec/timespan_spec.rb

@@ -1,63 +1,98 @@
 require 'spec_helper'
-require 'chronic'
 
-describe "Timespan" do
+describe Timespan do
 	subject { timespan }
 
-	let(:timespan) { TimeSpan.new :from => from, :to => to}
+  let(:from) { Chronic.parse("1 day ago") }
+  let(:to)   { Time.now }
 
-	let(:from) { Chronic.parse("1 day ago") }
-	let(:to) { Time.now }
+  context '2 days duration (from now - default)' do
+    let(:timespan) { Timespan.new :duration => "2 days"}
 
-  it "spans 1 day" do
-		timespan.to_d.should == 1
+    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
   end
 
-  it "spans 86400 sec" do
-		timespan.to_secs.should == 86400
-  end
+  context '3 hrs duration from now 2 days from now' do
+    let(:timespan) { Timespan.new("3 hrs").from(2.days.from_now) }
 
-  it "spans 86400 sec" do
-		timespan.to_mils.should be_within(10).of(86400000)
+    describe '.start_date' do
+      its(:start_date) { should be }
+      its(:end_date) { should be }
+      its(:duration) { should be_a Duration }
+    end
   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 duration with String' do
-		let(:timespan)  { TimeSpan.new :from => from, :duration => "3 days" }
+  context 'From and To with 1 day apart' do
+  	let(:timespan) { Timespan.new :from => from, :to => to}
 
-  	it 'should be 3 days' do
-  		timespan.to_d.should == 3
-  	end
+    describe '.convert_to_time' do
+      specify { subject.convert_to_time("1 day ago").to_s.should == 1.day.ago.to_s }
+    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
+  context 'From and 3 days' do
+    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 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 }    
+
+      before :each do
+        @old_timespan = timespan.clone
+        @new_timespan = timespan.clone
+        @new_timespan.start_date = Chronic.parse("2 days ago")
+      end
+
+      its(:duration) { should be_a Duration }
+      specify { subject.send(:dirty).should be_empty }
+
+      it 'should have diff timespans' do
+        @old_timespan.days.should_not == @new_timespan.days
+      end
+    end
+
+    describe 'set end_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.end_date = Chronic.parse("5 days from now")
+      end
+
+      its(:duration) { should be_a Duration }
+      specify { subject.send(:dirty).should be_empty }
+
+      it 'should have diff timespans' do
+        @old_timespan.days.should_not == @new_timespan.days
+      end
+    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

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-04-30"
-  s.description = "Easy to calculate time distance in different units"
+  s.date = "2012-05-04"
+  s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -25,8 +25,20 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "config/locales/timespan/da.yml",
     "lib/timespan.rb",
+    "lib/timespan/compare.rb",
+    "lib/timespan/mongoid.rb",
+    "lib/timespan/printer.rb",
+    "lib/timespan/rails/engine.rb",
+    "lib/timespan/span.rb",
+    "lib/timespan/units.rb",
     "spec/spec_helper.rb",
+    "spec/timespan/compare_spec.rb",
+    "spec/timespan/locales/duration_da.yml",
+    "spec/timespan/printer_spec.rb",
+    "spec/timespan/span_spec.rb",
+    "spec/timespan/units_spec.rb",
     "spec/timespan_spec.rb",
     "timespan.gemspec"
   ]
@@ -34,25 +46,29 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  s.summary = "Use TimeSpans in ruby"
+  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_runtime_dependency(%q<chronic>, [">= 0"])
+      s.add_runtime_dependency(%q<chronic_duration>, [">= 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<rails>, ["~> 3.2"])
       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<chronic>, [">= 0"])
+      s.add_dependency(%q<chronic_duration>, [">= 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<rails>, ["~> 3.2"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.8.3"])
@@ -60,9 +76,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<chronic>, [">= 0"])
+    s.add_dependency(%q<chronic_duration>, [">= 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<rails>, ["~> 3.2"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.8.3"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-04 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: chronic_duration
+  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: spanner
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +171,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.5'
-description: Easy to calculate time distance in different units
+description: Makes it easy to calculate time distance in different units
 email: kmandrup@gmail.com
 executables: []
 extensions: []
@@ -155,8 +187,20 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- config/locales/timespan/da.yml
 - lib/timespan.rb
+- lib/timespan/compare.rb
+- lib/timespan/mongoid.rb
+- lib/timespan/printer.rb
+- lib/timespan/rails/engine.rb
+- lib/timespan/span.rb
+- lib/timespan/units.rb
 - spec/spec_helper.rb
+- spec/timespan/compare_spec.rb
+- spec/timespan/locales/duration_da.yml
+- spec/timespan/printer_spec.rb
+- spec/timespan/span_spec.rb
+- spec/timespan/units_spec.rb
 - spec/timespan_spec.rb
 - timespan.gemspec
 homepage: http://github.com/kristianmandrup/timespan
@@ -174,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4198297860052493168
+      hash: 2914636864152776546
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,5 +230,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Use TimeSpans in ruby
+summary: Use timespans in ruby
 test_files: []