microscope 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d8b3f9466f8a555fcd4133c7cc541bfbe2e437
-  data.tar.gz: 0370c547769ffd68344c9a5746e0ab2f02d2ba54
+  metadata.gz: 33dac82bbfb0ee0add9e83ad93ebea6525f4f427
+  data.tar.gz: bbdc35dd0547369edac2fbb0877b42c970042584
 SHA512:
-  metadata.gz: 4328b4effc602616f1c6c2e80cf31213beb914a810a373d81f7c1142552fafa77bb8c457f286bd7359d5bdd0d702d80f39614dda799c61033ca00e9742e29026
-  data.tar.gz: 6da051c7e8ea9c78a947bb5eb6938ab57c61640afeb7d11bf323a2f1d0a10f24e1414d6ffc30d68a4cc4713d520052705e325c700c49746a7eabdb115a8c2cf9
+  metadata.gz: 3ec8faf2b9878a7fef29fce73a13720b54a6befff22580959252506240851549f05e79bd009c4487cf29b200f43825c9f1f44ae9c77f93a1db29423fc4aa8f1b
+  data.tar.gz: 5e36fb8f4f6819d721cb442cec88ec4ceffb7e430df68631f0cb59e8bc6069d9fb1d5975bdae1bd812f684b294fa1b3416e2f65fa7433c65bd9add25829dec2f

data/.rubocop.yml

@@ -0,0 +1,50 @@
+AllCops:
+  Include:
+    - microscope.gemspec
+
+Documentation:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+LineLength:
+  Max: 200
+
+ClassLength:
+  Max: 200
+
+AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+IfUnlessModifier:
+  Enabled: false
+
+CaseIndentation:
+  IndentWhenRelativeTo: case
+  IndentOneStep: true
+
+MethodLength:
+  CountComments: false
+  Max: 20
+
+SignalException:
+  Enabled: false
+
+ColonMethodCall:
+  Enabled: false
+
+AsciiComments:
+  Enabled: false
+
+Lambda:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false
+
+AssignmentInCondition:
+  Enabled: false
+
+ClassAndModuleChildren:
+  Enabled: false

data/.travis.yml

@@ -2,11 +2,9 @@ language: ruby
 
 rvm:
   - 2.0.0
-  - 1.9.3
 
 gemfile:
-  - gemfiles/Gemfile.activerecord-4.0
-  - gemfiles/Gemfile.activerecord-3.2.x
+  - gemfiles/Gemfile.activerecord-4.1
 
 env:
   - DB_ADAPTER=sqlite3

data/README.md

@@ -5,11 +5,11 @@
   <br />
   Microscope adds useful scopes targeting ActiveRecord <code>boolean</code>, <code>date</code> and <code>datetime</code> fields.
   <br /><br />
-  <a href="https://rubygems.org/gems/microscope"><img src="https://badge.fury.io/rb/microscope.png" /></a>
-  <a href="https://codeclimate.com/github/mirego/microscope"><img src="https://codeclimate.com/github/mirego/microscope.png" /></a>
-  <a href='https://coveralls.io/r/mirego/microscope?branch=master'><img src='https://coveralls.io/repos/mirego/microscope/badge.png?branch=master' /></a>
-  <a href='https://gemnasium.com/mirego/microscope'><img src="https://gemnasium.com/mirego/microscope.png" /></a>
-  <a href="https://travis-ci.org/mirego/microscope"><img src="https://travis-ci.org/mirego/microscope.png?branch=master" /></a>
+  <a href="https://rubygems.org/gems/microscope"><img src="http://img.shields.io/gem/v/microscope.svg" /></a>
+  <a href="https://codeclimate.com/github/mirego/microscope"><img src="http://img.shields.io/codeclimate/github/mirego/microscope.svg" /></a>
+  <a href='https://coveralls.io/r/mirego/microscope?branch=master'><img src="http://img.shields.io/coveralls/mirego/microscope.svg" /></a>
+  <a href='https://gemnasium.com/mirego/microscope'><img src="http://img.shields.io/gemnasium/mirego/microscope.svg" /></a>
+  <a href="https://travis-ci.org/mirego/microscope"><img src="http://img.shields.io/travis/mirego/microscope.svg" /></a>
 </p>
 
 ---
@@ -51,6 +51,9 @@ Event.expired_before(2.months.ago)
 Event.expired_before_now
 # SELECT * FROM `events` where `events`.`expired_at` < '2013-07-05 15:43:42'
 
+Event.expired_after_or_now
+# SELECT * FROM `events` where `events`.`expired_at` >= '2013-07-05 15:43:42'
+
 Event.expired_after_or_at(2.months.from_now)
 # SELECT * FROM `events` where `events`.`expired_at` >= '2013-09-05 15:43:42'
 
@@ -82,9 +85,19 @@ event.not_archived? # => false
 event = Event.unarchived.first
 event.archived? # => false
 
-event.archive!
+event.mark_as_archived
+event.archived? # => true
+event.archived_at # => 2013-07-05 15:43:42
+event.reload
+event.archived? # => false
+event.archived_at # => nil
+
+event.archive! # (same as #mark_as_archived but save the record immediately)
+event.archived? # => true
+event.archived_at # => 2013-07-05 15:43:42
+event.reload
 event.archived? # => true
-event.archived_at # => 2013-07-05 15:43:44 (Time.now)
+event.archived_at # => 2013-07-05 15:43:42
 ```
 
 ### Options

data/gemfiles/{Gemfile.activerecord-3.2.x → Gemfile.activerecord-4.1}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activerecord', '~> 3.2.0'
+gem 'activerecord', '~> 4.1.0'

data/lib/microscope.rb

@@ -1,18 +1,20 @@
-require "microscope/version"
+require 'microscope/version'
 
 require 'ostruct'
 require 'active_record'
 require 'active_support'
 
-require "microscope/scope"
-require "microscope/scope/boolean_scope"
-require "microscope/scope/datetime_scope"
-require "microscope/scope/date_scope"
+require 'microscope/utils'
 
-require "microscope/instance_method"
-require "microscope/instance_method/boolean_instance_method"
-require "microscope/instance_method/datetime_instance_method"
-require "microscope/instance_method/date_instance_method"
+require 'microscope/scope'
+require 'microscope/scope/boolean_scope'
+require 'microscope/scope/datetime_scope'
+require 'microscope/scope/date_scope'
+
+require 'microscope/instance_method'
+require 'microscope/instance_method/boolean_instance_method'
+require 'microscope/instance_method/datetime_instance_method'
+require 'microscope/instance_method/date_instance_method'
 
 module Microscope
   IRREGULAR_VERBS_FILE = File.expand_path('../../data/irregular_verbs.yml', __FILE__)

data/lib/microscope/instance_method.rb

@@ -13,31 +13,8 @@ module Microscope
     def self.inject_instance_methods(model, fields, options = {})
       fields.each do |field|
         scope = "#{field.type.to_s.camelize}InstanceMethod"
-
-        if Microscope::InstanceMethod.const_defined?(scope)
-          "Microscope::InstanceMethod::#{scope}".constantize.new(model, field).apply
-        end
-      end
-    end
-
-    # Convert a past participle to its infinitive form
-    def self.past_participle_to_infinitive(key)
-      *key, participle = key.split('_')
-
-      infinitive = if Microscope.special_verbs.include?(participle)
-        Microscope.special_verbs[participle]
-      elsif participle =~ /ed$/
-        participle.sub(/d$/, '')
-      else
-        participle
+        "Microscope::InstanceMethod::#{scope}".constantize.new(model, field).apply if const_defined?(scope)
       end
-
-      (key << infinitive).join('_')
-    end
-
-    # Convert a value to its boolean representation
-    def self.value_to_boolean(value)
-      ![nil, false, 0, '0', 'f', 'F', 'false', 'FALSE'].include?(value.presence)
     end
   end
 end

data/lib/microscope/instance_method/boolean_instance_method.rb

@@ -2,7 +2,7 @@ module Microscope
   class InstanceMethod
     class BooleanInstanceMethod < InstanceMethod
       def apply
-        infinitive_verb = self.class.past_participle_to_infinitive(field.name)
+        infinitive_verb = Microscope::Utils.past_participle_to_infinitive(field.name)
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           define_method "#{infinitive_verb}!" do

data/lib/microscope/instance_method/datetime_instance_method.rb

@@ -9,49 +9,63 @@ module Microscope
       end
 
       def apply
-        return unless @field_name =~ @cropped_field_regex
+        @cropped_field = field.name.gsub(@cropped_field_regex, '')
+        @infinitive_verb = Microscope::Utils.past_participle_to_infinitive(cropped_field)
 
-        cropped_field = field.name.gsub(@cropped_field_regex, '')
-        infinitive_verb = self.class.past_participle_to_infinitive(cropped_field)
+        model.class_eval(apply_methods) if @field_name =~ @cropped_field_regex
+      end
 
-        model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          define_method "#{cropped_field}?" do
-            value = send("#{field.name}")
-            !value.nil? && value <= #{@now}
-          end
+    protected
 
-          define_method "#{cropped_field}=" do |value|
-            if Microscope::InstanceMethod.value_to_boolean(value)
+      def apply_methods
+        apply_assignment_methods + apply_bang_methods + apply_predicate_methods + apply_aliases
+      end
+
+      def apply_assignment_methods
+        <<-RUBY
+          define_method '#{@cropped_field}=' do |value|
+            if Microscope::Utils.value_to_boolean(value)
               self.#{field.name} ||= #{@now}
             else
               self.#{field.name} = nil
             end
           end
 
-          define_method "not_#{cropped_field}?" do
-            !#{cropped_field}?
-          end
-          alias_method 'un#{cropped_field}?', 'not_#{cropped_field}?'
+          define_method('mark_as_#{@cropped_field}') { self.#{@cropped_field}= true }
+          define_method('mark_as_not_#{@cropped_field}') { self.#{@cropped_field}= false }
+          RUBY
+      end
 
-          define_method "#{infinitive_verb}!" do
-            send("#{field.name}=", #{@now})
+      def apply_bang_methods
+        <<-RUBY
+          define_method '#{@infinitive_verb}!' do
+            send('#{field.name}=', #{@now})
             save!
           end
 
-          define_method "not_#{infinitive_verb}!" do
-            send("#{field.name}=", nil)
+          define_method 'not_#{@infinitive_verb}!' do
+            send('#{field.name}=', nil)
             save!
           end
-          alias_method 'un#{infinitive_verb}!', 'not_#{infinitive_verb}!'
+        RUBY
+      end
 
-          define_method "mark_as_#{cropped_field}" do
-            self.#{cropped_field}= true
+      def apply_predicate_methods
+        <<-RUBY
+          define_method '#{@cropped_field}?' do
+            value = send('#{field.name}')
+            !value.nil? && value <= #{@now}
           end
 
-          define_method "mark_as_not_#{cropped_field}" do
-            self.#{cropped_field}= false
-          end
-          alias_method 'mark_as_un#{cropped_field}', 'mark_as_not_#{cropped_field}'
+          define_method('not_#{@cropped_field}?') { !#{@cropped_field}? }
+        RUBY
+      end
+
+      def apply_aliases
+        <<-RUBY
+          alias_method 'un#{@infinitive_verb}!', 'not_#{@infinitive_verb}!'
+          alias_method 'mark_as_un#{@cropped_field}', 'mark_as_not_#{@cropped_field}'
+          alias_method 'un#{@cropped_field}?', 'not_#{@cropped_field}?'
         RUBY
       end
     end

data/lib/microscope/scope.rb

@@ -19,10 +19,7 @@ module Microscope
     def self.inject_scopes(model, fields, options = {})
       fields.each do |field|
         scope = "#{field.type.to_s.camelize}Scope"
-
-        if Microscope::Scope.const_defined?(scope)
-          "Microscope::Scope::#{scope}".constantize.new(model, field).apply
-        end
+        "Microscope::Scope::#{scope}".constantize.new(model, field).apply if const_defined?(scope)
       end
     end
   end

data/lib/microscope/scope/date_scope.rb

@@ -6,7 +6,9 @@ module Microscope
 
         @now = 'Date.today'
         @now_suffix = '_today'
+        @specific_suffix = '_on'
         @cropped_field_regex = /_on$/
+        @formatted_time = 'time.try(:strftime, \'%Y-%m-%d\')'
       end
     end
   end

data/lib/microscope/scope/datetime_scope.rb

@@ -6,46 +6,31 @@ module Microscope
 
         @now = 'Time.now'
         @now_suffix = '_now'
+        @specific_suffix = '_at'
         @cropped_field_regex = /_at$/
+        @formatted_time = 'time'
       end
 
       def apply
-        return unless @field_name =~ @cropped_field_regex
-
-        model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          #{before_scopes}
-          #{after_scopes}
-          #{between_scopes}
-          #{boolean_scopes}
-        RUBY
+        model.class_eval(apply_scopes) if @field_name =~ @cropped_field_regex
       end
 
     private
 
-      def before_scopes
+      def apply_scopes
         <<-RUBY
-          scope "#{cropped_field}_before", lambda { |time| where('#{quoted_field} < ?', time) }
-          scope "#{cropped_field}_before_or_at", lambda { |time| where('#{quoted_field} <= ?', time) }
+          scope "#{cropped_field}_before", lambda { |time| where('#{quoted_field} < ?', #{@formatted_time}) }
+          scope "#{cropped_field}_before_or#{@specific_suffix}", lambda { |time| where('#{quoted_field} <= ?', #{@formatted_time}) }
           scope "#{cropped_field}_before#{@now_suffix}", lambda { where('#{quoted_field} < ?', #{@now}) }
-        RUBY
-      end
+          scope "#{cropped_field}_before_or#{@now_suffix}", lambda { where('#{quoted_field} <= ?', #{@now}) }
 
-      def after_scopes
-        <<-RUBY
-          scope "#{cropped_field}_after", lambda { |time| where('#{quoted_field} > ?', time) }
-          scope "#{cropped_field}_after_or_at", lambda { |time| where('#{quoted_field} >= ?', time) }
+          scope "#{cropped_field}_after", lambda { |time| where('#{quoted_field} > ?', #{@formatted_time}) }
+          scope "#{cropped_field}_after_or#{@specific_suffix}", lambda { |time| where('#{quoted_field} >= ?', #{@formatted_time}) }
           scope "#{cropped_field}_after#{@now_suffix}", lambda { where('#{quoted_field} > ?', #{@now}) }
-        RUBY
-      end
+          scope "#{cropped_field}_after_or#{@now_suffix}", lambda { where('#{quoted_field} >= ?', #{@now}) }
 
-      def between_scopes
-        <<-RUBY
           scope "#{cropped_field}_between", lambda { |range| where("#{@field_name}" => range) }
-        RUBY
-      end
 
-      def boolean_scopes
-        <<-RUBY
           scope "#{cropped_field}", lambda { where('#{quoted_field} IS NOT NULL AND #{quoted_field} <= ?', #{@now}) }
           scope "not_#{cropped_field}", lambda { where('#{quoted_field} IS NULL OR #{quoted_field} > ?', #{@now}) }
           scope "un#{cropped_field}", lambda { not_#{cropped_field} }

data/lib/microscope/utils.rb

@@ -0,0 +1,23 @@
+module Microscope
+  module Utils
+    # Convert a past participle to its infinitive form
+    def self.past_participle_to_infinitive(key)
+      *key, participle = key.split('_')
+
+      infinitive = participle
+
+      if Microscope.special_verbs.include?(participle)
+        infinitive = Microscope.special_verbs[participle]
+      elsif participle =~ /ed$/
+        infinitive = participle.sub(/d$/, '')
+      end
+
+      (key << infinitive).join('_')
+    end
+
+    # Convert a value to its boolean representation
+    def self.value_to_boolean(value)
+      ![nil, false, 0, '0', 'f', 'F', 'false', 'FALSE'].include?(value.presence)
+    end
+  end
+end

data/lib/microscope/version.rb

@@ -1,3 +1,3 @@
 module Microscope
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/microscope.gemspec

@@ -6,26 +6,28 @@ require 'microscope/version'
 Gem::Specification.new do |spec|
   spec.name          = 'microscope'
   spec.version       = Microscope::VERSION
-  spec.authors       = ["Simon Prévost", "Rémi Prévost"]
-  spec.email         = ["sprevost@mirego.com", "rprevost@mirego.com"]
+  spec.authors       = ['Simon Prévost', 'Rémi Prévost']
+  spec.email         = ['sprevost@mirego.com', 'rprevost@mirego.com']
   spec.description   = 'Microscope adds useful scopes targeting ActiveRecord boolean and datetime fields.'
-  spec.summary       = 'Microscope adds useful scopes targeting ActiveRecord boolean and datetime fields.'
+  spec.summary       = spec.description
   spec.homepage      = 'https://github.com/mirego/microscope'
   spec.license       = 'BSD 3-Clause'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($RS)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport', '>= 3.0.0'
   spec.add_dependency 'activerecord', '>= 3.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '3.0.0.rc1'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'mysql2', '~> 0.3.13'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop', '0.20.1'
+  spec.add_development_dependency 'phare'
 end

data/spec/microscope/instance_method/date_instance_method_spec.rb

@@ -79,7 +79,7 @@ describe Microscope::InstanceMethod::DateInstanceMethod do
 
   describe '#start!' do
     let(:stubbed_date) { Date.parse('2020-03-18 08:00:00') }
-    before { Date.stub(:today).and_return(stubbed_date) }
+    before { allow(Date).to receive(:today).and_return(stubbed_date) }
 
     let(:event) { Event.create(started_on: nil) }
     it { expect { event.start! }.to change { event.reload.started_on }.from(nil).to(stubbed_date) }
@@ -95,7 +95,7 @@ describe Microscope::InstanceMethod::DateInstanceMethod do
 
   describe '#mark_as_started' do
     let(:stubbed_date) { Date.parse('2020-03-18 08:00:00') }
-    before { Date.stub(:today).and_return(stubbed_date) }
+    before { allow(Date).to receive(:today).and_return(stubbed_date) }
 
     let(:event) { Event.create(started_on: nil) }
     it { expect { event.mark_as_started }.to_not change { event.reload.started_on } }

data/spec/microscope/instance_method/datetime_instance_method_spec.rb

@@ -68,7 +68,7 @@ describe Microscope::InstanceMethod::DatetimeInstanceMethod do
 
   describe '#start!' do
     let(:stubbed_date) { Time.parse('2020-03-18 08:00:00') }
-    before { Time.stub(:now).and_return(stubbed_date) }
+    before { allow(Time).to receive(:now).and_return(stubbed_date) }
 
     let(:event) { Event.create(started_at: nil) }
     it { expect { event.start! }.to change { event.reload.started_at }.from(nil).to(stubbed_date) }
@@ -84,7 +84,7 @@ describe Microscope::InstanceMethod::DatetimeInstanceMethod do
 
   describe '#mark_as_started' do
     let(:stubbed_date) { Time.parse('2020-03-18 08:00:00') }
-    before { Time.stub(:now).and_return(stubbed_date) }
+    before { allow(Time).to receive(:now).and_return(stubbed_date) }
 
     let(:event) { Event.create(started_at: nil) }
     it { expect { event.mark_as_started }.to_not change { event.reload.started_at } }

data/spec/microscope/scope/boolean_scope_spec.rb

@@ -17,7 +17,7 @@ describe Microscope::Scope::BooleanScope do
       @user2 = User.create(active: false)
     end
 
-    it { expect(User.active).to have(1).items }
+    it { expect(User.active.length).to eql 1 }
     it { expect(User.active).to include(@user1) }
   end
 
@@ -27,7 +27,7 @@ describe Microscope::Scope::BooleanScope do
       @user2 = User.create(active: true)
     end
 
-    it { expect(User.not_active).to have(1).items }
+    it { expect(User.not_active.length).to eql 1 }
     it { expect(User.not_active).to include(@user1) }
     it { expect(User.unactive.to_a).to eql User.not_active.to_a }
   end

data/spec/microscope/scope/date_scope_spec.rb

@@ -21,6 +21,31 @@ describe Microscope::Scope::DateScope do
     it { expect(Event.started_before(1.month.ago).to_a).to eql [@event] }
   end
 
+  describe 'before_or_on scope' do
+    let(:date) { 2.months.ago }
+
+    before do
+      @event1 = Event.create(started_on: date)
+      @event2 = Event.create(started_on: date - 1.day)
+      Event.create(started_on: 1.month.from_now)
+    end
+
+    it { expect(Event.started_before_or_on(date).to_a).to eql [@event1, @event2] }
+  end
+
+  describe 'before_or_now scope' do
+    let(:stubbed_date) { Date.parse('2020-03-18 08:00:00') }
+    before { allow(Date).to receive(:today).and_return(stubbed_date) }
+
+    before do
+      @event1 = Event.create(started_on: stubbed_date)
+      @event2 = Event.create(started_on: stubbed_date - 1.day)
+      Event.create(started_on: stubbed_date + 1.week)
+    end
+
+    it { expect(Event.started_before_or_today.to_a).to eql [@event1, @event2] }
+  end
+
   describe 'before_today scope' do
     before do
       @event = Event.create(started_on: 2.months.ago)
@@ -39,6 +64,31 @@ describe Microscope::Scope::DateScope do
     it { expect(Event.started_after(1.month.from_now).to_a).to eql [@event] }
   end
 
+  describe 'after_or_on scope' do
+    let(:date) { 2.months.from_now }
+
+    before do
+      @event1 = Event.create(started_on: date)
+      @event2 = Event.create(started_on: date + 1.day)
+      Event.create(started_on: 1.month.ago)
+    end
+
+    it { expect(Event.started_after_or_on(date).to_a).to eql [@event1, @event2] }
+  end
+
+  describe 'after_or_now scope' do
+    let(:stubbed_date) { Date.parse('2020-03-18 08:00:00') }
+    before { allow(Date).to receive(:today).and_return(stubbed_date) }
+
+    before do
+      @event1 = Event.create(started_on: stubbed_date)
+      @event2 = Event.create(started_on: stubbed_date + 1.day)
+      Event.create(started_on: 1.month.ago)
+    end
+
+    it { expect(Event.started_after_or_today.to_a).to eql [@event1, @event2] }
+  end
+
   describe 'after_today scope' do
     before do
       @event = Event.create(started_on: 2.months.from_now)

data/spec/microscope/scope/datetime_scope_spec.rb

@@ -21,6 +21,31 @@ describe Microscope::Scope::DatetimeScope do
     it { expect(Event.started_before(1.month.ago).to_a).to eql [@event] }
   end
 
+  describe 'before_or_at scope' do
+    let(:datetime) { 1.month.ago }
+
+    before do
+      @event1 = Event.create(started_at: datetime)
+      @event2 = Event.create(started_at: datetime - 1.second)
+      Event.create(started_at: 1.month.from_now)
+    end
+
+    it { expect(Event.started_before_or_at(datetime).to_a).to eql [@event1, @event2] }
+  end
+
+  describe 'before_or_now scope' do
+    let(:stubbed_date) { Time.parse('2020-03-18 08:00:00') }
+    before { allow(Time).to receive(:now).and_return(stubbed_date) }
+
+    before do
+      @event1 = Event.create(started_at: stubbed_date)
+      @event2 = Event.create(started_at: stubbed_date - 1.second)
+      Event.create(started_at: 1.month.from_now)
+    end
+
+    it { expect(Event.started_before_or_now.to_a).to eql [@event1, @event2] }
+  end
+
   describe 'before_now scope' do
     before do
       @event = Event.create(started_at: 2.months.ago)
@@ -39,6 +64,31 @@ describe Microscope::Scope::DatetimeScope do
     it { expect(Event.started_after(1.month.from_now).to_a).to eql [@event] }
   end
 
+  describe 'after_or_at scope' do
+    let(:datetime) { 1.month.from_now }
+
+    before do
+      @event1 = Event.create(started_at: datetime)
+      @event2 = Event.create(started_at: datetime + 1.second)
+      Event.create(started_at: 1.month.ago)
+    end
+
+    it { expect(Event.started_after_or_at(datetime).to_a).to eql [@event1, @event2] }
+  end
+
+  describe 'after_or_now scope' do
+    let(:stubbed_date) { Time.parse('2020-03-18 08:00:00') }
+    before { allow(Time).to receive(:now).and_return(stubbed_date) }
+
+    before do
+      @event1 = Event.create(started_at: stubbed_date)
+      @event2 = Event.create(started_at: stubbed_date + 1.second)
+      Event.create(started_at: 1.month.ago)
+    end
+
+    it { expect(Event.started_after_or_now.to_a).to eql [@event1, @event2] }
+  end
+
   describe 'after_now scope' do
     before do
       @event = Event.create(started_at: 2.months.from_now)

data/spec/microscope/{instance_method_spec.rb → utils_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Microscope::InstanceMethod do
+describe Microscope::Utils do
   describe :ClassMethods do
     describe :past_participle_to_infinitive do
       before do
@@ -9,9 +9,9 @@ describe Microscope::InstanceMethod do
         end
       end
 
-      let(:past_participles) { ['liked', 'loved', 'gateway_canceled', 'started', 'fed', 'foo'] }
-      let(:infinitives) { ['like', 'love', 'gateway_cancel', 'start', 'feed', 'bar'] }
-      let(:mapped_past_participles) { past_participles.map { |v| Microscope::InstanceMethod.past_participle_to_infinitive(v) } }
+      let(:past_participles) { %w(liked loved gateway_canceled started fed foo) }
+      let(:infinitives) { %w(like love gateway_cancel start feed bar) }
+      let(:mapped_past_participles) { past_participles.map { |v| Microscope::Utils.past_participle_to_infinitive(v) } }
 
       specify do
         expect(mapped_past_participles).to eql infinitives

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
 require 'coveralls'
 Coveralls.wear!
@@ -18,6 +18,11 @@ RSpec.configure do |config|
   config.include DatabaseMacros
   config.include ModelMacros
 
+  # Disable `should` syntax
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.before :each do
     # Establish ActiveRecord database connection
     adapter = ENV['DB_ADAPTER'] || 'sqlite3'

data/spec/support/macros/database_macros.rb

@@ -5,7 +5,7 @@ module DatabaseMacros
     klass = Class.new(ActiveRecord::Migration)
 
     # Create a new `up` that executes the argument
-    klass.send(:define_method, :up) { self.instance_exec(&block) }
+    klass.send(:define_method, :up) { instance_exec(&block) }
 
     # Create a new instance of it and execute its `up` method
     klass.new.up

data/spec/support/macros/model_macros.rb

@@ -7,7 +7,7 @@ module ModelMacros
     end
   end
 
-  protected
+protected
 
   # Create a new model class
   def spawn_model(klass_name, parent_klass, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microscope
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Simon Prévost
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,16 +71,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.20.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.20.1
+- !ruby/object:Gem::Dependency
+  name: phare
+  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: Microscope adds useful scopes targeting ActiveRecord boolean and datetime
   fields.
 email:
@@ -148,14 +176,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - data/irregular_verbs.yml
-- gemfiles/Gemfile.activerecord-3.2.x
-- gemfiles/Gemfile.activerecord-4.0
+- gemfiles/Gemfile.activerecord-4.1
 - lib/microscope.rb
 - lib/microscope/instance_method.rb
 - lib/microscope/instance_method/boolean_instance_method.rb
@@ -165,15 +193,16 @@ files:
 - lib/microscope/scope/boolean_scope.rb
 - lib/microscope/scope/date_scope.rb
 - lib/microscope/scope/datetime_scope.rb
+- lib/microscope/utils.rb
 - lib/microscope/version.rb
 - microscope.gemspec
 - spec/microscope/instance_method/boolean_instance_method_spec.rb
 - spec/microscope/instance_method/date_instance_method_spec.rb
 - spec/microscope/instance_method/datetime_instance_method_spec.rb
-- spec/microscope/instance_method_spec.rb
 - spec/microscope/scope/boolean_scope_spec.rb
 - spec/microscope/scope/date_scope_spec.rb
 - spec/microscope/scope/datetime_scope_spec.rb
+- spec/microscope/utils_spec.rb
 - spec/microscope_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/database/database_adapter.rb
@@ -211,10 +240,10 @@ test_files:
 - spec/microscope/instance_method/boolean_instance_method_spec.rb
 - spec/microscope/instance_method/date_instance_method_spec.rb
 - spec/microscope/instance_method/datetime_instance_method_spec.rb
-- spec/microscope/instance_method_spec.rb
 - spec/microscope/scope/boolean_scope_spec.rb
 - spec/microscope/scope/date_scope_spec.rb
 - spec/microscope/scope/datetime_scope_spec.rb
+- spec/microscope/utils_spec.rb
 - spec/microscope_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/database/database_adapter.rb

data/gemfiles/Gemfile.activerecord-4.0

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '../'
-
-gem 'activerecord', '~> 4.0.0'