microscope 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42926873b4c35009b176d9ee2bf2928bddf7ef35
-  data.tar.gz: d3b1659915412d6429b51565a5665e52f7b8eed3
+  metadata.gz: 4d0dca4213a2ae5d3f283756406aed55a4d28e55
+  data.tar.gz: 10c15290f3784a35e3273954fa5451cf91dd5ea5
 SHA512:
-  metadata.gz: 729e7481c9b34ec14105f8a1128a8ab925fb677e6388940ba43c9ba264f76d289b20404e7ec332a894a8dcb0bfab1d6c8fa394441e4b24072ee9bd20ba45ce9d
-  data.tar.gz: 20203298794289b9ccc8abd500bd8f719d5b60448c288c4572571238ff29611d6fb1302099dce1cd8340a0718c60233fc574d47e18916b0aca9afde3b4e2776c
+  metadata.gz: f567999f9639db99ed40340ce3f46260e81733f7fcdf753a09f8d133e7c8cd25dcee76c1be31c7ecf29d40a3e40e414c695f78dcaeb8121eb7564e92e140edd5
+  data.tar.gz: f4f8caa7fd050625cdaf7b1505808fa045c3df34e79017083a488829ecee460c44ef18c319f56b42f2268067db199fc630ef47cac9b72876487a3bc7149384e3

data/lib/microscope/scope/boolean_scope.rb

@@ -5,6 +5,7 @@ module Microscope
         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 "un#{@field_name}", lambda { not_#{@field_name} }
         RUBY
       end
     end

data/lib/microscope/scope/datetime_scope.rb

@@ -48,6 +48,7 @@ module Microscope
         <<-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} }
         RUBY
       end
     end

data/lib/microscope/version.rb

@@ -1,3 +1,3 @@
 module Microscope
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

data/spec/microscope/instance_method/date_instance_method_spec.rb

@@ -20,55 +20,55 @@ describe Microscope::InstanceMethod::DateInstanceMethod do
 
   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 }
+      let(:event) { Event.create(started_on: 2.months.ago) }
+      it { expect(event).to be_started }
+      it { expect(event).to_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 }
+      let(:event) { Event.create(started_on: 1.month.from_now) }
+      it { expect(event).to_not be_started }
+      it { expect(event).to be_not_started }
     end
   end
 
   describe '#started=' do
-    before { subject.started = value }
+    before { event.started = value }
 
     context 'with blank argument' do
-      subject { Event.create(started_on: 2.months.ago) }
+      let(:event) { Event.create(started_on: 2.months.ago) }
       let(:value) { '0' }
 
-      it { should_not be_started }
+      it { expect(event).to_not be_started }
     end
 
     context 'with present argument' do
-      subject { Event.create }
+      let(:event) { Event.create }
       let(:value) { '1' }
 
-      it { should be_started }
+      it { expect(event).to be_started }
     end
 
     context 'with present argument, twice' do
-      subject { Event.create(started_on: time) }
+      let(:event) { Event.create(started_on: time) }
       let(:time) { 2.months.ago }
       let(:value) { '1' }
 
-      it { expect(subject.started_on.day).to eql time.day }
-      it { expect(subject.started_on.month).to eql time.month }
-      it { expect(subject.started_on.year).to eql time.year }
+      it { expect(event.started_on.day).to eql time.day }
+      it { expect(event.started_on.month).to eql time.month }
+      it { expect(event.started_on.year).to eql time.year }
     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 }
+      let(:event) { Event.create(started_on: 2.months.ago) }
+      it { expect(event).to_not be_not_started }
     end
 
     context 'with positive result' do
-      subject { Event.create(started_on: 1.month.from_now) }
-      it { should be_not_started }
+      let(:event) { Event.create(started_on: 1.month.from_now) }
+      it { expect(event).to be_not_started }
     end
   end
 

data/spec/microscope/instance_method/datetime_instance_method_spec.rb

@@ -13,51 +13,51 @@ describe Microscope::InstanceMethod::DatetimeInstanceMethod do
 
   describe '#started?' do
     context 'with positive result' do
-      subject { Event.create(started_at: 2.months.ago) }
-      it { should be_started }
+      let(:event) { Event.create(started_at: 2.months.ago) }
+      it { expect(event).to be_started }
     end
 
     context 'with negative result' do
-      subject { Event.create(started_at: 1.month.from_now) }
-      it { should_not be_started }
+      let(:event) { Event.create(started_at: 1.month.from_now) }
+      it { expect(event).to_not be_started }
     end
   end
 
   describe '#started=' do
-    before { subject.started = value }
+    before { event.started = value }
 
     context 'with blank argument' do
-      subject { Event.create(started_at: 2.months.ago) }
+      let(:event) { Event.create(started_at: 2.months.ago) }
       let(:value) { '0' }
 
-      it { should_not be_started }
+      it { expect(event).to_not be_started }
     end
 
     context 'with present argument' do
-      subject { Event.create }
+      let(:event) { Event.create }
       let(:value) { '1' }
 
-      it { should be_started }
+      it { expect(event).to be_started }
     end
 
     context 'with present argument, twice' do
-      subject { Event.create(started_at: time) }
+      let(:event) { Event.create(started_at: time) }
       let(:time) { 2.months.ago }
       let(:value) { '1' }
 
-      it { expect(subject.started_at).to eql time }
+      it { expect(event.started_at).to eql time }
     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 }
+      let(:event) { Event.create(started_at: 2.months.ago) }
+      it { expect(event).to_not be_not_started }
     end
 
     context 'with positive result' do
-      subject { Event.create(started_at: 1.month.from_now) }
-      it { should be_not_started }
+      let(:event) { Event.create(started_at: 1.month.from_now) }
+      it { expect(event).to be_not_started }
     end
   end
 

data/spec/microscope/scope/boolean_scope_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Microscope::Scope::BooleanScope do
-  subject { User }
-
   before do
     run_migration do
       create_table(:users, force: true) do |t|
@@ -19,8 +17,8 @@ describe Microscope::Scope::BooleanScope do
       @user2 = User.create(active: false)
     end
 
-    its(:active) { should have(1).items }
-    its(:active) { should include(@user1) }
+    it { expect(User.active).to have(1).items }
+    it { expect(User.active).to include(@user1) }
   end
 
   describe 'negative scope' do
@@ -29,7 +27,8 @@ describe Microscope::Scope::BooleanScope do
       @user2 = User.create(active: true)
     end
 
-    its(:not_active) { should have(1).items }
-    its(:not_active) { should include(@user1) }
+    it { expect(User.not_active).to have(1).items }
+    it { expect(User.not_active).to include(@user1) }
+    it { expect(User.unactive.to_a).to eql User.not_active.to_a }
   end
 end

data/spec/microscope/scope/date_scope_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Microscope::Scope::DateScope do
-  subject { Event }
-
   before do
     run_migration do
       create_table(:events, force: true) do |t|
@@ -80,24 +78,23 @@ describe Microscope::Scope::DateScope do
     end
 
     it { expect(Event.not_started.to_a).to eql [@event1, @event2] }
+    it { expect(Event.unstarted.to_a).to eql Event.not_started.to_a }
   end
 
   describe 'boolean instance method' do
     context 'for positive record' do
-      subject { Event.create(started_on: 3.months.ago) }
-      it { should be_started }
+      let(:event) { Event.create(started_on: 3.months.ago) }
+      it { expect(event).to be_started }
     end
 
     context 'for negative record' do
-      subject { Event.create(started_on: 2.months.from_now) }
-      it { should_not be_started }
+      let(:event) { Event.create(started_on: 2.months.from_now) }
+      it { expect(event).to_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) }
+    it { expect(Event).to_not respond_to(:published_date) }
+    it { expect(Event).to_not respond_to(:not_published_date) }
   end
 end

data/spec/microscope/scope/datetime_scope_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Microscope::Scope::DatetimeScope do
-  subject { Event }
-
   before do
     run_migration do
       create_table(:events, force: true) do |t|
@@ -80,24 +78,23 @@ describe Microscope::Scope::DatetimeScope do
     end
 
     it { expect(Event.not_started.to_a).to eql [@event1, @event2] }
+    it { expect(Event.unstarted.to_a).to eql Event.not_started.to_a }
   end
 
   describe 'boolean instance method' do
     context 'for positive record' do
-      subject { Event.create(started_at: 3.months.ago) }
-      it { should be_started }
+      let(:event) { Event.create(started_at: 3.months.ago) }
+      it { expect(event).to be_started }
     end
 
     context 'for negative record' do
-      subject { Event.create(started_at: 2.months.from_now) }
-      it { should_not be_started }
+      let(:event) { Event.create(started_at: 2.months.from_now) }
+      it { expect(event).to_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) }
+    it { expect(Event).to_not respond_to(:published_date) }
+    it { expect(Event).to_not respond_to(:not_published_date) }
   end
 end

data/spec/microscope_spec.rb

@@ -2,8 +2,6 @@ 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|
@@ -28,32 +26,32 @@ describe Microscope 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 }
+      it { expect(User).to respond_to :active }
+      it { expect(User).to respond_to :not_active }
+      it { expect(User).to respond_to :moderator }
+      it { expect(User).to respond_to :not_moderator }
+      it { expect(User).to_not respond_to :admin }
+      it { expect(User).to_not respond_to :not_admin }
+      it { expect(User).to respond_to :published }
+      it { expect(User).to respond_to :not_published }
+      it { expect(User).to_not respond_to :removed }
+      it { expect(User).to_not respond_to :not_removed }
+      it { expect(User).to respond_to :started }
+      it { expect(User).to respond_to :not_started }
+      it { expect(User).to_not respond_to :ended }
+      it { expect(User).to_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? }
+        let(:user) { User.new }
+
+        it { expect(user).to respond_to :published? }
+        it { expect(user).to respond_to :not_published? }
+        it { expect(user).to_not respond_to :removed? }
+        it { expect(user).to_not respond_to :not_removed? }
+        it { expect(user).to respond_to :started? }
+        it { expect(user).to respond_to :not_started? }
+        it { expect(user).to_not respond_to :ended? }
+        it { expect(user).to_not respond_to :not_ended? }
       end
     end
 
@@ -62,32 +60,32 @@ describe Microscope 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 }
+      it { expect(User).to_not respond_to :active }
+      it { expect(User).to_not respond_to :not_active }
+      it { expect(User).to_not respond_to :moderator }
+      it { expect(User).to_not respond_to :not_moderator }
+      it { expect(User).to respond_to :admin }
+      it { expect(User).to respond_to :not_admin }
+      it { expect(User).to_not respond_to :published }
+      it { expect(User).to_not respond_to :not_published }
+      it { expect(User).to respond_to :removed }
+      it { expect(User).to respond_to :not_removed }
+      it { expect(User).to_not respond_to :started }
+      it { expect(User).to_not respond_to :not_started }
+      it { expect(User).to respond_to :ended }
+      it { expect(User).to 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? }
+        let(:user) { User.new }
+
+        it { expect(user).to respond_to :removed? }
+        it { expect(user).to respond_to :not_removed? }
+        it { expect(user).to_not respond_to :published? }
+        it { expect(user).to_not respond_to :not_published? }
+        it { expect(user).to respond_to :ended? }
+        it { expect(user).to respond_to :not_ended? }
+        it { expect(user).to_not respond_to :started? }
+        it { expect(user).to_not respond_to :not_started? }
       end
     end
 
@@ -96,32 +94,32 @@ describe Microscope 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 }
+      it { expect(User).to_not respond_to :active }
+      it { expect(User).to_not respond_to :not_active }
+      it { expect(User).to_not respond_to :moderator }
+      it { expect(User).to_not respond_to :not_moderator }
+      it { expect(User).to respond_to :admin }
+      it { expect(User).to respond_to :not_admin }
+      it { expect(User).to respond_to :started }
+      it { expect(User).to respond_to :not_started }
+      it { expect(User).to_not respond_to :published }
+      it { expect(User).to_not respond_to :not_published }
+      it { expect(User).to_not respond_to :removed }
+      it { expect(User).to_not respond_to :not_removed }
+      it { expect(User).to_not respond_to :ended }
+      it { expect(User).to_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? }
+        let(:user) { User.new }
+
+        it { expect(user).to respond_to :started? }
+        it { expect(user).to respond_to :not_started? }
+        it { expect(user).to_not respond_to :removed? }
+        it { expect(user).to_not respond_to :not_removed? }
+        it { expect(user).to_not respond_to :published? }
+        it { expect(user).to_not respond_to :not_published? }
+        it { expect(user).to_not respond_to :ended? }
+        it { expect(user).to_not respond_to :not_ended? }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microscope
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Simon Prévost
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport