indexers 4.1.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb6293d7448565833f062e82462c5102f531056
-  data.tar.gz: c9d4d54d81642f3640b43c4885264e748fe1a51d
+  metadata.gz: 3cd1b4b219caffd4cd86cf1f86a49aaa90fe8911
+  data.tar.gz: 6fd8d22673623460b65ecd70c6d1655f4baa02fb
 SHA512:
-  metadata.gz: eb6e00eaec82bfb722c58cce834acaa29e95a0ab016f18baf16fcc5633b391630ad83b13d2be47a057d3745b0d36b0b8c78ac91d40db633773937dde2541fdef
-  data.tar.gz: b9cb8483b777d4115ae227b969c7672aacd6d8c80c32f07f35e930055ee220175a6e8c88f86298e32560d2dbba32859fd1d22573fc38348e1022833d64bc5672
+  metadata.gz: 2bbf0c594fd26479d00c5a9fa69782b22d64427b145126e9f1ed7d7178dae78e089ab2a751407728dd67ef8d619fcf10bace527bcfc4e8d74b596e698e767317
+  data.tar.gz: a06663d9bb75f8bb9e3fe74e39bf6b3de31bc9d65ec7723fa12fa2e7fb37e1162291bdbc696ebcb1a2e19b632dd7c7e6aed4570758107d6fffeb7f1fe8268622

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Mathías Montossi
+Copyright 2017 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/indexers.svg)](http://badge.fury.io/rb/indexers)
-[![Code Climate](https://codeclimate.com/github/mmontossi/indexers/badges/gpa.svg)](https://codeclimate.com/github/mmontossi/indexers)
-[![Build Status](https://travis-ci.org/mmontossi/indexers.svg)](https://travis-ci.org/mmontossi/indexers)
-[![Dependency Status](https://gemnasium.com/mmontossi/indexers.svg)](https://gemnasium.com/mmontossi/indexers)
+[![Code Climate](https://codeclimate.com/github/museways/indexers/badges/gpa.svg)](https://codeclimate.com/github/museways/indexers)
+[![Build Status](https://travis-ci.org/museways/indexers.svg)](https://travis-ci.org/museways/indexers)
+[![Dependency Status](https://gemnasium.com/museways/indexers.svg)](https://gemnasium.com/museways/indexers)
 
 # Indexers
 
@@ -31,10 +31,10 @@ $ bundle
 
 To install Redis you can use homebrew:
 ```
-$ brew install elasticsearch24
+$ brew install elasticsearch
 ```
 
-NOTE: This gem is tested agains version 2.4.
+NOTE: This gem is tested agains version 5.4.
 
 ## Configuration
 
@@ -52,8 +52,7 @@ Indexers.configure do |config|
       type 'string'
       fields do
         raw do
-          type 'string'
-          index 'not_analyzed'
+          type 'keyword'
         end
       end
     end
@@ -69,7 +68,7 @@ Indexers.configure do |config|
 end
 ```
 
-If you need to personalize the analysis, you can it here:
+If you need to personalize the analysis:
 
 ```ruby
 Indexers.configure do |config|
@@ -115,7 +114,6 @@ Indexers.define :product do
     extract record, :name, :category, :price
     product_suggestions do
       input [record.name, transliterate(record.name)].uniq
-      output record.name
     end
   end
 
@@ -149,9 +147,8 @@ Indexers.define :product do
     shop = options[:shop]
     term = args.first
     query do
-      filtered do
-        traits :shop
-        query do
+      bool do
+        must do
           if term.present?
             multi_match do
               query term
@@ -162,19 +159,16 @@ Indexers.define :product do
             match_all
           end
         end
+        traits :shop
       end
     end
   end
 
   trait :shop do
     filter do
-      bool do
-        must do
-          if shop
-            term do
-              _parent shop.id
-            end
-          end
+      if shop
+        term do
+          _parent shop.id
         end
       end
     end
@@ -229,7 +223,7 @@ Product.search.includes(:shop)
 
 ### Pagination
 
-Works the same as [pagers gem](https://github.com/mmontossi/pagers):
+Works the same as [pagers gem](https://github.com/museways/pagers):
 ```ruby
 Products.search.page(1, padding: 4, length: 30)
 ```
@@ -263,7 +257,7 @@ Indexers.configure do |config|
   config.computed_sort :price do |direction|
     type 'number'
     script do
-      inline "if (_source.currency == 'UYU') { doc['price'].value * 30 }"
+      inline "if (params['_source']['currency'] == 'UYU') { doc['price'].value * 30 }"
     end
     order direction
   end
@@ -302,11 +296,11 @@ The result is an array of hashes with a text property:
 
 Any issue, pull request, comment of any kind is more than welcome!
 
-I will mainly ensure compatibility to PostgreSQL, AWS, Redis, Elasticsearch, FreeBSD and Memcached. 
+I will mainly ensure compatibility to Rails, AWS, PostgreSQL, Redis, Elasticsearch and FreeBSD. 
 
 ## Credits
 
-This gem is maintained and funded by [mmontossi](https://github.com/mmontossi).
+This gem is maintained and funded by [museways](https://github.com/museways).
 
 ## License
 

data/Rakefile

@@ -4,16 +4,14 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
-  t.warning = false
 end
 
 task default: :test

data/lib/indexers.rb

@@ -19,7 +19,7 @@ module Indexers
   class << self
 
     def namespace
-      "#{Rails.application.class.parent_name} #{Rails.env}".parameterize('_')
+      "#{Rails.application.class.parent_name} #{Rails.env}".parameterize(separator: '_')
     end
 
     def client

data/lib/indexers/collection.rb

@@ -56,7 +56,7 @@ module Indexers
           values << { _script: Dsl::Api.new(direction, &block).to_h }
         elsif property == :id
           values << { _uid: { order: direction } }
-        elsif mappings.has_key?(property) && mappings[property][:type] == 'string'
+        elsif mappings.has_key?(property) && mappings[property][:type] == 'text'
           values << { "#{property}.raw" => { order: direction } }
         end
       end
@@ -84,19 +84,17 @@ module Indexers
         request = Dsl::Search.new do
           if without_ids.any?
             query do
-              filtered do
-                filter do
-                  bool do
-                    must_not do
-                      without_ids.each do |id|
-                        term do
-                          _id id
-                        end
-                      end
+              bool do
+                must do
+                  body
+                end
+                must_not do
+                  without_ids.each do |id|
+                    term do
+                      _id id
                     end
                   end
                 end
-                query body
               end
             end
           else
@@ -155,7 +153,7 @@ module Indexers
 
     def fetch_ids(source)
       case source
-      when Fixnum,String
+      when Integer,String
         [source.to_i]
       when ActiveRecord::Base
         [source.id]

data/lib/indexers/concern.rb

@@ -22,7 +22,7 @@ module Indexers
       end
 
       def indexer
-        @indexer ||= Indexers.definitions.find(name.parameterize('_').to_sym)
+        @indexer ||= Indexers.definitions.find(name.parameterize(separator: '_').to_sym)
       end
 
     end

data/lib/indexers/version.rb

@@ -1,5 +1,5 @@
 module Indexers
 
-  VERSION = '4.1.0.1'
+  VERSION = '5.1.0'
 
 end

metadata

@@ -1,80 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: indexers
 version: !ruby/object:Gem::Version
-  version: 4.1.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - mmontossi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: Dsl to delegate searches to elasticsearch in rails.
 email:
-- mmontossi@gmail.com
+- hi@museways.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,59 +99,7 @@ files:
 - lib/indexers/railtie.rb
 - lib/indexers/version.rb
 - lib/tasks/indexers.rake
-- test/dsl_test.rb
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/indexers/product_indexer.rb
-- test/dummy/app/indexers/shop_indexer.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/models/shop.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/elasticsearch.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/indexers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20161104164148_create_products.rb
-- test/dummy/db/migrate/20161104182219_create_shops.rb
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/generator_test.rb
-- test/index_test.rb
-- test/record_test.rb
-- test/search_test.rb
-- test/task_test.rb
-- test/test_helper.rb
-homepage: https://github.com/mmontossi/indexers
+homepage: https://github.com/museways/indexers
 licenses:
 - MIT
 metadata: {}
@@ -169,69 +111,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- Elasticsearch
+requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Search indexers for rails.
-test_files:
-- test/dsl_test.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/indexers/product_indexer.rb
-- test/dummy/app/indexers/shop_indexer.rb
-- test/dummy/app/models/product.rb
-- test/dummy/app/models/shop.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/database.yml.travis
-- test/dummy/config/elasticsearch.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/indexers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/db/migrate/20161104164148_create_products.rb
-- test/dummy/db/migrate/20161104182219_create_shops.rb
-- test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/generator_test.rb
-- test/index_test.rb
-- test/record_test.rb
-- test/search_test.rb
-- test/task_test.rb
-- test/test_helper.rb
+test_files: []