mongoid-time_range 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c386f40e7b4f23e18633700bee7176944128244b
-  data.tar.gz: 07d68441727132bffd803dce7344cb5eb36a1ef5
+  metadata.gz: 42533adde53219b0683bdccbd450ad52770135a6
+  data.tar.gz: da95eff5f8eee018f51e91d4af22312cd55235cb
 SHA512:
-  metadata.gz: 3b990abf33843cc8c179c14814891ec1a56611a0118bef5ddb2167ad247acb0ff0d927f67d7af5314c49ecece2f0a9d9338c0541e39a279443695a31884a9722
-  data.tar.gz: a7e22009d8c4f1d29128490fee3149a1c88555604b82b6cad7461ab5fdf864a7eb800c6876a25cbebf8a05b75e63865249178d2f68dd3ed5e74beb02fc9b4ede
+  metadata.gz: 1034c7f4d369c874b2f8cdb7f44f23541ada721fd771e6eca15613cf2074c1cab7a68005fa2bd682618e428a2fd4f07d2b77ab3fadd3b77e31898e1011a0d519
+  data.tar.gz: e7dbe735671ea3cc672f9a30e9d825092cf87d1bd9805283067c1873e7c615e1faff9d7268ac86ef5f0d7604065e784ee72f24929e114c31f76aa52bb9b1aec0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.5.0 (Febrary 4, 2014)
+* Simplifies tests a lot.
+* Removes (direct) active_support dependency.
+
+# 0.4.1 (February 4, 2014)
+* Locks on mongoid ~> 3.0.
+
 # 0.4.0 (January 06, 2013)
 * Adds setters.
 

data/Gemfile

@@ -1,7 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
 gem 'minitest'
 gem 'rake'
-gem 'timecop'

data/README.md

@@ -53,7 +53,7 @@ gem 'mongoid-time_range', require: 'mongoid/time_range/global'
 
 (The MIT license)
 
-Copyright (c) 2013 Mario Uher
+Copyright (c) 2013-2014 Mario Uher
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.test_files = FileList['spec/**/*_spec.rb']
+  t.pattern = 'test/*_test.rb'
 end
 
 task default: :test

data/lib/mongoid/time_range/global.rb

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

data/lib/mongoid/time_range/version.rb

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

data/lib/mongoid/time_range.rb

@@ -1,18 +1,17 @@
 require 'active_support/all'
-require 'enumerable/associate'
 require 'mongoid'
 
 module Mongoid
   class TimeRange < Hash
     def initialize(from = Time.now, to = nil)
-      merge!(from: from, to: to)
+      merge! from: from, to: to
     end
 
     [:from, :to].each do |key|
       define_method key do
         self[key]
       end
-      
+
       define_method :"#{key}=" do |value|
         self[key] = value
       end
@@ -26,17 +25,15 @@ module Mongoid
 
     class << self
       def mongoize(object)
-        [:from, :to].associate { |key| Time.mongoize(object[key]) }
+        { from: Time.mongoize(object[:from]), to: Time.mongoize(object[:to]) }
       end
 
       def demongoize(hash)
-        return nil if hash.nil?
-        
+        return if hash.nil?
         hash = hash.symbolize_keys
-        hash = [:from, :to].associate { |key| Time.demongoize(hash[key]) }
-        
-        new.merge(hash)
+
+        new(Time.demongoize(hash[:from]), Time.demongoize(hash[:to]))
       end
     end
   end
-end
+end

data/mongoid-time_range.gemspec

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

data/test/integration_test.rb

@@ -0,0 +1,43 @@
+require_relative 'test_helper'
+
+class Document
+  include Mongoid::Document
+
+  field :range, type: Mongoid::TimeRange
+end
+
+class IntegrationTest < Minitest::Test
+  def test_it_initializes_with_nil
+    assert_nil Document.create.range
+  end
+
+
+  def test_it_initializes_with_default_hash
+    assert(Class.new(Document) do
+      field :range, type: Mongoid::TimeRange, default: ->{ { from: Time.now } }
+    end.create.range)
+  end
+
+
+  def test_it_initializes_with_default_time_range
+    assert(Class.new(Document) do
+      field :range, type: Mongoid::TimeRange, default: ->{ Mongoid::TimeRange.new(Time.now) }
+    end.create.range)
+  end
+
+
+  def test_it_initializes_with_given_from
+    document = Document.create(range: { from: Time.now })
+
+    assert     document.range.from
+    assert_nil document.range.to
+  end
+
+
+  def test_it_initializes_with_given_from_and_to
+    document = Document.create(range: { from: Time.now, to: Time.now })
+
+    assert document.range.from
+    assert document.range.to
+  end
+end

data/test/require_test.rb

@@ -0,0 +1,8 @@
+require_relative 'test_helper'
+require 'mongoid/time_range/global'
+
+class RequireTest < Minitest::Test
+  def test_time_range_is_globally_available
+    assert_equal ::TimeRange, Mongoid::TimeRange
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+$: << File.expand_path('../../lib', __FILE__)
+require 'minitest/autorun'
+require 'minitest/pride'
+
+require 'mongoid/time_range'
+
+Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__), 'test')

data/test/time_range_test.rb

@@ -0,0 +1,90 @@
+require_relative 'test_helper'
+
+class TimeRangeTest < Minitest::Test
+  def freeze_time(&block)
+    Time.stub :now, Time.at(Time.now) do
+      yield
+    end
+  end
+
+
+  def test_it_initializes_without_any_argument
+    freeze_time do
+      time_range = Mongoid::TimeRange.new
+      assert_equal Time.now, time_range.from
+      assert_nil   time_range.to
+
+      time_range = Mongoid::TimeRange.new(Time.now)
+      assert_equal Time.now, time_range.from
+      assert_nil   time_range.to
+
+      time_range = Mongoid::TimeRange.new(Time.now, Time.now.tomorrow)
+      assert_equal Time.now, time_range.from
+      assert_equal Time.now.tomorrow, time_range.to
+    end
+  end
+
+
+  def test_it_has_getters_and_getters
+    time_range = Mongoid::TimeRange.new
+
+    assert time_range.respond_to?(:from)
+    assert time_range.respond_to?(:from=)
+
+    assert time_range.respond_to?(:to)
+    assert time_range.respond_to?(:to=)
+  end
+
+
+  def test_mongoize_returns_database_friendly_hash
+    freeze_time do
+      time_range = Mongoid::TimeRange.new(Time.now)
+      assert_equal({ from: Time.now.mongoize, to: nil }, time_range.mongoize)
+
+      time_range = Mongoid::TimeRange.new(Time.now, Time.now.tomorrow)
+      assert_equal({ from: Time.now.mongoize, to: Time.now.tomorrow.mongoize }, time_range.mongoize)
+    end
+  end
+
+
+  def test_class_mongoize_returns_database_friendly_hash_when_giving_a_time_range
+    freeze_time do
+      time_range = Mongoid::TimeRange.new(Time.now)
+      assert_equal({ from: Time.now.mongoize, to: nil }, Mongoid::TimeRange.mongoize(time_range))
+
+      time_range = Mongoid::TimeRange.new(Time.now, Time.now.tomorrow)
+      assert_equal({ from: Time.now.mongoize, to: Time.now.tomorrow.mongoize }, Mongoid::TimeRange.mongoize(time_range))
+    end
+  end
+
+
+  def test_class_mongoize_returns_database_friendly_hash_when_giving_a_hash
+    freeze_time do
+      hash = Mongoid::TimeRange.mongoize(from: Time.now, to: nil)
+      assert_equal({ from: Time.now.mongoize, to: nil }, Mongoid::TimeRange.mongoize(hash))
+
+      hash = Mongoid::TimeRange.mongoize(from: Time.now, to: Time.now.tomorrow)
+      assert_equal({ from: Time.now.mongoize, to: Time.now.tomorrow.mongoize }, Mongoid::TimeRange.mongoize(hash))
+    end
+  end
+
+
+  def test_class_demongoize_returns_time_range
+    freeze_time do
+      time_range = Mongoid::TimeRange.demongoize(from: Time.now, to: nil)
+      assert_equal Mongoid::TimeRange.new(Time.now, nil), time_range
+
+      time_range = Mongoid::TimeRange.demongoize(from: Time.now, to: Time.now.tomorrow)
+      assert_equal Mongoid::TimeRange.new(Time.now, Time.now.tomorrow), time_range
+    end
+  end
+
+
+  def test_it_returns_array
+    freeze_time do
+      time_range = Mongoid::TimeRange.demongoize(from: Time.now, to: nil)
+
+      assert_equal [Time.now, nil], time_range.to_a
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-time_range
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mario Uher
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -49,19 +35,15 @@ files:
 - Gemfile
 - README.md
 - 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
-- spec/support/mongoid.yml
-- spec/support/time.rb
-- spec/time_range_spec.rb
+- test/integration_test.rb
+- test/mongoid.yml
+- test/require_test.rb
+- test/test_helper.rb
+- test/time_range_test.rb
 homepage: https://github.com/haihappen/mongoid-time_range
 licenses: []
 metadata: {}

data/lib/enumerable/associate.rb

@@ -1,29 +0,0 @@
-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,
-  # pass a block that returns a value for the key:
-  #
-  #   [1, 2, 3].associate { |i| i ** 2 }
-  #   # => { 1 => 1, 2 => 4, 3 => 9 }
-  #
-  #   %w( tender love ).associate &:capitalize
-  #   # => {"tender"=>"Tender", "love"=>"Love"}
-  #
-  # If you have an enumerable key/value pairs and want to associate them,
-  # omit the block and you'll get a hash in return:
-  #
-  #   [[1, 2], [3, 4]].associate
-  #   # => { 1 => 2, 3 => 4 }
-  def associate(mapping = {})
-    if block_given?
-      each_with_object(mapping) do |key, object|
-        object[key] = yield(key)
-      end
-    else
-      each_with_object(mapping) do |(key, value), object|
-        object[key] = value
-      end
-    end
-  end
-end

data/spec/global_spec.rb

@@ -1,10 +0,0 @@
-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

@@ -1,58 +0,0 @@
-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.must_be_nil
-    end
-
-
-    describe 'when default is set to from: Time.now }' do
-      subject { DocumentWithImplicitDefault.create }
-
-
-      it 'sets from to current time and to to ni' do
-        subject.range.must_equal from: Time.now, to: nil
-      end
-    end
-
-
-    describe 'when default is set to ->{ Mongoid::TimeRange.new(from: Time.now) }' do
-      subject { DocumentWithExplicitDefault.create }
-
-
-      it 'sets from to current time and to to ni' do
-        subject.range.must_equal from: Time.now, to: nil
-      end
-    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.must_equal from: Time.now.beginning_of_year, to: 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.must_equal from: Time.now.beginning_of_year, to: Time.now.end_of_year
-    end
-  end
-
-
-  after { Timecop.return }
-end

data/spec/spec_helper.rb

@@ -1,13 +0,0 @@
-$: << File.expand_path('../../lib', __FILE__)
-
-require 'minitest/autorun'
-require 'minitest/pride'
-require 'minitest/spec'
-
-require 'mongoid/time_range'
-
-require 'mongoid'
-require 'timecop'
-
-# Load support *.rb files in ./support
-Dir[File.expand_path('../support/*.rb', __FILE__)].each { |file| require_relative file }

data/spec/support/connection.rb

@@ -1 +0,0 @@
-Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__), 'test')

data/spec/support/document.rb

@@ -1,17 +0,0 @@
-class Document
-  include Mongoid::Document
-
-  field :range, type: Mongoid::TimeRange
-end
-
-class DocumentWithImplicitDefault
-  include Mongoid::Document
-
-  field :range, type: Mongoid::TimeRange, default: ->{ { from: Time.now } }
-end
-
-class DocumentWithExplicitDefault
-  include Mongoid::Document
-
-  field :range, type: Mongoid::TimeRange, default: -> { Mongoid::TimeRange.new(Time.now) }
-end

data/spec/support/time.rb

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

data/spec/time_range_spec.rb

@@ -1,182 +0,0 @@
-require_relative 'spec_helper'
-
-describe Mongoid::TimeRange do
-  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
-    describe 'without any arguments' do
-      subject { Mongoid::TimeRange.new }
-
-
-      it 'sets from to Time.now' do
-        subject.from.must_equal Time.now
-      end
-
-
-      it 'sets to to nil' do
-        subject.to.must_be_nil
-      end
-    end
-
-
-    describe 'with one argument' do
-      subject { Mongoid::TimeRange.new(from) }
-
-
-      it 'sets from to given value' do
-        subject.from.must_equal from
-      end
-
-
-      it 'sets to to nil' do
-        subject.to.must_be_nil
-      end
-    end
-
-
-    describe 'with two arguments' do
-      subject { Mongoid::TimeRange.new(from, to) }
-
-
-      it 'sets from to given value' do
-        subject.from.must_equal from
-      end
-
-
-      it 'sets to to given value' do
-        subject.to.must_equal to
-      end
-    end
-  end
-
-
-  describe 'getters' do
-    it 'responds to from' do
-      subject.must_respond_to :from
-    end
-
-
-    it 'responds to to' do
-      subject.must_respond_to :to
-    end
-  end
-
-
-  describe 'setters' do
-    it 'responds to from=' do
-      subject.must_respond_to :from=
-    end
-
-
-    it 'responds to to=' do
-      subject.must_respond_to :to=
-    end
-  end
-
-
-  describe :mongoize do
-    let(:value) { subject.mongoize }
-
-
-    describe 'having both from and to' do
-      it 'returns database friendly value' do
-        value.must_equal from: from.mongoize, to: to.mongoize
-      end
-    end
-
-
-    describe 'having only from value' do
-      let(:to) { nil }
-
-
-      it 'returns database friendly value' do
-        value.must_equal from: from.mongoize, to: nil
-      end
-    end
-  end
-
-
-  describe 'self.mongoize' do
-    describe 'giving a time range object' do
-      let(:value) { Mongoid::TimeRange.mongoize(subject) }
-
-
-      describe 'having both from and to' do
-        it 'returns database friendly value' do
-          value.must_equal from: from.mongoize, to: to.mongoize
-        end
-      end
-
-
-      describe 'having only from value' do
-        let(:to) { nil }
-
-
-        it 'returns database friendly value' do
-          value.must_equal from: from.mongoize, to: nil
-        end
-      end
-    end
-
-
-    describe 'giving a hash' do
-      let(:value) { Mongoid::TimeRange.mongoize(from: from, to: to) }
-
-
-      describe 'having both from and to' do
-        it 'returns database friendly value' do
-          value.must_equal from: from.mongoize, to: to.mongoize
-        end
-      end
-
-
-      describe 'having only from value' do
-        let(:to) { nil }
-
-
-        it 'returns database friendly value' do
-          value.must_equal from: from.mongoize, to: nil
-        end
-      end
-    end
-  end
-
-
-  describe 'self.demongoize' do
-    let(:value) { Mongoid::TimeRange.demongoize(from: from, to: to) }
-
-
-    describe 'having both from and to' do
-      it 'returns a TimeRange object' do
-        value.must_equal Mongoid::TimeRange.new(from, to)
-      end
-    end
-
-
-    describe 'having only from value' do
-      let(:to) { nil }
-
-
-      it 'returns database friendly value' do
-        value.must_equal Mongoid::TimeRange.new(from)
-      end
-    end
-  end
-
-
-  describe :to_a do
-    let(:value) { subject.to_a }
-
-
-    it 'returns an array' do
-      value.must_equal [from, to]
-    end
-  end
-
-
-  after { Timecop.return }
-end