elasticsearch_autocomplete 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 033b837130dd4581eb9dbefe8b6424a5012f179c
-  data.tar.gz: 517d306c4a96ba7da1693bf6591a662133028a06
+  metadata.gz: 4f9206e0ce061bd387b72955314aef688bf605d1
+  data.tar.gz: ee11adab330424718638a670f6b3ce13d0525750
 SHA512:
-  metadata.gz: 141d423cb8d784bf259f4b4ef7026fce9804116bf7552525f9856638bb8cb44a8f78f870539322be926b55c1f6758d946ac0560c3783c822918faa167a9871cc
-  data.tar.gz: be4c0e832e7a27c0f41243902c37d8531a3c42361af68e4eb50e732512cc51693086a0691ab9cadfa5442e84c86784bfb7bb3b3f33c25c424c035e9f1aa0e640
+  metadata.gz: a56d6e952ca07c36fc8d25f2ed7684061e7bb2345d694140937e8f3f5b728771973f153391e62145aec810020621766e0f1b2c5d860d00f3f823ebf0277d7e93
+  data.tar.gz: cf73bef59eabdd792c1c27d8b6dccc85ec1f3da6e38b5b0405e4ac285785b084947339e07cfa86a1e942a80949a0a350611c67921b1ec128c24a99eabea0c1a8

data/.gitignore

@@ -21,4 +21,7 @@ tmp
 .rspec
 .ruby-version
 .ruby-gemset
-TODO
+Vagrantfile
+.vagrant
+TODO
+.byebug_history

data/.travis.yml

@@ -1,12 +1,14 @@
-language: ruby
+sudo: false
 
-services:
-  - elasticsearch
+language: ruby
 
-gemfile:
-  - Gemfile
+before_install:
+  - curl -s https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.0.0/elasticsearch-2.0.0.tar.gz  > elasticsearch.tar.gz
+  - tar -xzf elasticsearch.tar.gz
+  - cd elasticsearch*/ && bin/elasticsearch &
+  - sleep 10 && curl http://localhost:9200
 
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.5
+  - 2.3.0
+

data/lib/elasticsearch_autocomplete.rb

@@ -9,6 +9,13 @@ module ElasticsearchAutocomplete
   mattr_accessor :enable_indexing
   self.enable_indexing = true
 
+  mattr_accessor :elasticsearch_version
+  self.elasticsearch_version = '2.x'
+
+  def self.es2?
+    elasticsearch_version && elasticsearch_version.start_with?('2')
+  end
+
   def self.default_index_prefix
     Object.const_defined?(:Rails) ? ::Rails.application.class.name.split('::').first.downcase : nil
   end

data/lib/elasticsearch_autocomplete/model_addition.rb

@@ -11,7 +11,7 @@ module ElasticsearchAutocomplete
 
         after_save :ac_update_index
         after_destroy :ac_update_index
-        
+
         index_prefix ElasticsearchAutocomplete.defaults[:index_prefix] if ElasticsearchAutocomplete.defaults[:index_prefix]
       end
 
@@ -28,7 +28,7 @@ module ElasticsearchAutocomplete
         self.ac_mode_config = ElasticsearchAutocomplete::MODES[ac_opts[:mode]]
 
         self.ac_search_attrs = ac_opts[:search_fields] || (ac_opts[:localized] ? I18n.available_locales.map { |l| "#{ac_attr}_#{l}" } : [ac_attr])
-        self.ac_search_fields = ac_search_attrs.map { |attr| ac_mode_config.values.map { |prefix| "#{prefix}_#{attr}" } }.flatten
+        self.ac_search_fields = ac_search_attrs.map { |attr| ac_mode_config.values.map { |prefix| "#{attr}.#{prefix}_#{attr}" } }.flatten
 
         define_ac_index(ac_opts[:mode]) unless options[:skip_settings]
       end
@@ -57,6 +57,14 @@ module ElasticsearchAutocomplete
           end
 
           filter(:and, filters: options[:with].map { |k, v| {terms: {k => ElasticsearchAutocomplete.val_to_terms(v)}} }) if options[:with].present?
+
+          if options[:or].present?
+            or_filters = Array(options[:or]).map do |filter|
+              {and: filter.map {|k, v| {terms: {k => ElasticsearchAutocomplete.val_to_terms(v)}}}}
+            end
+            filter(:or, or_filters)
+          end
+
           if options[:without].present?
             options[:without].each do |k, v|
               filter(:not, {terms: {k => ElasticsearchAutocomplete.val_to_terms(v, true)}})
@@ -78,23 +86,24 @@ module ElasticsearchAutocomplete
 
       def ac_index_config(attr, mode=:word)
         defaults = {type: 'string', search_analyzer: 'ac_search', include_in_all: false}
+        index_analyzer_key = ElasticsearchAutocomplete.es2? ? :analyzer : :index_analyzer
         fields = case mode
                    when :word
                      {
                          attr => {type: 'string'},
-                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer: 'ac_edge_ngram'),
-                         "#{ac_mode_config[:word]}_#{attr}" => defaults.merge(index_analyzer: 'ac_edge_ngram_word')
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer_key => 'ac_edge_ngram'),
+                         "#{ac_mode_config[:word]}_#{attr}" => defaults.merge(index_analyzer_key => 'ac_edge_ngram_word')
                      }
                    when :phrase
                      {
                          attr => {type: 'string'},
-                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer: 'ac_edge_ngram')
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer_key => 'ac_edge_ngram')
                      }
                    when :full
                      {
                          attr => {type: 'string'},
-                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer: 'ac_edge_ngram', boost: 3),
-                         "#{ac_mode_config[:full]}_#{attr}" => defaults.merge(index_analyzer: 'ac_edge_ngram_full')
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer_key => 'ac_edge_ngram', boost: 3),
+                         "#{ac_mode_config[:full]}_#{attr}" => defaults.merge(index_analyzer_key => 'ac_edge_ngram_full')
                      }
                  end
         {type: 'multi_field', fields: fields}

data/lib/elasticsearch_autocomplete/version.rb

@@ -1,3 +1,3 @@
 module ElasticsearchAutocomplete
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/elasticsearch_autocomplete/search_filters_spec.rb

@@ -35,6 +35,11 @@ describe 'search filters' do
     @model.setup_index
   end
 
+  it 'filter suggestions with or terms' do
+    expect(@model.ac_search('Laura', or: [{interest_ids: [1]}, {interest_ids: '4'}]).map(&:full_name)).to\
+      match_array ['Laura Nelson', 'Laura Larson']
+  end
+
   it 'filter suggestions with terms' do
     expect(@model.ac_search('Laura', with: {interest_ids: [2]}).map(&:full_name)).to match_array ['Laura Nelson', 'Laura Flores']
   end
@@ -62,8 +67,8 @@ describe 'search filters' do
   end
 
   it 'paginate suggestions' do
-    res = @model.ac_search('Laura', per_page: 1, page: 2).to_a
+    res = @model.ac_search('Laura', order: :id, per_page: 1, page: 2).to_a
     expect(res.length).to eq 1
     expect(res.first.full_name).to eq 'Laura Flores'
   end
-end
+end

data/spec/spec_helper.rb

@@ -4,13 +4,15 @@ require 'active_support/core_ext'
 require 'elasticsearch_autocomplete'
 
 Tire.configure do
-  #logger 'tmp/elasticsearch.log'  # Commented out logger line here so that it doesn't break specs when tmp directory doesn't exist.
-  url 'http://localhost:9200'
+  # logger 'tmp/elasticsearch.log'  # Commented out logger line here so that it doesn't break specs when tmp directory doesn't exist.
+  url "http://localhost:#{ENV['ES_PORT'] || 9200}"
   pretty 1
 end
 
 I18n.available_locales = [:en, :ru]
 
+# ElasticsearchAutocomplete.elasticsearch_version = '1.x'
+
 class ActiveModelBase
   include ActiveModel::AttributeMethods
   include ActiveModel::Serialization

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_autocomplete
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch autocomplete for models