mongoid-time_range 0.1.0 → 0.2.0

data/README.md

@@ -10,12 +10,6 @@ In your Gemfile:
 gem 'mongoid-time_range'
 ```
 
-If you want to use ::TimeRange instead of Mongoid::TimeRange, your Gemfile must include a additional require statement:
-
-```ruby
-gem 'mongoid-time_range', require: 'mongoid/time_range/global'
-```
-
 ## Usage
 
 ```ruby
@@ -34,6 +28,22 @@ year2013 = Document.create(range: { from: Time.now.at_beginning_of_year, to: Tim
 year2013.range # => { from: 2013-01-01 00:00:00 +0100, to: 2013-12-31 23:59:59 +0100 }
 ```
 
+If you want to use `TimeRange` directly instead of `Mongoid::TimeRange`:
+
+```ruby
+class Document
+  include Mongoid::Document
+
+  field :range, type: TimeRange
+end
+```
+
+… your Gemfile must include a additional require statement:
+
+```ruby
+gem 'mongoid-time_range', require: 'mongoid/time_range/global'
+```
+
 ## Contributing
 
 1. Fork it

data/lib/mongoid/time_range.rb

@@ -1,10 +1,15 @@
+require 'active_support/all'
 require 'enumerable/associate'
+require 'mongoid'
 
 module Mongoid
-  class TimeRange < Struct.new(:from, :to)
-    def initialize(*)
-      super
-      self.from ||= Time.now
+  class TimeRange
+    attr_accessor :from, :to
+    delegate :inspect, :[], to: :to_h
+
+    def initialize(from = nil, to = nil)
+      self.from = from || Time.now
+      self.to = to
     end
 
     def mongoize
@@ -23,10 +28,6 @@ module Mongoid
       [from, to]
     end
 
-    def inspect
-      to_h.inspect
-    end
-
     class << self
       def mongoize(object)
         [:from, :to].associate { |key| Time.mongoize(object[key]) }
@@ -34,6 +35,7 @@ module Mongoid
 
       def demongoize(hash)
         hash ||= {}
+        hash = hash.symbolize_keys
         hash = [:from, :to].associate { |key| Time.demongoize(hash[key]) }
         
         new(*hash.values)

data/lib/mongoid/time_range/version.rb

@@ -1,7 +1,5 @@
-require 'mongoid/time_range'
-
 module Mongoid
   class TimeRange
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/mongoid-time_range.gemspec

@@ -13,5 +13,6 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.require_path  = 'lib'
 
+  gem.add_dependency 'activesupport'
   gem.add_dependency 'mongoid'
 end

data/spec/integration_spec.rb

@@ -9,8 +9,7 @@ describe 'Mongoid::TimeRange integration' do
 
 
     it 'sets from to current time and to to nil' do
-      subject.range.from.to_i.must_equal Time.now.to_i
-      subject.range.to.must_be_nil
+      subject.range.to_h.must_equal from: Time.now, to: nil
     end
   end
 
@@ -20,8 +19,7 @@ describe 'Mongoid::TimeRange integration' do
 
 
     it 'sets from to given time and to to nil' do
-      subject.range.from.to_i.must_equal Time.now.beginning_of_year.to_i
-      subject.range.to.must_be_nil
+      subject.range.to_h.must_equal from: Time.now.beginning_of_year, to: nil
     end
   end
 
@@ -31,8 +29,7 @@ describe 'Mongoid::TimeRange integration' do
 
 
     it 'sets from and to to given time' do
-      subject.range.from.to_i.must_equal Time.now.beginning_of_year.to_i
-      subject.range.to.to_i.must_equal Time.now.end_of_year.to_i
+      subject.range.to_h.must_equal from: Time.now.beginning_of_year, to: Time.now.end_of_year
     end
   end
 

data/spec/support/time.rb

@@ -0,0 +1,6 @@
+class Time
+  def ==(other)
+    to_i == other.to_i &&
+      usec - (usec % 1000) == other.usec - (other.usec % 1000)
+  end
+end

metadata

@@ -2,15 +2,31 @@
 name: mongoid-time_range
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  name: activesupport
+  type: :runtime
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -49,6 +65,7 @@ files:
 - spec/support/connection.rb
 - spec/support/document.rb
 - spec/support/mongoid.yml
+- spec/support/time.rb
 - spec/time_range_spec.rb
 homepage: https://github.com/haihappen/mongoid-time_range
 licenses: []