timespan 0.3.2 → 0.4.0

data/Gemfile

@@ -8,8 +8,10 @@ gem 'xduration', '~> 2.2'
 group :test, :development do
   gem "rspec", 		">= 2.8.0"
   gem 'rails', 		'~> 3.2'
-  gem 'mongoid',  '~> 2.4'
-  gem 'bson',     '~> 1.6'
+  gem 'mongoid',  '>= 2.4'
+  # gem 'bson',     '>= 1.6'
+
+  # gem 'mongoid',  '~> 3.0.0.rc', :git => 'git://github.com/mongoid/mongoid.git'  
   # gem 'i18n'
 end
 

data/Gemfile.lock

@@ -53,11 +53,11 @@ GEM
     mime-types (1.18)
     mongo (1.6.2)
       bson (~> 1.6.2)
-    mongoid (2.4.9)
+    mongoid (2.4.10)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    multi_json (1.3.4)
+    multi_json (1.3.6)
     numerizer (0.1.1)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -116,12 +116,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson (~> 1.6)
   bundler (>= 1.0.0)
   chronic
   chronic_duration
   jeweler (>= 1.8.3)
-  mongoid (~> 2.4)
+  mongoid (>= 2.4)
   rails (~> 3.2)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)

data/README.md

@@ -107,6 +107,8 @@ da:
 
 ## Timespan for Mongoid
 
+Tested and works with Mongoid 2.4 and 3.0.0.rc
+
 Custom Timespan datatype
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/timespan/mongoid.rb

@@ -8,21 +8,9 @@ class Object
   end
 end
 
-Mongoid::Fields.option :between do |model, field, options|  
-  name = field.name.to_sym
-  model.class_eval do
-    meta_def :"#{name}_between" do |from, to|
-      self.where(:"#{name}.#{TimeSpan.start_field}".gte => from.to_i, :"#{name}.#{TimeSpan.end_field}".lte => to.to_i)
-    end
-  end
-end
-
-# Mongoid serialization support for Timespan type.
 module Mongoid
   module Fields
     class Timespan
-      include Mongoid::Fields::Serializable
-    
       class << self
         attr_writer :start_field, :end_field
 
@@ -35,58 +23,53 @@ module Mongoid
         end
       end
 
-      def self.instantiate(name, options = {})
-        super
-      end
-
-      # Deserialize a Timespan given the hash stored by Mongodb
-      #
-      # @param [Hash] Timespan as hash
-      # @return [Timespan] deserialized Timespan
-      def deserialize(hash)
-        return if !hash
-        ::Timespan.new :from => from(hash), :to => to(hash)
-      end
+      # protected
 
-      # 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 serialize(value)
-        return if value.blank?
-        timespan = case value
-        when ::Timespan
-          value
-        else
-          ::Timespan.new(value)
+      module Methods
+        def from hash
+          from_value = hash['from'] || hash[:from]
+          raise ArgumentError, ":from is nil, #{hash.inspect}" if from_value.nil?
+          deserialize_time from_value
         end
-        {:from => serialize_time(timespan.start_time), :to => serialize_time(timespan.end_time.to_i), :duration => timespan.duration.total }
-      end
 
-      protected
+        def to hash
+          to_value = hash['to'] || hash[:to]
+          raise ArgumentError, ":to is nil, #{hash.inspect}" if to_value.nil?
+          deserialize_time to_value
+        end
 
-      def from hash
-        from_value = hash['from'] || hash[:from]
-        raise ArgumentError, ":from is nil, #{hash.inspect}" if from_value.nil?
-        deserialize_time from_value
-      end
+        def serialize_time time
+          raise ArgumentError, "Can't serialize time from nil" if time.nil?
+          time.to_i
+        end
 
-      def to hash
-        to_value = hash['to'] || hash[:to]
-        raise ArgumentError, ":to is nil, #{hash.inspect}" if to_value.nil?
-        deserialize_time to_value
+        def deserialize_time millisecs
+          raise ArgumentError, "Can't deserialize time from nil" if millisecs.nil?
+          Time.at millisecs
+        end      
       end
 
-      def serialize_time time
-        time.to_i
-      end
+      include Methods
+      extend Methods
+    end
+  end
+end
 
-      def deserialize_time millisecs
-        Time.at millisecs
+if defined?(Mongoid::Fields) && Mongoid::Fields.respond_to?(:option)
+  Mongoid::Fields.option :between do |model, field, options|  
+    name = field.name.to_sym
+    model.class_eval do
+      meta_def :"#{name}_between" do |from, to|
+        self.where(:"#{name}.#{TimeSpan.start_field}".gte => from.to_i, :"#{name}.#{TimeSpan.end_field}".lte => to.to_i)
       end
     end
   end
 end
 
+module Mongoid
+  MAJOR_VERSION =  Mongoid::VERSION > '3' ? 3 : 2
+end
+
+require "timespan/mongoid/mongoid_#{Mongoid::MAJOR_VERSION}x"
+
 TimeSpan = Mongoid::Fields::Timespan

data/lib/timespan/mongoid/mongoid_2x.rb

@@ -0,0 +1,37 @@
+# Mongoid serialization support for Timespan type.
+module Mongoid
+  module Fields
+    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
+      # @return [Timespan] deserialized Timespan
+      def deserialize(hash)
+        return if !hash
+        ::Timespan.new :from => from(hash), :to => to(hash)
+      end
+
+      # 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 serialize(value)
+        return if value.blank?
+        timespan = case value
+        when ::Timespan
+          value
+        else
+          ::Timespan.new(value)
+        end
+        {:from => serialize_time(timespan.start_time), :to => serialize_time(timespan.end_time.to_i), :duration => timespan.duration.total }
+      end
+    end
+  end
+end

data/lib/timespan/mongoid/mongoid_3x.rb

@@ -0,0 +1,46 @@
+class Timespan
+  module Mongoize
+    extend ActiveSupport::Concern
+    # 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 => serialize_time(start_time), :to => serialize_time(end_time), :duration => duration.total }
+    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
+
+      # TODO
+      # def evolve(object)
+      #   { "$gte" => object.first, "$lte" => object.last }
+      # end
+    end
+  end
+end
+
+
+class Timespan
+  include Mongoize
+
+  protected
+
+  include Mongoid::Fields::Timespan::Methods
+  extend Mongoid::Fields::Timespan::Methods
+end

data/spec/timespan/mongoid/{account.rb → models/account_2x.rb}

@@ -1,6 +1,7 @@
 class Account
-	include Mongoid::Document  
-	field :period, :type => TimeSpan, :between => true
+  include Mongoid::Document
+    
+  field :period, :type => TimeSpan, :between => true
 
   def self.create_it! duration
     s = self.new

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

@@ -0,0 +1,14 @@
+class Account
+  include Mongoid::Document
+
+  field :period, :type => ::Timespan, :between => true
+
+  def self.create_it! duration
+    t = ::Timespan.new(duration: duration)
+    self.new period: t
+  end
+
+  def self.between from, to
+    Account.where(:'period.from'.gt => from.to_i, :'period.to'.lte => to.to_i)
+  end
+end

data/spec/timespan/mongoid/mongoid_setup.rb

@@ -0,0 +1,37 @@
+module Mongoid
+  module VersionSetup
+    def self.configure config
+      version = Mongoid::VERSION
+      case
+      when version < '2'
+        raise ArgumentError, "Mongoid versions < 2 not supported"
+      when version < '3'
+        version_2 config
+      when version > '3'
+        version_3 config
+      end
+    end
+
+    def self.version_3 config      
+      require 'moped'
+      config.connect_to('mongoid_geo_test')      
+    end
+
+    def self.version_2 config
+      require 'bson'
+      
+      opts = YAML.load(File.read(File.dirname(__FILE__) + '/support/mongoid.yml'))["test"]
+      opts.delete("slaves") # no slaves support for version < 3
+      name = opts.delete("database")
+      host = opts.delete("host")
+      port = opts.delete("port")
+      config.master = begin
+         Mongo::Connection.new(host, port, opts).db(name)
+      rescue Mongo::ConnectionFailure
+        Mongo::Connection.new(host, '27017', opts).db(name)
+      end
+      config.logger = nil
+      config.allow_dynamic_fields = true
+    end      
+  end
+end

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -30,21 +30,9 @@ describe TimeSpan do
     end
   end
 
-  context '2 days duration using :duration => integer via ActiveSupport::Duration' do
-    let(:account) do 
-      Account.create :period => {:duration => 2.days }
-    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
-
   context '2 days using integer via ActiveSupport::Duration' do
     let(:account) do 
-      Account.create :period => 2.days
+      Account.create :period => Timespan.new(2.days)
     end
 
     describe '.start_date' do
@@ -53,28 +41,4 @@ describe TimeSpan do
       end
     end
   end
-
-  context '2 days duration using string' do
-    let(:account) do 
-      Account.create :period => {:duration => '2 days'}
-    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
-
-  context '2 days duration (from 1 day ago)' do
-    let(:account) do 
-      Account.create :period => {:duration => '2 days', :from => from }
-    end
-
-    describe '.start_date' do
-      it 'should default to today' do
-        DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == 1.day.ago.strftime('%d %b %Y') 
-      end
-    end
-  end
 end

data/spec/timespan/mongoid/spec_helper.rb

@@ -1,12 +1,31 @@
 require 'spec_helper'
 require 'mongoid'
-require 'bson'
 
-Mongoid.configure.master = Mongo::Connection.new.db('timespan')
+# puts "version: #{Mongoid::VERSION}"
 
-Mongoid.database.collections.each do |coll|
-  coll.remove
+require 'timespan/mongoid/mongoid_setup'
+
+Mongoid.configure do |config|
+  Mongoid::VersionSetup.configure config
+end
+
+if RUBY_VERSION >= '1.9.2'
+  YAML::ENGINE.yamler = 'syck'
+end
+
+RSpec.configure do |config|
+  # config.mock_with(:mocha)
+
+  config.before(:each) do
+    Mongoid.purge!
+    # Mongoid.database.collections.each do |collection|
+    #   unless collection.name =~ /^system\./
+    #     collection.remove
+    #   end
+    # end
+  end
 end
 
 require 'timespan/mongoid'
-require 'timespan/mongoid/account'
+
+require "timespan/mongoid/models/account_#{Mongoid::MAJOR_VERSION}x"

data/spec/timespan/mongoid/support/mongod.conf

@@ -0,0 +1,3 @@
+dbpath = /usr/local/var/mongodb
+master = true
+bind_ip = 127.0.0.1

data/spec/timespan/mongoid/support/mongoid.yml

@@ -0,0 +1,19 @@
+test:
+  database: mongoid_timespan_test
+  host: localhost
+  port: 27017
+  # slaves:
+    # - host: localhost
+      # port: 27018
+    # - host: localhost
+      # port: 27019
+  # allow_dynamic_fields: false
+  # include_root_in_json: true
+  # parameterize_keys: false
+  # persist_in_safe_mode: false
+  # raise_not_found_error: false
+  # reconnect_time: 5
+  # autocreate_indexes: false
+  # persist_types: false
+  # option_no_exist: false
+  # skip_version_check: false

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-05-30"
+  s.date = "2012-06-05"
   s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
     "lib/timespan.rb",
     "lib/timespan/compare.rb",
     "lib/timespan/mongoid.rb",
+    "lib/timespan/mongoid/mongoid_2x.rb",
+    "lib/timespan/mongoid/mongoid_3x.rb",
     "lib/timespan/printer.rb",
     "lib/timespan/rails/engine.rb",
     "lib/timespan/span.rb",
@@ -37,10 +39,14 @@ Gem::Specification.new do |s|
     "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/models/account_2x.rb",
+    "spec/timespan/mongoid/models/account_3x.rb",
     "spec/timespan/mongoid/mongoid_search_spec.rb",
+    "spec/timespan/mongoid/mongoid_setup.rb",
     "spec/timespan/mongoid/mongoid_timespan_spec.rb",
     "spec/timespan/mongoid/spec_helper.rb",
+    "spec/timespan/mongoid/support/mongod.conf",
+    "spec/timespan/mongoid/support/mongoid.yml",
     "spec/timespan/printer_spec.rb",
     "spec/timespan/span_spec.rb",
     "spec/timespan/units_spec.rb",
@@ -64,8 +70,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<xduration>, ["~> 2.2"])
       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<mongoid>, [">= 2.4"])
       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"])
@@ -77,8 +82,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<xduration>, ["~> 2.2"])
       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<mongoid>, [">= 2.4"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.8.3"])
@@ -91,8 +95,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<xduration>, ["~> 2.2"])
     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<mongoid>, [">= 2.4"])
     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.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -112,7 +112,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
@@ -120,25 +120,9 @@ dependencies:
   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
@@ -223,6 +207,8 @@ files:
 - lib/timespan.rb
 - lib/timespan/compare.rb
 - lib/timespan/mongoid.rb
+- lib/timespan/mongoid/mongoid_2x.rb
+- lib/timespan/mongoid/mongoid_3x.rb
 - lib/timespan/printer.rb
 - lib/timespan/rails/engine.rb
 - lib/timespan/span.rb
@@ -231,10 +217,14 @@ files:
 - 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/models/account_2x.rb
+- spec/timespan/mongoid/models/account_3x.rb
 - spec/timespan/mongoid/mongoid_search_spec.rb
+- spec/timespan/mongoid/mongoid_setup.rb
 - spec/timespan/mongoid/mongoid_timespan_spec.rb
 - spec/timespan/mongoid/spec_helper.rb
+- spec/timespan/mongoid/support/mongod.conf
+- spec/timespan/mongoid/support/mongoid.yml
 - spec/timespan/printer_spec.rb
 - spec/timespan/span_spec.rb
 - spec/timespan/units_spec.rb
@@ -256,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1296550633399706024
+      hash: 3654551960923174159
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: