timespan 0.2.1 → 0.2.2

data/Gemfile

@@ -3,7 +3,7 @@ source :rubygems
 gem 'chronic'
 gem 'chronic_duration'
 gem 'spanner'
-gem 'ruby-duration', :git => 'git://github.com/kristianmandrup/ruby-duration.git'
+gem 'ruby-duration', '~> 2.2.1', :git => 'git://github.com/kristianmandrup/ruby-duration.git'
 
 group :test, :development do
   gem "rspec", 		">= 2.8.0"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/kristianmandrup/ruby-duration.git
-  revision: 002f43a5ad5b6191ae5ee218e532176005279384
+  revision: c9b47be02e4a35f7ed3bf7de909d583d14272be8
   specs:
-    ruby-duration (2.1.4)
+    ruby-duration (2.2.1)
       activesupport (>= 3.0.0)
       i18n
 
@@ -65,7 +65,7 @@ GEM
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.2)
+    multi_json (1.3.4)
     numerizer (0.1.1)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -130,6 +130,6 @@ DEPENDENCIES
   rails (~> 3.2)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)
-  ruby-duration!
+  ruby-duration (~> 2.2.1)!
   simplecov (>= 0.5)
   spanner

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/timespan/compare.rb

@@ -49,10 +49,12 @@ class Timespan
 
     def +(other)
       self.duration += Duration.new(other)
+      self
     end
 
     def -(other)
       self.duration -= Duration.new(other)
+      self
     end
 
 

data/lib/timespan/units.rb

@@ -13,18 +13,21 @@ class Timespan
 			
 		alias_method :to_secs, 		:seconds
 		alias_method :to_seconds, :seconds
+		alias_method :secs, 			:seconds
 
 		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 :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_hrs, :to_hours
 		alias_method :hrs, 		:to_hours
 		alias_method :hours, 	:to_hours
 
@@ -38,7 +41,7 @@ class Timespan
 			@to_weeks ||= (to_days / 7.0).round
 		end	
 		alias_method :to_w, 	:to_weeks
-		alias_method :weeks, 	:to_days
+		alias_method :weeks, 	:to_weeks
 
 		def to_months
 			@to_months ||= (to_days / 30.0).round
@@ -50,6 +53,8 @@ class Timespan
 			@to_years ||= (to_days.to_f / 365.25).round
 		end	
 		alias_method :to_y, 	:to_years
+		alias_method :yrs, 		:to_years
+		alias_method :to_yrs, :to_years
 		alias_method :years, 	:to_years
 
 		def to_decades

data/spec/timespan/duration_macros_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'duration/macros'
+
+describe Timespan do
+	subject { timespan }
+
+  let(:from) { Chronic.parse("1 day ago") }
+  let(:to)   { Time.now }
+
+  context '3 hrs duration + 3hrs duration' do
+    let(:timespan) { Timespan.new("3 hrs") + 3.dhours }
+
+    describe '.start_date' do
+      its(:start_date) { should be }
+      its(:end_date) { should be }
+      its(:duration) { should be_a Duration }
+      specify { subject.hours.should be 6 }
+    end
+  end
+
+  context '3 hrs duration + 2hrs' do
+    let(:timespan) { Timespan.new("3 hrs") + 2.hours }
+
+    describe '.start_date' do
+      its(:start_date) { should be }
+      its(:end_date) { should be }
+      its(:duration) { should be_a Duration }
+      specify { subject.hours.should be 5 }
+    end
+  end
+end

data/spec/timespan/units_spec.rb

@@ -20,7 +20,7 @@ describe Timespan::Units do
 	    it "spans 1 day" do
 	  		timespan.to_d.should == 1
 	    end
-	    its(:days) { seconds.should == 1 }
+	    its(:days) { should == 1 }
 	  end
 
 		describe '.hours' do

data/spec/timespan_spec.rb

@@ -26,7 +26,6 @@ describe Timespan do
     end
   end
 
-
   context 'From and To with 1 day apart' do
   	let(:timespan) { Timespan.new :from => from, :to => to}
 

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/timespan/units.rb",
     "spec/spec_helper.rb",
     "spec/timespan/compare_spec.rb",
+    "spec/timespan/duration_macros_spec.rb",
     "spec/timespan/locales/duration_da.yml",
     "spec/timespan/mongoid/account.rb",
     "spec/timespan/mongoid/mongoid_timespan_spec.rb",
@@ -58,7 +59,7 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<ruby-duration>, ["~> 2.2.1"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<rails>, ["~> 3.2"])
       s.add_development_dependency(%q<mongoid>, ["~> 2.4"])
@@ -71,7 +72,7 @@ Gem::Specification.new do |s|
       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<ruby-duration>, ["~> 2.2.1"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<rails>, ["~> 3.2"])
       s.add_dependency(%q<mongoid>, ["~> 2.4"])
@@ -85,7 +86,7 @@ Gem::Specification.new do |s|
     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<ruby-duration>, ["~> 2.2.1"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<rails>, ["~> 3.2"])
     s.add_dependency(%q<mongoid>, ["~> 2.4"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +229,7 @@ files:
 - lib/timespan/units.rb
 - spec/spec_helper.rb
 - spec/timespan/compare_spec.rb
+- spec/timespan/duration_macros_spec.rb
 - spec/timespan/locales/duration_da.yml
 - spec/timespan/mongoid/account.rb
 - spec/timespan/mongoid/mongoid_timespan_spec.rb
@@ -253,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3275887994789672968
+      hash: 4000809282305753750
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: