activerecord-time-scope 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a47d07140b93b71ecc7b8b4b69aad8eca6ace3e2
-  data.tar.gz: 0b00cb660f8003ba42e2aa24e18b9a3b427afcc6
+  metadata.gz: 371764ccbdc580176d978b5e7b69ee720b28fe62
+  data.tar.gz: 45dfca027bfc038cdc2cafe771201b24d90b9900
 SHA512:
-  metadata.gz: aefcda06d0a7f805eba9dd43622beb09de6f63e4ffc835082a130ea8c57c67758b6216e2db9dc1421ba813851acfd0c87edcb9b0b7bb06f971abfd790284b21a
-  data.tar.gz: 9cf87bf678472ccc200e91cf2b20461f657071b75f2585ecad336953f512af7e603b50dd6633b78eba9302be9481a4d04b183d89317a6bea8b4dbe44575a4efe
+  metadata.gz: 4f59e7cb0ef3876bc948b927091b0ec11fb679dbfd20eff57d2f0e48a23e72a80979f4f5947111477351d0e9e6844c366ef7148b22e2f36f0dce6f615224ae14
+  data.tar.gz: a66a5faee07bbded9c3a0ce489e11096ca0b98981c2660b5d6d8a74c804ccd1dff90560b510db44d762b172f9e333d8aeca5bc7d2a394f70c749e4bde56dc48f

data/.travis.yml

@@ -6,11 +6,14 @@ rvm:
   - 2.1
 
 env:
-  -
-  - ACTIVE_RECORD_VERSION=3.2.0
-  - ACTIVE_RECORD_VERSION=4.0.0
-  - ACTIVE_RECORD_VERSION=4.1.0
-  - ACTIVE_RECORD_VERSION=4.2.0.beta2
+  global:
+    - CODECLIMATE_REPO_TOKEN=9c215b69f33357ece2af42829259ad13f704172c052587a22cefcee2450bcc71
+  matrix:
+    -
+    - ACTIVE_RECORD_VERSION=3.2.0
+    - ACTIVE_RECORD_VERSION=4.0.0
+    - ACTIVE_RECORD_VERSION=4.1.0
+    - ACTIVE_RECORD_VERSION=4.2.0.rc1
 
 script: "bundle exec rake spec"
 

data/Gemfile

@@ -4,5 +4,6 @@ gem "activerecord", "~> #{ENV['ACTIVE_RECORD_VERSION']}" if ENV['ACTIVE_RECORD_V
 
 gem "sqlite3"
 gem 'database_cleaner'
+gem "codeclimate-test-reporter", group: :test, require: nil
 
 gemspec

data/README.md

@@ -115,8 +115,8 @@ Copyright (c) 2014 Daisuke Taniwaki. See [LICENSE](LICENSE) for details.
 [build-link]:  http://travis-ci.org/dtaniwaki/activerecord-time-scope
 [deps-image]:  https://gemnasium.com/dtaniwaki/activerecord-time-scope.svg
 [deps-link]:   https://gemnasium.com/dtaniwaki/activerecord-time-scope
-[cov-image]:   https://coveralls.io/repos/dtaniwaki/activerecord-time-scope/badge.png
-[cov-link]:    https://coveralls.io/r/dtaniwaki/activerecord-time-scope
+[cov-image]:   https://codeclimate.com/github/dtaniwaki/activerecord-time-scope/badges/coverage.svg
+[cov-link]:    https://codeclimate.com/github/dtaniwaki/activerecord-time-scope
 [gpa-image]:   https://codeclimate.com/github/dtaniwaki/activerecord-time-scope.png
 [gpa-link]:    https://codeclimate.com/github/dtaniwaki/activerecord-time-scope
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/activerecord-time-scope.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", ">= 3.0"
-  gem.add_development_dependency "coveralls"
 end

data/lib/active_record/time_scope.rb

@@ -31,9 +31,11 @@ module ActiveRecord
         model = self
         from_name = "#{table_name}.#{from_name}"
         to_name = "#{table_name}.#{to_name}"
-        model.scope "#{verb}_before", ->(time, opts = {}){ TimeRangeProxy.new(model, from_name, to_name).before(time, opts) }
+        scope "#{verb}_before", ->(time, opts = {}){ TimeRangeProxy.new(model, from_name, to_name).before(time, opts) }
         scope "#{verb}_after", ->(time, opts = {}){ TimeRangeProxy.new(model, from_name, to_name).after(time, opts) }
         scope "#{verb}_within", ->(from, to, from_opts = {}, to_opts = {}){ TimeRangeProxy.new(model, from_name, to_name).within(from, to, from_opts, to_opts) }
+        scope "#{verb}_at", ->(dt, opts = {}){ TimeRangeProxy.new(model, from_name, to_name).at(dt, opts) }
+        scope "#{verb}_on", ->(dt, opts = {}){ TimeRangeProxy.new(model, from_name, to_name).at(dt, opts) }
       end
     end
   end

data/lib/active_record/time_scope/time_range_proxy.rb

@@ -24,6 +24,12 @@ module ActiveRecord
         to_operator = to_opts[:include_equal].to_s != '' ? '<=' : '<'
         @model.where("? #{from_operator} #{@column_name1} AND #{@column_name2} #{to_operator} ?", from, to)
       end
+
+      def at(dt, opts = {})
+        operator = opts[:include_equal].to_s != '' ? '<=' : '<'
+        @model.where("#{@column_name1} #{operator} ? AND ? #{operator} #{@column_name2}", dt, dt)
+      end
+      alias_method :on, :at
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'database_cleaner'
 require 'simplecov'
-require 'coveralls'
-Coveralls.wear!
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 
 SimpleCov.start do
   add_filter 'spec/'

data/spec/time_scope/time_range_proxy_spec.rb

@@ -247,4 +247,64 @@ RSpec.describe ActiveRecord::TimeScope::TimeRangeProxy do
       end
     end
   end
+  describe "::wow_at" do
+    shared_examples "at" do
+      before do
+        klass.create! foo: time + 100.days, bar: time + 100.days
+      end
+      let(:options) { {} }
+      let(:a) { false }
+      let(:b) { false }
+      let(:c) { false }
+      let(:d) { false }
+      let(:e) { false }
+      subject { klass.wow_at(time, options) == [model] }
+      # A
+      # .=====.
+      # ......!
+      context "foo < bar < time" do
+        let!(:model) { klass.create! foo: time - 2.days, bar: time - 1.days }
+        it { is_expected.to be a }
+      end
+      # B
+      # .=====.
+      # .....!.
+      context "foo < bar = time" do
+        let!(:model) { klass.create! foo: time - 2.days, bar: time }
+        it { is_expected.to be b }
+      end
+      # C
+      # .=====.
+      # !......
+      context "time < foo < bar" do
+        let!(:model) { klass.create! foo: time + 1.days, bar: time + 2.days }
+        it { is_expected.to be c }
+      end
+      # D
+      # .=====.
+      # .!.....
+      context "time = foo < bar" do
+        let!(:model) { klass.create! foo: time, bar: time + 2.days }
+        it { is_expected.to be d }
+      end
+      # E
+      # .=====.
+      # ...!...
+      context "foo < time < bar" do
+        let!(:model) { klass.create! foo: time - 1.days, bar: time + 1.days }
+        it { is_expected.to be e }
+      end
+    end
+    it_behaves_like "at" do
+      let(:e) { true }
+    end
+    context "with include_equal option" do
+      it_behaves_like "at" do
+        let(:options) { {include_equal: true} }
+        let(:b) { true }
+        let(:d) { true }
+        let(:e) { true }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time-scope
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Time-Related Scope for ActiveRecord
 email:
 - daisuketaniwaki@gmail.com
@@ -113,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Time-Related Scope for ActiveRecord