searchjoy 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 053a6b95d747131d4856e8f1165a4d5d8ea91be2
-  data.tar.gz: 1619363e231d4be19e7a88ba028cbb8ba8e3a301
+  metadata.gz: 718d461a1a5396990820d7317954813740bf68a2
+  data.tar.gz: 50c91afedfa3db697f0f94d3bab4bb9911a08355
 SHA512:
-  metadata.gz: 533a183daef983d6aaa7d30fece95f66b9c103f3201c592fb71cfe82e05f71220d623d56d0129057013fca8bb952da5dc7aeb363d7b867f94c3832433653c02a
-  data.tar.gz: 5acb9924124d161c48c908b284fbce60fe191c9de3ebb403b6aeb1d2702c9c2b46281e92ba8af2b5143214c199a825479de4f85c7bea15f7e8ff10ecf1945751
+  metadata.gz: 57c03a406ab8d0e6b75fdbda81b519ab02d6b9d00c3a079b32540b6fd6e1e92d6467201db9334733f18fbca3153b46d6f46d0899795426540d5696f32f1a429b
+  data.tar.gz: e1a65b650370a3d47458edba0380b7cb2e10795d511da052231d548359db6829d6a1bcb8558a4567421126005b91a8e4c164e0743441e5343421436dcaca690e

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.1.0
+
+- Fixed Searchkick integration for `execute: false`

data/README.md

@@ -8,7 +8,7 @@ Search analytics made easy
 - track conversions week over week
 - monitor the performance of top searches
 
-Works with Rails 3.1+ and any search engine, including Elasticsearch, Sphinx, and Solr
+Works with any search platform, including Elasticsearch, Sphinx, and Solr
 
 :cupid: An amazing companion to [Searchkick](https://github.com/ankane/searchkick)
 
@@ -73,14 +73,14 @@ Next, when a user searches, keep track of the search id. With Searchkick, you ca
 When a user converts, find the record and call `convert`.
 
 ```ruby
-search = Searchjoy::Search.find params[:id]
+search = Searchjoy::Search.find(params[:id])
 search.convert
 ```
 
 Better yet, record the model that converted.
 
 ```ruby
-item = Item.find params[:item_id]
+item = Item.find(params[:item_id])
 search.convert(item)
 ```
 
@@ -102,7 +102,7 @@ ENV["SEARCHJOY_PASSWORD"] = "secret"
 In your `config/routes.rb`:
 
 ```ruby
-authenticate :user, lambda{|user| user.admin? } do
+authenticate :user, -> (user) { user.admin? } do
   mount Searchjoy::Engine, at: "admin/searchjoy"
 end
 ```
@@ -130,7 +130,7 @@ Searchjoy.top_searches = 500 # defaults to 100
 Show the conversion name in the live stream.
 
 ```ruby
-Searchjoy.conversion_name = proc{|model| model.name }
+Searchjoy.conversion_name = -> (model) { model.name }
 ```
 
 ## TODO

data/lib/searchjoy.rb

@@ -29,13 +29,10 @@ end
 
 if defined?(Searchkick)
   module Searchkick
-    module Reindex
-      def self.extended(base)
-        base.send(:extend, Searchjoy::Track)
-        method_name = Searchkick.respond_to?(:search_method_name) ? Searchkick.search_method_name : :search
-        base.define_singleton_method(:search_without_track, base.method(method_name))
-        base.define_singleton_method(method_name, base.method(:search_with_track))
-      end
+    class Query
+      include Searchjoy::Track
+      define_method(:execute_without_track, instance_method(:execute))
+      define_method(:execute, instance_method(:execute_with_track))
     end
 
     class Results

data/lib/searchjoy/track.rb

@@ -1,14 +1,23 @@
 module Searchjoy
   module Track
-    def search_with_track(term, options = {}, &block)
-      results = search_without_track(term, options) do |body|
-        block.call(body) if block
-      end
+    def execute_with_track
+      results = execute_without_track
 
       if options[:track]
         attributes = options[:track] == true ? {} : options[:track]
-        results.search = Searchjoy::Search.create({search_type: name, query: term, results_count: results.total_count}.merge(attributes))
+
+        search_type =
+          if klass.respond_to?(:name) && klass.name.present?
+            klass.name
+          elsif options[:index_name]
+            Array(options[:index_name]).map(&:to_s).sort.join(" ")
+          else
+            "All Indices"
+          end
+
+        results.search = Searchjoy::Search.create({search_type: search_type, query: term, results_count: results.total_count}.merge(attributes))
       end
+
       results
     end
   end

data/lib/searchjoy/version.rb

@@ -1,3 +1,3 @@
 module Searchjoy
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchjoy
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md