timespan 0.3.1 → 0.3.2

data/README.md

@@ -30,6 +30,21 @@ Will calculate time diff between two dates, then allow you to get the time diffe
 
 See specs for more examples of usage
 
+## Comparison
+
+```ruby
+timespan.between?(2.days.ago, 1.minute.from_now)
+timespan.between?(1.days, 3.days)
+timespan < 3.days
+```
+
+## Math
+
+```ruby
+3_days_more = timespan + 3.days
+day_less = timespan -1 3.day
+```
+
 ## Spanner
 
 Internally Timespan uses Spanner to parse duration strings.

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/timespan/compare.rb

@@ -21,6 +21,20 @@ class Timespan
   module Compare
   	include Comparable
 
+    def between? cfrom, cto
+      case cfrom
+      when Date, Time, DateTime
+        unless any_kind_of?(cto, Time, Date, DateTime)
+          raise ArgumentError, "Arguments must both be Date or Time, was: #{cfrom}, #{cto}"
+        end
+        (self.start_time.to_i >= cfrom.to_i) && (self.end_time.to_i <= cto.to_i)
+      when ::Duration, String, Integer, ActiveSupport::Duration
+        self >= cfrom && self <= cto
+      else
+        raise ArgumentError, "Not valid arguments for between comparison: #{cfrom}, #{cto}"
+      end
+    end
+
     def time_left time = nil
       time_compare = time || now
       diff = end_time - time_compare
@@ -57,6 +71,12 @@ class Timespan
       self
     end
 
+    protected
+
+    def any_kind_of? obj, *types
+      types.flatten.compact.any?{|type| obj.kind_of? type }
+    end
+
 
     def valid_compare? time
       valid_compare_types.any? {|type| time.kind_of? type }

data/spec/timespan/compare_spec.rb

@@ -3,29 +3,71 @@ require 'spec_helper'
 describe "Timespan" do
 	subject { timespan }
 
-  context 'From and To with 1 day apart' do
+  context 'From and To with 2 day apart' do
   	let(:timespan) { Timespan.new :from => from, :to => to}
 
-  	let(:from) { Chronic.parse("1 day ago") }
+  	let(:from) { 2.days.ago }
   	let(:to)   { Time.now }
 
-    describe '.compare == ' do  
-    	specify do 
-    		(subject == 1.day).should be_true
-    	end  
-    end
-
-    describe '.compare < ' do    
-    	specify do 
-    		(subject < 1.day).should be_false
-    	end
-    end    
-
-    describe '.compare > ' do    
-    	specify do 
-    		(subject > 1.day).should be_false
-    	end
-    end    
+    describe 'Compare' do
+      describe '==' do  
+      	specify do 
+      		(subject == 2.days).should be_true
+      	end  
+      end
+
+      describe '<' do    
+      	specify do 
+      		(subject < 2.day).should be_false
+      	end
+
+        specify do 
+          (subject < 3.days).should be_true
+        end
+      end    
+
+      describe '>' do    
+      	specify do 
+      		(subject > 2.day).should be_false
+      	end
+
+        specify do 
+          (subject > 1.day).should be_true
+        end
+      end
+
+      describe '>=' do    
+        specify do 
+          (subject >= 2.days).should be_true
+        end
+      end
+
+      describe '<=' do    
+        specify do 
+          (subject <= 2.days).should be_true
+        end
+      end
+
+      describe 'between? dates' do    
+        specify do 
+          subject.between?(2.days.ago, 1.minute.from_now).should be_true
+        end
+
+        specify do 
+          subject.between?(Time.now, 1.day.from_now).should be_false
+        end
+      end
+
+      describe 'between? durations' do    
+        specify do 
+          subject.between?(1.days, 3.days).should be_true
+        end
+
+        specify do 
+          subject.between?(3.days, 4.days).should be_false
+        end
+      end
+    end     
   end
 
   context 'From 2 days ago until today' do

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   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.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -256,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4280308012345220837
+      hash: 1296550633399706024
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: