autocompl 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c522e7a3820bd72329a60bb3f2e6db9348db2b
-  data.tar.gz: 7bf631b5de96b73795ee15bb594064fe6a44c455
+  metadata.gz: 451f4f6c82f31bc074c13cfaa4214803940aee40
+  data.tar.gz: 34797507e45ea10880975998c50ec3853ba5e603
 SHA512:
-  metadata.gz: 6fd35e1abb615f661759fbc65ea2675ab5ba8e3ac590c7c18eff7fcbad8ca0f9aa4f3c6d96dcc2ba332fd3455abf6672c0433dfa0862b044aba6981dcd3a3bf0
-  data.tar.gz: a5d07694c71bfac7ed3611ed964ae98536c7ac7ed7fa23adfaeb71f3e38b7fbd5c51d0ad6d4a2c7a834ba89f253612b3db9e4d6a32b6bc442548cd0b8d586876
+  metadata.gz: 34baf7b4c8d83315ffbd3eebf9c818dc7b061ab14366ecfe4b01093600bcf39bd5dfb664f8aec427a725e78ae3ebad52226d653ec8782ec4bb4db0b60f935d87
+  data.tar.gz: 4fee165adf480e89c0d078169d789ae610059acd8f841572d03c268b4b6beada7bd139e536f96388a064314d759011df2746024933d05dc2c58a4a7e732e60e9

data/lib/autocompl/base.rb

@@ -2,38 +2,42 @@ require 'autocompl/repository'
 
 module Autocompl
   module Base
+    BASE_CACHE_KEY = 'autocomplete_cache'.freeze
+
     def self.included(target)
       target.extend Autocompl::Base::ClassMethods
       target.send :include, Autocompl::Repository
     end
 
     module ClassMethods
-      BASE_CACHE_KEY = 'autocomplete_cache'.freeze
-
       def autocomplete(options = {})
         define_method('autocomplete_endpoint') do
           render json: [] if params[:term].nil?
           render json: [] if options.nil?
-          if cacheable?
-            items = Rails.cache.fetch(get_cache_key(options), expires_in: cache_expire) { get_items(options) }
-          else
-            items = get_items(options)
-          end
+          # if cacheable?
+          #   items = Rails.cache.fetch(get_cache_key(options), expires_in: cache_expire) { get_items(options, params[:term]) }
+          # elsle
+          items = get_items(options, params)
+          # end
           render json: items
         end
       end
     end
 
-    def get_items(options)
+    def get_items(options, params)
       klasses = options.keys
       items = []
       for klass in klasses
         columns = options[klass].instance_of?(Array) ? options[klass] : [] << options[klass]
-        items.concat(get_collection(klass, columns))
+        items.concat(get_collection(klass, columns, term: params[:term], limit: get_limit(params)))
       end
       items
     end
 
+    def get_limit(params)
+      params[:limit] ||= 20
+    end
+
     def cacheable?
       Rails.application.config.cache_store.present? && Rails.application.config.cache_autocomplete
     end
@@ -43,7 +47,7 @@ module Autocompl
     end
 
     def get_cache_key(options)
-      ClassMethods::BASE_CACHE_KEY + ':' + get_model_cache_key(options)
+      BASE_CACHE_KEY + ':' + get_model_cache_key(options)
     end
 
     def get_model_cache_key(options)

data/lib/autocompl/repository.rb

@@ -1,10 +1,10 @@
 module Autocompl
   module Repository
-    def get_collection(model, columns)
+    def get_collection(model, columns, options)
       klass = model.to_s.camelize.constantize
       items = []
       for column in columns
-        items.concat(klass.select(column).distinct.map(&column))
+        items.concat(klass.select(column).where("#{column} LIKE ?", "%#{options[:term]}%").limit(options[:limit]).distinct.map(&column))
       end
       items
     end

data/lib/autocompl/version.rb

@@ -1,3 +1,3 @@
 module Autocompl
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/test/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    autocompl (0.1.2)
+    autocompl (0.2.1)
       rails (>= 4.2.0)
 
 GEM

data/test/dummy/log/development.log

@@ -2956,3 +2956,136 @@ Processing by MakersController#autocomplete_endpoint as JSON
 Completed 200 OK in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
 
 
+Started GET "/products" for ::1 at 2017-01-26 23:44:15 +0900
+DEPRECATION WARNING: ActiveRecord::Base.raise_in_transactional_callbacks= is deprecated, has no effect and will be removed without replacement. (called from block (3 levels) in <class:Railtie> at /Users/takahashiseiji/src/github.com/timakin/autocompl/test/dummy/vendor/bundle/ruby/2.3.0/gems/activerecord-5.0.1/lib/active_record/railtie.rb:113)
+  ActiveRecord::SchemaMigration Load (1.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by ProductsController#index as HTML
+  Rendering products/index.html.erb within layouts/application
+  Product Load (1.3ms)  SELECT "products".* FROM "products"
+  Rendered products/index.html.erb within layouts/application (64.1ms)
+Started GET "/products" for ::1 at 2017-01-26 23:44:16 +0900
+Processing by ProductsController#index as HTML
+  Rendering products/index.html.erb within layouts/application
+  Product Load (0.2ms)  SELECT "products".* FROM "products"
+  Rendered products/index.html.erb within layouts/application (2.1ms)
+Completed 200 OK in 160ms (Views: 158.2ms | ActiveRecord: 0.2ms)
+
+
+Completed 200 OK in 609ms (Views: 597.8ms | ActiveRecord: 1.8ms)
+
+
+Started GET "/assets/makers.self-08dba1ca5eca7ae6468c13bb588e6b0aa62676d80e307c312855bcac16be80a3.js?body=1" for ::1 at 2017-01-26 23:44:16 +0900
+Started GET "/assets/products.self-bbcb94d3a0d5bcf6c07b22138897d08cbb40bd52d52c699d9fa0fc2200dc35e0.js?body=1" for ::1 at 2017-01-26 23:44:16 +0900
+Started GET "/products/autocomplete_endpoint?term=a" for ::1 at 2017-01-26 23:44:23 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"a"}
+  Product Load (0.2ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%a%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 5ms (Views: 0.4ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/products" for ::1 at 2017-01-26 23:44:23 +0900
+Processing by ProductsController#index as HTML
+  Rendering products/index.html.erb within layouts/application
+  Product Load (0.1ms)  SELECT "products".* FROM "products"
+  Rendered products/index.html.erb within layouts/application (2.5ms)
+Completed 200 OK in 20ms (Views: 17.2ms | ActiveRecord: 0.1ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%81%BF" for ::1 at 2017-01-26 23:44:26 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"み"}
+  Product Load (0.4ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%み%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%81%BF%E3%81%8B%E3%82%93a" for ::1 at 2017-01-26 23:44:29 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"みかんa"}
+  Product Load (0.3ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%みかんa%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%81%BF%E3%81%8B%E3%82%93" for ::1 at 2017-01-26 23:44:29 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"みかん"}
+  Product Load (0.2ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%みかん%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.2ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%81%BF%E3%81%8B" for ::1 at 2017-01-26 23:44:30 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"みか"}
+  Product Load (0.3ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%みか%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.4ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%81%BF%E3%81%8Bf" for ::1 at 2017-01-26 23:44:31 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"みかf"}
+  Product Load (0.4ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%みかf%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8A" for ::1 at 2017-01-26 23:44:36 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"り"}
+  Product Load (0.3ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%り%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8An" for ::1 at 2017-01-26 23:44:37 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"りn"}
+  Product Load (0.2ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%りn%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8A%E3%82%93" for ::1 at 2017-01-26 23:44:39 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"りん"}
+  Product Load (0.3ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%りん%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8A%E3%82%93" for ::1 at 2017-01-26 23:44:42 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"りん"}
+  Product Load (0.3ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%りん%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8A%E3%82%93%E3%81%82" for ::1 at 2017-01-26 23:44:44 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"りんあ"}
+  Product Load (0.2ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%りんあ%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8A%E3%82%93%E3%81%94" for ::1 at 2017-01-26 23:44:44 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"りんご"}
+  Product Load (0.2ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%りんご%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.3ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%8A%E3%82%93%E3%81%94%E3%81%82" for ::1 at 2017-01-26 23:44:45 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"りんごあ"}
+  Product Load (0.2ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%りんごあ%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%82%81" for ::1 at 2017-01-26 23:44:47 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"め"}
+  Product Load (0.3ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%め%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 2ms (Views: 0.2ms | ActiveRecord: 0.3ms)
+
+
+Started GET "/products/autocomplete_endpoint?term=%E3%83%A1%E3%83%AD" for ::1 at 2017-01-26 23:44:48 +0900
+Processing by ProductsController#autocomplete_endpoint as JSON
+  Parameters: {"term"=>"メロ"}
+  Product Load (0.4ms)  SELECT  DISTINCT "products"."name" FROM "products" WHERE (name LIKE '%メロ%') LIMIT ?  [["LIMIT", 20]]
+Completed 200 OK in 3ms (Views: 0.4ms | ActiveRecord: 0.4ms)
+
+

data/test/dummy/tmp/cache/assets/sprockets/v3.0/01/01H2EkpZWXO0y1JdqGg-x30S7nb2tN2h5beZiwZn-gQ.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=f55b68c7c1013259b4e47da503fea086e775ff13475dc1d49372c28d29732a96:ET

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autocompl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - timakin
@@ -136,6 +136,7 @@ files:
 - test/dummy/tmp/cache/75D/921/autocomplete_cache%3Aproduct_name_and_maker_name_ja_name_en
 - test/dummy/tmp/cache/D00/DC0/autocomplete_cache%3Aproduct_name
 - test/dummy/tmp/cache/assets/sprockets/v3.0/-I/-IXSJkaKinU8Fl50eKDwB1ydQ0JtcZ5gnVse55EfjIw.cache
+- test/dummy/tmp/cache/assets/sprockets/v3.0/01/01H2EkpZWXO0y1JdqGg-x30S7nb2tN2h5beZiwZn-gQ.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/0s/0saAXDP1LgnauZgKcL7RYa23dQGPLLL5Qsc6inAVKVA.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/1c/1cJQq91B0zcYUIcPj7LP7CA1sE-McgS0WSCA_V0kZaA.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/3C/3CBEbL4TspoWoNsPcQ1zQTj-exbwnq339w_7UnHBD3Y.cache
@@ -174,6 +175,7 @@ files:
 - test/dummy/tmp/cache/assets/sprockets/v3.0/Z2/Z2P0w0owMglA0uqkRDlcbkDdIJNQ8nonHbQC2TtA8QE.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/Zb/ZbrDOS-Sy277xxdvxjn0aweKst_5fnfJ7LLJlZ0IsQA.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/az/azI5AS0eFV_y-Ld5TnIKGxuM-KYbgdR4IpUIVJqHOmU.cache
+- test/dummy/tmp/cache/assets/sprockets/v3.0/bG/bG1YH6QB51Was7wJ99y1omNpZSY4K-T8WlXDcfNWENk.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/dO/dOZ5cU6HWKj5BNcnPUIFjH8930y3pFITKcXLUTB7V2A.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/dd/ddD0bTKZ3paS1rj4G_xcZc6t9S8MAKgTZwdXA7G6zoI.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/e3/e3muujThQ4WWrJ9-qrxh0dUVwSv9MfVOETtK7F-Zt_4.cache
@@ -3574,6 +3576,7 @@ test_files:
 - test/dummy/test/models/product_test.rb
 - test/dummy/tmp/cache/75D/921/autocomplete_cache%3Aproduct_name_and_maker_name_ja_name_en
 - test/dummy/tmp/cache/assets/sprockets/v3.0/-I/-IXSJkaKinU8Fl50eKDwB1ydQ0JtcZ5gnVse55EfjIw.cache
+- test/dummy/tmp/cache/assets/sprockets/v3.0/01/01H2EkpZWXO0y1JdqGg-x30S7nb2tN2h5beZiwZn-gQ.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/0s/0saAXDP1LgnauZgKcL7RYa23dQGPLLL5Qsc6inAVKVA.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/1c/1cJQq91B0zcYUIcPj7LP7CA1sE-McgS0WSCA_V0kZaA.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/3C/3CBEbL4TspoWoNsPcQ1zQTj-exbwnq339w_7UnHBD3Y.cache
@@ -3586,6 +3589,7 @@ test_files:
 - test/dummy/tmp/cache/assets/sprockets/v3.0/9u/9uxgGG9_QdAxOXdXscuoVWfjxLJiPCQS21uY5gQTI8w.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/Aq/AqNGhHk1VeXGpnPVZLp6ae6CjLXApTRdQXbYDj4Ldr0.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/az/azI5AS0eFV_y-Ld5TnIKGxuM-KYbgdR4IpUIVJqHOmU.cache
+- test/dummy/tmp/cache/assets/sprockets/v3.0/bG/bG1YH6QB51Was7wJ99y1omNpZSY4K-T8WlXDcfNWENk.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/BN/BN4Jum0nAu0cumhqUUs9QERjQpKaPBammfrYyv9MVbc.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/C1/C1ZE2hO2C1AJh0F5vK0fsog_QGcOlMRhQxMa2H8WBgs.cache
 - test/dummy/tmp/cache/assets/sprockets/v3.0/C_/C_o_CSo6amWaEQVLG47OH0oI8rfhOuyVsHyYMZfwRLM.cache