searchjoy 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8829cfdcf0e99e13e962d499ac5fd3ef086e9aff
-  data.tar.gz: f231ac45644bbd7e3b2e1933500bc028dc8723e2
+  metadata.gz: 286338a56506c0efe7a8499ca70e68217d722b97
+  data.tar.gz: 5cf770afd4da14880dde412dd83fd1c23d8299cf
 SHA512:
-  metadata.gz: 42a8ecb79f3a0ec02f27c892ee28d1cf28b9df9670280955577b81e95497052384ef0a620e2bbad92039b14f20baab8117f8d8ca07efc242696b338424a9af0b
-  data.tar.gz: 0c8974a26e7f0d5a2720569651eeb3c03e27c992c72a0f492737f001c2c88886176463c49b799ed2b0f8c5d46ee418ba45ad1cf51e4eb1c22ced56c920d26fac
+  metadata.gz: 08117e05a6809313e7dab569a0b928cc744a124e81845019726576b6d05e5d11bf86169f894ffca4237490ae29eade9f2f41f1b778917100166cfb1813e077e0
+  data.tar.gz: 52d5431f207d5e3b13576aeb3f298cce732995eadd1c1d9fa958af1bb6b1f2724d6ce5f261b3ee1c510d3d20829ceb09ae7e6927c56e9b9636eaead80f12c59f

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in searchjoy.gemspec
 gemspec

data/README.md

@@ -12,7 +12,7 @@ Works with Rails 3.1+ and any search engine, including Elasticsearch, Sphinx, an
 
 :cupid: An amazing companion to [Searchkick](https://github.com/ankane/searchkick)
 
-:tangerine: Battle-tested at [Instacart](https://www.instacart.com)
+:tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
 ## Get Started
 
@@ -45,14 +45,15 @@ Track searches by creating a record in the database.
 Searchjoy::Search.create(
   search_type: "Item", # typically the model name
   query: "apple",
-  results_count: 12
+  results_count: 12,
+  user_id: 1
 )
 ```
 
 With [Searchkick](https://github.com/ankane/searchkick), you can use the `track` option to do this automatically.
 
 ```ruby
-Item.search "apple", track: true
+Item.search "apple", track: {user_id: 1}
 ```
 
 If you want to track more attributes, add them to the `searchjoy_searches` table.  Then, pass the values to the `track` option.

data/app/controllers/searchjoy/searches_controller.rb

@@ -12,7 +12,7 @@ module Searchjoy
 
     def index
       if params[:sort] == "conversion_rate"
-        @searches.sort_by!{|s| [s["conversion_rate"].to_f, s["query"]] }
+        @searches.sort_by! { |s| [s["conversion_rate"].to_f, s["query"]] }
       end
     end
 
@@ -21,7 +21,7 @@ module Searchjoy
       @searches_by_week = relation.group_by_week(:created_at, Time.zone, @time_range).count
       @conversions_by_week = relation.where("converted_at is not null").group_by_week(:created_at, Time.zone, @time_range).count
       @top_searches = @searches.first(5)
-      @bad_conversion_rate = @searches.sort_by{|s| [s["conversion_rate"].to_f, s["query"]] }.first(5).select{|s| s["conversion_rate"] < 50 }
+      @bad_conversion_rate = @searches.sort_by { |s| [s["conversion_rate"].to_f, s["query"]] }.first(5).select { |s| s["conversion_rate"] < 50 }
       @conversion_rate_by_week = {}
       @searches_by_week.each do |week, searches_count|
         @conversion_rate_by_week[week] = searches_count > 0 ? (100.0 * @conversions_by_week[week] / searches_count).round : 0

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

@@ -1,6 +1,7 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :searchjoy_searches do |t|
+      t.integer :user_id
       t.string :search_type
       t.string :query
       t.string :normalized_query

data/lib/searchjoy/search.rb

@@ -3,14 +3,14 @@ module Searchjoy
     belongs_to :convertable, polymorphic: true
 
     # the devise way
-    if Rails::VERSION::MAJOR == 3 and !defined?(ActionController::StrongParameters)
+    if (Rails::VERSION::MAJOR == 3 && !defined?(ActionController::StrongParameters)) || defined?(ActiveModel::MassAssignmentSecurity)
       attr_accessible :search_type, :query, :results_count
     end
 
     before_save :set_normalized_query
 
     def convert(convertable = nil)
-      if !converted?
+      unless converted?
         self.converted_at = Time.now
         self.convertable = convertable
         save(validate: false)
@@ -26,6 +26,5 @@ module Searchjoy
     def set_normalized_query
       self.normalized_query = query.downcase if query
     end
-
   end
 end

data/lib/searchjoy/track.rb

@@ -1,16 +1,14 @@
 module Searchjoy
   module Track
-
     def search_with_track(term, options = {})
       results = search_without_track(term, options)
 
       if options[:track]
         attributes = options[:track] == true ? {} : options[:track]
-        results.search = Searchjoy::Search.create({search_type: self.name, query: term, results_count: results.total_count}.merge(attributes))
+        results.search = Searchjoy::Search.create({search_type: name, query: term, results_count: results.total_count}.merge(attributes))
       end
 
       results
     end
-
   end
 end

data/lib/searchjoy/version.rb

@@ -1,3 +1,3 @@
 module Searchjoy
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/searchjoy.gemspec

@@ -1,19 +1,19 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'searchjoy/version'
+require "searchjoy/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "searchjoy"
   spec.version       = Searchjoy::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.description   = %q{Search analytics made easy}
-  spec.summary       = %q{Search analytics made easy}
+  spec.description   = "Search analytics made easy"
+  spec.summary       = "Search analytics made easy"
   spec.homepage      = "https://github.com/ankane/searchjoy"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchjoy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -113,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Search analytics made easy
 test_files: []
-has_rdoc: