squeel 0.8.10 → 0.9.0

data/README.md

@@ -266,6 +266,54 @@ I'm not sure about you, but I much prefer the latter. In short, you can add `_an
 `_all` to any predicate method, and it would do what you expect, when given an array of
 possibilities to compare against.
 
+### Sifters
+
+Sifters are like little snippets of conditions that take parameters. Let's say that you
+have a model called Article, and you often want to query for articles that contain a
+string in the title or body. So you write a scope:
+
+    def self.title_or_body_contains(string)
+      where{title.matches("%#{string}%") | body.matches("%#{string}%")}
+    end
+
+But then you want to query for people who wrote an article that matches these conditions,
+but the scope only works against the model where it was defined. So instead, you write a
+sifter:
+
+    class Article < ActiveRecord::Base
+      sifter :title_or_body_contains do |string|
+        title.matches("%#{string}%") | body.matches("%#{string}%")
+      end
+    end
+
+Now you can write...
+
+    Article.where{sift :title_or_body_contains, 'awesome'}
+    => SELECT "articles".* FROM "articles"  
+       WHERE ((
+         "articles"."title" LIKE '%awesome%' 
+         OR "articles"."body" LIKE '%awesome%'
+       ))
+
+... or ...
+
+    Person.joins(:articles).
+           where{
+             {articles => sift(:title_or_body_contains, 'awesome')}
+           }
+    # => SELECT "people".* FROM "people" 
+         INNER JOIN "articles" ON "articles"."person_id" = "people"."id" 
+         WHERE ((
+           "articles"."title" LIKE '%awesome%' 
+           OR "articles"."body" LIKE '%awesome%'
+         ))
+
+Or, you can just modify your previous scope, changing `where` to `squeel`:
+
+    def self.title_or_body_contains(string)
+      squeel{title.matches("%#{string}%") | body.matches("%#{string}%")}
+    end
+
 ### Subqueries
 
 You can supply an `ActiveRecord::Relation` as a value for a predicate in order to use

data/lib/squeel/adapters/active_record.rb

@@ -1,26 +1,28 @@
 case ActiveRecord::VERSION::MAJOR
 when 3
   ActiveRecord::Relation.send :include, Squeel::Nodes::Aliasing
-  require 'squeel/adapters/active_record/join_dependency'
+  require 'squeel/adapters/active_record/join_dependency_extensions'
+  require 'squeel/adapters/active_record/base_extensions'
+  ActiveRecord::Base.extend Squeel::Adapters::ActiveRecord::BaseExtensions
 
   case ActiveRecord::VERSION::MINOR
   when 0
     require 'squeel/adapters/active_record/3.0/compat'
-    require 'squeel/adapters/active_record/3.0/relation'
-    require 'squeel/adapters/active_record/3.0/association_preload'
+    require 'squeel/adapters/active_record/3.0/relation_extensions'
+    require 'squeel/adapters/active_record/3.0/association_preload_extensions'
     require 'squeel/adapters/active_record/3.0/context'
 
-    ActiveRecord::Relation.send :include, Squeel::Adapters::ActiveRecord::Relation
-    ActiveRecord::Associations::ClassMethods::JoinDependency.send :include, Squeel::Adapters::ActiveRecord::JoinDependency
-    ActiveRecord::Base.extend Squeel::Adapters::ActiveRecord::AssociationPreload
+    ActiveRecord::Relation.send :include, Squeel::Adapters::ActiveRecord::RelationExtensions
+    ActiveRecord::Associations::ClassMethods::JoinDependency.send :include, Squeel::Adapters::ActiveRecord::JoinDependencyExtensions
+    ActiveRecord::Base.extend Squeel::Adapters::ActiveRecord::AssociationPreloadExtensions
   else
-    require 'squeel/adapters/active_record/relation'
-    require 'squeel/adapters/active_record/preloader'
+    require 'squeel/adapters/active_record/relation_extensions'
+    require 'squeel/adapters/active_record/preloader_extensions'
     require 'squeel/adapters/active_record/context'
 
-    ActiveRecord::Relation.send :include, Squeel::Adapters::ActiveRecord::Relation
-    ActiveRecord::Associations::JoinDependency.send :include, Squeel::Adapters::ActiveRecord::JoinDependency
-    ActiveRecord::Associations::Preloader.send :include, Squeel::Adapters::ActiveRecord::Preloader
+    ActiveRecord::Relation.send :include, Squeel::Adapters::ActiveRecord::RelationExtensions
+    ActiveRecord::Associations::JoinDependency.send :include, Squeel::Adapters::ActiveRecord::JoinDependencyExtensions
+    ActiveRecord::Associations::Preloader.send :include, Squeel::Adapters::ActiveRecord::PreloaderExtensions
   end
 else
   raise NotImplementedError, "Squeel does not support ActiveRecord version #{ActiveRecord::VERSION::STRING}"

data/lib/squeel/adapters/active_record/3.0/{association_preload.rb → association_preload_extensions.rb}

@@ -1,7 +1,7 @@
 module Squeel
   module Adapters
     module ActiveRecord
-      module AssociationPreload
+      module AssociationPreloadExtensions
 
         def preload_associations(records, associations, preload_options={})
           super(records, Visitors::SymbolVisitor.new.accept(associations), preload_options)

data/lib/squeel/adapters/active_record/3.0/context.rb

@@ -60,6 +60,16 @@ module Squeel
           end
         end
 
+        def classify(object)
+          if Class === object
+            object
+          elsif object.respond_to? :active_record
+            object.active_record
+          else
+            raise ArgumentError, "#{object} can't be converted to a class"
+          end
+        end
+
       end
     end
   end

data/lib/squeel/adapters/active_record/3.0/{relation.rb → relation_extensions.rb}

@@ -3,7 +3,7 @@ require 'active_record'
 module Squeel
   module Adapters
     module ActiveRecord
-      module Relation
+      module RelationExtensions
 
         JoinAssociation = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
         JoinDependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency

data/lib/squeel/adapters/active_record/base_extensions.rb

@@ -0,0 +1,22 @@
+module Squeel
+  module Adapters
+    module ActiveRecord
+      module BaseExtensions
+
+        def squeel(&block)
+          DSL.eval &block
+        end
+
+        def sifter(name = nil)
+          if Symbol === name && block_given?
+            singleton_class.send :define_method, name,
+                                  lambda {|*args| DSL.exec(*args, &Proc.new)}
+          else
+            raise ArgumentError, "A name and block are required"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/squeel/adapters/active_record/context.rb

@@ -60,6 +60,16 @@ module Squeel
           end
         end
 
+        def classify(object)
+          if Class === object
+            object
+          elsif object.respond_to? :active_record
+            object.active_record
+          else
+            raise ArgumentError, "#{object} can't be converted to a class"
+          end
+        end
+
       end
     end
   end

data/lib/squeel/adapters/active_record/{join_dependency.rb → join_dependency_extensions.rb}

@@ -3,7 +3,7 @@ require 'polyamorous'
 module Squeel
   module Adapters
     module ActiveRecord
-      module JoinDependency
+      module JoinDependencyExtensions
 
         def self.included(base)
           base.class_eval do

data/lib/squeel/adapters/active_record/{preloader.rb → preloader_extensions.rb}

@@ -1,7 +1,7 @@
 module Squeel
   module Adapters
     module ActiveRecord
-      module Preloader
+      module PreloaderExtensions
 
         def self.included(base)
           base.class_eval do

data/lib/squeel/adapters/active_record/{relation.rb → relation_extensions.rb}

@@ -3,7 +3,7 @@ require 'active_record'
 module Squeel
   module Adapters
     module ActiveRecord
-      module Relation
+      module RelationExtensions
 
         JoinAssociation = ::ActiveRecord::Associations::JoinDependency::JoinAssociation
         JoinDependency = ::ActiveRecord::Associations::JoinDependency

data/lib/squeel/context.rb

@@ -1,7 +1,7 @@
 require 'arel'
 
 module Squeel
-  # @abstract Subclass and implement {#traverse}, #{find} and {#get_table}
+  # @abstract Subclass and implement {#traverse}, {#find} and {#get_table}
   #   to create a Context that supports a given ORM.
   class Context
     attr_reader :base, :engine, :arel_visitor
@@ -63,5 +63,13 @@ module Squeel
       raise NotImplementedError, "Subclasses must implement private method get_table"
     end
 
+    # Returns a class for the corresponding object.
+    #
+    # @param object A classifiable object (this will depend on the subclass's implementation)
+    # @return [Class] The class corresponding to the object
+    def classify(object)
+      raise NotImplementedError, "Subclasses must implement private method classify"
+    end
+
   end
 end

data/lib/squeel/dsl.rb

@@ -6,7 +6,7 @@ module Squeel
     # method calls to fall through to method_missing.
     Squeel.evil_things do
       (instance_methods + private_instance_methods).each do |method|
-        unless method.to_s =~ /^(__|instance_eval)/
+        unless method.to_s =~ /^(__|instance_eval|instance_exec)/
           undef_method method
         end
       end
@@ -32,6 +32,14 @@ module Squeel
       end
     end
 
+    # Called from an adapter, not directly.
+    # Executes a block of Squeel DSL code, possibly with arguments.
+    #
+    # @return The results of the executed DSL code.
+    def self.exec(*args, &block)
+      self.new(block.binding).instance_exec(*args, &block)
+    end
+
     private
 
     # This isn't normally called directly, but via DSL.eval, which will
@@ -63,6 +71,16 @@ module Squeel
       Nodes::Literal.new(string)
     end
 
+    # Create a Squeel Sifter node. This essentially substitutes the
+    # sifter block of the supplied name from the model.
+    #
+    # @param [Symbol, Nodes::Stub] name The name of the sifter defined in the model.
+    # @return [Nodes::Sifter] The sifter node
+    def sift(name, *args)
+      name = name.to_sym if Nodes::Stub === name
+      Nodes::Sifter.new name, args
+    end
+
     # Node generation inside DSL blocks.
     #
     # @overload node_name

data/lib/squeel/nodes.rb

@@ -7,6 +7,7 @@ end
 require 'squeel/nodes/literal'
 require 'squeel/nodes/stub'
 require 'squeel/nodes/key_path'
+require 'squeel/nodes/sifter'
 require 'squeel/nodes/predicate'
 require 'squeel/nodes/function'
 require 'squeel/nodes/operation'

data/lib/squeel/nodes/sifter.rb

@@ -0,0 +1,14 @@
+module Squeel
+  module Nodes
+    class Sifter
+      include PredicateOperators
+
+      attr_reader :name, :args
+
+      def initialize(name, args)
+        @name, @args = name, args
+      end
+
+    end
+  end
+end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.10"
+  VERSION = "0.9.0"
 end

data/lib/squeel/visitors/attribute_visitor.rb

@@ -1,10 +1,10 @@
-require 'squeel/visitors/base'
+require 'squeel/visitors/visitor'
 
 module Squeel
   module Visitors
     # A visitor that tries to convert visited nodes into Arel::Attributes
     # or other nodes that can be used for grouping, ordering, and the like.
-    class AttributeVisitor < Base
+    class AttributeVisitor < Visitor
 
       private
 

data/lib/squeel/visitors/predicate_visitor.rb

@@ -1,8 +1,8 @@
-require 'squeel/visitors/base'
+require 'squeel/visitors/visitor'
 
 module Squeel
   module Visitors
-    class PredicateVisitor < Base
+    class PredicateVisitor < Visitor
 
       TRUE_SQL = Arel.sql('1=1').freeze
       FALSE_SQL = Arel.sql('1=0').freeze
@@ -83,6 +83,17 @@ module Squeel
         Arel.sql(o.expr)
       end
 
+      # Visit a Squeel sifter by executing its corresponding constraint block
+      # in the parent's class, with its given arguments, then visiting the result.
+      #
+      # @param [Nodes::Sifter] o The Sifter to visit
+      # @param parent The parent object in the context
+      # @return The result of visiting the executed block's return value
+      def visit_Squeel_Nodes_Sifter(o, parent)
+        klass = classify(parent)
+        visit(klass.send(o.name, *o.args), parent)
+      end
+
       # Visit a Squeel predicate, converting it into an ARel predicate
       #
       # @param [Nodes::Predicate] o The predicate to visit
@@ -220,7 +231,7 @@ module Squeel
       # @param v The value to consider
       def implies_context_change?(v)
         case v
-        when Hash, Nodes::Predicate, Nodes::Unary, Nodes::Binary, Nodes::Nary
+        when Hash, Nodes::Predicate, Nodes::Unary, Nodes::Binary, Nodes::Nary, Nodes::Sifter
           true
         when Nodes::KeyPath
           can_visit?(v.endpoint) && !(Nodes::Stub === v.endpoint)
@@ -245,7 +256,7 @@ module Squeel
           end
 
         case v
-        when Hash, Nodes::KeyPath, Nodes::Predicate, Nodes::Unary, Nodes::Binary, Nodes::Nary
+        when Hash, Nodes::KeyPath, Nodes::Predicate, Nodes::Unary, Nodes::Binary, Nodes::Nary, Nodes::Sifter
           visit(v, parent || k)
         when Array
           v.map {|val| visit(val, parent || k)}

data/lib/squeel/visitors/symbol_visitor.rb

@@ -1,8 +1,8 @@
-require 'squeel/visitors/base'
+require 'squeel/visitors/visitor'
 
 module Squeel
   module Visitors
-    class SymbolVisitor < Base
+    class SymbolVisitor < Visitor
 
       def initialize
       end

data/lib/squeel/visitors/{base.rb → visitor.rb}

@@ -4,9 +4,9 @@ require 'squeel/nodes'
 module Squeel
   module Visitors
     # The Base visitor class, containing the default behavior common to subclasses.
-    class Base
+    class Visitor
       attr_accessor :context
-      delegate :contextualize, :find, :traverse, :engine, :arel_visitor, :to => :context
+      delegate :contextualize, :classify, :find, :traverse, :engine, :arel_visitor, :to => :context
 
       # Create a new Visitor that uses the supplied context object to contextualize
       # visited nodes.

data/spec/helpers/squeel_helper.rb

@@ -3,6 +3,10 @@ module SqueelHelper
     Squeel::DSL.eval(&block)
   end
 
+  def dsl_exec(*args, &block)
+    Squeel::DSL.exec(*args, &block)
+  end
+
   def queries_for
     $queries_executed = []
     yield

data/spec/squeel/adapters/active_record/base_extensions_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Squeel
+  module Adapters
+    module ActiveRecord
+      describe BaseExtensions do
+
+        subject { Person }
+
+        it { should respond_to :sifter }
+
+        describe '#sifter' do
+
+          subject { Article }
+
+          specify { expect {subject.sifter 'blah'}.to raise_error ArgumentError }
+
+          context 'with a sifter defned via block' do
+            before :all do
+              subject.sifter :title_or_body_contains do |value|
+                (title =~ "%#{value}%") | (body =~ "%#{value}%")
+              end
+            end
+
+            it { should respond_to :title_or_body_contains }
+            specify { subject.title_or_body_contains('ernie').should be_a Nodes::Or }
+          end
+
+          context 'with a sifter defined via method' do
+            before :all do
+              def subject.title_starts_with(val)
+                squeel{title =~ "#{val}%"}
+              end
+            end
+
+            it { should respond_to :title_starts_with }
+            specify { subject.title_starts_with('ernie').should be_a Nodes::Predicate }
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/spec/squeel/adapters/active_record/{join_dependency_spec.rb → join_dependency_extensions_spec.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Squeel
   module Adapters
     module ActiveRecord
-      describe JoinDependency do
+      describe JoinDependencyExtensions do
         before do
           @jd = new_join_dependency(Person, {}, [])
         end

data/spec/squeel/adapters/active_record/{relation_spec.rb → relation_extensions_spec.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Squeel
   module Adapters
     module ActiveRecord
-      describe Relation do
+      describe RelationExtensions do
 
         describe '#predicate_visitor' do
 

data/spec/squeel/dsl_spec.rb

@@ -96,5 +96,19 @@ module Squeel
       end
     end
 
+    describe '#sift' do
+      it 'creates a Sifter' do
+        result = dsl{sift :blah}
+        result.should be_a Nodes::Sifter
+        result.name.should eq :blah
+      end
+
+      it 'casts Stubs to Symbols for sifter names' do
+        result = dsl{sift blah}
+        result.should be_a Nodes::Sifter
+        result.name.should eq :blah
+      end
+    end
+
   end
 end

data/spec/squeel/nodes/sifter_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module Squeel
+  module Nodes
+    describe Sifter do
+
+      subject { Sifter.new :title_or_body_contains, ['awesome'] }
+
+      specify { subject.name.should eq :title_or_body_contains }
+      specify { subject.args.should eq ['awesome'] }
+
+      it { should respond_to :& }
+      it { should respond_to :| }
+      it { should respond_to :-@ }
+
+      specify { (subject & subject).should be_a And }
+      specify { (subject | subject).should be_a Or }
+      specify { (-subject).should be_a Not }
+
+    end
+  end
+end

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -248,6 +248,24 @@ module Squeel
         predicate.to_sql.should match /"people"."name" = "children_people"."name"/
       end
 
+      it 'visits Squeel Sifters at top level' do
+        predicate = @v.accept(dsl {sift :name_starts_or_ends_with, 'smith'})
+        predicate.should be_a Arel::Nodes::Grouping
+        expr = predicate.expr
+        expr.should be_a Arel::Nodes::Or
+        expr.left.to_sql.should match /"people"."name" LIKE 'smith%'/
+        expr.right.to_sql.should match /"people"."name" LIKE '%smith'/
+      end
+
+      it 'visits nested Squeel sifters' do
+        predicate = @v.accept(dsl {{:children => sift(:name_starts_or_ends_with, 'smith')}})
+        predicate.should be_a Arel::Nodes::Grouping
+        expr = predicate.expr
+        expr.should be_a Arel::Nodes::Or
+        expr.left.to_sql.should match /"children_people"."name" LIKE 'smith%'/
+        expr.right.to_sql.should match /"children_people"."name" LIKE '%smith'/
+      end
+
       it 'honors an explicit table in string keys' do
         predicate = @v.accept('things.attribute' => 'retro')
         predicate.should be_a Arel::Nodes::Equality

data/spec/support/schema.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'squeel'
 
 ActiveRecord::Base.establish_connection(
   :adapter  => 'sqlite3',
@@ -19,6 +20,10 @@ class Person < ActiveRecord::Base
 
   has_many   :outgoing_messages, :class_name => 'Message', :foreign_key => :author_id
   has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
+
+  sifter :name_starts_or_ends_with do |value|
+    (name =~ "#{value}%") | (name =~ "%#{value}")
+  end
 end
 
 class PersonWithNamePrimaryKey < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70152532762100 !ruby/object:Gem::Requirement
+  requirement: &70114561715900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152532762100
+  version_requirements: *70114561715900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70152532761420 !ruby/object:Gem::Requirement
+  requirement: &70114561714720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152532761420
+  version_requirements: *70114561714720
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70152532757160 !ruby/object:Gem::Requirement
+  requirement: &70114561713420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152532757160
+  version_requirements: *70114561713420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152532756300 !ruby/object:Gem::Requirement
+  requirement: &70114561712440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70152532756300
+  version_requirements: *70114561712440
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70152532755220 !ruby/object:Gem::Requirement
+  requirement: &70114561710960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70152532755220
+  version_requirements: *70114561710960
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70152532754580 !ruby/object:Gem::Requirement
+  requirement: &70114561710220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70152532754580
+  version_requirements: *70114561710220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70152532753940 !ruby/object:Gem::Requirement
+  requirement: &70114561709220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70152532753940
+  version_requirements: *70114561709220
 description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
   with\n      a handy block-based syntax. You can write subqueries, access named\n
   \     functions provided by your RDBMS, and more, all without writing\n      SQL
@@ -109,14 +109,15 @@ files:
 - lib/core_ext/symbol.rb
 - lib/squeel.rb
 - lib/squeel/adapters/active_record.rb
-- lib/squeel/adapters/active_record/3.0/association_preload.rb
+- lib/squeel/adapters/active_record/3.0/association_preload_extensions.rb
 - lib/squeel/adapters/active_record/3.0/compat.rb
 - lib/squeel/adapters/active_record/3.0/context.rb
-- lib/squeel/adapters/active_record/3.0/relation.rb
+- lib/squeel/adapters/active_record/3.0/relation_extensions.rb
+- lib/squeel/adapters/active_record/base_extensions.rb
 - lib/squeel/adapters/active_record/context.rb
-- lib/squeel/adapters/active_record/join_dependency.rb
-- lib/squeel/adapters/active_record/preloader.rb
-- lib/squeel/adapters/active_record/relation.rb
+- lib/squeel/adapters/active_record/join_dependency_extensions.rb
+- lib/squeel/adapters/active_record/preloader_extensions.rb
+- lib/squeel/adapters/active_record/relation_extensions.rb
 - lib/squeel/configuration.rb
 - lib/squeel/constants.rb
 - lib/squeel/context.rb
@@ -138,15 +139,16 @@ files:
 - lib/squeel/nodes/order.rb
 - lib/squeel/nodes/predicate.rb
 - lib/squeel/nodes/predicate_operators.rb
+- lib/squeel/nodes/sifter.rb
 - lib/squeel/nodes/stub.rb
 - lib/squeel/nodes/unary.rb
 - lib/squeel/predicate_methods.rb
 - lib/squeel/version.rb
 - lib/squeel/visitors.rb
 - lib/squeel/visitors/attribute_visitor.rb
-- lib/squeel/visitors/base.rb
 - lib/squeel/visitors/predicate_visitor.rb
 - lib/squeel/visitors/symbol_visitor.rb
+- lib/squeel/visitors/visitor.rb
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb
@@ -156,9 +158,10 @@ files:
 - spec/core_ext/symbol_spec.rb
 - spec/helpers/squeel_helper.rb
 - spec/spec_helper.rb
+- spec/squeel/adapters/active_record/base_extensions_spec.rb
 - spec/squeel/adapters/active_record/context_spec.rb
-- spec/squeel/adapters/active_record/join_dependency_spec.rb
-- spec/squeel/adapters/active_record/relation_spec.rb
+- spec/squeel/adapters/active_record/join_dependency_extensions_spec.rb
+- spec/squeel/adapters/active_record/relation_extensions_spec.rb
 - spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
@@ -170,6 +173,7 @@ files:
 - spec/squeel/nodes/order_spec.rb
 - spec/squeel/nodes/predicate_operators_spec.rb
 - spec/squeel/nodes/predicate_spec.rb
+- spec/squeel/nodes/sifter_spec.rb
 - spec/squeel/nodes/stub_spec.rb
 - spec/squeel/visitors/attribute_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
@@ -223,9 +227,10 @@ test_files:
 - spec/core_ext/symbol_spec.rb
 - spec/helpers/squeel_helper.rb
 - spec/spec_helper.rb
+- spec/squeel/adapters/active_record/base_extensions_spec.rb
 - spec/squeel/adapters/active_record/context_spec.rb
-- spec/squeel/adapters/active_record/join_dependency_spec.rb
-- spec/squeel/adapters/active_record/relation_spec.rb
+- spec/squeel/adapters/active_record/join_dependency_extensions_spec.rb
+- spec/squeel/adapters/active_record/relation_extensions_spec.rb
 - spec/squeel/core_ext/symbol_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
@@ -237,6 +242,7 @@ test_files:
 - spec/squeel/nodes/order_spec.rb
 - spec/squeel/nodes/predicate_operators_spec.rb
 - spec/squeel/nodes/predicate_spec.rb
+- spec/squeel/nodes/sifter_spec.rb
 - spec/squeel/nodes/stub_spec.rb
 - spec/squeel/visitors/attribute_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb