microscope 0.1.1 → 0.2

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+  - 2.0.0
+  - 1.9.3
+
+gemfile:
+  - gemfiles/Gemfile.activerecord-4.0
+  - gemfiles/Gemfile.activerecord-3.2.x
+
+script: "echo 'DO IT' && bundle exec rake spec"

data/README.md

@@ -1,6 +1,9 @@
 # Microscope
 
-Microscope adds useful scopes targeting ActiveRecord boolean and datetime fields.
+[![Gem Version](https://badge.fury.io/rb/microscope.png)](https://rubygems.org/gems/microscope)
+[![Build Status](https://travis-ci.org/mirego/microscope.png?branch=master)](https://travis-ci.org/mirego/microscope)
+
+Microscope adds useful scopes targeting ActiveRecord boolean, date and datetime fields.
 
 ## Installation
 
@@ -17,6 +20,7 @@ create_table "events" do |t|
   t.string   "name"
   t.boolean  "special"
   t.datetime "expired_at"
+  t.date     "started_on"
 end
 
 class Event < ActiveRecord::Base
@@ -33,16 +37,22 @@ Time.now
 # => 2013-07-05 15:43:42
 
 Event.expired_before(2.months.ago)
-# SELECT * FROM `events` where `events`.`expired_at` > '2013-05-05 15:43:42'
+# SELECT * FROM `events` where `events`.`expired_at` < '2013-05-05 15:43:42'
 
 Event.expired_before_now
-# SELECT * FROM `events` where `events`.`expired_at` > '2013-07-05 15:43:42'
+# 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'
 
 Event.expired_between(2.months.ago..1.month.from_now)
 # SELECT * FROM `events` where `events`.`expired_at` BETWEEN '2013-05-05 15:43:42' AND '2013-08-05 15:43:42'
+
+Event.started_before(2.days.ago)
+# SELECT * FROM `events` where `events`.`started_on` < '2013-07-03'
+
+Event.started_between(2.days.ago..3.days.from_now)
+# SELECT * FROM `events` where `events`.`started_on` BETWEEN '2013-07-03' AND '2013-07-08'
 ```
 
 ### Options
@@ -55,14 +65,14 @@ class Event < ActiveRecord::Base
 end
 
 class User < ActiveRecord::Base
-  acts_as_microscope, except: [:activated_at]
+  acts_as_microscope, except: [:created_at]
 end
 
 Event.created_before(2.months.ago) # works!
 Event.updated_before(2.months.ago) # NoMethodError
 
-User.created_before(2.months.ago) # works!
-User.activated_before(2.months.ago) # NoMethodError
+User.created_before(2.months.ago) # NoMethodError
+User.updated_before(2.months.ago) # works!
 ```
 
 ## License
@@ -71,5 +81,6 @@ User.activated_before(2.months.ago) # NoMethodError
 
 ## About Mirego
 
-Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun.
-We proudly built mobile applications for [iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"), [iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"), [Android](http://mirego.com/en/android-app-development/ "Android application development"), [Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"), [Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and [Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development").
+Mirego is a team of passionate people who believe that work is a place where you can innovate and have fun. We proudly build mobile applications for [iPhone](http://mirego.com/en/iphone-app-development/ "iPhone application development"), [iPad](http://mirego.com/en/ipad-app-development/ "iPad application development"), [Android](http://mirego.com/en/android-app-development/ "Android application development"), [Blackberry](http://mirego.com/en/blackberry-app-development/ "Blackberry application development"), [Windows Phone](http://mirego.com/en/windows-phone-app-development/ "Windows Phone application development") and [Windows 8](http://mirego.com/en/windows-8-app-development/ "Windows 8 application development") in beautiful Quebec City.
+
+We also love [open-source software](http://open.mirego.com/) and we try to extract as much code as possible from our projects to give back to the community.

data/gemfiles/Gemfile.activerecord-3.2.x

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

data/gemfiles/Gemfile.activerecord-4.0

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

data/lib/microscope.rb

@@ -9,12 +9,8 @@ module Microscope
   def self.inject_into_active_record
     @inject_into_active_record ||= Proc.new do
       def self.acts_as_microscope(options = {})
-        self.microscope_options = options
-        self.send :include, Microscope::Mixin
-      end
-
-      def self.microscope_options=(options)
         @microscope_options = options
+        include Microscope::Mixin
       end
     end
   end

data/lib/microscope/mixin.rb

@@ -16,28 +16,39 @@ module Microscope
         end
 
         boolean_fields = model_columns.select { |c| c.type == :boolean }.map(&:name)
-        class_eval do
-          boolean_fields.each do |field|
-            scope field, lambda { where(field => true) }
-            scope "not_#{field}", lambda { where(field => false) }
-          end
+        boolean_fields.each do |field|
+          scope field, lambda { where(field => true) }
+          scope "not_#{field}", lambda { where(field => false) }
         end
 
         datetime_fields = model_columns.select { |c| c.type == :datetime }.map(&:name)
-        class_eval do
-          datetime_fields.each do |field|
-            cropped_field = field.gsub(/_at$/, '')
+        datetime_fields.each do |field|
+          cropped_field = field.gsub(/_at$/, '')
 
-            scope "#{cropped_field}_before", lambda { |time| where(["#{field} < ?", time]) }
-            scope "#{cropped_field}_before_or_at", lambda { |time| where(["#{field} <= ?", time]) }
-            scope "#{cropped_field}_before_now", lambda { where(["#{field} < ?", Time.now]) }
+          scope "#{cropped_field}_before", lambda { |time| where("#{field} < ?", time) }
+          scope "#{cropped_field}_before_or_at", lambda { |time| where("#{field} <= ?", time) }
+          scope "#{cropped_field}_before_now", lambda { where("#{field} < ?", Time.now) }
 
-            scope "#{cropped_field}_after", lambda { |time| where(["#{field} > ?", time]) }
-            scope "#{cropped_field}_after_or_at", lambda { |time| where(["#{field} >= ?", time]) }
-            scope "#{cropped_field}_after_now", lambda { where(["#{field} > ?", Time.now]) }
+          scope "#{cropped_field}_after", lambda { |time| where("#{field} > ?", time) }
+          scope "#{cropped_field}_after_or_at", lambda { |time| where("#{field} >= ?", time) }
+          scope "#{cropped_field}_after_now", lambda { where("#{field} > ?", Time.now) }
 
-            scope "#{cropped_field}_between", lambda { |range| where(field => range) }
-          end
+          scope "#{cropped_field}_between", lambda { |range| where(field => range) }
+        end
+
+        date_fields = model_columns.select { |c| c.type == :date }.map(&:name)
+        date_fields.each do |field|
+          cropped_field = field.gsub(/_on$/, '')
+
+          scope "#{cropped_field}_before", lambda { |time| where("#{field} < ?", time) }
+          scope "#{cropped_field}_before_or_on", lambda { |time| where("#{field} <= ?", time) }
+          scope "#{cropped_field}_before_today", lambda { where("#{field} < ?", Date.today) }
+
+          scope "#{cropped_field}_after", lambda { |time| where("#{field} > ?", time) }
+          scope "#{cropped_field}_after_or_at", lambda { |time| where("#{field} >= ?", time) }
+          scope "#{cropped_field}_after_today", lambda { where("#{field} > ?", Date.today) }
+
+          scope "#{cropped_field}_between", lambda { |range| where(field => range) }
         end
       end
     end

data/lib/microscope/version.rb

@@ -1,3 +1,3 @@
 module Microscope
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/spec/microscope/mixin_spec.rb

@@ -143,4 +143,64 @@ describe Microscope::Mixin do
       it { expect(Event.started_between(4.months.ago..2.months.ago).to_a).to eql [@event] }
     end
   end
+
+  describe 'Date scopes' do
+    subject { Event }
+
+    before do
+      run_migration do
+        create_table(:events, force: true) do |t|
+          t.date :started_on, default: false
+        end
+      end
+
+      microscope 'Event'
+    end
+
+    describe 'before scope' do
+      before do
+        @event = Event.create(started_on: 2.months.ago)
+        Event.create(started_on: 1.month.from_now)
+      end
+
+      it { expect(Event.started_before(1.month.ago).to_a).to eql [@event] }
+    end
+
+    describe 'before_today scope' do
+      before do
+        @event = Event.create(started_on: 2.months.ago)
+        Event.create(started_on: 1.month.from_now)
+      end
+
+      it { expect(Event.started_before_today.to_a).to eql [@event] }
+    end
+
+    describe 'after scope' do
+      before do
+        @event = Event.create(started_on: 2.months.from_now)
+        Event.create(started_on: 1.month.ago)
+      end
+
+      it { expect(Event.started_after(1.month.from_now).to_a).to eql [@event] }
+    end
+
+    describe 'after_today scope' do
+      before do
+        @event = Event.create(started_on: 2.months.from_now)
+        Event.create(started_on: 1.month.ago)
+      end
+
+      it { expect(Event.started_after_today.to_a).to eql [@event] }
+    end
+
+    describe 'between scope' do
+      before do
+        Event.create(started_on: 1.month.ago)
+        @event = Event.create(started_on: 3.months.ago)
+        Event.create(started_on: 5.month.ago)
+      end
+
+      it { expect(Event.started_between(4.months.ago..2.months.ago).to_a).to eql [@event] }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microscope
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,10 +119,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
+- gemfiles/Gemfile.activerecord-3.2.x
+- gemfiles/Gemfile.activerecord-4.0
 - lib/microscope.rb
 - lib/microscope/mixin.rb
 - lib/microscope/railtie.rb
@@ -147,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1493090215892188080
+      hash: -4314982214745494353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1493090215892188080
+      hash: -4314982214745494353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23