searchlight 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432e9a94536f38173152799da14d74ba3adb8e23
-  data.tar.gz: 649e95855e50d9663f831b8e639e97d7c9bbb64c
+  metadata.gz: 2417c0b1b3d3b3a7de838a2c5129c3182c421083
+  data.tar.gz: fdb71cd159542903b8a21065962564fec9d9f14d
 SHA512:
-  metadata.gz: 545f658dcc895609270b655f20d6dc14e3ffcdbb26567b4a2051d86372872c540e58b03264fd9e6a68f68a8b4860d5f5eb0ba68c9d60590dab71025523203798
-  data.tar.gz: 926a6a17de716ce11200f0c3182238338d57aaaa4aab19662a50df4021344f16affe998504db9f8e5219e9911bdc06616f63a2f100635cffacb042f937d69d58
+  metadata.gz: f8da4a68ca0e200a61dcd3fcaaba0eb44b2e549b203511a1408d3cab0aa71e502797ecb7f5cb644e2dfd955cbdc6ce838101066328cd9a3dbe0bdf9df6202692
+  data.tar.gz: a8c3067c059af9749675bdbae399b06073e9e94eaa5e58af233856f554bcc9c1634dd4400e206f46340fc4fc1054026311cc1f60bfd3678b4b1274744beafc3f

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Searchlight does its best to use [semantic versioning](http://semver.org).
 
+## v3.1.1
+
+### Bugfix
+
+- Bugfix for Sequel users. Don't use `.call` unless target is a proc; avoids mistakenly using `Sequel::Dataset#call`. See [bug report](https://github.com/nathanl/searchlight/issues/25). Thanks to [Jorge Marques](https://github.com/jorge-marques) for pointing out this problem. Bug was introduced in v3.1.0.
+
 ## v3.1.0
 
 Allow callable search targets, thanks to [Adam Nowak](https://github.com/lubieniebieski).

data/README.md

@@ -7,7 +7,6 @@ Searchlight can work with **any** ORM or object that can build a query using **c
 [![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)
 [![Build Status](https://api.travis-ci.org/nathanl/searchlight.png?branch=master)](https://travis-ci.org/nathanl/searchlight)
-[![Coverage Status](https://coveralls.io/repos/nathanl/searchlight/badge.png?branch=master)](https://coveralls.io/r/nathanl/searchlight?branch=master)
 [![Dependency Status](https://gemnasium.com/nathanl/searchlight.png)](https://gemnasium.com/nathanl/searchlight)
 
 ## Getting Started

data/gemfiles/Gemfile.rails-3.2.x

@@ -4,4 +4,3 @@ gemspec :path => ".."
 
 gem "rails",     "~> 3.2.13"
 gem 'mongoid',   "~> 3.1.4"
-gem 'coveralls', require: false

data/gemfiles/Gemfile.rails-4.0.x

@@ -5,4 +5,3 @@ gemspec :path => '..'
 gem "rails",     "~> 4.0.0"
 gem "mongoid"
 gem 'bson_ext'
-gem 'coveralls', require: false

data/lib/searchlight/search.rb

@@ -15,7 +15,8 @@ module Searchlight
     def search
       @search ||= begin
                     target = self.class.search_target
-                    if target.respond_to?(:call)
+                    if callable?(target)
+                      # for delayed scope evaluation
                       target.call
                     else
                       target
@@ -84,6 +85,12 @@ module Searchlight
       false
     end
 
+    def callable?(target)
+      # The obvious implementation would be 'respond_to?(:call)`, but
+      # then we may use Sequel::Dataset#call by accident.
+      target.is_a?(Proc)
+    end
+
     MissingSearchTarget = Class.new(Searchlight::Error)
 
     class UndefinedOption < Searchlight::Error

data/lib/searchlight/version.rb

@@ -1,3 +1,3 @@
 module Searchlight
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/searchlight.gemspec

@@ -25,12 +25,8 @@ Gem::Specification.new do |spec|
   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/searchlight/search_spec.rb

@@ -186,7 +186,7 @@ describe Searchlight::Search do
 
   describe "search_on" do
 
-    context "when an explicit, non-callable search target was provided" do
+    context "when an explicit search target was provided and it's not a proc" do
 
       let(:example_search_target) { "Bobby Fischer" }
 
@@ -210,7 +210,7 @@ describe Searchlight::Search do
 
     end
 
-    context "when an explicit, callable search target was provided" do
+    context "when an explicit search target was provided and it is a proc" do
 
       it "calls it in the process of producing search results" do
         search = ProcSearch.new(first_name: "Jimmy")

data/spec/spec_helper.rb

@@ -1,11 +1,4 @@
 require 'capybara/rspec'
-if ENV["TRAVIS"]
-  require 'coveralls'
-  Coveralls.wear!
-else
-  require 'simplecov'
-  SimpleCov.start { add_filter "/spec" }
-end
 require 'searchlight'
 $LOAD_PATH << '.'
 require 'support/mock_model'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlight
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Nathan Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named
@@ -81,20 +81,6 @@ dependencies:
     - - "~>"
       - !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'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -123,20 +109,6 @@ dependencies:
     - - "~>"
       - !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.