autocomplete_rails 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7eed4339441b8ff35370508d4a241c4662631c7
-  data.tar.gz: 6a90ee2bb13d34f18ba3bfff9d5a43b9c1c91c09
+  metadata.gz: 1252115fac64fe3b2177ac3fe4ecd2cdec6dcc57
+  data.tar.gz: 05bf9a79349b5a78eaa913f928a5347cc9a16efd
 SHA512:
-  metadata.gz: c6837fd169753cfc1c4d01214c504366f23f1503f27f0bf35d4b80e71744e2a20b4466362b394cbebf54a9db5e77cff64389f0413f18c6a471a64b5de5ec603c
-  data.tar.gz: c1b3e85d6c176e81e04d78533801dc1c348146d2a8c2c3215627f57bdab30d10bac074ea3b4632b808066809b65da0cd48fab2b977b5db00df1473abbd46e727
+  metadata.gz: 0a678532046c07d694d814e6f3ff4b89d2c91f0b7bd0f123d9a97752beb346fbe83c53acc6a849b6bfa2331b74139d1fe2359b54597ea579aa84454514faced6
+  data.tar.gz: 3c5fcc78cc3f83bbbba89efc34f77c2aa09d7e7f5e4ba66c85b6db5a152f73a2e3cb9ba012dea61e9ff119e2712272513a7e5abdf2a1dbb993f80d4d9737a19c

data/Rakefile

@@ -27,3 +27,10 @@ RSpec::Core::RakeTask.new(:spec)
 desc 'Run all specs in spec directory (excluding plugin specs)'
 task default: :spec
 
+task :build do
+  system "gem build autocomplete_rails.gemspec"
+end
+
+task release: :build do
+  system "gem push bundler-#{AutocompleteRails::VERSION}"
+end

data/lib/autocomplete_rails/controller.rb

@@ -26,6 +26,8 @@ module AutocompleteRails
       # * value_method - method on model to autocomplete. This supplies the 'value' field in results.
       #                  Also used as the label unless you supply options[:label_method].
       # * options - hash of optional settings.
+      # * &block - an optional block to further modify the results set,
+      #            e.g. `{ |results| results.where(smth: @instance_variable) }`
       #
       #
       # Options accepts a hash of:
@@ -39,6 +41,8 @@ module AutocompleteRails
       #                  field being searched (see value_method above) must start with the search term.
       # * :scopes - Build your autocomplete query from the specified ActiveRecord scope(s). Multiple scopes can be
       #             used, pass them in as an array. Example: `scopes: [:scope1, :scope2]`
+      #             If you need to pass additional arguments to your scope, define them as an array of arrays.
+      #             Example: `scopes: [:scope1, [:scope2, 'argument 1', 'argument 2] ]`
       # * :order - specify an order clause, defaults to 'LOWER(#{table}.#{value_method}) ASC'
       #
       # Be sure to add a route to reach the generated controller method. Example:
@@ -54,13 +58,13 @@ module AutocompleteRails
       #     autocomplete :user, :email, label_method: full_name, full_model: true
       #   end
       #
-      def autocomplete(model_symbol, value_method, options = {})
+      def autocomplete(model_symbol, value_method, options = {}, &block)
         label_method = options[:label_method] || value_method
         model = model_symbol.to_s.camelize.constantize
         autocomplete_method_name = "autocomplete_#{model_symbol}_#{value_method}"
 
         define_method(autocomplete_method_name) do
-          results = autocomplete_results(model, value_method, label_method, options)
+          results = autocomplete_results(model, value_method, label_method, options, &block)
           render json: autocomplete_build_json(results, value_method, label_method, options), root: false
         end
       end
@@ -68,13 +72,22 @@ module AutocompleteRails
 
     protected
 
-    def autocomplete_results(model, value_method, label_method = nil, options)
+    def autocomplete_results(model, value_method, label_method = nil, options, &block)
       term = params[:term]
       return {} if term.blank?
 
       results = model.where(nil) # make an empty scope to add select, where, etc, to.
       scopes  = Array(options[:scopes])
-      scopes.each { |scope| results = results.send(scope) } unless scopes.empty?
+      unless scopes.empty?
+        scopes.each do |scope|
+          if scope.is_a?(Array)
+            results = results.send(scope.slice(0), *scope.drop(1))
+          else
+            results = results.send(scope)
+          end
+        end
+      end
+      results = instance_exec(results, &block) if block
       results = results.select(autocomplete_select_clause(model, value_method, label_method, options)) unless
         options[:full_model]
       results.
@@ -112,7 +125,7 @@ module AutocompleteRails
 
       # default to ASC order
       table_prefix = "#{model.table_name}."
-      "LOWER(#{table_prefix}#{value_method}) ASC"
+      Arel.sql("LOWER(#{table_prefix}#{value_method}) ASC")
     end
 
     def autocomplete_build_json(results, value_method, label_method, options)

data/lib/autocomplete_rails/engine.rb

@@ -4,7 +4,7 @@ module AutocompleteRails
   class Engine < ::Rails::Engine
     config.generators do |g|
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
     end
   end
 end

data/lib/autocomplete_rails/version.rb

@@ -1,3 +1,3 @@
 module AutocompleteRails
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autocomplete_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Tomich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement