act_as_time_as_boolean 0.4.0 → 1.0.0

data/.gitignore

@@ -17,3 +17,4 @@ Gemfile.lock
 .yardoc
 _yardoc
 doc/
+*.sqlite

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+cache: bundler
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1

data/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# Contributing
+
+1. Fork repository
+2. Create a branch following a [successfull branching model](http://nvie.com/posts/a-successful-git-branching-model/)
+3. Write your feature/fix
+4. Write tests
+5. Pull request

data/README.md

@@ -10,20 +10,22 @@ _Add time_as_boolean feature to your ruby classes_
 
 ## Installation
 
-```shell
-gem install act_as_time_as_boolean
+### Ruby 1.9.3+, 2+
+
+```ruby
+gem 'act_as_time_as_boolean'
 ```
 
-Or in your Gemfile:
+### Ruby 1.9.2
 
 ```ruby
-gem 'act_as_time_as_boolean'
+gem 'act_as_time_as_boolean', '~> 0.4.0'
 ```
 
 ## Usage
 
 ```ruby
-class Item
+class Item < ActiveRecord::Base
   include ActAsTimeAsBoolean
 
   attr_accessor :active_at
@@ -46,11 +48,7 @@ item.active?
 
 item.inactive?
 #=> false
-```
-
-#### On a rails app
 
-```ruby
 Item.active
 #=>  #<ActiveRecord::Relation [...]>
 
@@ -60,11 +58,7 @@ Item.inactive
 
 ## Contributing
 
-1. Fork repository
-2. Create a branch following a [successfull branching model](http://nvie.com/posts/a-successful-git-branching-model/)
-3. Write your feature/fix
-4. Write tests
-5. Pull request
+[Contributors](https://github.com/caedes/act_as_time_as_boolean/graphs/contributors) and [CONTRIBUTING](https://github.com/caedes/act_as_time_as_boolean/blob/master/CONTRIBUTING.md)
 
 ## Licence
 

data/act_as_time_as_boolean.gemspec

@@ -6,15 +6,20 @@ Gem::Specification.new do |s|
   s.authors     = ['caedes']
   s.email       = ['laurentromain@gmail.com']
   s.homepage    = 'https://github.com/caedes/act_as_time_as_boolean'
-  s.summary     = 'Add time_as_boolean feature to your ruby classes'
+  s.summary     = 'Add time_as_boolean feature to ActiveRecord classes'
   s.description = s.summary
 
   s.files        = `git ls-files`.split("\n")
 
   s.require_path = 'lib'
 
+  s.add_dependency 'activesupport', '>= 3.2'
+
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.13'
   s.add_development_dependency 'coveralls', '~> 0.6'
   s.add_development_dependency 'json', '~> 1.7.7'
+  s.add_development_dependency 'combustion', '~> 0.5.1'
+  s.add_development_dependency 'rspec-rails', '~> 2.14'
+  s.add_development_dependency 'sqlite3', '~> 1.3.3'
+  s.add_development_dependency 'activerecord', '~> 4.0.4'
 end

data/lib/act_as_time_as_boolean/concern.rb

@@ -0,0 +1,50 @@
+require 'active_support/concern'
+
+module ActAsTimeAsBoolean
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def time_as_boolean(field, options = {})
+      define_method field do
+        !send(:"#{field}_at").nil?
+      end
+      send :alias_method, :"#{field}?", :"#{field}"
+
+      define_method :"#{field}=" do |value|
+        value = value && value.to_s != '0'
+        if value && !send(field)
+          send :"#{field}_at=", Time.now
+          true
+        elsif !value && send(field)
+          send :"#{field}_at=", nil
+        end
+      end
+
+      define_method :"#{field}!" do
+        send :"#{field}=", true
+        save!
+      end
+
+      if options[:opposite]
+        opposite = options[:opposite]
+        define_method :"#{opposite}" do
+          send(:"#{field}_at").nil?
+        end
+        send :alias_method, :"#{opposite}?", :"#{opposite}"
+
+        define_method :"#{opposite}!" do
+          send :"#{field}=", false
+          save!
+        end
+
+        scope opposite, -> {
+          where "#{table_name}.#{field}_at IS NULL OR #{table_name}.#{field}_at > ?", Time.current
+        }
+      end
+
+      scope field, -> {
+        where "#{table_name}.#{field}_at IS NOT NULL AND #{table_name}.#{field}_at <= ?", Time.current
+      }
+    end
+  end
+end

data/lib/act_as_time_as_boolean/version.rb

@@ -1,3 +1,3 @@
 module ActAsTimeAsBoolean
-  VERSION = '0.4.0'
+  VERSION = '1.0.0'
 end

data/lib/act_as_time_as_boolean.rb

@@ -1,2 +1,2 @@
 require 'act_as_time_as_boolean/version'
-require 'act_as_time_as_boolean/base'
+require 'act_as_time_as_boolean/concern'

data/spec/internal/app/models/article.rb

@@ -0,0 +1,5 @@
+class Article < ActiveRecord::Base
+  include ActAsTimeAsBoolean
+
+  time_as_boolean :active
+end

data/spec/internal/app/models/article_with_opposite.rb

@@ -0,0 +1,5 @@
+class ArticleWithOpposite < ActiveRecord::Base
+  include ActAsTimeAsBoolean
+
+  time_as_boolean :active, opposite: :inactive
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  #
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,9 @@
+ActiveRecord::Schema.define do
+  create_table :articles, force: true do |t|
+    t.datetime  :active_at
+  end
+
+  create_table :article_with_opposites, force: true do |t|
+    t.datetime  :active_at
+  end
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/lib/act_as_time_as_boolean_spec.rb

@@ -1,66 +1,15 @@
-require_relative '../spec_helper'
-
-class SimpleTimeAsBooleanModel
-  include ActAsTimeAsBoolean
-
-  attr_accessor :active_at
-
-  time_as_boolean :active
-end
-
-class TimeAsBooleanWithOppositeModel
-  include ActAsTimeAsBoolean
-
-  attr_accessor :active_at
-
-  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
-
-  def save!
-  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
+require 'spec_helper'
 
 describe ActAsTimeAsBoolean do
   it 'defines time_as_boolean class method' do
-    SimpleTimeAsBooleanModel.singleton_methods.should include(:time_as_boolean)
+    Article.singleton_methods.should include(:time_as_boolean)
   end
 
   describe 'calling time_as_boolean' do
     describe 'without param' do
       it 'raises an ArgumentError' do
         expect do
-          class NoParamTimeAsBooleanModel
+          class Article < ActiveRecord::Base
             include ActAsTimeAsBoolean
 
             time_as_boolean
@@ -70,7 +19,7 @@ describe ActAsTimeAsBoolean do
     end
 
     describe 'with :active param' do
-      subject { SimpleTimeAsBooleanModel.new.methods }
+      subject { Article.new.methods }
 
       it 'defines active method' do
         subject.should include(:active)
@@ -84,7 +33,7 @@ describe ActAsTimeAsBoolean do
     end
 
     describe 'with :active and opposite param' do
-      subject { TimeAsBooleanWithOppositeModel.new.methods }
+      subject { ArticleWithOpposite.new.methods }
 
       it 'defines active method' do
         subject.should include(:active)
@@ -103,9 +52,9 @@ describe ActAsTimeAsBoolean do
       end
     end
 
-    describe 'on a rails app' do
+    describe 'scopes' do
       describe 'with :active param' do
-        subject { InheritedModel.new }
+        subject { Article.new }
 
         it 'define active scope' do
           subject.class.methods.should include(:active)
@@ -117,7 +66,7 @@ describe ActAsTimeAsBoolean do
       end
 
       describe 'with :active and opposite param' do
-        subject { InheritedModelWithOpposite.new }
+        subject { ArticleWithOpposite.new }
 
         it 'define active scope' do
           subject.class.methods.should include(:active)
@@ -137,7 +86,7 @@ describe ActAsTimeAsBoolean do
   describe 'using ActAsTimeAsBoolean' do
     describe 'with an active instance' do
       let(:time) { Time.now }
-      subject { TimeAsBooleanWithOppositeModel.new active_at: time }
+      subject { ArticleWithOpposite.new active_at: time }
 
       describe 'calling active' do
         it { subject.active.should be_true }
@@ -180,10 +129,22 @@ describe ActAsTimeAsBoolean do
       describe 'calling inactive?' do
         it { subject.inactive?.should be_false }
       end
+
+      describe 'calling active!' do
+        before { subject.active! }
+
+        it { subject.active?.should be_true }
+      end
+
+      describe 'calling inactive!' do
+        before { subject.inactive! }
+
+        it { subject.active?.should be_false }
+      end
     end
 
     describe 'with an inactive instance' do
-      subject { TimeAsBooleanWithOppositeModel.new }
+      subject { ArticleWithOpposite.new }
 
       describe 'calling active' do
         it { subject.active.should be_false }
@@ -198,7 +159,7 @@ describe ActAsTimeAsBoolean do
           describe "with #{value}" do
             before { subject.active = value }
 
-            it { subject.active_at.class.should == Time }
+            it { subject.active_at.class.should == ActiveSupport::TimeWithZone }
           end
         end
 
@@ -218,20 +179,6 @@ describe ActAsTimeAsBoolean do
       describe 'calling inactive?' do
         it { subject.inactive?.should be_true }
       end
-    end
-
-    describe 'with an ActiveRecord inherited instance' do
-      subject { InheritedModel.new }
-
-      describe 'calling active!' do
-        before { subject.active! }
-
-        it { subject.active?.should be_true }
-      end
-    end
-
-    describe 'with an ActiveRecord inherited with opposite instance' do
-      subject { InheritedModelWithOpposite.new }
 
       describe 'calling active!' do
         before { subject.active! }

data/spec/spec_helper.rb

@@ -2,3 +2,8 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'act_as_time_as_boolean'
+require 'combustion'
+
+Combustion.initialize! :active_record
+
+require 'rspec/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: act_as_time_as_boolean
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,71 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
-description: Add time_as_boolean feature to your ruby classes
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+description: Add time_as_boolean feature to ActiveRecord classes
 email:
 - laurentromain@gmail.com
 executables: []
@@ -84,6 +148,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -91,8 +156,15 @@ files:
 - act_as_time_as_boolean.gemspec
 - init.rb
 - lib/act_as_time_as_boolean.rb
-- lib/act_as_time_as_boolean/base.rb
+- lib/act_as_time_as_boolean/concern.rb
 - lib/act_as_time_as_boolean/version.rb
+- spec/internal/app/models/article.rb
+- spec/internal/app/models/article_with_opposite.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/lib/act_as_time_as_boolean_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/caedes/act_as_time_as_boolean
@@ -118,5 +190,5 @@ rubyforge_project:
 rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
-summary: Add time_as_boolean feature to your ruby classes
+summary: Add time_as_boolean feature to ActiveRecord classes
 test_files: []

data/lib/act_as_time_as_boolean/base.rb

@@ -1,103 +0,0 @@
-module ActAsTimeAsBoolean
-  def self.included(base)
-    @base = base
-
-    base.define_singleton_method(:time_as_boolean) do |field, options = {}|
-      ActAsTimeAsBoolean.time_as_boolean_method field, options
-    end
-  end
-
-  protected
-
-  def self.time_as_boolean_method(field, options)
-    field = field.to_sym
-
-    ActAsTimeAsBoolean.field_getter_method field
-    ActAsTimeAsBoolean.field_setter_method field
-
-    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
-
-    if ActAsTimeAsBoolean.is_active_record_inherited?
-       ActAsTimeAsBoolean.field_bang_method field
-
-      if options[:opposite]
-        ActAsTimeAsBoolean.opposite_bang_method field, options[:opposite]
-      end
-    end
-  end
-
-  def self.field_getter_method(field)
-    send :define_method, field do
-      !send(:"#{field}_at").nil?
-    end
-
-    send :alias_method, :"#{field}?", :"#{field}"
-  end
-
-  def self.field_setter_method(field)
-    send :define_method, :"#{field}=" do |value|
-      value = value && value.to_s != '0'
-      if value && !send(field)
-        send :"#{field}_at=", Time.now
-        true
-      elsif !value && send(field)
-        send :"#{field}_at=", nil
-      end
-    end
-  end
-
-  def self.field_bang_method(field)
-    send :define_method, :"#{field}!" do
-      send :"#{field}=", true
-      save!
-    end
-  end
-
-  def self.opposite_getter_method(field, opposite)
-    send :define_method, :"#{opposite}" do
-      send(:"#{field}_at").nil?
-    end
-
-    send :alias_method, :"#{opposite}?", :"#{opposite}"
-  end
-
-  def self.opposite_bang_method(field, opposite)
-    send :define_method, :"#{opposite}!" do
-      send :"#{field}=", false
-      save!
-    end
-  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.is_active_record_inherited?
-    defined?(ActiveRecord::Base) &&
-    ActiveRecord::Base.is_a?(Class) &&
-    @base < ActiveRecord::Base
-  end
-
-  def self.has_scope_method?
-    is_active_record_inherited? &&
-    ActiveRecord::Base.methods.include?(:scope)
-  end
-end