searchlight 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5654905b697feb05239ed5b783d46e6a282eaa4
-  data.tar.gz: 7b9622f4a6d5d9f7cdcc2429941fc08f36e6c491
+  metadata.gz: 4ca4e4a2693cd9315c4734f63f2e3cdbb560d8f9
+  data.tar.gz: 5182116d73d4fd2da4d2ef187f7be4df210cab7f
 SHA512:
-  metadata.gz: 64e8e55512aac81f5bed20ac97152a012211cdfdcb25906f62cb62b52e0a8970eb8111f991b85120f382e57771cea3f23e64edf4d4bcb0673b8983dc12a91f26
-  data.tar.gz: 491c812aa4973a4cfca1b2948f435a647ab1c59da69ea40414073bd93d780d4619afe5a5c10bebfee1a5509bf8915693abd7723b5e5080db29ef2c7bc5cde29b
+  metadata.gz: b1b65c23ac4951fde9cd7810ee92fb4374838efc3df42cbd4861439098516557bccd500d08a3f1d135dcf562a78114438cfff3a82af296df6ce13fd73e4b4216
+  data.tar.gz: 0963fe2edc3ced89da8c97132425bbe1152a38445ebe168537d20a1af21bed960faaf38f3709b740327727d951de3e764621409242aac9eadd00e27494cd5b2f

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Searchlight does its best to use [semantic versioning](http://semver.org).
 
+## 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/)
+
 ## v1.3.0
 
 New Mongoid adapter, thanks to [iliabylich](https://github.com/iliabylich).

data/lib/searchlight/adapters/active_record.rb

@@ -20,7 +20,7 @@ module Searchlight
 
           eval_string = attribute_names.map { |attribute_name|
             model_class = model_class_for(search_target)
-            if model_class_for(search_target).columns_hash.keys.include?(attribute_name.to_s)
+            if model_has_db_attribute?(attribute_name.to_s)
 
               <<-UNICORN_BILE
               def search_#{attribute_name}
@@ -40,6 +40,25 @@ module Searchlight
 
           @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

data/lib/searchlight/version.rb

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

data/searchlight.gemspec

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'searchlight/version'
 
 Gem::Specification.new do |spec|
+  spec.license       = 'MIT'
   spec.name          = "searchlight"
   spec.version       = Searchlight::VERSION
   spec.authors       = ["Nathan Long", "Adam Hunter"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlight
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Nathan Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: named