searchjoy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718d461a1a5396990820d7317954813740bf68a2
-  data.tar.gz: 50c91afedfa3db697f0f94d3bab4bb9911a08355
+  metadata.gz: 1b5b37420e741afe05925396f8b0b80ea561ae1b
+  data.tar.gz: 54799f92c58b23b70520f1ce02edf1e950992b22
 SHA512:
-  metadata.gz: 57c03a406ab8d0e6b75fdbda81b519ab02d6b9d00c3a079b32540b6fd6e1e92d6467201db9334733f18fbca3153b46d6f46d0899795426540d5696f32f1a429b
-  data.tar.gz: e1a65b650370a3d47458edba0380b7cb2e10795d511da052231d548359db6829d6a1bcb8558a4567421126005b91a8e4c164e0743441e5343421436dcaca690e
+  metadata.gz: 6dbb2d7291d0378747674ee6a8d2bc5ab0915fa6bed0958845818406f83b58dfddd7766bfed084c4ed85c62c2b384bcecbfab3e2410a052fb95773b7ac524dd7
+  data.tar.gz: 7908a81eec008402c9c61392f5e5a17387297da415302f846bc5742f8a17c34c5c15fbfb7bc1f527f48dcce307d9842eb4e20eebd3bb4b763c78f661916053cc

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.0
+
+- Fixed error with Rails 5
+- Fixed `Index name too long` error with SQLite
+- Added `query_name` option
+- Removed support for Rails 3
+
 ## 0.1.0
 
 - Fixed Searchkick integration for `execute: false`

data/README.md

@@ -12,8 +12,6 @@ Works with any search platform, including Elasticsearch, Sphinx, and Solr
 
 :cupid: An amazing companion to [Searchkick](https://github.com/ankane/searchkick)
 
-:tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
-
 ## Get Started
 
 Add this line to your application’s Gemfile:
@@ -32,7 +30,7 @@ rake db:migrate
 Next, add the dashboard to your `config/routes.rb`.
 
 ```ruby
-mount Searchjoy::Engine, at: "admin/searchjoy"
+mount Searchjoy::Engine, at: "searchjoy"
 ```
 
 Be sure to protect the endpoint in production - see the [Authentication](#authentication) section for ways to do this.
@@ -88,44 +86,44 @@ search.convert(item)
 
 Don’t forget to protect the dashboard in production.
 
-#### Basic Authentication
+#### Devise
 
-Set the following variables in your environment or an initializer.
+In your `config/routes.rb`:
 
 ```ruby
-ENV["SEARCHJOY_USERNAME"] = "andrew"
-ENV["SEARCHJOY_PASSWORD"] = "secret"
+authenticate :user, -> (user) { user.admin? } do
+  mount Searchjoy::Engine, at: "searchjoy"
+end
 ```
 
-#### Devise
+#### Basic Authentication
 
-In your `config/routes.rb`:
+Set the following variables in your environment or an initializer.
 
 ```ruby
-authenticate :user, -> (user) { user.admin? } do
-  mount Searchjoy::Engine, at: "admin/searchjoy"
-end
+ENV["SEARCHJOY_USERNAME"] = "andrew"
+ENV["SEARCHJOY_PASSWORD"] = "secret"
 ```
 
 ### Customize
 
-#### Time Zone
-
 To change the time zone, create an initializer `config/initializers/searchjoy.rb` with:
 
 ```ruby
 Searchjoy.time_zone = "Pacific Time (US & Canada)" # defaults to Time.zone
 ```
 
-#### Top Searches
-
 Change the number of top searches shown with:
 
 ```ruby
 Searchjoy.top_searches = 500 # defaults to 100
 ```
 
-#### Live Conversions
+Add additional info to the query in the live stream. [master]
+
+```ruby
+Searchjoy.query_name = -> (search) { "#{search.query} #{search.city}" }
+```
 
 Show the conversion name in the live stream.
 

data/app/controllers/searchjoy/searches_controller.rb

@@ -4,11 +4,11 @@ module Searchjoy
 
     http_basic_authenticate_with name: ENV["SEARCHJOY_USERNAME"], password: ENV["SEARCHJOY_PASSWORD"] if ENV["SEARCHJOY_PASSWORD"]
 
-    before_filter :set_time_zone
-    before_filter :set_search_types
-    before_filter :set_search_type, only: [:index, :overview]
-    before_filter :set_time_range, only: [:index, :overview]
-    before_filter :set_searches, only: [:index, :overview]
+    before_action :set_time_zone
+    before_action :set_search_types
+    before_action :set_search_type, only: [:index, :overview]
+    before_action :set_time_range, only: [:index, :overview]
+    before_action :set_searches, only: [:index, :overview]
 
     def index
       if params[:sort] == "conversion_rate"

data/app/views/searchjoy/searches/index.html.erb

@@ -7,9 +7,9 @@
   <thead>
     <tr>
       <th>Query</th>
-      <th class="num" style="width: 20%;"><%= link_to "Searches", params.except(:sort), class: ("active" if params[:sort] != "conversion_rate") %></th>
+      <th class="num" style="width: 20%;"><%= link_to "Searches", searches_path(search_type: params[:search_type]), class: ("active" if params[:sort] != "conversion_rate") %></th>
       <th class="num" style="width: 20%;">Conversions</th>
-      <th class="num" style="width: 20%;"><%= link_to "%", params.merge(sort: "conversion_rate"), class: ("active" if params[:sort] == "conversion_rate") %></th>
+      <th class="num" style="width: 20%;"><%= link_to "%", searches_path(search_type: params[:search_type], sort: "conversion_rate"), class: ("active" if params[:sort] == "conversion_rate") %></th>
       <th class="num" style="width: 20%;">Avg Results</th>
     </tr>
   </thead>

data/app/views/searchjoy/searches/recent.html.erb

@@ -3,7 +3,8 @@
     <td style="width: 15%;">
       <%= link_to search.search_type, overview_searches_path(search_type: search.search_type), class: "type-link type-link-#{@search_types.index(search.search_type)}" %>
     </td>
-    <td><%= search.query %></td>
+    <td><%= Searchjoy.query_name ? Searchjoy.query_name.call(search) : search.query %></td>
+
     <td style="width: 35%; color: #5cb85c;">
       <% if search.converted_at %>
         <strong>✓</strong>

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

@@ -14,7 +14,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 
     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_and_normalized_query_an" # autogenerated name is too long
+    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]
   end
 end

data/lib/searchjoy.rb

@@ -19,6 +19,7 @@ module Searchjoy
 
   # conversion name
   mattr_accessor :conversion_name
+  mattr_accessor :query_name
 end
 
 begin

data/lib/searchjoy/version.rb

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

data/searchjoy.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "chartkick"
   spec.add_dependency "groupdate"
-  spec.add_dependency "activerecord"
+  spec.add_dependency "activerecord", ">= 4"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchjoy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,11 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Search analytics made easy
 test_files:
 - test/searchjoy_test.rb
 - test/test_helper.rb
-has_rdoc: