act_as_time_as_boolean 0.2.1 → 0.3.0

data/README.md

@@ -33,21 +33,31 @@ end
 
 item = Item.new
 
-p item.active?
+item.active?
 #=> false
 
-p item.inactive?
+item.inactive?
 #=> true
 
 item.active = true
 
-p item.active?
+item.active?
 #=> true
 
-p item.inactive?
+item.inactive?
 #=> false
 ```
 
+#### On a rails app
+
+```ruby
+Item.active
+#=>  #<ActiveRecord::Relation [...]>
+
+Item.inactive
+#=>  #<ActiveRecord::Relation [...]>
+```
+
 ## Contributing
 
 1. Fork repository

data/lib/act_as_time_as_boolean/base.rb

@@ -1,12 +1,13 @@
 module ActAsTimeAsBoolean
-
   def self.included(base)
-    base.define_singleton_method(:time_as_boolean) do |field, options={}|
+    @base = base
+
+    base.define_singleton_method(:time_as_boolean) do |field, options = {}|
       ActAsTimeAsBoolean.time_as_boolean_method field, options
     end
   end
 
-protected
+  protected
 
   def self.time_as_boolean_method(field, options)
     field = field.to_sym
@@ -17,33 +18,59 @@ protected
     if options[:opposite]
       ActAsTimeAsBoolean.opposite_getter_method field, options[:opposite]
     end
+
+    if ActAsTimeAsBoolean.has_scope_method?
+      ActAsTimeAsBoolean.field_scope field
+
+      if options[:opposite]
+        ActAsTimeAsBoolean.opposite_field_scope field, options[:opposite]
+      end
+    end
   end
 
   def self.field_getter_method(field)
-    self.send :define_method, field do
+    send :define_method, field do
       !send(:"#{field}_at").nil?
     end
 
-    self.send :alias_method, :"#{field}?", :"#{field}"
+    send :alias_method, :"#{field}?", :"#{field}"
   end
 
   def self.field_setter_method(field)
-    self.send :define_method, :"#{field}=" do |value|
+    send :define_method, :"#{field}=" do |value|
       value = value && value.to_s != '0'
-      if value && !self.send(field)
+      if value && !send(field)
         send :"#{field}_at=", Time.now
         true
-      elsif !value && self.send(field)
+      elsif !value && send(field)
         send :"#{field}_at=", nil
       end
     end
   end
 
   def self.opposite_getter_method(field, opposite)
-    self.send :define_method, :"#{opposite}" do
+    send :define_method, :"#{opposite}" do
       send(:"#{field}_at").nil?
     end
 
-    self.send :alias_method, :"#{opposite}?", :"#{opposite}"
+    send :alias_method, :"#{opposite}?", :"#{opposite}"
+  end
+
+  def self.field_scope(field)
+    @base.send :scope, field, -> {
+      @base.send :where, [ "#{field}_at IS NOT NULL AND #{field}_at <= ?", Time.current]
+    }
+  end
+
+  def self.opposite_field_scope(field, opposite)
+    @base.send :scope, opposite, -> {
+      @base.send :where, [ "#{field}_at IS NULL OR #{field}_at > ?", Time.current]
+    }
+  end
+
+  def self.has_scope_method?
+    defined?(ActiveRecord::Base) &&
+    ActiveRecord::Base.is_a?(Class) &&
+    ActiveRecord::Base.methods.include?(:scope)
   end
 end

data/lib/act_as_time_as_boolean/version.rb

@@ -1,3 +1,3 @@
 module ActAsTimeAsBoolean
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/lib/act_as_time_as_boolean_spec.rb

@@ -13,13 +13,41 @@ class TimeAsBooleanWithOppositeModel
 
   attr_accessor :active_at
 
-  def initialize(options={})
+  def initialize(options = {})
     @active_at = options[:active_at] || nil
   end
 
   time_as_boolean :active, opposite: :inactive
 end
 
+# Awesome mock to test scope
+class ActiveRecord
+end
+
+class ActiveRecord::Base
+  def self.scope(name, body, &block)
+    define_singleton_method name do
+      # Nothing to do here, just a mock
+    end
+  end
+end
+
+class InheritedModel < ActiveRecord::Base
+  include ActAsTimeAsBoolean
+
+  attr_accessor :active_at
+
+  time_as_boolean :active
+end
+
+class InheritedModelWithOpposite < ActiveRecord::Base
+  include ActAsTimeAsBoolean
+
+  attr_accessor :active_at
+
+  time_as_boolean :active, opposite: :inactive
+end
+
 describe ActAsTimeAsBoolean do
   it 'defines time_as_boolean class method' do
     SimpleTimeAsBooleanModel.singleton_methods.should include(:time_as_boolean)
@@ -71,6 +99,24 @@ describe ActAsTimeAsBoolean do
         subject.methods.should include(:inactive?)
       end
     end
+
+    describe 'on a rails app' do
+      describe 'with :active param' do
+        it 'define active scope' do
+          InheritedModel.methods.should include(:active)
+        end
+      end
+
+      describe 'with :active and opposite param' do
+        it 'define active scope' do
+          InheritedModelWithOpposite.methods.should include(:active)
+        end
+
+        it 'define inactive scope' do
+          InheritedModelWithOpposite.methods.should include(:inactive)
+        end
+      end
+    end
   end
 
   describe 'using ActAsTimeAsBoolean' do
@@ -133,28 +179,20 @@ describe ActAsTimeAsBoolean do
       end
 
       describe 'calling active=' do
-        describe 'with true' do
-          before { subject.active = true }
-
-          it { subject.active_at.class.should == Time }
-        end
-
-        describe 'with false' do
-          before { subject.active = false }
+        [true, '1'].each do |value|
+          describe "with #{value}" do
+            before { subject.active = value }
 
-          it { subject.active_at.should be_nil }
-        end
-
-        describe "with '1'" do
-          before { subject.active = '1' }
-
-          it { subject.active_at.class.should == Time }
+            it { subject.active_at.class.should == Time }
+          end
         end
 
-        describe "with '0'" do
-          before { subject.active = '0' }
+        [false, '0'].each do |value|
+          describe "with #{value}" do
+            before { subject.active = value }
 
-          it { subject.active_at.should be_nil }
+            it { subject.active_at.should be_nil }
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: act_as_time_as_boolean
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake