searchjoy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e149d7bbe57f78d3d77522a99ebe00c5c9958528
-  data.tar.gz: 0027be7a3d258f50a9897cd64218b0b4a3843506
+  metadata.gz: 251310fe718b7f513e69055ad21cff3c6b172941
+  data.tar.gz: 6c9b95367fb7cf245e797d329f545c25fa3b4190
 SHA512:
-  metadata.gz: b59164fcca41b33eabcb6eed7e0aa83a738ce818fbb1ac3b9439d04b8847966e2b764d13d328de7a6eead5fe7fbd758521396659e00a9d5e0153d072ae4b4572
-  data.tar.gz: db768b9ce87fcac0d1921a45b89827930e9ff3dd512b6fa4e01b98b0a3611203f9224cbe1881de4b31adab60cf1bc82947c6a2eb9401169256cd208c28affead
+  metadata.gz: 4b9c9a88f6b774e9854dd5762e96ad13b0e4ddab0d374552fe43f054a923c0ac3d9896636196b2d0d3cc0c24c2698ffc4dadd7fe7b7fb376c9e7c75cdbc5ae2a
+  data.tar.gz: cdeab36645b69149e4807428e59e9d2d04de44616eec9c6740846d42ff874fcd45788c72d8ac47309a4339c901b744810f5c606dcfffae25a0ead18f11f65293

data/.gitattributes

@@ -0,0 +1 @@
+app/views/* linguist-vendored

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.2
+
+- Use `references` in migration
+- Fixed migration for SQLite
+
 ## 0.3.1
 
 - Fixed support for Rails 5.1

data/README.md

@@ -24,7 +24,7 @@ And run the generator. This creates a migration to store searches.
 
 ```sh
 rails generate searchjoy:install
-rake db:migrate
+rails db:migrate
 ```
 
 Next, add the dashboard to your `config/routes.rb`.
@@ -91,7 +91,7 @@ Don’t forget to protect the dashboard in production.
 In your `config/routes.rb`:
 
 ```ruby
-authenticate :user, -> (user) { user.admin? } do
+authenticate :user, ->(user) { user.admin? } do
   mount Searchjoy::Engine, at: "searchjoy"
 end
 ```
@@ -122,19 +122,19 @@ Searchjoy.top_searches = 500 # defaults to 100
 Link to the search results [master]
 
 ```ruby
-Searchjoy.query_url = -> (search) { Rails.application.routes.url_helpers.items_path(q: search.query) }
+Searchjoy.query_url = ->(search) { Rails.application.routes.url_helpers.items_path(q: search.query) }
 ```
 
 Add additional info to the query in the live stream.
 
 ```ruby
-Searchjoy.query_name = -> (search) { "#{search.query} #{search.city}" }
+Searchjoy.query_name = ->(search) { "#{search.query} #{search.city}" }
 ```
 
 Show the conversion name in the live stream.
 
 ```ruby
-Searchjoy.conversion_name = -> (model) { model.name }
+Searchjoy.conversion_name = ->(model) { model.name }
 ```
 
 ## TODO

data/lib/generators/searchjoy/templates/install.rb

@@ -1,20 +1,18 @@
 class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :searchjoy_searches do |t|
-      t.integer :user_id
+      t.references :user
       t.string :search_type
       t.string :query
       t.string :normalized_query
       t.integer :results_count
       t.timestamp :created_at
-      t.integer :convertable_id
-      t.string :convertable_type
+      t.references :convertable, polymorphic: true
       t.timestamp :converted_at
     end
 
     add_index :searchjoy_searches, [:created_at]
     add_index :searchjoy_searches, [:search_type, :created_at]
-    add_index :searchjoy_searches, [:search_type, :normalized_query, :created_at], name: "index_searchjoy_searches_on_search_type_normalized_query" # autogenerated name is too long
-    add_index :searchjoy_searches, [:convertable_id, :convertable_type]
+    add_index :searchjoy_searches, [:search_type, :normalized_query, :created_at], name: "index_searchjoy_searches_on_search_type_query" # autogenerated name is too long
   end
 end

data/lib/searchjoy.rb

@@ -30,15 +30,8 @@ rescue LoadError
 end
 
 if defined?(Searchkick)
-  module Searchkick
-    class Query
-      include Searchjoy::Track
-      define_method(:execute_without_track, instance_method(:execute))
-      define_method(:execute, instance_method(:execute_with_track))
-    end
-
-    class Results
-      attr_accessor :search
-    end
+  Searchkick::Query.prepend(Searchjoy::Track)
+  class Searchkick::Results
+    attr_accessor :search
   end
 end

data/lib/searchjoy/track.rb

@@ -1,7 +1,7 @@
 module Searchjoy
   module Track
-    def execute_with_track
-      results = execute_without_track
+    def execute
+      results = super
 
       if options[:track]
         attributes = options[:track] == true ? {} : options[:track]

data/lib/searchjoy/version.rb

@@ -1,3 +1,3 @@
 module Searchjoy
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchjoy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Search analytics made easy