searchlight 0.9.0 → 0.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGRhMjI1Mjg1ZDRmYTA5Yjc1YTk1ZWVkZWY5M2VhNjQ2YmQ0YzRhYQ==
+    NGM3YWIxODBiNTM5MmM4NDJkNjk4Mzk3MmU5MGIwMzg4M2JlM2E2ZA==
   data.tar.gz: !binary |-
-    NTU2MjMxYTdmY2YwNTYxZDY4YzU0NTY2ZjczNGRjMjlmNTM3MWFiZg==
+    Njc0ZDYxZjFkZWZmNDE2ZTJjNzY2Y2QzNjJjMTJiYjkwODZmODhiZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWE1NWE0ZDc3N2MyMGJiNzZmY2MwNGYzMzg4NWVmNjY4MWQyYzY5ZGEzZmQz
-    YjIwYmE4ZGJkZDhkNzhkNmM0MDNhODBiMzRhMTVjODY1MjM2NjJkMzhkNzZi
-    ODVmZDMyMGQ2N2Q1YWEwMDVlOTI0Zjg5YjBmYjYzZjZjOTU2M2U=
+    OGM2NjZmNTc2OTI3MjdkMmNlNTcwNzE2Mjk5Mzk3YmIzMzVmMjNjYTVmMGFi
+    ODhkYjQ2ZmNiNzJlNDNlYzhlOTVjMDIxN2M5ZGE4NDU5ZGI4NmYyN2JjMzI2
+    NWFmYWI0NDYwOTg4YjI1ZjhkOTJiNmQyNzkzNDRkMzc2ZjM2MjM=
   data.tar.gz: !binary |-
-    YmNhN2M0M2VjMmM0MTZmMjBmOTI1ODJlMzE0NWI0YTVhZDA2ZDIzYWY0NTYx
-    YjFhM2QxMGZmZGY3MTFkNzg0NWY0YmMzN2MxMTViMjlmMWQyMTRiYjEzZTAy
-    MjMyZTY5YjRjYWM1NjI2ZTE0MjNmN2UyMWM2MDVmNzliMmMyMDU=
+    M2JiOGE2ODJiNjhlOTM0NDBiNGVkZDBlZDE5MDNiMDRjMGRjOTQ5MzViZmM4
+    YWZiOTVkNDFmZTdiZmRkMTM1ZjE3MGM2ZjBlMzFlMGE2ODM3NGM0OTBiN2I0
+    NDFlOTE0NzM3MjJkOGFiYmY5ZDFkMzBmNTdkNzcyZmE5M2U5YTE=

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Searchlight does its best to use [semantic versioning](http://semver.org).
 
+## v0.9.1
+
+Bugfix for ActiveRecord adapter
+
+## v0.9.0
+
+- Clean up dynamic module inclusion
+- Better `ActionView` and `ActiveRecord` adapters
+- Better error messages
+- More documentation
+
 ## v0.0.1
 
 Experimental and unstable, Searchlight totters onto the scene and takes its first wide-eyed look at the world.

data/TODO.md

@@ -3,3 +3,4 @@
 - Run rcov and mutant
 - Make nice Github page
 - Test with ActiveRecord 4
+- Add more complex example searches to show where Searchlight shines. Eg: for a given disease, find people who've traveled in a given time period and visited countries that had an outbreak of that disease during their visit.

data/lib/searchlight/adapters/active_record.rb

@@ -4,7 +4,10 @@ module Searchlight
 
       def search_on(target)
         super
-        extend Search if target.is_a?(::ActiveRecord::Base) || target.is_a?(::ActiveRecord::Relation)
+        if target.is_a?(Class) && target.ancestors.include?(::ActiveRecord::Base) ||
+          target.is_a?(::ActiveRecord::Relation)
+          extend Search
+        end
       end
 
       module Search

data/lib/searchlight/version.rb

@@ -1,3 +1,3 @@
 module Searchlight
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/searchlight/adapters/active_record_spec.rb

@@ -7,29 +7,49 @@ describe 'Searchlight::Adapters::ActiveRecord', adapter: true do
     require 'active_record'
   end
 
-  let(:search_class) { Named::Class.new('SearchClass', Searchlight::Search) { search_on MockActiveRecord } }
+  let(:search_class)    { Named::Class.new('SearchClass', Searchlight::Search).tap { |klass| klass.search_on target } }
   let(:search_instance) { search_class.new(elephants: 'yes, please') }
 
   before :each do
     search_class.searches :elephants
   end
 
-  it "adds search methods to the search class" do
-    expect(search_class.new).to respond_to(:search_elephants)
-  end
+  shared_examples "search classes with an ActiveRecord target" do
+
+    it "adds search methods to the search class" do
+      expect(search_class.new).to respond_to(:search_elephants)
+    end
+
+    it "adds search_elephants to the search_methods array" do
+      expect(search_instance.send(:search_methods)).to include('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 eq([: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
 
-  it "adds search_elephants to the search_methods array" do
-    expect(search_instance.send(:search_methods)).to include('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 eq([:where])
+  context "when the search target is an ActiveRecord class" do
+
+    let(:target)   { MockActiveRecord }
+
+    it_behaves_like "search classes with an ActiveRecord target"
+
   end
 
-  it "sets arguments properly in the defined method" do
-    search_instance.search.should_receive(:where).with('elephants' => 'yes, please')
-    search_instance.search_elephants
+  context "when the search target is an ActiveRecord class" 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/support/mock_model.rb

@@ -8,8 +8,12 @@ end
 
 class MockActiveRecord < MockModel
 
+  def self.ancestors
+    super + [::ActiveRecord::Base]
+  end
+
   def self.is_a?(thing)
-    thing == ActiveRecord::Base ? true : super
+    thing == ::ActiveRecord::Base ? true : super
   end
 
 end
@@ -24,4 +28,10 @@ class MockRelation
   def method_missing(method, *args, &block)
     tap { called_methods << method }
   end
+
+  def is_a?(thing)
+    thing == ::ActiveRecord::Relation ? true : super
+  end
+
 end
+

metadata

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