microscope 0.4 → 0.4.1

data/README.md

@@ -1,10 +1,16 @@
-# Microscope
-
-[![Gem Version](https://badge.fury.io/rb/microscope.png)](https://rubygems.org/gems/microscope)
-[![Code Climate](https://codeclimate.com/github/mirego/microscope.png)](https://codeclimate.com/github/mirego/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.
+<p align="center">
+  <a href="https://github.com/mirego/microscope">
+    <img src="http://i.imgur.com/JMcAStM.png" alt="Microscope" />
+  </a>
+  <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://travis-ci.org/mirego/microscope"><img src="https://travis-ci.org/mirego/microscope.png?branch=master" /></a>
+</p>
+
+---
 
 ## Installation
 
@@ -96,6 +102,8 @@ User.updated_before(2.months.ago) # works!
 
 `Microscope` is © 2013 [Mirego](http://www.mirego.com) and may be freely distributed under the [New BSD license](http://opensource.org/licenses/BSD-3-Clause).  See the [`LICENSE.md`](https://github.com/mirego/microscope/blob/master/LICENSE.md) file.
 
+The microscope logo is based on [this lovely icon](http://thenounproject.com/noun/microscope/#icon-No9056) by [Scott Lewis](http://thenounproject.com/iconify), from The Noun Project. Used under a [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/) license.
+
 ## 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 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.

data/lib/microscope/instance_method/date_instance_method.rb

@@ -9,6 +9,10 @@ module Microscope
             value = send("#{field.name}")
             !value.nil? && value <= Date.today
           end
+
+          define_method "not_#{cropped_field}?" do
+            !#{cropped_field}?
+          end
         RUBY
       end
     end

data/lib/microscope/instance_method/datetime_instance_method.rb

@@ -9,6 +9,10 @@ module Microscope
             value = send("#{field.name}")
             !value.nil? && value <= Time.now
           end
+
+          define_method "not_#{cropped_field}?" do
+            !#{cropped_field}?
+          end
         RUBY
       end
     end

data/lib/microscope/scope.rb

@@ -1,5 +1,12 @@
 module Microscope
   class Scope < Struct.new(:model, :field)
+    def initialize(*args)
+      super
+
+      @field_name = field.name
+      @table_name = model.name.tableize
+    end
+
     # Inject ActiveRecord scopes into a model
     def self.inject_scopes(model, fields, options = {})
       fields.each do |field|

data/lib/microscope/scope/boolean_scope.rb

@@ -3,8 +3,8 @@ module Microscope
     class BooleanScope < Scope
       def apply
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          scope "#{field.name}", lambda { where("#{field.name}" => true) }
-          scope "not_#{field.name}", lambda { where("#{field.name}" => false) }
+          scope "#{@field_name}", lambda { where("#{@field_name}" => true) }
+          scope "not_#{@field_name}", lambda { where("#{@field_name}" => false) }
         RUBY
       end
     end

data/lib/microscope/scope/datetime_scope.rb

@@ -10,7 +10,8 @@ module Microscope
       end
 
       def apply
-        @cropped_field = field.name.gsub(@cropped_field_regex, '')
+        return unless @field_name =~ @cropped_field_regex
+        @cropped_field = @field_name.gsub(@cropped_field_regex, '')
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           #{before_scopes}
@@ -24,30 +25,30 @@ module Microscope
 
       def before_scopes
         <<-RUBY
-          scope "#{@cropped_field}_before", lambda { |time| where("#{field.name} < ?", time) }
-          scope "#{@cropped_field}_before_or_at", lambda { |time| where("#{field.name} <= ?", time) }
-          scope "#{@cropped_field}_before#{@now_suffix}", lambda { where("#{field.name} < ?", #{@now}) }
+          scope "#{@cropped_field}_before", lambda { |time| where("`#{@table_name}`.`#{@field_name}` < ?", time) }
+          scope "#{@cropped_field}_before_or_at", lambda { |time| where("`#{@table_name}`.`#{@field_name}` <= ?", time) }
+          scope "#{@cropped_field}_before#{@now_suffix}", lambda { where("`#{@table_name}`.`#{@field_name}` < ?", #{@now}) }
         RUBY
       end
 
       def after_scopes
         <<-RUBY
-          scope "#{@cropped_field}_after", lambda { |time| where("#{field.name} > ?", time) }
-          scope "#{@cropped_field}_after_or_at", lambda { |time| where("#{field.name} >= ?", time) }
-          scope "#{@cropped_field}_after#{@now_suffix}", lambda { where("#{field.name} > ?", #{@now}) }
+          scope "#{@cropped_field}_after", lambda { |time| where("`#{@table_name}`.`#{@field_name}` > ?", time) }
+          scope "#{@cropped_field}_after_or_at", lambda { |time| where("`#{@table_name}`.`#{@field_name}` >= ?", time) }
+          scope "#{@cropped_field}_after#{@now_suffix}", lambda { where("`#{@table_name}`.`#{@field_name}` > ?", #{@now}) }
         RUBY
       end
 
       def between_scopes
         <<-RUBY
-          scope "#{@cropped_field}_between", lambda { |range| where("#{field.name}" => range) }
+          scope "#{@cropped_field}_between", lambda { |range| where("#{@field_name}" => range) }
         RUBY
       end
 
       def boolean_scopes
         <<-RUBY
-          scope "#{@cropped_field}", lambda { where("#{field.name} IS NOT NULL AND #{field.name} <= ?", #{@now}) }
-          scope "not_#{@cropped_field}", lambda { where("#{field.name} IS NULL OR #{field.name} > ?", #{@now}) }
+          scope "#{@cropped_field}", lambda { where("`#{@table_name}`.`#{@field_name}` IS NOT NULL AND `#{@table_name}`.`#{@field_name}` <= ?", #{@now}) }
+          scope "not_#{@cropped_field}", lambda { where("`#{@table_name}`.`#{@field_name}` IS NULL OR `#{@table_name}`.`#{@field_name}` > ?", #{@now}) }
         RUBY
       end
     end

data/lib/microscope/version.rb

@@ -1,3 +1,3 @@
 module Microscope
-  VERSION = "0.4"
+  VERSION = "0.4.1"
 end

data/spec/microscope/instance_method/date_instance_method_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Microscope::InstanceMethod::DateInstanceMethod do
+  before do
+    run_migration do
+      create_table(:events, force: true) do |t|
+        t.date :started_on, default: nil
+      end
+    end
+
+    microscope 'Event'
+  end
+
+  describe '#started?' do
+    context 'with positive result' do
+      subject { Event.create(started_on: 2.months.ago) }
+      it { should be_started }
+      it { should_not be_not_started }
+    end
+
+    context 'with negative result' do
+      subject { Event.create(started_on: 1.month.from_now) }
+      it { should_not be_started }
+      it { should be_not_started }
+    end
+  end
+
+  describe '#not_started?' do
+    context 'with negative result' do
+      subject { Event.create(started_on: 2.months.ago) }
+      it { should_not be_not_started }
+    end
+
+    context 'with positive result' do
+      subject { Event.create(started_on: 1.month.from_now) }
+      it { should be_not_started }
+    end
+  end
+end

data/spec/microscope/instance_method/datetime_instance_method_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Microscope::InstanceMethod::DatetimeInstanceMethod do
+  before do
+    run_migration do
+      create_table(:events, force: true) do |t|
+        t.datetime :started_at, default: nil
+      end
+    end
+
+    microscope 'Event'
+  end
+
+  describe '#started?' do
+    context 'with positive result' do
+      subject { Event.create(started_at: 2.months.ago) }
+      it { should be_started }
+    end
+
+    context 'with negative result' do
+      subject { Event.create(started_at: 1.month.from_now) }
+      it { should_not be_started }
+    end
+  end
+
+  describe '#not_started?' do
+    context 'with negative result' do
+      subject { Event.create(started_at: 2.months.ago) }
+      it { should_not be_not_started }
+    end
+
+    context 'with positive result' do
+      subject { Event.create(started_at: 1.month.from_now) }
+      it { should be_not_started }
+    end
+  end
+end

data/spec/microscope/scope/boolean_scope_spec.rb

@@ -14,18 +14,22 @@ describe Microscope::Scope::BooleanScope do
   end
 
   describe 'positive scope' do
-    before { @user1 = User.create(active: true) }
+    before do
+      @user1 = User.create(active: true)
+      @user2 = User.create(active: false)
+    end
 
     its(:active) { should have(1).items }
     its(:active) { should include(@user1) }
-    its(:not_active) { should be_empty }
   end
 
   describe 'negative scope' do
-    before { @user1 = User.create(active: false) }
+    before do
+      @user1 = User.create(active: false)
+      @user2 = User.create(active: true)
+    end
 
     its(:not_active) { should have(1).items }
     its(:not_active) { should include(@user1) }
-    its(:active) { should be_empty }
   end
 end

data/spec/microscope/scope/date_scope_spec.rb

@@ -7,6 +7,7 @@ describe Microscope::Scope::DateScope do
     run_migration do
       create_table(:events, force: true) do |t|
         t.date :started_on, default: nil
+        t.date :published_date, default: nil
       end
     end
 
@@ -92,4 +93,11 @@ describe Microscope::Scope::DateScope do
       it { should_not be_started }
     end
   end
+
+  context 'for field that does not match the pattern' do
+    subject { Event }
+
+    it { should_not respond_to(:published_date) }
+    it { should_not respond_to(:not_published_date) }
+  end
 end

data/spec/microscope/scope/datetime_scope_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Microscope::Scope::DatetimeScope do
   subject { Event }
 
@@ -5,6 +7,7 @@ describe Microscope::Scope::DatetimeScope do
     run_migration do
       create_table(:events, force: true) do |t|
         t.datetime :started_at, default: nil
+        t.datetime :published_date, default: nil
       end
     end
 
@@ -90,4 +93,11 @@ describe Microscope::Scope::DatetimeScope do
       it { should_not be_started }
     end
   end
+
+  context 'for field that does not match the pattern' do
+    subject { Event }
+
+    it { should_not respond_to(:published_date) }
+    it { should_not respond_to(:not_published_date) }
+  end
 end

data/spec/microscope_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper'
+
+describe Microscope do
+  describe :acts_as_microscope do
+    subject { User }
+
+    before do
+      run_migration do
+        create_table(:users, force: true) do |t|
+          # Boolean
+          t.boolean :active, default: false
+          t.boolean :admin, default: false
+          t.boolean :moderator, default: false
+
+          # DateTime
+          t.datetime :published_at, default: false
+          t.datetime :removed_at, default: false
+
+          # Date
+          t.date :started_on, default: false
+          t.date :ended_on, default: false
+        end
+      end
+    end
+
+    describe :except do
+      before do
+        microscope 'User', except: [:admin, :removed_at, :ended_on]
+      end
+
+      it { should respond_to :active }
+      it { should respond_to :not_active }
+      it { should respond_to :moderator }
+      it { should respond_to :not_moderator }
+      it { should_not respond_to :admin }
+      it { should_not respond_to :not_admin }
+      it { should respond_to :published }
+      it { should respond_to :not_published }
+      it { should_not respond_to :removed }
+      it { should_not respond_to :not_removed }
+      it { should respond_to :started }
+      it { should respond_to :not_started }
+      it { should_not respond_to :ended }
+      it { should_not respond_to :not_ended }
+
+      context 'for single instance' do
+        subject { User.new }
+
+        it { should respond_to :published? }
+        it { should respond_to :not_published? }
+        it { should_not respond_to :removed? }
+        it { should_not respond_to :not_removed? }
+        it { should respond_to :started? }
+        it { should respond_to :not_started? }
+        it { should_not respond_to :ended? }
+        it { should_not respond_to :not_ended? }
+      end
+    end
+
+    describe :only do
+      before do
+        microscope 'User', only: [:admin, :removed_at, :ended_on]
+      end
+
+      it { should_not respond_to :active }
+      it { should_not respond_to :not_active }
+      it { should_not respond_to :moderator }
+      it { should_not respond_to :not_moderator }
+      it { should respond_to :admin }
+      it { should respond_to :not_admin }
+      it { should_not respond_to :published }
+      it { should_not respond_to :not_published }
+      it { should respond_to :removed }
+      it { should respond_to :not_removed }
+      it { should_not respond_to :started }
+      it { should_not respond_to :not_started }
+      it { should respond_to :ended }
+      it { should respond_to :not_ended }
+
+      context 'for single instance' do
+        subject { User.new }
+
+        it { should respond_to :removed? }
+        it { should respond_to :not_removed? }
+        it { should_not respond_to :published? }
+        it { should_not respond_to :not_published? }
+        it { should respond_to :ended? }
+        it { should respond_to :not_ended? }
+        it { should_not respond_to :started? }
+        it { should_not respond_to :not_started? }
+      end
+    end
+
+    describe 'except and only' do
+      before do
+        microscope 'User', only: [:admin, :started_on], except: [:active]
+      end
+
+      it { should_not respond_to :active }
+      it { should_not respond_to :not_active }
+      it { should_not respond_to :moderator }
+      it { should_not respond_to :not_moderator }
+      it { should respond_to :admin }
+      it { should respond_to :not_admin }
+      it { should respond_to :started }
+      it { should respond_to :not_started }
+      it { should_not respond_to :published }
+      it { should_not respond_to :not_published }
+      it { should_not respond_to :removed }
+      it { should_not respond_to :not_removed }
+      it { should_not respond_to :ended }
+      it { should_not respond_to :not_ended }
+
+      context 'for single instance' do
+        subject { User.new }
+
+        it { should respond_to :started? }
+        it { should respond_to :not_started? }
+        it { should_not respond_to :removed? }
+        it { should_not respond_to :not_removed? }
+        it { should_not respond_to :published? }
+        it { should_not respond_to :not_published? }
+        it { should_not respond_to :ended? }
+        it { should_not respond_to :not_ended? }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microscope
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,10 +136,12 @@ files:
 - lib/microscope/scope/datetime_scope.rb
 - lib/microscope/version.rb
 - microscope.gemspec
+- spec/microscope/instance_method/date_instance_method_spec.rb
+- spec/microscope/instance_method/datetime_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/scope_spec.rb
+- spec/microscope_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb
@@ -158,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2193329954126245792
+      hash: 3433673012719073524
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2193329954126245792
+      hash: 3433673012719073524
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -176,10 +178,12 @@ specification_version: 3
 summary: Microscope adds useful scopes targeting ActiveRecord boolean and datetime
   fields.
 test_files:
+- spec/microscope/instance_method/date_instance_method_spec.rb
+- spec/microscope/instance_method/datetime_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/scope_spec.rb
+- spec/microscope_spec.rb
 - spec/spec_helper.rb
 - spec/support/macros/database_macros.rb
 - spec/support/macros/model_macros.rb

data/spec/microscope/scope_spec.rb

@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe Microscope::Scope do
-  describe :inject_scopes do
-    subject { User }
-
-    before do
-      run_migration do
-        create_table(:users, force: true) do |t|
-          t.boolean :active, default: false
-          t.boolean :admin, default: false
-          t.boolean :moderator, default: false
-        end
-      end
-    end
-
-    describe :except do
-      before do
-        microscope 'User', except: [:admin]
-      end
-
-      it { should respond_to :active }
-      it { should respond_to :not_active }
-      it { should respond_to :moderator }
-      it { should respond_to :not_moderator }
-      it { should_not respond_to :admin }
-      it { should_not respond_to :not_admin }
-    end
-
-    describe :only do
-      before do
-        microscope 'User', only: [:admin]
-      end
-
-      it { should_not respond_to :active }
-      it { should_not respond_to :not_active }
-      it { should_not respond_to :moderator }
-      it { should_not respond_to :not_moderator }
-      it { should respond_to :admin }
-      it { should respond_to :not_admin }
-    end
-
-    describe 'except and only' do
-      before do
-        microscope 'User', only: [:admin], except: [:active]
-      end
-
-      it { should_not respond_to :active }
-      it { should_not respond_to :not_active }
-      it { should_not respond_to :moderator }
-      it { should_not respond_to :not_moderator }
-      it { should respond_to :admin }
-      it { should respond_to :not_admin }
-    end
-  end
-end