timespan 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/timespan/mongoid.rb

@@ -1,5 +1,6 @@
 require "timespan"
 require "mongoid/fields"
+require "timespan/mongoid/timespanned"
 
 # http://whytheluckystiff.net/articles/seeingMetaclassesClearly.html
 class Object 

data/lib/timespan/mongoid/mongoid_3x.rb

@@ -1,6 +1,18 @@
 class Timespan
-  module Mongoize
-    extend ActiveSupport::Concern
+  Serializer = Mongoid::Fields::Timespan
+
+  # See http://mongoid.org/en/mongoid/docs/upgrading.html        
+
+  # Serialize a Timespan or a Hash (with Timespan units) or a Duration in some form to
+  # a BSON serializable type.
+  #
+  # @param [Timespan, Hash, Integer, String] value
+  # @return [Hash] Timespan in seconds
+  def mongoize
+    {:from => Serializer.serialize_time(start_time), :to => Serializer.serialize_time(end_time), :duration => duration.total }
+  end
+
+  class << self
     # See http://mongoid.org/en/mongoid/docs/upgrading.html        
 
     # Serialize a Timespan or a Hash (with Timespan units) or a Duration in some form to
@@ -8,39 +20,37 @@ class Timespan
     #
     # @param [Timespan, Hash, Integer, String] value
     # @return [Hash] Timespan in seconds
-    def mongoize
-      {:from => serialize_time(start_time), :to => serialize_time(end_time), :duration => duration.total }
+    def mongoize object
+      case object
+      when Timespan then object.mongoize
+      when Hash
+        ::Timespan.new object
+      else
+        object
+      end
     end
 
-    module ClassMethods
-      # Deserialize a Timespan given the hash stored by Mongodb
-      #
-      # @param [Hash] Timespan as hash
-      # @return [Timespan] deserialized Timespan
-      def demongoize(value)
-        return if !value
-        case value
-        when Hash
-          ::Timespan.new :from => from(value), :to => to(value)
-        else
-          ::Timespan.new value
-        end        
-      end
+    # Deserialize a Timespan given the hash stored by Mongodb
+    #
+    # @param [Hash] Timespan as hash
+    # @return [Timespan] deserialized Timespan
+    def demongoize(object)
+      return if !object
+      case object
+      when Hash
+        ::Timespan.new :from => Serializer.from(object), :to => Serializer.to(object)
+      else
+        ::Timespan.new object
+      end        
+    end
 
-      # TODO
-      # def evolve(object)
-      #   { "$gte" => object.first, "$lte" => object.last }
-      # end
+    # Converts the object that was supplied to a criteria and converts it
+    # into a database friendly form.
+    def evolve(object)
+      case object
+      when Timespan then object.mongoize
+      else object
+      end
     end
   end
 end
-
-
-class Timespan
-  include Mongoize
-
-  protected
-
-  include Mongoid::Fields::Timespan::Methods
-  extend Mongoid::Fields::Timespan::Methods
-end

data/lib/timespan/mongoid/timespanned.rb

@@ -0,0 +1,21 @@
+module Mongoid
+  module Timespanned
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def timespan_setters name = :period  
+        define_method :"#{name}_start=" do |date|
+          self.send "#{name}=", ::Timespan.new(start_date: date, end_date: self.send(name).end_date)
+        end
+
+        define_method :"#{name}_end=" do |date|
+          self.send "#{name}=", ::Timespan.new(start_date: self.send(name).start_date, end_date: date)
+        end
+
+        define_method :"#{name}duration=" do |duration|
+          self.send "#{name}=", ::Timespan.new(start_date: self.send(name).start_date, duration: duration)
+        end
+      end
+    end
+  end
+end

data/spec/timespan/mongoid/models/account_3x.rb

@@ -1,8 +1,13 @@
 class Account
   include Mongoid::Document
+  include Mongoid::Timespanned
 
   field :period, :type => ::Timespan, :between => true
 
+  delegate :start_date, to: :period
+
+  timespan_setters :period
+
   def self.create_it! duration
     t = ::Timespan.new(duration: duration)
     self.new period: t

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -3,6 +3,10 @@ require 'timespan/mongoid/spec_helper'
 describe TimeSpan do
 	subject { account }
 
+  def tomorrow
+    Date.today + 1.day
+  end
+
   let(:from) { Chronic.parse("1 day ago") }
   let(:to)   { Time.now }
 
@@ -40,5 +44,15 @@ describe TimeSpan do
         DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
       end
     end
+
+    describe 'set new start_date' do
+      before :each do
+        subject.period_start = tomorrow
+      end
+
+      specify do
+        Date.parse(subject.start_date.to_s).should == tomorrow
+      end
+    end
   end
 end

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-09-18"
+  s.date = "2012-09-19"
   s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/timespan/mongoid.rb",
     "lib/timespan/mongoid/mongoid_2x.rb",
     "lib/timespan/mongoid/mongoid_3x.rb",
+    "lib/timespan/mongoid/timespanned.rb",
     "lib/timespan/printer.rb",
     "lib/timespan/rails/engine.rb",
     "lib/timespan/span.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -209,6 +209,7 @@ files:
 - lib/timespan/mongoid.rb
 - lib/timespan/mongoid/mongoid_2x.rb
 - lib/timespan/mongoid/mongoid_3x.rb
+- lib/timespan/mongoid/timespanned.rb
 - lib/timespan/printer.rb
 - lib/timespan/rails/engine.rb
 - lib/timespan/span.rb
@@ -246,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2725134475145941873
+      hash: -2120967004770595531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: