elasticsearch_autocomplete 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ec053155e8286256103931b33b97f4bae9108f0f
+  data.tar.gz: 3f2f2be1ab323398e21dbe1feb543313b5903cc7
+SHA512:
+  metadata.gz: b5a457a872f4bd0540fa8f26ffc87faa72744a8dbc67a28d020b7f7f05403d2640f40e61578fcd9da38e29a31caf259b7a4d33ccba41e8b032b6d50ce45e08bc
+  data.tar.gz: 4bbf9a2a52d161b122323f5c0b08c7b98989406babde58749f1cfaff72b1297d1d38fe5734e7a1576727dc1a967cb4f3200b3c88ae45c30ae7f674763b695852

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+
+services:
+  - elasticsearch
+
+gemfile:
+  - Gemfile
+
+env:
+  - JRUBY_OPTS="-Xcext.enabled=true"
+
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - 2.0.0

data/README.md

@@ -2,6 +2,12 @@
 
 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)
+
+## Example app
+
+Look at ElasticsearchAutocomplete [example app](https://github.com/leschenko/example_elasticsearch_autocomplete)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/elasticsearch_autocomplete.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w(lib)
 
-  gem.add_dependency 'tire'
+  gem.add_dependency 'tire', '~> 0.6.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/elasticsearch_autocomplete.rb

@@ -1,13 +1,14 @@
+require 'tire'
 require 'elasticsearch_autocomplete/version'
 require 'elasticsearch_autocomplete/analyzers'
 require 'elasticsearch_autocomplete/model_addition'
-require 'elasticsearch_autocomplete/railtie' if defined? Rails
+require 'elasticsearch_autocomplete/railtie' if Object.const_defined?(:Rails)
 
 module ElasticsearchAutocomplete
   mattr_accessor :defaults
 
   def self.default_index_prefix
-    Rails.application.class.name.split('::').first.downcase if Object.const_defined?('Rails')
+    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}

data/lib/elasticsearch_autocomplete/model_addition.rb

@@ -11,7 +11,7 @@ module ElasticsearchAutocomplete
           after_save lambda { tire.update_index }
         end
         after_destroy lambda { tire.update_index }
-        index_prefix ElasticsearchAutocomplete.defaults[:index_prefix]
+        index_prefix ElasticsearchAutocomplete.defaults[:index_prefix] if ElasticsearchAutocomplete.defaults[:index_prefix]
       end
 
       def ac_field(*args, &block)
@@ -38,9 +38,9 @@ module ElasticsearchAutocomplete
 
     module ClassMethods
       def ac_search(query, options={})
-        options.reverse_merge!({:per_page => 50, :search_fields => ac_search_fields})
+        options.reverse_merge!({:per_page => 50, :search_fields => ac_search_fields, :load => false})
 
-        tire.search :per_page => options[:per_page], :page => options[:page] do
+        tire.search :per_page => options[:per_page], :page => options[:page], :load => options[:load] do
           query do
             if query.size.zero?
               all

data/lib/elasticsearch_autocomplete/railtie.rb

@@ -1,9 +1,15 @@
 module ElasticsearchAutocomplete
   class Railtie < Rails::Railtie
     initializer 'elasticsearch_autocomplete.model_additions' do
+
+      ActiveSupport.on_load :mongoid do
+        const_get(:ClassMethods).send :include, ElasticsearchAutocomplete::ModelAddition::SingletonMethods
+      end
+
       ActiveSupport.on_load :active_record do
         include ElasticsearchAutocomplete::ModelAddition
       end
+
     end
   end
 end

data/lib/elasticsearch_autocomplete/version.rb

@@ -1,3 +1,3 @@
 module ElasticsearchAutocomplete
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/elasticsearch_autocomplete/base_spec.rb

@@ -2,6 +2,28 @@ require 'spec_helper'
 
 class ActiveModelUser < StubModelBase
   ac_field :full_name
+
+  def self.test_data
+    ['Test User', 'Test User2']
+  end
+
+  def self.populate
+    test_data.each_with_index do |name, id|
+      u = new(:full_name => name)
+      u.id = id
+      u.save
+    end
+  end
+
+  # Stub for find, which takes in array of ids.
+  def self.find(ids)
+    ids.map do |id|
+      id = id.to_i
+      u = new(:full_name => test_data[id])
+      u.id = id
+      u
+    end
+  end
 end
 
 describe ElasticsearchAutocomplete do
@@ -30,6 +52,20 @@ describe ElasticsearchAutocomplete do
       ElasticsearchAutocomplete.defaults.should == {: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 }
+    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 }
+    end
+  end
 end
 
 shared_examples 'basic autocomplete' do |model|

data/spec/elasticsearch_autocomplete/full_mode_spec.rb

@@ -17,33 +17,32 @@ class ActiveModelProductFull < StubModelBase
 end
 
 describe ':full mode autocomplete' do
-  let(:model) { ActiveModelProductFull }
-
   before :all do
-    model.setup_index
+    @model = ActiveModelProductFull
+    @model.setup_index
   end
 
   it 'have :full mode' do
-    model.ac_opts[:mode].should == :full
+    @model.ac_opts[:mode].should == :full
   end
 
   it 'suggest for beginning of the source' do
-    model.ac_search('A.31').to_a.should_not be_empty
+    @model.ac_search('A.31').to_a.should_not be_empty
   end
 
   it 'suggest for for full match' do
-    model.ac_search('SAMARA').to_a.should_not be_empty
+    @model.ac_search('SAMARA').to_a.should_not be_empty
   end
 
   it 'don\'t suggest for unmatched term' do
-    model.ac_search('kac3').to_a.should be_empty
+    @model.ac_search('kac3').to_a.should be_empty
   end
 
   it 'suggest from the middle of the word' do
-    model.ac_search('/sm').to_a.should_not be_empty
+    @model.ac_search('/sm').to_a.should_not be_empty
   end
 
   it 'suggest with relevance order' do
-    model.ac_search('A.3').map(&:sku).should == ['A.3103', 'b A.3611']
+    @model.ac_search('A.3').map(&:sku).should == ['A.3103', 'b A.3611']
   end
 end

data/spec/elasticsearch_autocomplete/localized_spec.rb

@@ -20,15 +20,14 @@ class ActiveModelProductLocalized < StubModelBase
 end
 
 describe 'suggestions for localized attributes' do
-  let(:model) { ActiveModelProductLocalized }
-
   before :all do
-    model.setup_index
+    @model = ActiveModelProductLocalized
+    @model.setup_index
   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
+    @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
   end
 end

data/spec/elasticsearch_autocomplete/phrase_mode_spec.rb

@@ -7,20 +7,21 @@ end
 describe ':phrase mode autocomplete' do
   let(:model) { ActiveModelUserPhrase }
   before :all do
-    model.setup_index
+    @model = ActiveModelUserPhrase
+    @model.setup_index
   end
 
   it 'have :phrase mode' do
-    model.ac_opts[:mode].should == :phrase
+    @model.ac_opts[:mode].should == :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
+    @model.ac_search('becca').to_a.should be_empty
   end
 
   it 'don\'t for each word of the source' do
-    model.ac_search('Flores').map(&:full_name).should be_empty
+    @model.ac_search('Flores').map(&:full_name).should be_empty
   end
 end

data/spec/elasticsearch_autocomplete/search_filters_spec.rb

@@ -30,40 +30,39 @@ class ActiveModelUserFilter < StubModelBase
 end
 
 describe 'search filters' do
-  let(:model) { ActiveModelUserFilter }
-
   before :all do
-    model.setup_index
+    @model = ActiveModelUserFilter
+    @model.setup_index
   end
 
   it 'filter suggestions with terms' do
-    model.ac_search('Laura', :with => {:interest_ids => [2]}).map(&:full_name).should =~ ['Laura Nelson', 'Laura Flores']
+    @model.ac_search('Laura', :with => {:interest_ids => [2]}).map(&:full_name).should =~ ['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']
+    @model.ac_search('Laura', :with => {:interest_ids => '1,4'}).map(&:full_name).should =~ ['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']
+    @model.ac_search('Laura', :without => {:interest_ids => [2]}).map(&:full_name).should =~ ['Laura Larson']
   end
 
   it 'can order suggestions desc' do
-    res = model.ac_search('Laura', :order => :id, :sort_mode => 'desc').map(&:id)
+    res = @model.ac_search('Laura', :order => :id, :sort_mode => 'desc').map(&:id)
     res.should == res.sort.reverse
   end
 
   it 'can order suggestions asc' do
-    res = model.ac_search('Laura', :order => :id, :sort_mode => 'asc').map(&:id)
+    res = @model.ac_search('Laura', :order => :id, :sort_mode => 'asc').map(&:id)
     res.should == res.sort
   end
 
   it 'limit suggestions collection size' do
-    model.ac_search('Laura', :per_page => 1).to_a.should have(1).result
+    @model.ac_search('Laura', :per_page => 1).to_a.should have(1).result
   end
 
   it 'paginate suggestions' do
-    res = model.ac_search('Laura', :per_page => 1, :page => 2).to_a
+    res = @model.ac_search('Laura', :per_page => 1, :page => 2).to_a
     res.should have(1).result
     res.first.full_name.should == 'Laura Flores'
   end

data/spec/elasticsearch_autocomplete/word_mode_spec.rb

@@ -5,27 +5,26 @@ class ActiveModelUserWord < StubModelBase
 end
 
 describe ':word mode autocomplete' do
-  let(:model) { ActiveModelUserWord }
-
   before :all do
-    model.setup_index
+    @model = ActiveModelUserWord
+    @model.setup_index
   end
 
   it 'have :word mode' do
-    model.ac_opts[:mode].should == :word
+    @model.ac_opts[:mode].should == :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
+    @model.ac_search('becca').to_a.should be_empty
   end
 
   it 'suggest for each word of the source' do
-    model.ac_search('Flores').map(&:full_name).should == ['Joyce Flores']
+    @model.ac_search('Flores').map(&:full_name).should == ['Joyce Flores']
   end
 
   it 'suggest with relevance order' do
-    model.ac_search('Lau').map(&:full_name).should == ['Laura Larson', 'Larson Laura']
+    @model.ac_search('Lau').map(&:full_name).should == ['Laura Larson', 'Larson Laura']
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext'
 require 'elasticsearch_autocomplete'
 
 Tire.configure do
-  logger 'tmp/elasticsearch.log'
+  #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'
   pretty 1
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_autocomplete
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
   name: tire
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 0.6.0
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple autocomplete for your models using awesome elasticsearch and tire
   gem
 email:
@@ -84,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -103,33 +95,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/leschenko/elasticsearch_autocomplete
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4258391315820171784
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4258391315820171784
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Elasticsearch autocomplete for models
 test_files:
 - spec/elasticsearch_autocomplete/base_spec.rb