elastic_record 0.7.2 → 0.7.3

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
  
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '0.7.2'
+  s.version = '0.7.3'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/lucene.rb

@@ -12,21 +12,21 @@ module ElasticRecord
       end
 
       # Returns a lucene query that works like G
-      def smart_query(query, fields)
+      def smart_query(query, fields, &block)
         return if query.blank?
 
         words = Shellwords::shellwords(query)
 
         words.map do |word|
           if word =~ /^(\w+):(.+)$/ && fields.include?($1)
-            match_word $2, [$1]
+            match_word $2, [$1], &block
           else
-            match_word word, fields
+            match_word word, fields, &block
           end
         end.join(' AND ')
       end
 
-      def match_word(word, fields)
+      def match_word(word, fields, &block)
         word = escape(word)
         if word =~ / /
           word = "\"#{word}\""
@@ -34,7 +34,10 @@ module ElasticRecord
           word = "#{word}*"
         end
 
-        or_query = fields.map { |field| "#{field}:#{word}" }.join(' OR ')
+        or_query = fields.map do |field|
+          field = yield(field) if block_given?
+          "#{field}:#{word}"
+        end.join(' OR ')
 
         "(#{or_query})"
       end

data/test/elastic_record/lucene_test.rb

@@ -11,13 +11,14 @@ class ElasticRecord::LuceneTest < MiniTest::Spec
     assert_smart_escape nil, nil, ['name']
 
     assert_smart_escape '(name:foo*)', 'foo', ['name']
+    assert_smart_escape '(name.analyzed:foo*)', 'foo', ['name'] { |f| "#{f}.analyzed" }
     assert_smart_escape '(name:foo* OR street:foo*)', 'foo', ['name', 'street']
     assert_smart_escape '(name:"foo bar" OR street:"foo bar") AND (name:faz* OR street:faz*)', '"foo bar" faz', ['name', 'street']
     assert_smart_escape '(street:"42 place") AND (name:bar*)', 'street:"42 place" name:bar', ['name', 'street']
   end
 
   private
-    def assert_smart_escape(expected, query, fields)
-      assert_equal expected, ElasticRecord::Lucene.smart_query(query, fields)
+    def assert_smart_escape(expected, query, fields, &block)
+      assert_equal expected, ElasticRecord::Lucene.smart_query(query, fields, &block)
     end
 end

data/test/support/widget.rb

@@ -7,10 +7,18 @@ class Widget
   include ElasticRecord::Callbacks
 
   self.elastic_index.mapping[:properties].update(
-    name: {type: 'string', index: 'analyzed'},
-    color: {type: 'string', index: 'not_analyzed'}
+    name: {
+      type: 'multi_field', 
+      fields: {
+        name: {type: 'string', index: 'not_analyzed'},
+        analyzed: {type: 'string', index: 'analyzed'}
+      }
+    },
+    color: {
+      type: 'string', index: 'not_analyzed'
+    }
   )
-
+  
   class << self
     def find(ids)
       ids.map { |id| new(id: id, color: 'red') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
-  requirement: &70212670043440 !ruby/object:Gem::Requirement
+  requirement: &70305939301120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212670043440
+  version_requirements: *70305939301120
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70212670041220 !ruby/object:Gem::Requirement
+  requirement: &70305939300660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212670041220
+  version_requirements: *70305939300660
 description: Find your records with elastic search
 email: developer@matthewhiggins.com
 executables: []