timespan 0.2.0 → 0.2.1

data/Gemfile

@@ -8,6 +8,8 @@ gem 'ruby-duration', :git => 'git://github.com/kristianmandrup/ruby-duration.git
 group :test, :development do
   gem "rspec", 		">= 2.8.0"
   gem 'rails', 		'~> 3.2'
+  gem 'mongoid',  '~> 2.4'
+  gem 'bson',     '~> 1.6'
   # gem 'i18n'
 end
 

data/Gemfile.lock

@@ -37,6 +37,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bson (1.6.2)
     builder (3.0.0)
     chronic (0.6.7)
     chronic_duration (0.9.6)
@@ -58,6 +59,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
+    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)
     numerizer (0.1.1)
     polyglot (0.3.3)
@@ -114,10 +121,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bson (~> 1.6)
   bundler (>= 1.0.0)
   chronic
   chronic_duration
   jeweler (>= 1.8.3)
+  mongoid (~> 2.4)
   rails (~> 3.2)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)

data/README.md

@@ -90,12 +90,22 @@ Custom Timespan datatype
 ```ruby
 require 'timespan/mongoid'
 
-class MyModel
+class Account
   include Mongoid::Document
-  field :period, type => Timespan
+  field :period, :type => TimeSpan
 end
 ```
 
+Usage example:
+
+```ruby
+account = Account.create :period => {:duration => '2 days', :from => Date.today }
+
+account.period.start_date
+account.period.end_date
+account.period.days
+account.period.duration # => Duration
+
 ## Chronic duration
 
 Is used to parse duration strings if Spanner can't be handle it

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/timespan/compare.rb

@@ -19,7 +19,6 @@ class Timespan
   end
 
   module Compare
-
   	include Comparable
 
     def time_left time = nil
@@ -48,6 +47,15 @@ class Timespan
       end
     end
 
+    def +(other)
+      self.duration += Duration.new(other)
+    end
+
+    def -(other)
+      self.duration -= Duration.new(other)
+    end
+
+
     def valid_compare? time
       valid_compare_types.any? {|type| time.kind_of? type }
     end

data/lib/timespan/mongoid.rb

@@ -7,6 +7,10 @@ module Mongoid
     class Timespan
       include Mongoid::Fields::Serializable
     
+      def self.instantiate(name, options = {})
+        super
+      end
+
       # Deserialize a Timespan given the hash stored by Mongodb
       #
       # @param [Hash] Timespan as hash
@@ -24,8 +28,10 @@ module Mongoid
       def serialize(value)
         return if value.blank?
         timespan = ::Timespan.new(value)
-        {:from => time_span.start_time, :to => time_span.end_time, :Timespan => time_span.Timespan}
+        {:from => timespan.start_time, :to => timespan.end_time, :duration => timespan.duration.total}
       end
     end
   end
-end
+end
+
+TimeSpan = Mongoid::Fields::Timespan

data/lib/timespan/span.rb

@@ -6,6 +6,8 @@ class Timespan
 
 		def duration= duration
 			@duration = case duration
+			when Timespan
+				duration.duration
 			when Duration
 				duration
 			when Numeric, Hash

data/spec/timespan/mongoid/account.rb

@@ -0,0 +1,4 @@
+class Account
+	include Mongoid::Document
+	field :period, :type => ::TimeSpan
+end

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -0,0 +1,20 @@
+require 'timespan/mongoid/spec_helper'
+
+describe Timespan do
+	subject { account }
+
+  let(:from) { Chronic.parse("1 day ago") }
+  let(:to)   { Time.now }
+
+  context '2 days duration (from now - default)' do
+    let(:account) do 
+      Account.create :period => {:duration => '2 days', :from => Date.today }
+    end
+
+    describe '.start_date' do
+      it 'should default to today' do
+        DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
+      end
+    end
+  end
+end

data/spec/timespan/mongoid/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'mongoid'
+require 'bson'
+
+Mongoid.configure.master = Mongo::Connection.new.db('timespan')
+
+Mongoid.database.collections.each do |coll|
+  coll.remove
+end
+
+require 'timespan/mongoid'
+require 'timespan/mongoid/account'

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -36,6 +36,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/timespan/compare_spec.rb",
     "spec/timespan/locales/duration_da.yml",
+    "spec/timespan/mongoid/account.rb",
+    "spec/timespan/mongoid/mongoid_timespan_spec.rb",
+    "spec/timespan/mongoid/spec_helper.rb",
     "spec/timespan/printer_spec.rb",
     "spec/timespan/span_spec.rb",
     "spec/timespan/units_spec.rb",
@@ -58,6 +61,8 @@ Gem::Specification.new do |s|
       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<mongoid>, ["~> 2.4"])
+      s.add_development_dependency(%q<bson>, ["~> 1.6"])
       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"])
@@ -69,6 +74,8 @@ Gem::Specification.new do |s|
       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<mongoid>, ["~> 2.4"])
+      s.add_dependency(%q<bson>, ["~> 1.6"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.8.3"])
@@ -81,6 +88,8 @@ Gem::Specification.new do |s|
     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<mongoid>, ["~> 2.4"])
+    s.add_dependency(%q<bson>, ["~> 1.6"])
     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.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -107,6 +107,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +230,9 @@ files:
 - spec/spec_helper.rb
 - spec/timespan/compare_spec.rb
 - spec/timespan/locales/duration_da.yml
+- spec/timespan/mongoid/account.rb
+- spec/timespan/mongoid/mongoid_timespan_spec.rb
+- spec/timespan/mongoid/spec_helper.rb
 - spec/timespan/printer_spec.rb
 - spec/timespan/span_spec.rb
 - spec/timespan/units_spec.rb
@@ -218,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2914636864152776546
+      hash: -3275887994789672968
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: