searchlight 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca4e4a2693cd9315c4734f63f2e3cdbb560d8f9
-  data.tar.gz: 5182116d73d4fd2da4d2ef187f7be4df210cab7f
+  metadata.gz: d87d47fdacfae5b1d8d87d2c34b6443610fb4f88
+  data.tar.gz: 639cb63efe19379336e0fbcd65b8d66f0d265f2a
 SHA512:
-  metadata.gz: b1b65c23ac4951fde9cd7810ee92fb4374838efc3df42cbd4861439098516557bccd500d08a3f1d135dcf562a78114438cfff3a82af296df6ce13fd73e4b4216
-  data.tar.gz: 0963fe2edc3ced89da8c97132425bbe1152a38445ebe168537d20a1af21bed960faaf38f3709b740327727d951de3e764621409242aac9eadd00e27494cd5b2f
+  metadata.gz: 9785b92c697fb59b0ae3aebd88af3f1913c04df0ff99aed3b73923b13d2d313d9923f98b217a7646be742c163ab892d61ce3eb8cff77960da21a132979a1717d
+  data.tar.gz: 5438b35af95bcf804ff0898f8989f0d804f7bb1b46f9f74642e59d3a98c5a27ac70c681a988b8ffca545aa9253a9339b3f3efca9fe29e7beaca868b70b0d73df

data/.travis.yml

@@ -1,10 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode # JRuby in 1.9 mode
   - 2.0.0
-gemfile:
-  - gemfiles/Gemfile.rails-3.2.x
-  - gemfiles/Gemfile.rails-4.0.x
-env: JRUBY_OPTS="-Xcext.enabled=true"
+  - 2.1.1

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 Searchlight does its best to use [semantic versioning](http://semver.org).
 
+## v2.0.0
+
+Now with fewer features! :D
+
+### No more ORM adapters
+
+ORM "adapters", which were never actually necessary, have been removed. They required lots of hackery, added test dependencies, and sometimes introduced [weird bugs](https://github.com/nathanl/searchlight/pull/15). All that just so that if you said your class `searches :first_name, :last_name`, we could save you from typing simple search methods like:
+
+```ruby
+def search_first_name
+  search.where(first_name: first_name)
+end
+```
+
+You can easily save yourself this effort with something like:
+
+```ruby
+%w[name address pant_size].each do |attr|
+  define_method("search_#{attr}") do
+    search.where(:"#{attr}" => attr)
+  end
+end
+```
+
+...and you'll get much saner backtraces if anything goes wrong.
+
+**ActiveRecord users**: note that with this change, you'll need to update your `search_on` calls to return an `ActiveRecord::Relation` so that, if no options are passed, you don't return the model class itself. Eg, instead of `search_on User`, do `search_on User.all` for Rails > 4 or `search_on User.scoped` for Rails < 4.
+
+With this change, Searchlight no longer has any ties to any ORM, but can still work with any of them that use method chaining. Hooray!
+
 ## v1.3.1
 
 Add license to gemspec, thanks to notice from Benjamin Fleischer - see [his blog post](http://www.benjaminfleischer.com/2013/07/12/make-the-world-a-better-place-put-a-license-in-your-gemspec/)

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in searchlight.gemspec
 gemspec
-
-gem 'rspec', '~> 2.13'

data/README.md

@@ -1,8 +1,8 @@
 # Searchlight
 
-Searchlight helps you build searches from options via Ruby methods that you write.
+Searchlight is a low-magic way to build database searches using an ORM.
 
-Searchlight can work with any ORM or object that can build a query using chained methods (eg, ActiveRecord's `.where(...).where(...).limit(...)`). It comes with modules for integrating with ActiveRecord and ActionView, but can easily be used in any Ruby program.
+Searchlight can work with **any** ORM or object that can build a query using **chained method calls** (eg, ActiveRecord's `.where(...).where(...).limit(...)`, or similar chains with [Sequel](https://rubygems.org/gems/sequel), [Mongoid](https://rubygems.org/gems/mongoid), etc).
 
 [![Gem Version](https://badge.fury.io/rb/searchlight.png)](https://rubygems.org/gems/searchlight)
 [![Code Climate](https://codeclimate.com/github/nathanl/searchlight.png)](https://codeclimate.com/github/nathanl/searchlight)
@@ -21,10 +21,12 @@ The basic idea of Searchlight is to build a search by chaining method calls that
 For example, if you have a Searchlight search class called `YetiSearch`, and you instantiate it like this:
 
 ```ruby
-  search = YetiSearch.new(active: true, name: 'Jimmy', location_in: %w[NY LA]) # or params[:search]
+  search = YetiSearch.new(
+    active: true, name: 'Jimmy', location_in: %w[NY LA] # or params[:search]
+  )
 ```
 
-... calling `results` on the instance will build a search by chaining calls to `search_active`, `search_name`, and `search_location`.
+... calling `results` on the instance will build a search by chaining calls to `search_active`, `search_name`, and `search_location_in`.
 
 The `results` method will then return the return value of the last search method. If you're using ActiveRecord, this would be an `ActiveRecord::Relation`, and you can then call `each` to loop through the results, `to_sql` to get the generated query, etc.
 
@@ -38,7 +40,9 @@ A search class has three main parts: a target, options, and methods. For example
 class PersonSearch < Searchlight::Search
 
   # The search target; in this case, an ActiveRecord model.
-  search_on Person
+  # This is the starting point for any chaining we do, and it's what
+  # will be returned if no search options are passed.
+  search_on Person.all
 
   # The options the search understands. Supply any combination of them to an instance.
   searches :first_name, :last_name
@@ -120,7 +124,7 @@ search = MySearchClass.new(awesomeness: 'Xtreme')
 
 ... your search methods can use:
 
-- `awesomeness` to retrive the given value, `'Xtreme'`
+- `awesomeness` to retrieve the given value, `'Xtreme'`
 - `awesomeness?` to get a boolean version: `true`
 
 The boolean conversion is form-friendly, so that `0`, `'0'`, and `'false'` are considered `false`.
@@ -181,7 +185,7 @@ You can define defaults for boolean attributes if you treat them as "yes/no/eith
 ```ruby
 class AnimalSearch < Searchlight::Search
 
-  search_on Animal
+  search_on Animal.all
   
   searches :is_fictional
   
@@ -214,7 +218,7 @@ You can subclass an existing search class and support all the same options with
 
 ```ruby
 class VillageSearch < CitySearch
-  search_on Village
+  search_on Village.all
 end
 ```
 
@@ -286,27 +290,9 @@ class OrdersController < ApplicationController
   end
 end
 ```
-## Adapters
+## ActionView Adapter
 
-Currently, Searchlight has adapters for ActiveRecord, ActionView, and Mongoid. We'd love to get pull requests for others. :)
-
-### ActiveRecord and Mongoid
-
-When you call `search_on` in your Searchlight class, Searchlight checks whether the search target comes from ActiveRecord or Mongoid, and, if so, mixes a module into your class.
-
-For each of your search options, the module will have the simplest possible search method defined. For example, if your class `searches :name`, the ActiveRecord module will have this method:
-
-```ruby
-  def search_name
-    search.where(name: name)
-  end
-```
-
-Since that method is in a parent module, you can easily override it by defining your own method. You can also call `super` in the method you define.
-
-### ActionView
-
-Similarly, Searchlight adds ActionView-friendly methods to your classes if it sees that `ActionView` is a defined constant. See the code for details, but the upshot is that you can use a search with `form_for`.
+Searchlight's ActionView adapter adds ActionView-friendly methods to your classes if it sees that `ActionView` is a defined constant. See the code for details, but the upshot is that you can use a search with `form_for`.
 
 ## Compatibility
 
@@ -337,4 +323,4 @@ Or install it yourself as:
 ## Shout Outs
 
 - The excellent [Mr. Adam Hunter](https://github.com/adamhunter), co-creator of Searchlight.
-- [TMA](http://tma1.com) for supporting the development of Searchlight.
+- [TMA](http://tma1.com) for supporting the initial development of Searchlight.

data/lib/searchlight.rb

@@ -7,6 +7,4 @@ end
 
 require 'searchlight/dsl'
 require 'searchlight/search'
-require 'searchlight/adapters/active_record' if defined?(::ActiveRecord)
-require 'searchlight/adapters/mongoid'       if defined?(::Mongoid)
 require 'searchlight/adapters/action_view'   if defined?(::ActionView)

data/lib/searchlight/adapters/action_view.rb

@@ -5,7 +5,7 @@ module Searchlight
       module ClassMethods
 
         def model_name
-          ActiveModel::Name.new(self, nil, 'search')
+          ::ActiveModel::Name.new(self, nil, 'search')
         end
 
       end

data/lib/searchlight/version.rb

@@ -1,3 +1,3 @@
 module Searchlight
-  VERSION = "1.3.1"
+  VERSION = "2.0.0"
 end

data/searchlight.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.version       = Searchlight::VERSION
   spec.authors       = ["Nathan Long", "Adam Hunter"]
   spec.email         = ["nathanmlong@gmail.com", "adamhunter@me.com"]
-  spec.description   = %q{Searchlight helps you build searches from options via Ruby methods that you write. Searchlight can work with any ORM or object that allows chaining search methods. It comes with modules for integrating with ActiveRecord and ActionView, but can easily be used in any Ruby program.}
-  spec.summary       = %q{Searchlight helps you build searches from options via Ruby methods that you write.}
+  spec.summary        = %q{Searchlight is a low-magic way to build database searches using an ORM.}
+  spec.description    = %q{Searchlight is a low-magic way to build database searches using an ORM. It's compatible with ActiveRecord, Sequel, Mongoid, and any other ORM that can build queries by chaining method calls.}
   spec.homepage      = "https://github.com/nathanl/searchlight"
   spec.license       = "MIT"
 
@@ -21,9 +21,16 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "named", "~> 1.0"
 
-  spec.add_development_dependency "rspec",     "~> 2.13"
+  spec.add_development_dependency "rspec",     "~> 2.14"
   spec.add_development_dependency "bundler",   "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "capybara",  "~> 2.0"
   spec.add_development_dependency "simplecov", "~> 0.7"
+
+  # To test integration with actionview and activerecord
+  spec.add_development_dependency "actionview",         "~> 4.1"
+  spec.add_development_dependency "activemodel",        "~> 4.1"
+
+  # For coverage testing on Travis
+  spec.add_development_dependency "coveralls",        "~> 0.7"
 end

data/spec/spec_helper.rb

@@ -9,8 +9,6 @@ end
 require 'searchlight'
 $LOAD_PATH << '.'
 require 'support/mock_model'
-require 'support/mock_models/active_record'
-require 'support/mock_models/mongoid'
 require 'support/account_search'
 require 'support/spiffy_account_search'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlight
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Nathan Long
@@ -9,96 +9,137 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: Searchlight helps you build searches from options via Ruby methods that
-  you write. Searchlight can work with any ORM or object that allows chaining search
-  methods. It comes with modules for integrating with ActiveRecord and ActionView,
-  but can easily be used in any Ruby program.
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+description: Searchlight is a low-magic way to build database searches using an ORM.
+  It's compatible with ActiveRecord, Sequel, Mongoid, and any other ORM that can build
+  queries by chaining method calls.
 email:
 - nathanmlong@gmail.com
 - adamhunter@me.com
@@ -106,9 +147,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -119,22 +160,16 @@ files:
 - gemfiles/Gemfile.rails-4.0.x
 - lib/searchlight.rb
 - lib/searchlight/adapters/action_view.rb
-- lib/searchlight/adapters/active_record.rb
-- lib/searchlight/adapters/mongoid.rb
 - lib/searchlight/dsl.rb
 - lib/searchlight/search.rb
 - lib/searchlight/version.rb
 - searchlight.gemspec
 - spec/searchlight/adapters/action_view_spec.rb
-- spec/searchlight/adapters/active_record_spec.rb
-- spec/searchlight/adapters/mongoid_spec.rb
 - spec/searchlight/search_spec.rb
 - spec/searchlight_spec.rb
 - spec/spec_helper.rb
 - spec/support/account_search.rb
 - spec/support/mock_model.rb
-- spec/support/mock_models/active_record.rb
-- spec/support/mock_models/mongoid.rb
 - spec/support/spiffy_account_search.rb
 homepage: https://github.com/nathanl/searchlight
 licenses:
@@ -146,30 +181,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Searchlight helps you build searches from options via Ruby methods that you
-  write.
+summary: Searchlight is a low-magic way to build database searches using an ORM.
 test_files:
 - spec/searchlight/adapters/action_view_spec.rb
-- spec/searchlight/adapters/active_record_spec.rb
-- spec/searchlight/adapters/mongoid_spec.rb
 - spec/searchlight/search_spec.rb
 - spec/searchlight_spec.rb
 - spec/spec_helper.rb
 - spec/support/account_search.rb
 - spec/support/mock_model.rb
-- spec/support/mock_models/active_record.rb
-- spec/support/mock_models/mongoid.rb
 - spec/support/spiffy_account_search.rb

data/lib/searchlight/adapters/active_record.rb

@@ -1,96 +0,0 @@
-module Searchlight
-  module Adapters
-    module ActiveRecord
-
-      def search_on(target)
-        super
-        extend Search       if is_active_record?(target)
-        convert_to_relation if is_active_record_class?(target)
-      end
-
-      module Search
-        def searches(*attribute_names)
-          super
-
-          # Ensure this class only adds one search module to the ancestors chain
-          if @ar_searches_module.nil?
-            @ar_searches_module = Named::Module.new("SearchlightActiveRecordSearches(#{self})")
-            include @ar_searches_module
-          end
-
-          eval_string = attribute_names.map { |attribute_name|
-            model_class = model_class_for(search_target)
-            if model_has_db_attribute?(attribute_name.to_s)
-
-              <<-UNICORN_BILE
-              def search_#{attribute_name}
-                search.where('#{attribute_name}' => public_send("#{attribute_name}"))
-              end
-              UNICORN_BILE
-            else
-              <<-MERMAID_TEARS
-              def search_#{attribute_name}
-                raise Searchlight::Adapters::ActiveRecord::UndefinedColumn,
-                "Class `#{model_class}` has no column `#{attribute_name}`; please define `search_#{attribute_name}` on `\#{self.class}` to clarify what you intend to search for"
-              end
-              MERMAID_TEARS
-            end
-
-          }.join
-
-          @ar_searches_module.module_eval(eval_string, __FILE__, __LINE__)
-        end
-
-        # The idea here is to provide a means to allow users to bypass the check if it causes problems (e.g. during
-        # `rake assets:precompile` if the DB has yet to be created). To bypass this, a user could monkey patch as
-        # follows:
-        #
-        #     module Searchlight::Adapters::ActiveRecord::Search
-        #       def model_has_db_attribute?(attribute_name)
-        #         model_class_for(search_target).columns_hash.keys.include?(attribute_name)
-        #       rescue StandardError
-        #         true
-        #       end
-        #     end
-        #
-        # Alternatively, they could monkey-patch Searchlight::Adapters::ActiveRecord::Search::model_has_db_attribute
-        # to simply always return true, though they would then not get the benefit of the improved error messaging.
-        #
-        def model_has_db_attribute?(attribute_name)
-          model_class_for(search_target).columns_hash.keys.include?(attribute_name)
-        end
-      end
-
-      protected
-
-      def is_active_record?(target)
-         is_active_record_class?(target) || is_active_record_relation?(target)
-      end
-
-      def is_active_record_class?(target)
-        target.is_a?(Class) && target.ancestors.include?(::ActiveRecord::Base)
-      end
-
-      def is_active_record_relation?(target)
-        target.is_a?(::ActiveRecord::Relation)
-      end
-
-      # Ensure that searches without options still return enumerable results
-      def convert_to_relation
-        self.search_target = (active_record_version >= 4) ? search_target.all : search_target.scoped
-      end
-
-      def model_class_for(target)
-        is_active_record_class?(target) ? target : target.engine
-      end
-
-      def active_record_version
-        ::ActiveRecord::VERSION::MAJOR.to_i
-      end
-
-      UndefinedColumn = Class.new(StandardError)
-    end
-  end
-end
-
-Searchlight::Search.extend(Searchlight::Adapters::ActiveRecord)

data/lib/searchlight/adapters/mongoid.rb

@@ -1,60 +0,0 @@
-module Searchlight
-  module Adapters
-    module Mongoid
-
-      def search_on(target)
-        super
-        extend Search if mongoid?(target)
-      end
-
-      module Search
-
-        def searches(*attributes_names)
-          super
-
-          attributes_names.map do |attribute_name|
-            method_name = "search_#{attribute_name}"
-            if field?(attribute_name)
-              define_method method_name do
-                search.where(attribute_name.to_s => public_send(attribute_name))
-              end
-            else
-              define_method method_name do
-                raise Searchlight::Adapters::Mongoid::UndefinedColumn,
-                "Class `#{self.class.model_class}` has no field `#{attribute_name}`; please define `search_#{attribute_name}` on `#{self.class}` to clarify what you intend to search for"
-              end
-            end
-          end
-        end
-
-        def field?(attributes_name)
-          model_class.fields.has_key? attributes_name.to_s
-        end
-
-        def model_class
-          search_target.is_a?(::Mongoid::Criteria) ? search_target.klass : search_target
-        end
-
-      end
-
-      protected
-
-      def mongoid?(target)
-        mongoid_document?(target) || mongoid_criteria?(target)
-      end
-
-      def mongoid_document?(target)
-        defined?(::Mongoid::Document) && target.include?(::Mongoid::Document)
-      end
-
-      def mongoid_criteria?(target)
-        defined?(::Mongoid::Criteria) && target.is_a?(::Mongoid::Criteria)
-      end
-
-      UndefinedColumn = Class.new(StandardError)
-
-    end
-  end
-end
-
-Searchlight::Search.extend(Searchlight::Adapters::Mongoid)

data/spec/searchlight/adapters/active_record_spec.rb

@@ -1,107 +0,0 @@
-require 'spec_helper'
-
-describe 'Searchlight::Adapters::ActiveRecord', adapter: true do
-
-  before :all do
-    require 'searchlight/adapters/active_record'
-    require 'active_record'
-  end
-
-  let(:search_class)    {
-    Named::Class.new('SearchClass', Searchlight::Search).tap { |klass|
-      klass.instance_eval(&ar_version_faker)
-      klass.search_on target
-    }
-  }
-  let(:ar_version_faker) { lambda {|klass| nil } } # no-op
-  let(:search_instance) { search_class.new(elephants: 'yes, please') }
-
-  shared_examples "search classes with an ActiveRecord target" do
-
-    context "when the base model has a column matching the search term" do
-
-      before :each do
-        MockActiveRecord.stub(:columns_hash).and_return({'elephants' => 'column info...'})
-        search_class.searches :elephants
-      end
-
-      it "adds search methods to the search class" do
-        expect(search_class.new).to respond_to(:search_elephants)
-      end
-
-      it "defines search methods that call `where` on the search target" do
-        search_instance.results
-        expect(search_instance.search.called_methods).to include(:where)
-      end
-
-      it "sets arguments properly in the defined method" do
-        search_instance.search.should_receive(:where).with('elephants' => 'yes, please')
-        search_instance.search_elephants
-      end
-
-    end
-
-    context "when the base model has no column matching the search term" do
-
-      before :each do
-        MockActiveRecord.stub(:columns_hash).and_return({})
-        search_class.searches :elephants
-      end
-
-      it "adds search methods to the search class" do
-        expect(search_class.new).to respond_to(:search_elephants)
-      end
-
-      it "defines search methods to raise an exception" do
-        expect { search_instance.results }.to raise_error(
-          Searchlight::Adapters::ActiveRecord::UndefinedColumn
-        )
-      end
-
-    end
-
-  end
-
-  context "when the search target is an ActiveRecord class" do
-
-    let(:target)   { MockActiveRecord }
-
-    describe "converting to an ActiveRecord::Relation" do
-
-      context "for ActiveRecord <= 3" do
-
-        let(:ar_version_faker) { lambda { |klass| klass.stub(:active_record_version).and_return(3) } }
-
-        it "calls 'scoped'" do
-          target.should_receive(:scoped)
-          search_class
-        end
-
-      end
-
-      context "for ActiveRecord >= 4" do
-
-        let(:ar_version_faker) { lambda { |klass| klass.stub(:active_record_version).and_return(4) } }
-
-        it "calls 'all'" do
-          target.should_receive(:all)
-          search_class
-        end
-
-      end
-
-    end
-
-    it_behaves_like "search classes with an ActiveRecord target"
-
-  end
-
-  context "when the search target is an ActiveRecord relation" do
-
-    let(:target)   { MockActiveRecord.joins(:dudes_named_milford).tap { |r| r.called_methods.clear } }
-
-    it_behaves_like "search classes with an ActiveRecord target"
-
-  end
-
-end

data/spec/searchlight/adapters/mongoid_spec.rb

@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-describe 'Searchlight::Adapters::Mongoid', adapter: true do
-
-  before :all do
-    require 'mongoid'
-    require 'searchlight/adapters/mongoid'
-  end
-
-  after :all do
-    Object.send(:remove_const, :Mongoid)
-  end
-
-  let(:search_class)    {
-    Named::Class.new('SearchClass', Searchlight::Search).tap { |klass| klass.search_on target }
-  }
-
-  let(:search_instance) { search_class.new(elephants: 'yes, please') }
-
-  shared_examples "search classes with an Mongoid target" do
-
-    context "when the base model has a field matching the search term" do
-
-      before do
-        MockMongoid.stub(:fields).and_return('elephants' => 'column info...')
-        search_class.searches :elephants
-      end
-
-      it "adds search methods to the search class" do
-        expect(search_class.new).to respond_to(:search_elephants)
-      end
-
-      it "defines search methods that call `where` on the search target" do
-        search_instance.results
-        expect(search_instance.search.called_methods).to include(:where)
-      end
-
-      it "sets arguments properly in the defined method" do
-        search_instance.search.should_receive(:where).with('elephants' => 'yes, please')
-        search_instance.search_elephants
-      end
-
-    end
-
-    context "when the base model has no field matching the search term" do
-
-      before do
-        MockMongoid.stub(fields: {})
-        search_class.searches :elephants
-      end
-
-      it "adds search methods to the search class" do
-        expect(search_class.new).to respond_to(:search_elephants)
-      end
-
-      it "defines search methods to raise an exception" do
-        expect { search_instance.results }.to raise_error(
-          Searchlight::Adapters::Mongoid::UndefinedColumn
-        )
-      end
-
-    end
-
-  end
-
-  context "when the search target is a class with Mongoid::Document module" do
-
-    let(:target)   { MockMongoid }
-
-    it_behaves_like "search classes with an Mongoid target"
-
-  end
-
-  context "when the search target is Mongoid::Criteria class" do
-
-    let(:target)   { MockMongoidCriteria.new([]) }
-
-    before do
-      target.stub(klass: MockMongoid)
-    end
-
-    it_behaves_like "search classes with an Mongoid target"
-
-  end
-
-end

data/spec/support/mock_models/active_record.rb

@@ -1,23 +0,0 @@
-class MockActiveRecord < MockModel
-
-  def self.ancestors
-    super + [::ActiveRecord::Base]
-  end
-
-  def self.is_a?(thing)
-    thing == ::ActiveRecord::Base ? true : super
-  end
-
-end
-
-class MockActiveRecordRelation < MockRelation
-
-  def is_a?(thing)
-    thing == ::ActiveRecord::Relation ? true : super
-  end
-
-  def engine
-    MockActiveRecord
-  end
-
-end

data/spec/support/mock_models/mongoid.rb

@@ -1,19 +0,0 @@
-class MockMongoid < MockModel
-
-  def self.include?(thing)
-    thing == ::Mongoid::Document ? true : super
-  end
-
-end
-
-class MockMongoidCriteria < MockRelation
-
-  def is_a?(thing)
-    thing == ::Mongoid::Criteria ? true : super
-  end
-
-  def self.include?(thing)
-    thing == ::Mongoid::Document ? false : super
-  end
-
-end