elasticsearch_autocomplete 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec053155e8286256103931b33b97f4bae9108f0f
-  data.tar.gz: 3f2f2be1ab323398e21dbe1feb543313b5903cc7
+  metadata.gz: a87e3e5a235180354eabcb8fb4ed51c88e79152a
+  data.tar.gz: 597ba4146d2e445899a3aafd2e3a91137e64e350
 SHA512:
-  metadata.gz: b5a457a872f4bd0540fa8f26ffc87faa72744a8dbc67a28d020b7f7f05403d2640f40e61578fcd9da38e29a31caf259b7a4d33ccba41e8b032b6d50ce45e08bc
-  data.tar.gz: 4bbf9a2a52d161b122323f5c0b08c7b98989406babde58749f1cfaff72b1297d1d38fe5734e7a1576727dc1a967cb4f3200b3c88ae45c30ae7f674763b695852
+  metadata.gz: 675ae4a73d7bed41485d2db1dcf189ef7f531b5d64cb9efa1c8ed7f01b7de2bf21b9a3880440ea2c5a0c2a6cfbc78198e291a8579767e78d6cd2115a2930ca89
+  data.tar.gz: f120c92b1e5b9c091bf9b3ac3bac6bc9ae0cfc2c9416032f1ecbaae15e122691a0bdcda30c8fdd4410ebfaf8cee5591f410cec21ae2ff04a039950a76ccc5cd8

data/README.md

@@ -63,7 +63,7 @@ class Product < ActiveRecord::Base
 end
 ```
 
-If you wand to define settings and mapping for elasticsearch index yourselves:
+If you want to define settings and mapping for elasticsearch index yourselves:
 
 ```ruby
 class Product < ActiveRecord::Base

data/elasticsearch_autocomplete.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'oj'
+  gem.add_development_dependency 'activerecord', '>= 3.2'
 end

data/lib/elasticsearch_autocomplete.rb

@@ -19,9 +19,11 @@ module ElasticsearchAutocomplete
       :full => {:base => 'ac', :full => 'ac_full'}
   }
 
-  def self.val_to_array(val, zero=false)
+  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?)
   end

data/lib/elasticsearch_autocomplete/model_addition.rb

@@ -58,10 +58,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_array(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_array(v, true)}})
+              filter(:not, {:terms => {k => ElasticsearchAutocomplete.val_to_terms(v, true)}})
             end
           end
         end

data/lib/elasticsearch_autocomplete/version.rb

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

data/spec/elasticsearch_autocomplete/base_spec.rb

@@ -66,6 +66,40 @@ describe ElasticsearchAutocomplete do
       results.map{|x| x.is_a?(ActiveModelUser).should == true }
     end
   end
+
+  describe '#val_to_terms' do
+    it 'empty array if argument is blank' do
+      ElasticsearchAutocomplete.val_to_terms(nil).should == []
+    end
+
+    it 'array if argument is array' do
+      ElasticsearchAutocomplete.val_to_terms([1, 2]).should == [1, 2]
+    end
+
+    it 'comma separated values' do
+      ElasticsearchAutocomplete.val_to_terms('1,2').should == [1, 2]
+    end
+
+    context 'skip zero' do
+      it 'skip zero by default' do
+        ElasticsearchAutocomplete.val_to_terms('0,1,2').should == [1, 2]
+      end
+
+      it 'include zero' do
+        ElasticsearchAutocomplete.val_to_terms('0,1,2', true).should == [0, 1, 2]
+      end
+    end
+
+    context 'boolean' do
+      it 'true value' do
+        ElasticsearchAutocomplete.val_to_terms('true').should == [true]
+      end
+
+      it 'false value' do
+        ElasticsearchAutocomplete.val_to_terms('false').should == [false]
+      end
+    end
+  end
 end
 
 shared_examples 'basic autocomplete' do |model|

data/spec/spec_helper.rb

@@ -38,14 +38,11 @@ class ActiveModelBase
   end
 
   def save
-    _run_save_callbacks do
-    end
+    run_callbacks(:save) {}
   end
 
   def destroy
-    _run_destroy_callbacks do
-      @destroyed = true
-    end
+    run_callbacks(:destroy) { @destroyed = true }
   end
 
   def destroyed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_autocomplete
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tire
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !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
   gem
 email: