timespan 0.5.6.1 → 0.5.7

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.5.6
+
+* Initial support for `time-lord` gem.
+* Use `xduration` 3.0.0 gem
+
+## 0.5.5
+
+* Better DurationRange specs
+* DurationRange comparisons
+* DurationRange Mongoid serialization works (and specs)
+
 ## 0.5.4
 
 - Added subclasses LongDurationRange and ShortDurationRange for long and short durations.

data/Gemfile

@@ -1,14 +1,16 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'chronic'
 gem 'chronic_duration'
 gem 'activesupport', '>= 3.0.0'
 gem 'spanner'
 gem 'sugar-high', '>= 0.7.3' # for range intersect
-gem 'xduration',  '>= 2.2'
+
+gem 'xduration',     '>= 3.0.0' # ruby-duration with extensions
+gem 'time-lord',     '>= 1.0.0'
 
 group :test, :development do
-  gem "rspec", 		">= 2.8.0"
+  gem "rspec", 		">= 2.12.0"
   gem 'rails', 		'>= 3.1'
   # gem 'mongoid',  '>= 2.4'
   # gem 'bson',     '>= 1.6'

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
       rdoc
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.12)
       actionpack (= 3.2.12)
@@ -113,13 +113,14 @@ GEM
     sugar-high (0.7.3)
     thor (0.17.0)
     tilt (1.3.5)
+    time-lord (1.0.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    xduration (2.2.3)
+    xduration (3.0.0)
       activesupport (>= 3.0.0)
-      i18n
+      i18n (>= 0.6)
 
 PLATFORMS
   ruby
@@ -133,8 +134,9 @@ DEPENDENCIES
   mongoid (>= 3.0)
   origin-selectable_ext (~> 0.1.1)
   rails (>= 3.1)
-  rspec (>= 2.8.0)
+  rspec (>= 2.12.0)
   simplecov (>= 0.7)
   spanner
   sugar-high (>= 0.7.3)
-  xduration (>= 2.2)
+  time-lord (>= 1.0.0)
+  xduration (>= 3.0.0)

data/README.md

@@ -51,7 +51,9 @@ Internally Timespan uses Spanner to parse duration strings.
 
 `Spanner.parse('23 hours 12 minutes')
 
-## Duration (ruby-duration)
+## Duration (xduration)
+
+The type `Duration` is supported via the [xduration](https://github.com/kristianmandrup/xduration) gem, which extends `ruby-duration` with additional macros, specific time unit classes and supports longer duration time periods such as weeks, months and years.
 
 ```ruby
 Duration.new(100) => #<Duration: minutes=1, seconds=40, total=100>
@@ -89,7 +91,7 @@ require 'duration/mongoid'
 
 class MyModel
   include Mongoid::Document
-  field :duration, type => Duration
+  field :duration, type => ::Duration
 end
 ```
 
@@ -253,6 +255,13 @@ class Account
 
 See the `mongoid_search_spec.rb` for examples:
 
+## Time lord
+
+This gem can be used in combination with [Time lord](https://github.com/krainboltgreene/time-lord), which has a lot of functionality for time periods, conversions, calculations and outputting to strings etc.
+
+Some initial support for `time-lord` has been added, but not yet tested. 
+Please help out ;)
+
 ## Chronic duration
 
 Is used to parse duration strings if Spanner can't be handle it

data/VERSION

@@ -1 +1 @@
-0.5.6.1
+0.5.7

data/lib/timespan.rb

@@ -2,6 +2,7 @@ require 'duration'
 require 'chronic'
 require 'chronic_duration'
 require 'spanner'
+require 'time-lord'
 
 # Range intersection that works with dates!
 require 'sugar-high/range'
@@ -57,7 +58,7 @@ class Timespan
 		options = {:duration => options} if options.kind_of? Numeric
 		
 		case options
-		when Duration, String
+		when TimeLord::Period, ::Duration, String
 			options = {:duration => options}
 		end
 		
@@ -194,15 +195,23 @@ class Timespan
 			time.to_time
 		when Duration
 			(Time.now + time).to_time
+		when TimeLord::Period
+			(Time.now + time).to_time
+		when TimeLord::Time
+			(Time.now + time.moment).to_time
 		when Time
 			time
 		else
-			raise ArgumentError, "A valid time must be either a String, Duration, Date, Time or DateTime, was: #{time.inspect} (#{time.class})"
+			raise ArgumentError, "A valid time must be one of #{valid_time_classes.inspect}, was: #{time.inspect} (#{time.class})"
 		end
 	end
 
 	protected
 
+	def valid_time_classes
+		[String, Duration, Date, Time, DateTime, TimeLord::Period, TimeLord::Time]
+	end
+
 	attr_reader :init_options
 
 	def first_from keys, options = {}

data/lib/timespan/compare.rb

@@ -56,6 +56,8 @@ class Timespan
       	time.to_time.to_i
       when Integer
       	seconds <=> time
+      when Timelord::Time
+        seconds <=> time.moment
       when ActiveSupport::Duration
         seconds <=> time.to_i
       end

data/lib/timespan/span.rb

@@ -13,6 +13,8 @@ class Timespan
 					duration.duration
 				when Duration
 					duration
+				when TimeLord::Period
+					Duration.new start_date: duration.beginning, end_date: duration.ending
 				when Hash
 					Duration.new duration
 				when String

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.5.6.1"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -84,8 +84,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<spanner>, [">= 0"])
       s.add_runtime_dependency(%q<sugar-high>, [">= 0.7.3"])
-      s.add_runtime_dependency(%q<xduration>, [">= 2.2"])
-      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_runtime_dependency(%q<xduration>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<time-lord>, [">= 1.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.12.0"])
       s.add_development_dependency(%q<rails>, [">= 3.1"])
       s.add_development_dependency(%q<mongoid>, [">= 3.0"])
       s.add_development_dependency(%q<origin-selectable_ext>, ["~> 0.1.1"])
@@ -98,8 +99,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<spanner>, [">= 0"])
       s.add_dependency(%q<sugar-high>, [">= 0.7.3"])
-      s.add_dependency(%q<xduration>, [">= 2.2"])
-      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<xduration>, [">= 3.0.0"])
+      s.add_dependency(%q<time-lord>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2.12.0"])
       s.add_dependency(%q<rails>, [">= 3.1"])
       s.add_dependency(%q<mongoid>, [">= 3.0"])
       s.add_dependency(%q<origin-selectable_ext>, ["~> 0.1.1"])
@@ -113,8 +115,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<spanner>, [">= 0"])
     s.add_dependency(%q<sugar-high>, [">= 0.7.3"])
-    s.add_dependency(%q<xduration>, [">= 2.2"])
-    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<xduration>, [">= 3.0.0"])
+    s.add_dependency(%q<time-lord>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2.12.0"])
     s.add_dependency(%q<rails>, [">= 3.1"])
     s.add_dependency(%q<mongoid>, [">= 3.0"])
     s.add_dependency(%q<origin-selectable_ext>, ["~> 0.1.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.5.6.1
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -98,7 +98,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: time-lord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -334950470551913116
+      hash: -400546450151555613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: