elasticsearch_autocomplete 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87e3e5a235180354eabcb8fb4ed51c88e79152a
-  data.tar.gz: 597ba4146d2e445899a3aafd2e3a91137e64e350
+  metadata.gz: 033b837130dd4581eb9dbefe8b6424a5012f179c
+  data.tar.gz: 517d306c4a96ba7da1693bf6591a662133028a06
 SHA512:
-  metadata.gz: 675ae4a73d7bed41485d2db1dcf189ef7f531b5d64cb9efa1c8ed7f01b7de2bf21b9a3880440ea2c5a0c2a6cfbc78198e291a8579767e78d6cd2115a2930ca89
-  data.tar.gz: f120c92b1e5b9c091bf9b3ac3bac6bc9ae0cfc2c9416032f1ecbaae15e122691a0bdcda30c8fdd4410ebfaf8cee5591f410cec21ae2ff04a039950a76ccc5cd8
+  metadata.gz: 141d423cb8d784bf259f4b4ef7026fce9804116bf7552525f9856638bb8cb44a8f78f870539322be926b55c1f6758d946ac0560c3783c822918faa167a9871cc
+  data.tar.gz: be4c0e832e7a27c0f41243902c37d8531a3c42361af68e4eb50e732512cc51693086a0691ab9cadfa5442e84c86784bfb7bb3b3f33c25c424c035e9f1aa0e640

data/.gitignore

@@ -19,4 +19,6 @@ tmp
 .idea
 .rvmrc
 .rspec
+.ruby-version
+.ruby-gemset
 TODO

data/.travis.yml

@@ -6,10 +6,7 @@ services:
 gemfile:
   - Gemfile
 
-env:
-  - JRUBY_OPTS="-Xcext.enabled=true"
-
 rvm:
   - 1.9.3
-  - jruby-19mode
-  - 2.0.0
+  - 2.0.0
+  - 2.1.5

data/README.md

@@ -1,8 +1,9 @@
 # ElasticsearchAutocomplete
 
-Simple autocomplete for rails models using awesome [Elasticsearch](http://www.elasticsearch.org/) and [tire](https://github.com/karmi/tire) gem
-
 [![Build Status](https://travis-ci.org/leschenko/elasticsearch_autocomplete.png?branch=master)](https://travis-ci.org/leschenko/elasticsearch_autocomplete)
+[![Dependency Status](https://gemnasium.com/leschenko/elasticsearch_autocomplete.png)](https://gemnasium.com/leschenko/elasticsearch_autocomplete)
+
+Simple autocomplete for rails models using awesome [Elasticsearch](http://www.elasticsearch.org/).
 
 ## Example app
 
@@ -51,7 +52,7 @@ You can specify fields for suggestions search:
 
 ```ruby
 class User < ActiveRecord::Base
-  ac_field :full_name, :search_fields => [:full_name, :email]
+  ac_field :full_name, search_fields: [:full_name, :email]
 end
 ```
 
@@ -59,7 +60,7 @@ For search on localized fields such as `name_en`, `name_ru`:
 
 ```ruby
 class Product < ActiveRecord::Base
-  ac_field :name, :localized => true
+  ac_field :name, localized: true
 end
 ```
 
@@ -67,7 +68,7 @@ If you want to define settings and mapping for elasticsearch index yourselves:
 
 ```ruby
 class Product < ActiveRecord::Base
-  ac_field :name, :skip_settings => true
+  ac_field :name, skip_settings: true
 end
 ```
 

data/lib/elasticsearch_autocomplete.rb

@@ -6,25 +6,39 @@ require 'elasticsearch_autocomplete/railtie' if Object.const_defined?(:Rails)
 
 module ElasticsearchAutocomplete
   mattr_accessor :defaults
+  mattr_accessor :enable_indexing
+  self.enable_indexing = true
 
   def self.default_index_prefix
     Object.const_defined?(:Rails) ? ::Rails.application.class.name.split('::').first.downcase : nil
   end
 
-  self.defaults = {:attr => :name, :localized => false, :mode => :word, :index_prefix => default_index_prefix}
+  self.defaults = {attr: :name, localized: false, mode: :word, index_prefix: default_index_prefix}
 
   MODES = {
-      :word => {:base => 'ac', :word => 'ac_word'},
-      :phrase => {:base => 'ac'},
-      :full => {:base => 'ac', :full => 'ac_full'}
+      word: {base: 'ac', word: 'ac_word'},
+      phrase: {base: 'ac'},
+      full: {base: 'ac', full: 'ac_full'}
   }
 
-  def self.val_to_terms(val, zero=false)
-    return [] unless val
-    return val if val.is_a?(Array)
-    return [true] if val == 'true'
-    return [false] if val == 'false'
-    a = val.to_s.split(',').map(&:to_i)
-    zero ? a : a.reject(&:zero?)
+  class << self
+    def val_to_terms(val, zero=false)
+      return [] unless val
+      return val if val.is_a?(Array)
+      return [true] if val == 'true'
+      return [false] if val == 'false'
+      a = val.to_s.split(',').map(&:to_i)
+      zero ? a : a.reject(&:zero?)
+    end
+
+    def without_indexing
+      original_setting = enable_indexing
+      self.enable_indexing = false
+      begin
+        yield
+      ensure
+        self.enable_indexing = original_setting
+      end
+    end
   end
 end

data/lib/elasticsearch_autocomplete/analyzers.rb

@@ -2,56 +2,56 @@ module ElasticsearchAutocomplete
   module Analyzers
 
     AC_TOKENIZERS = {
-        :ac_edge_ngram => {
-            :type => 'edgeNGram',
-            :min_gram => 1,
-            :max_gram => 50,
-            :side => 'front'
+        ac_edge_ngram: {
+            type: 'edgeNGram',
+            min_gram: 1,
+            max_gram: 50,
+            side: 'front'
         },
-        :ac_edge_ngram_full => {
-            :type => 'nGram',
-            :min_gram => 1,
-            :max_gram => 50
+        ac_edge_ngram_full: {
+            type: 'nGram',
+            min_gram: 1,
+            max_gram: 50
         }
     }
 
     AC_FILTERS = {
-        :ac_edge_ngram => {
-            :type => 'edgeNGram',
-            :min_gram => 1,
-            :max_gram => 50,
-            :side => 'front'
+        ac_edge_ngram: {
+            type: 'edgeNGram',
+            min_gram: 1,
+            max_gram: 50,
+            side: 'front'
         }
     }
 
     AC_ANALYZERS = {
-        :ac_edge_ngram => {
-            :type => 'custom',
-            :tokenizer => 'ac_edge_ngram',
-            :filter => %w(lowercase asciifolding)
+        ac_edge_ngram: {
+            type: 'custom',
+            tokenizer: 'ac_edge_ngram',
+            filter: %w(lowercase asciifolding)
         },
-        :ac_edge_ngram_full => {
-            :type => 'custom',
-            :tokenizer => 'ac_edge_ngram_full',
-            :filter => %w(lowercase asciifolding)
+        ac_edge_ngram_full: {
+            type: 'custom',
+            tokenizer: 'ac_edge_ngram_full',
+            filter: %w(lowercase asciifolding)
         },
-        :ac_edge_ngram_word => {
-            :type => 'custom',
-            :tokenizer => 'standard',
-            :filter => %w(lowercase asciifolding ac_edge_ngram)
+        ac_edge_ngram_word: {
+            type: 'custom',
+            tokenizer: 'standard',
+            filter: %w(lowercase asciifolding ac_edge_ngram)
         },
-        :ac_search => {
-            :type => 'custom',
-            :tokenizer => 'keyword',
-            :filter => %w(lowercase asciifolding)
+        ac_search: {
+            type: 'custom',
+            tokenizer: 'keyword',
+            filter: %w(lowercase asciifolding)
         }
     }
 
     AC_BASE = {
-        :analysis => {
-            :analyzer => AC_ANALYZERS,
-            :tokenizer => AC_TOKENIZERS,
-            :filter => AC_FILTERS
+        analysis: {
+            analyzer: AC_ANALYZERS,
+            tokenizer: AC_TOKENIZERS,
+            filter: AC_FILTERS
         }
     }
 

data/lib/elasticsearch_autocomplete/model_addition.rb

@@ -5,24 +5,23 @@ module ElasticsearchAutocomplete
     end
 
     module SingletonMethods
-      def elasticsearch(options={})
+      def ac_setup_tire
+        include InstanceMethods
         include Tire::Model::Search
-        unless options.delete(:skip_after_save)
-          after_save lambda { tire.update_index }
-        end
-        after_destroy lambda { tire.update_index }
+
+        after_save :ac_update_index
+        after_destroy :ac_update_index
+        
         index_prefix ElasticsearchAutocomplete.defaults[:index_prefix] if ElasticsearchAutocomplete.defaults[:index_prefix]
       end
 
-      def ac_field(*args, &block)
-        options = args.extract_options!
-
-        include InstanceMethods
+      def ac_field(*args)
         extend ClassMethods
 
-        elasticsearch(options)
+        ac_setup_tire
 
-        class_attribute :ac_opts, :ac_attr, :ac_search_attrs, :ac_search_fields, :ac_mode_config, :instance_writer => false
+        class_attribute :ac_opts, :ac_attr, :ac_search_attrs, :ac_search_fields, :ac_mode_config, instance_writer: false
+        options = args.extract_options!
         self.ac_opts = options.reverse_merge(ElasticsearchAutocomplete.defaults)
         self.ac_attr = args.first || ElasticsearchAutocomplete.defaults[:attr]
 
@@ -31,16 +30,15 @@ module ElasticsearchAutocomplete
         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
 
-
         define_ac_index(ac_opts[:mode]) unless options[:skip_settings]
       end
     end
 
     module ClassMethods
       def ac_search(query, options={})
-        options.reverse_merge!({:per_page => 50, :search_fields => ac_search_fields, :load => false})
+        options.reverse_merge!({per_page: 50, search_fields: ac_search_fields, load: false})
 
-        tire.search :per_page => options[:per_page], :page => options[:page], :load => options[:load] do
+        tire.search per_page: options[:per_page], page: options[:page], load: options[:load] do
           query do
             if query.size.zero?
               all
@@ -58,10 +56,10 @@ module ElasticsearchAutocomplete
             by(options[:order], options[:sort_mode] || 'asc') if options[:order].present?
           end
 
-          filter(:and, :filters => options[:with].map { |k, v| {:terms => {k => ElasticsearchAutocomplete.val_to_terms(v)}} }) if options[:with].present?
+          filter(:and, filters: options[:with].map { |k, v| {terms: {k => ElasticsearchAutocomplete.val_to_terms(v)}} }) if options[:with].present?
           if options[:without].present?
             options[:without].each do |k, v|
-              filter(:not, {:terms => {k => ElasticsearchAutocomplete.val_to_terms(v, true)}})
+              filter(:not, {terms: {k => ElasticsearchAutocomplete.val_to_terms(v, true)}})
             end
           end
         end
@@ -79,27 +77,27 @@ module ElasticsearchAutocomplete
       end
 
       def ac_index_config(attr, mode=:word)
-        defaults = {:type => 'string', :search_analyzer => 'ac_search', :include_in_all => false}
+        defaults = {type: 'string', search_analyzer: 'ac_search', include_in_all: false}
         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')
+                         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')
                      }
                    when :phrase
                      {
-                         attr => {:type => 'string'},
-                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(:index_analyzer => 'ac_edge_ngram')
+                         attr => {type: 'string'},
+                         "#{ac_mode_config[:base]}_#{attr}" => defaults.merge(index_analyzer: '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')
+                         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')
                      }
                  end
-        {:type => 'multi_field', :fields => fields}
+        {type: 'multi_field', fields: fields}
       end
     end
 
@@ -112,6 +110,11 @@ module ElasticsearchAutocomplete
         end
         MultiJson.encode(for_json)
       end
+
+      def ac_update_index
+        return true unless ElasticsearchAutocomplete.enable_indexing
+        tire.update_index
+      end
     end
   end
 end

data/lib/elasticsearch_autocomplete/version.rb

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

data/spec/elasticsearch_autocomplete/base_spec.rb

@@ -9,7 +9,7 @@ class ActiveModelUser < StubModelBase
 
   def self.populate
     test_data.each_with_index do |name, id|
-      u = new(:full_name => name)
+      u = new(full_name: name)
       u.id = id
       u.save
     end
@@ -19,7 +19,7 @@ class ActiveModelUser < StubModelBase
   def self.find(ids)
     ids.map do |id|
       id = id.to_i
-      u = new(:full_name => test_data[id])
+      u = new(full_name: test_data[id])
       u.id = id
       u
     end
@@ -33,11 +33,15 @@ describe ElasticsearchAutocomplete do
   end
 
   it 'add ac_search method' do
-    should respond_to(:ac_search)
+    expect(subject).to respond_to(:ac_search)
+  end
+
+  it 'indexing enabled by default' do
+    expect(ElasticsearchAutocomplete.enable_indexing).to be_truthy
   end
 
   it 'define to_indexed_json method' do
-    ActiveModelUser.new(:full_name => 'test').to_indexed_json.should == '{"id":null,"created_at":null,"full_name":"test"}'
+    expect(ActiveModelUser.new(full_name: 'test').to_indexed_json).to eq '{"id":null,"created_at":null,"full_name":"test"}'
   end
 
   describe 'default settings' do
@@ -48,70 +52,84 @@ describe ElasticsearchAutocomplete do
     end
 
     it 'allow to change default settings' do
-      ElasticsearchAutocomplete.defaults = {:attr => :test, :localized => true, :mode => :phrase, :index_prefix => 'test'}
-      ElasticsearchAutocomplete.defaults.should == {:attr => :test, :localized => true, :mode => :phrase, :index_prefix => 'test'}
+      ElasticsearchAutocomplete.defaults = {attr: :test, localized: true, mode: :phrase, index_prefix: 'test'}
+      expect(ElasticsearchAutocomplete.defaults).to eq ({attr: :test, localized: true, mode: :phrase, index_prefix: 'test'})
     end
   end
 
   describe 'eager loading' do
     it 'does not eager load the records from ac_search by default' do
       results = ActiveModelUser.ac_search('Test User')
-      results.to_a.should_not be_empty
-      results.map{|x| x.is_a?(ActiveModelUser).should == false }
+      expect(results.to_a).not_to be_empty
+      results.map{|x| expect(x.is_a?(ActiveModelUser)).to eq false }
     end
 
     it 'eager loads the records from ac_search' do
-      results = ActiveModelUser.ac_search('Test User', :load => true)
-      results.to_a.should_not be_empty
-      results.map{|x| x.is_a?(ActiveModelUser).should == true }
+      results = ActiveModelUser.ac_search('Test User', load: true)
+      expect(results.to_a).not_to be_empty
+      results.map{|x| expect(x.is_a?(ActiveModelUser)).to eq true }
     end
   end
 
   describe '#val_to_terms' do
     it 'empty array if argument is blank' do
-      ElasticsearchAutocomplete.val_to_terms(nil).should == []
+      expect(ElasticsearchAutocomplete.val_to_terms(nil)).to eq []
     end
 
     it 'array if argument is array' do
-      ElasticsearchAutocomplete.val_to_terms([1, 2]).should == [1, 2]
+      expect(ElasticsearchAutocomplete.val_to_terms([1, 2])).to eq [1, 2]
     end
 
     it 'comma separated values' do
-      ElasticsearchAutocomplete.val_to_terms('1,2').should == [1, 2]
+      expect(ElasticsearchAutocomplete.val_to_terms('1,2')).to eq [1, 2]
     end
 
     context 'skip zero' do
       it 'skip zero by default' do
-        ElasticsearchAutocomplete.val_to_terms('0,1,2').should == [1, 2]
+        expect(ElasticsearchAutocomplete.val_to_terms('0,1,2')).to eq [1, 2]
       end
 
       it 'include zero' do
-        ElasticsearchAutocomplete.val_to_terms('0,1,2', true).should == [0, 1, 2]
+        expect(ElasticsearchAutocomplete.val_to_terms('0,1,2', true)).to eq [0, 1, 2]
       end
     end
 
     context 'boolean' do
       it 'true value' do
-        ElasticsearchAutocomplete.val_to_terms('true').should == [true]
+        expect(ElasticsearchAutocomplete.val_to_terms('true')).to eq [true]
       end
 
       it 'false value' do
-        ElasticsearchAutocomplete.val_to_terms('false').should == [false]
+        expect(ElasticsearchAutocomplete.val_to_terms('false')).to eq [false]
       end
     end
   end
+
+  describe 'indexing' do
+    it 'enabled by default' do
+      record = ActiveModelUser.new(full_name: 'test')
+      expect(record).to receive(:tire).and_return(double('tire').as_null_object)
+      record.save
+    end
+
+    it 'disabled' do
+      record = ActiveModelUser.new(full_name: 'test')
+      expect(record).not_to receive(:tire)
+      ElasticsearchAutocomplete.without_indexing { record.save }
+    end
+  end
 end
 
 shared_examples 'basic autocomplete' do |model|
   it 'suggest for beginning of the source' do
-    model.ac_search('Joyce Flores').to_a.should_not be_empty
+    expect(model.ac_search('Joyce Flores').to_a).not_to be_empty
   end
 
   it 'suggest for for full match' do
-    model.ac_search('Lau').to_a.should_not be_empty
+    expect(model.ac_search('Lau').to_a).not_to be_empty
   end
 
   it 'don\'t suggest for unmatched term' do
-    model.ac_search('Lai').to_a.should be_empty
+    expect(model.ac_search('Lai').to_a).to be_empty
   end
 end

data/spec/elasticsearch_autocomplete/full_mode_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class ActiveModelProductFull < StubModelBase
-  ac_field :sku, :mode => :full
+  ac_field :sku, mode: :full
 
   def self.test_data
     ['SAMARA', 'A.3103', 'b A.3611', 'kac12 dk/sm']
@@ -9,7 +9,7 @@ class ActiveModelProductFull < StubModelBase
 
   def self.populate
     test_data.each_with_index do |name, id|
-      u = new(:sku => name)
+      u = new(sku: name)
       u.id = id
       u.save
     end
@@ -23,26 +23,26 @@ describe ':full mode autocomplete' do
   end
 
   it 'have :full mode' do
-    @model.ac_opts[:mode].should == :full
+    expect(@model.ac_opts[:mode]).to eq :full
   end
 
   it 'suggest for beginning of the source' do
-    @model.ac_search('A.31').to_a.should_not be_empty
+    expect(@model.ac_search('A.31').to_a).not_to be_empty
   end
 
   it 'suggest for for full match' do
-    @model.ac_search('SAMARA').to_a.should_not be_empty
+    expect(@model.ac_search('SAMARA').to_a).not_to be_empty
   end
 
   it 'don\'t suggest for unmatched term' do
-    @model.ac_search('kac3').to_a.should be_empty
+    expect(@model.ac_search('kac3').to_a).to be_empty
   end
 
   it 'suggest from the middle of the word' do
-    @model.ac_search('/sm').to_a.should_not be_empty
+    expect(@model.ac_search('/sm').to_a).not_to be_empty
   end
 
   it 'suggest with relevance order' do
-    @model.ac_search('A.3').map(&:sku).should == ['A.3103', 'b A.3611']
+    expect(@model.ac_search('A.3').map(&:sku)).to eq ['A.3103', 'b A.3611']
   end
 end

data/spec/elasticsearch_autocomplete/localized_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 class ActiveModelProductLocalized < StubModelBase
-  ac_field :name, :localized => true
+  ac_field :name, localized: true
 
   def self.test_data
     [
-        {:name_ru => 'name_ru first', :name_en => 'name_en first'},
-        {:name_ru => 'name_ru second', :name_en => 'name_en second'}
+        {name_ru: 'name_ru first', name_en: 'name_en first'},
+        {name_ru: 'name_ru second', name_en: 'name_en second'}
     ]
   end
 
@@ -26,8 +26,8 @@ describe 'suggestions for localized attributes' do
   end
 
   it 'don\'t suggest from all locales' do
-    @model.ac_search('name_en first').to_a.should have(1).results
-    @model.ac_search('name_ru first').to_a.should have(1).results
-    @model.ac_search('name_ru').to_a.should have(2).results
+    expect(@model.ac_search('name_en first').to_a.length).to eq 1
+    expect(@model.ac_search('name_ru first').to_a.length).to eq 1
+    expect(@model.ac_search('name_ru').to_a.length).to eq 2
   end
 end

data/spec/elasticsearch_autocomplete/phrase_mode_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class ActiveModelUserPhrase < StubModelBase
-  ac_field :full_name, :mode => :phrase
+  ac_field :full_name, mode: :phrase
 end
 
 describe ':phrase mode autocomplete' do
@@ -12,16 +12,16 @@ describe ':phrase mode autocomplete' do
   end
 
   it 'have :phrase mode' do
-    @model.ac_opts[:mode].should == :phrase
+    expect(@model.ac_opts[:mode]).to eq :phrase
   end
 
   it_behaves_like 'basic autocomplete', ActiveModelUserPhrase
 
   it 'don\'t suggest from the middle of the word' do
-    @model.ac_search('becca').to_a.should be_empty
+    expect(@model.ac_search('becca').to_a).to be_empty
   end
 
   it 'don\'t for each word of the source' do
-    @model.ac_search('Flores').map(&:full_name).should be_empty
+    expect(@model.ac_search('Flores').map(&:full_name)).to be_empty
   end
 end

data/spec/elasticsearch_autocomplete/search_filters_spec.rb

@@ -5,9 +5,9 @@ class ActiveModelUserFilter < StubModelBase
 
   def self.test_data
     [
-        {:full_name => 'Laura Nelson', :interest_ids => [1, 2]},
-        {:full_name => 'Laura Flores', :interest_ids => [2, 3]},
-        {:full_name => 'Laura Larson', :interest_ids => [3, 4]}
+        {full_name: 'Laura Nelson', interest_ids: [1, 2]},
+        {full_name: 'Laura Flores', interest_ids: [2, 3]},
+        {full_name: 'Laura Larson', interest_ids: [3, 4]}
     ]
   end
 
@@ -36,34 +36,34 @@ describe 'search filters' do
   end
 
   it 'filter suggestions with terms' do
-    @model.ac_search('Laura', :with => {:interest_ids => [2]}).map(&:full_name).should =~ ['Laura Nelson', 'Laura Flores']
+    expect(@model.ac_search('Laura', with: {interest_ids: [2]}).map(&:full_name)).to match_array ['Laura Nelson', 'Laura Flores']
   end
 
   it 'accept coma separated string for filter' do
-    @model.ac_search('Laura', :with => {:interest_ids => '1,4'}).map(&:full_name).should =~ ['Laura Nelson', 'Laura Larson']
+    expect(@model.ac_search('Laura', with: {interest_ids: '1,4'}).map(&:full_name)).to match_array ['Laura Nelson', 'Laura Larson']
   end
 
   it 'filter suggestions without terms' do
-    @model.ac_search('Laura', :without => {:interest_ids => [2]}).map(&:full_name).should =~ ['Laura Larson']
+    expect(@model.ac_search('Laura', without: {interest_ids: [2]}).map(&:full_name)).to match_array ['Laura Larson']
   end
 
   it 'can order suggestions desc' do
-    res = @model.ac_search('Laura', :order => :id, :sort_mode => 'desc').map(&:id)
-    res.should == res.sort.reverse
+    res = @model.ac_search('Laura', order: :id, sort_mode: 'desc').map(&:id)
+    expect(res).to eq res.sort.reverse
   end
 
   it 'can order suggestions asc' do
-    res = @model.ac_search('Laura', :order => :id, :sort_mode => 'asc').map(&:id)
-    res.should == res.sort
+    res = @model.ac_search('Laura', order: :id, sort_mode: 'asc').map(&:id)
+    expect(res).to eq res.sort
   end
 
   it 'limit suggestions collection size' do
-    @model.ac_search('Laura', :per_page => 1).to_a.should have(1).result
+    expect(@model.ac_search('Laura', per_page: 1).to_a.length).to eq 1
   end
 
   it 'paginate suggestions' do
-    res = @model.ac_search('Laura', :per_page => 1, :page => 2).to_a
-    res.should have(1).result
-    res.first.full_name.should == 'Laura Flores'
+    res = @model.ac_search('Laura', per_page: 1, page: 2).to_a
+    expect(res.length).to eq 1
+    expect(res.first.full_name).to eq 'Laura Flores'
   end
 end

data/spec/elasticsearch_autocomplete/word_mode_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class ActiveModelUserWord < StubModelBase
-  ac_field :full_name, :mode => :word
+  ac_field :full_name, mode: :word
 end
 
 describe ':word mode autocomplete' do
@@ -11,20 +11,20 @@ describe ':word mode autocomplete' do
   end
 
   it 'have :word mode' do
-    @model.ac_opts[:mode].should == :word
+    expect(@model.ac_opts[:mode]).to eq :word
   end
 
   it_behaves_like 'basic autocomplete', ActiveModelUserWord
 
   it 'don\'t suggest from the middle of the word' do
-    @model.ac_search('becca').to_a.should be_empty
+    expect(@model.ac_search('becca').to_a).to be_empty
   end
 
   it 'suggest for each word of the source' do
-    @model.ac_search('Flores').map(&:full_name).should == ['Joyce Flores']
+    expect(@model.ac_search('Flores').map(&:full_name)).to eq ['Joyce Flores']
   end
 
   it 'suggest with relevance order' do
-    @model.ac_search('Lau').map(&:full_name).should == ['Laura Larson', 'Larson Laura']
+    expect(@model.ac_search('Lau').map(&:full_name)).to eq ['Laura Larson', 'Larson Laura']
   end
 end

data/spec/spec_helper.rb

@@ -65,7 +65,7 @@ class StubModelBase < ActiveModelBase
 
   def self.populate
     test_data.each_with_index do |name, id|
-      u = new(:full_name => name)
+      u = new(full_name: name)
       u.id = id
       u.save
     end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_autocomplete
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Simple autocomplete for your models using awesome elasticsearch and tire
@@ -88,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Elasticsearch autocomplete for models