mongoid-time_range 0.0.1 → 0.1.0

data/Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
 gemspec
+
+gem 'minitest'
+gem 'rake'
+gem 'timecop'

data/README.md

@@ -10,6 +10,12 @@ 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
@@ -22,10 +28,10 @@ end
 
 ```ruby
 document = Document.create
-document.range # => 
+document.range # => { from: 2013-01-01 00:00:00 +0100, to: nil }
 
 year2013 = Document.create(range: { from: Time.now.at_beginning_of_year, to: Time.now.end_of_year })
-year2013.range # =>
+year2013.range # => { from: 2013-01-01 00:00:00 +0100, to: 2013-12-31 23:59:59 +0100 }
 ```
 
 ## Contributing

data/lib/enumerable/associate.rb

@@ -1,4 +1,4 @@
-module Enumerable # Remove me as soon as it is integrated into ActiveSupport.
+module Enumerable # Remove this as soon as it is integrated into ActiveSupport.
   # Associates keys with values and returns a Hash.
   #
   # If you have an enumerable of keys and want to associate them with values,

data/lib/mongoid/time_range.rb

@@ -1,33 +1,43 @@
 require 'enumerable/associate'
-require 'mongoid'
 
-class Mongoid::TimeRange < Struct.new(:from, :to)
-  def initialize(*)
-    super
-    self.from ||= Time.now
-  end
+module Mongoid
+  class TimeRange < Struct.new(:from, :to)
+    def initialize(*)
+      super
+      self.from ||= Time.now
+    end
 
-  def mongoize
-    Mongoid::TimeRange.mongoize(self)
-  end
+    def mongoize
+      self.class.mongoize(self)
+    end
 
-  def ==(other)
-    self.from == other.from && self.to == other.to
-  end
+    def ==(other)
+      self.from == other.from && self.to == other.to
+    end
 
-  def to_a
-    [from, to]
-  end
+    def to_h
+      { from: from, to: to }
+    end
 
-  class << self
-    def mongoize(object)
-      %w[from to].associate { |key| object[key.to_sym].mongoize }
+    def to_a
+      [from, to]
     end
 
-    def demongoize(hash)
-      times = hash.values.map { |time| Time.demongoize(time) }
-      
-      Mongoid::TimeRange.new(*times)
+    def inspect
+      to_h.inspect
+    end
+
+    class << self
+      def mongoize(object)
+        [:from, :to].associate { |key| Time.mongoize(object[key]) }
+      end
+
+      def demongoize(hash)
+        hash ||= {}
+        hash = [:from, :to].associate { |key| Time.demongoize(hash[key]) }
+        
+        new(*hash.values)
+      end
     end
   end
-end
+end

data/lib/mongoid/time_range/global.rb

@@ -0,0 +1,3 @@
+require 'mongoid/time_range'
+
+TimeRange = Mongoid::TimeRange

data/lib/mongoid/time_range/version.rb

@@ -1,3 +1,7 @@
-class Mongoid::TimeRange
-  VERSION = '0.0.1'
+require 'mongoid/time_range'
+
+module Mongoid
+  class TimeRange
+    VERSION = '0.1.0'
+  end
 end

data/mongoid-time_range.gemspec

@@ -1,9 +1,9 @@
 $: << File.expand_path('../lib', __FILE__)
-# require 'mongoid/time_range/version'
+require 'mongoid/time_range/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'mongoid-time_range'
-  gem.version       = '0.0.1'
+  gem.version       = Mongoid::TimeRange::VERSION
   gem.authors       = 'Mario Uher'
   gem.email         = 'uher.mario@gmail.com'
   gem.homepage      = 'https://github.com/haihappen/mongoid-time_range'
@@ -14,8 +14,4 @@ Gem::Specification.new do |gem|
   gem.require_path  = 'lib'
 
   gem.add_dependency 'mongoid'
-
-  gem.add_development_dependency 'minitest'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'timecop'
 end

data/spec/global_spec.rb

@@ -0,0 +1,10 @@
+require_relative 'spec_helper'
+
+describe Mongoid::TimeRange do
+  before { require 'mongoid/time_range/global' }
+
+
+  it 'is available as ::TimeRange too' do
+    ::TimeRange.must_be_same_as Mongoid::TimeRange
+  end
+end

data/spec/integration_spec.rb

@@ -0,0 +1,41 @@
+require_relative 'spec_helper'
+
+describe 'Mongoid::TimeRange integration' do
+  before { Timecop.freeze }
+
+
+  describe 'create document without any attributes' do
+    subject { Document.create }
+
+
+    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
+    end
+  end
+
+
+  describe 'create document only with from attribute' do
+    subject { Document.create(range: { from: Time.now.beginning_of_year }) }
+
+
+    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
+    end
+  end
+
+
+  describe 'create document with both attributes' do
+    subject { Document.create(range: { from: Time.now.beginning_of_year, to: Time.now.end_of_year }) }
+
+
+    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
+    end
+  end
+
+
+  after { Timecop.return }
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'minitest/spec'
 
 require 'mongoid/time_range'
 
+require 'mongoid'
 require 'timecop'
 
 # Load support *.rb files in ./support

data/spec/support/document.rb

@@ -1,9 +1,5 @@
 class Document
   include Mongoid::Document
 
-end
-
-class Localized
-  include Mongoid::Document
-
+  field :range, type: Mongoid::TimeRange
 end

data/spec/support/mongoid.yml

@@ -3,6 +3,6 @@ test:
     default:
       database: mongoid_time_range_test
       hosts:
-        - localhost: 27017
+        - localhost:27017
       options:
         consistency: :strong

data/spec/time_range_spec.rb

@@ -65,7 +65,7 @@ describe Mongoid::TimeRange do
 
     describe 'having both from and to' do
       it 'returns database friendly value' do
-        value.must_equal 'from' => from.mongoize, 'to' => to.mongoize
+        value.must_equal from: from.mongoize, to: to.mongoize
       end
     end
 
@@ -75,7 +75,7 @@ describe Mongoid::TimeRange do
 
 
       it 'returns database friendly value' do
-        value.must_equal 'from' => from.mongoize, 'to' => nil
+        value.must_equal from: from.mongoize, to: nil
       end
     end
   end
@@ -88,7 +88,7 @@ describe Mongoid::TimeRange do
 
       describe 'having both from and to' do
         it 'returns database friendly value' do
-          value.must_equal 'from' => from.mongoize, 'to' => to.mongoize
+          value.must_equal from: from.mongoize, to: to.mongoize
         end
       end
 
@@ -98,7 +98,7 @@ describe Mongoid::TimeRange do
 
 
         it 'returns database friendly value' do
-          value.must_equal 'from' => from.mongoize, 'to' => nil
+          value.must_equal from: from.mongoize, to: nil
         end
       end
     end
@@ -110,7 +110,7 @@ describe Mongoid::TimeRange do
 
       describe 'having both from and to' do
         it 'returns database friendly value' do
-          value.must_equal 'from' => from.mongoize, 'to' => to.mongoize
+          value.must_equal from: from.mongoize, to: to.mongoize
         end
       end
 
@@ -120,7 +120,7 @@ describe Mongoid::TimeRange do
 
 
         it 'returns database friendly value' do
-          value.must_equal 'from' => from.mongoize, 'to' => nil
+          value.must_equal from: from.mongoize, to: nil
         end
       end
     end
@@ -128,7 +128,7 @@ describe Mongoid::TimeRange do
 
 
   describe 'self.demongoize' do
-    let(:value) { Mongoid::TimeRange.demongoize('from' => from, 'to' => to) }
+    let(:value) { Mongoid::TimeRange.demongoize(from: from, to: to) }
 
 
     describe 'having both from and to' do

metadata

@@ -2,14 +2,14 @@
 name: mongoid-time_range
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,54 +27,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: minitest
-  type: :development
-  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:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: rake
-  type: :development
-  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:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  name: timecop
-  type: :development
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
 description: Mongoid::TimeRange defines a TimeRange type for your Mongoid apps.
 email: uher.mario@gmail.com
 executables: []
@@ -88,8 +40,11 @@ files:
 - Rakefile
 - lib/enumerable/associate.rb
 - lib/mongoid/time_range.rb
+- lib/mongoid/time_range/global.rb
 - lib/mongoid/time_range/version.rb
 - mongoid-time_range.gemspec
+- spec/global_spec.rb
+- spec/integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/connection.rb
 - spec/support/document.rb