pacecar 1.5.3 → 2.0.0

data/Rakefile

@@ -5,10 +5,14 @@ require 'appraisal'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-desc "Default: run the unit tests."
-task :default => [:all]
+task :default do |t|
+  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+    exec 'rake spec'
+  else
+    Rake::Task['appraise'].execute
+  end
+end
 
-desc 'Test the plugin under all supported Rails versions.'
-task :all => ["appraisal:install"] do |t|
-  exec('rake appraisal spec')
+task appraise: ['appraisal:install'] do |t|
+  exec 'rake appraisal'
 end

data/TESTING.md

@@ -0,0 +1,40 @@
+Running the test suite
+======================
+
+
+Run the tests:
+
+    % rake
+
+In order to do this you must have gems bundled, Appraisal set up, and
+three databases configured.
+
+bundler
+-------
+
+    % bundle --binstubs
+
+Appraisal
+---------
+
+    % rake appraisal:install
+
+MySQL
+-----
+
+    % echo create database pacecar_test | mysql
+    % cd spec/dummy
+    spec/dummy% RAILS_ENV=test BUNDLE_GEMFILE=../../gemfiles/rails_4_mysql2_driver.gemfile bundle exec rake db:migrate
+
+Postgres
+--------
+
+    % createdb pacecar_test
+    % cd spec/dummy
+    spec/dummy% RAILS_ENV=test BUNDLE_GEMFILE=../../gemfiles/rails_4_pg_driver.gemfile bundle exec rake db:migrate
+
+sqlite
+------
+
+    % cd spec/dummy
+    spec/dummy% RAILS_ENV=test % BUNDLE_GEMFILE=../../gemfiles/rails_4_sqlite3_driver.gemfile bundle exec rake db:migrate

data/gemfiles/rails_4_mysql2_driver.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.0.0"
+gem "mysql2"
+
+gemspec :path=>"../"

data/gemfiles/rails_4_pg_driver.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.0.0"
+gem "pg"
+
+gemspec :path=>"../"

data/gemfiles/rails_4_sqlite3_driver.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.0.0"
+gem "sqlite3"
+
+gemspec :path=>"../"

data/lib/pacecar.rb

@@ -1,33 +1,23 @@
-require 'pacecar/associations'
 require 'pacecar/boolean'
-require 'pacecar/datetime'
-require 'pacecar/duration'
 require 'pacecar/helpers'
 require 'pacecar/limit'
 require 'pacecar/order'
 require 'pacecar/polymorph'
 require 'pacecar/presence'
-require 'pacecar/ranking'
 require 'pacecar/search'
 require 'pacecar/state'
-require 'pacecar/numeric'
 require 'pacecar/version'
 
 module Pacecar
   def self.included(base)
     base.class_eval do
-      include Pacecar::Associations
       include Pacecar::Boolean
-      include Pacecar::Datetime
-      include Pacecar::Duration
       include Pacecar::Limit
       include Pacecar::Order
       include Pacecar::Polymorph
       include Pacecar::Presence
-      include Pacecar::Ranking
       include Pacecar::Search
       include Pacecar::State
-      include Pacecar::Numeric
     end
   end
 end

data/lib/pacecar/boolean.rb

@@ -1,31 +1,19 @@
+require 'active_support/concern'
+
 module Pacecar
   module Boolean
-    def self.included(base)
-      base.extend ClassMethods
+    extend ActiveSupport::Concern
+
+    included do
+      define_boolean_scopes
     end
 
     module ClassMethods
-      def self.extended(base)
-        base.send :define_boolean_scopes
-        base.send :define_balance_count
-      end
-
-      protected
 
       def define_boolean_scopes
         boolean_column_names.each do |name|
-          scope name.to_sym, :conditions => ["#{quoted_table_name}.#{connection.quote_column_name name} = ?", true]
-          scope "not_#{name}".to_sym, :conditions => ["#{quoted_table_name}.#{connection.quote_column_name name} = ?", false]
-        end
-      end
-
-      def define_balance_count
-        boolean_column_names.each do |name|
-          self.class_eval %Q{
-            def self.#{name}_balance
-              #{name}.count - not_#{name}.count
-            end
-          }
+          scope name, -> { where(name => true) }
+          scope "not_#{name}", -> { where(name => false) }
         end
       end
 

data/lib/pacecar/helpers.rb

@@ -1,16 +1,15 @@
+require 'active_support/concern'
+
 module Pacecar
   module Helpers
+    extend ActiveSupport::Concern
 
     mattr_accessor :options
     self.options = {
-      :state_pattern => /_(type|state)$/i,
-      :default_limit => 10
+      state_pattern: /_(type|state)$/i,
+      default_limit: 10
     }
 
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
     module ClassMethods
 
       def safe_column_names
@@ -25,10 +24,6 @@ module Pacecar
         column_names_for_type :boolean
       end
 
-      def datetime_column_names
-        column_names_for_type :datetime, :date
-      end
-
       def text_and_string_column_names
         column_names_for_type :text, :string
       end
@@ -37,10 +32,6 @@ module Pacecar
         text_and_string_column_names.reject { |name| name =~ Pacecar::Helpers.options[:state_pattern] }
       end
 
-      def numeric_column_names
-        column_names_for_type :integer, :float, :decimal
-      end
-
       protected
 
       def safe_columns
@@ -71,8 +62,8 @@ module Pacecar
       end
 
       def column_names_without_type(*types)
-        safe_columns.select { |column| ! types.include? column.type }.collect(&:name)
-      end      
+        safe_columns.reject { |column| types.include? column.type }.collect(&:name)
+      end
 
     end
   end

data/lib/pacecar/limit.rb

@@ -1,19 +1,19 @@
+require 'active_support/concern'
+
 module Pacecar
   module Limit
-    def self.included(base)
-      base.extend ClassMethods
+    extend ActiveSupport::Concern
+
+    included do
+      define_limit_scopes
     end
 
     module ClassMethods
-      def self.extended(base)
-        base.send :define_limit_scopes
-      end
-
-      protected
 
       def define_limit_scopes
-        scope :limited, lambda { |*args|
-          { :limit => args.flatten.first || (defined?(per_page) ? per_page : Pacecar::Helpers.options[:default_limit]) }
+        scope :limited, ->(*args) {
+          value = args.flatten.first || (defined?(per_page) ? per_page : Pacecar::Helpers.options[:default_limit])
+          limit(value)
         }
       end
 

data/lib/pacecar/order.rb

@@ -1,20 +1,20 @@
+require 'active_support/concern'
+
 module Pacecar
   module Order
-    def self.included(base)
-      base.extend ClassMethods
+    extend ActiveSupport::Concern
+
+    included do
+      define_order_scopes
     end
 
     module ClassMethods
-      def self.extended(base)
-        base.send :define_order_scopes
-      end
-
-      protected
 
       def define_order_scopes
         safe_column_names.each do |name|
-          scope "by_#{name}".to_sym, lambda { |*args|
-            { :order => "#{quoted_table_name}.#{connection.quote_column_name name} #{args.flatten.first || 'asc'}" }
+          scope "by_#{name}", ->(*args) {
+            direction = args.flatten.first || 'asc'
+            order("#{name} #{direction}")
           }
         end
       end

data/lib/pacecar/polymorph.rb

@@ -1,15 +1,15 @@
+require 'active_support/concern'
+
 module Pacecar
   module Polymorph
-    def self.included(base)
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
 
       def has_polymorph(name)
-        scope "for_#{name}_type".to_sym, lambda { |type|
+        scope "for_#{name}_type", ->(type) {
           polymorph_type = "#{name}_type"
-          { :conditions => ["#{quoted_table_name}.#{connection.quote_column_name polymorph_type} = ?", type.to_s] }
+          where(polymorph_type => type)
         }
       end
 

data/lib/pacecar/presence.rb

@@ -1,20 +1,19 @@
+require 'active_support/concern'
+
 module Pacecar
   module Presence
-    def self.included(base)
-      base.extend ClassMethods
+    extend ActiveSupport::Concern
+
+    included do
+      define_presence_scopes
     end
 
     module ClassMethods
-      def self.extended(base)
-        base.send :define_presence_scopes
-      end
-
-      protected
 
       def define_presence_scopes
         non_boolean_column_names.each do |name|
-          scope "#{name}_present".to_sym, :conditions => "#{quoted_table_name}.#{connection.quote_column_name name} IS NOT NULL"
-          scope "#{name}_missing".to_sym, :conditions => "#{quoted_table_name}.#{connection.quote_column_name name} IS NULL"
+          scope "#{name}_present", -> { where(arel_table[name].not_eq nil) }
+          scope "#{name}_missing", -> { where(arel_table[name].eq nil) }
         end
       end
 

data/lib/pacecar/search.rb

@@ -1,47 +1,23 @@
+require 'active_support/concern'
+
 module Pacecar
   module Search
-    def self.included(base)
-      base.extend ClassMethods
+    extend ActiveSupport::Concern
+
+    included do
+      define_search_scopes
     end
 
     module ClassMethods
-      def self.extended(base)
-        base.send :define_search_scopes
-        base.send :define_basic_search_scope
-      end
-
-      protected
 
       def define_search_scopes
         safe_column_names.each do |name|
-          scope "#{name}_equals".to_sym, lambda { |query|
-            { :conditions => { table_name => { name.to_sym => query} } }
-          }
-        end
-        text_and_string_column_names.each do |name|
-          scope "#{name}_matches".to_sym, lambda { |query|
-            { :conditions => ["lower(#{quoted_table_name}.#{connection.quote_column_name(name)}) LIKE lower(:query)", { :query => "%#{query}%" }] }
-          }
-          scope "#{name}_starts_with".to_sym, lambda { |query|
-            { :conditions => ["lower(#{quoted_table_name}.#{connection.quote_column_name(name)}) LIKE lower(:query)", { :query => "#{query}%" }] }
-          }
-          scope "#{name}_ends_with".to_sym, lambda { |query|
-            { :conditions => ["lower(#{quoted_table_name}.#{connection.quote_column_name(name)}) LIKE lower(:query)", { :query => "%#{query}" }] }
+          scope "#{name}_equals", ->(query) {
+            where(name => query)
           }
         end
       end
 
-      def define_basic_search_scope
-        scope :search_for, lambda { |*args|
-          opts = args.extract_options!
-          query = args.flatten.first
-          columns = opts[:on] || non_state_text_and_string_columns
-          joiner = opts[:require].eql?(:all) ? 'AND' : 'OR'
-          match = columns.collect { |name| "lower(#{quoted_table_name}.#{connection.quote_column_name(name)}) LIKE lower(:query)" }.join(" #{joiner} ")
-          { :conditions => [match, { :query => "%#{query}%" } ] }
-        }
-      end
-
     end
   end
 end

data/lib/pacecar/state.rb

@@ -1,8 +1,8 @@
+require 'active_support/concern'
+
 module Pacecar
   module State
-    def self.included(base)
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
 
@@ -11,8 +11,12 @@ module Pacecar
         names.each do |name|
           constant = opts[:with] || const_get(name.to_s.pluralize.upcase)
           constant.each do |state|
-            scope "#{name}_#{state.downcase}".to_sym, :conditions => ["#{quoted_table_name}.#{connection.quote_column_name name} = ?", state]
-            scope "#{name}_not_#{state.downcase}".to_sym, :conditions => ["#{quoted_table_name}.#{connection.quote_column_name name} <> ?", state]
+            scope "#{name}_#{state.downcase}", -> {
+              where(arel_table[name].eq state)
+            }
+            scope "#{name}_not_#{state.downcase}", -> {
+              where(arel_table[name].not_eq state)
+            }
             self.class_eval %Q{
               def #{name}_#{state.downcase}?
                 #{name} == '#{state}'
@@ -22,11 +26,11 @@ module Pacecar
               end
             }
           end
-          scope "#{name}".to_sym, lambda { |state|
-            { :conditions => ["#{quoted_table_name}.#{connection.quote_column_name name} = ?", state] }
+          scope "#{name}", ->(state) {
+            where(arel_table[name].eq state)
           }
-          scope "#{name}_not".to_sym, lambda { |state|
-            { :conditions => ["#{quoted_table_name}.#{connection.quote_column_name name} <> ?", state] }
+          scope "#{name}_not", ->(state) {
+            where(arel_table[name].not_eq state)
           }
         end
       end

data/lib/pacecar/version.rb

@@ -1,3 +1,3 @@
 module Pacecar
-  VERSION = '1.5.3'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/pacecar.gemspec

@@ -1,25 +1,27 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "pacecar/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'pacecar/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'pacecar'
-  s.version     = Pacecar::VERSION.dup
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Matt Jankowski', 'Gabe Berke-Williams', 'Chad Pytel', 'Ryan McGeary', 'Mike Burns', 'Ryan Sonnek', 'Thomas Dippel', 'Tristan Dunn']
-  s.email       = 'support@thoughtbot.com'
-  s.homepage    = 'http://github.com/thoughtbot/pacecar'
-  s.summary     = 'Pacecar adds scope methods to ActiveRecord classes via database column introspection.'
-  s.description = 'Generated scopes for ActiveRecord classes.'
+  s.name          = 'pacecar'
+  s.version       = Pacecar::VERSION.dup
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = ['Matt Jankowski', 'Gabe Berke-Williams', 'Chad Pytel', 'Ryan McGeary', 'Mike Burns', 'Ryan Sonnek', 'Thomas Dippel', 'Tristan Dunn']
+  s.email         = 'support@thoughtbot.com'
+  s.homepage      = 'http://github.com/thoughtbot/pacecar'
+  s.summary       = 'Pacecar adds scope methods to ActiveRecord classes via database column introspection.'
+  s.description   = 'Generated scopes for ActiveRecord classes.'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_development_dependency("appraisal", "~> 0.4")
-  s.add_development_dependency("capybara", ">= 0.4.0")
-  s.add_development_dependency("mocha")
-  s.add_development_dependency("rspec-rails", ">= 2.4.0")
-  s.add_development_dependency("factory_girl_rails")
+  s.add_dependency('activerecord', '>= 4.0.0')
+
+  s.add_development_dependency('appraisal')
+  s.add_development_dependency('mocha')
+  s.add_development_dependency('rspec-rails')
+  s.add_development_dependency('factory_girl_rails')
+  s.add_development_dependency('rails')
 end