mongoid-time_range 0.2.0 → 0.3.0

data/lib/mongoid/time_range/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
-  class TimeRange
-    VERSION = '0.2.0'
+  class TimeRange < Hash
+    VERSION = '0.3.0'
   end
 end

data/lib/mongoid/time_range.rb

@@ -3,29 +3,27 @@ require 'enumerable/associate'
 require 'mongoid'
 
 module Mongoid
-  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
+  class TimeRange < Hash
+    def initialize(from = Time.now, to = nil)
+      merge!(from: from, to: to)
     end
 
+    alias_method :to_a, :values
+
     def mongoize
       self.class.mongoize(self)
     end
 
-    def ==(other)
-      self.from == other.from && self.to == other.to
+    def to_h
+      self
     end
 
-    def to_h
-      { from: from, to: to }
+    def from
+      self[:from]
     end
 
-    def to_a
-      [from, to]
+    def to
+      self[:to]
     end
 
     class << self
@@ -34,11 +32,12 @@ module Mongoid
       end
 
       def demongoize(hash)
-        hash ||= {}
+        return nil if hash.nil?
+        
         hash = hash.symbolize_keys
         hash = [:from, :to].associate { |key| Time.demongoize(hash[key]) }
         
-        new(*hash.values)
+        new.merge(hash)
       end
     end
   end

data/spec/integration_spec.rb

@@ -9,7 +9,17 @@ describe 'Mongoid::TimeRange integration' do
 
 
     it 'sets from to current time and to to nil' do
-      subject.range.to_h.must_equal from: Time.now, to: nil
+      subject.range.must_be_nil
+    end
+
+
+    describe 'when default is set to ->{ TimeRange.new }' do
+      subject { DocumentWithDefault.create }
+
+
+      it 'sets from to current time and to to nil' do
+        subject.range.to_h.must_equal from: Time.now, to: nil
+      end
     end
   end
 

data/spec/support/document.rb

@@ -3,3 +3,9 @@ class Document
 
   field :range, type: Mongoid::TimeRange
 end
+
+class DocumentWithDefault
+  include Mongoid::Document
+
+  field :range, type: Mongoid::TimeRange, default: ->{ TimeRange.new }
+end

data/spec/time_range_spec.rb

@@ -1,15 +1,13 @@
 require_relative 'spec_helper'
 
 describe Mongoid::TimeRange do
-  let(:from) { Time.now }
-  let(:to) { from + 1.day }
+  before { Timecop.freeze }
+  let(:from) { Time.now.beginning_of_year }
+  let(:to) { Time.now.end_of_year }
   subject { Mongoid::TimeRange.new(from, to) }
 
 
   describe :initialize do
-    before { Timecop.freeze }
-
-
     describe 'without any arguments' do
       subject { Mongoid::TimeRange.new }
 
@@ -53,9 +51,6 @@ describe Mongoid::TimeRange do
         subject.to.must_equal to
       end
     end
-
-
-    after { Timecop.return }
   end
 
 
@@ -157,4 +152,7 @@ describe Mongoid::TimeRange do
       value.must_equal [from, to]
     end
   end
+
+
+  after { Timecop.return }
 end

metadata

@@ -2,14 +2,14 @@
 name: mongoid-time_range
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement