elastic_record 0.7.1 → 0.7.2

data/elastic_record.gemspec

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

data/lib/elastic_record.rb

@@ -7,6 +7,7 @@ module ElasticRecord
   autoload :Config, 'elastic_record/config'
   autoload :Connection, 'elastic_record/connection'
   autoload :Index, 'elastic_record/index'
+  autoload :Lucene, 'elastic_record/lucene'
   autoload :Model, 'elastic_record/model'
   autoload :Relation, 'elastic_record/relation'
   autoload :Searching, 'elastic_record/searching'

data/lib/elastic_record/lucene.rb

@@ -0,0 +1,43 @@
+require 'shellwords'
+
+module ElasticRecord
+  class Lucene
+    # Special characters:
+    # + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+    ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\)/
+
+    class << self
+      def escape(query)
+        query.gsub(ESCAPE_REGEX, "\\\\\\1")
+      end
+
+      # Returns a lucene query that works like G
+      def smart_query(query, fields)
+        return if query.blank?
+
+        words = Shellwords::shellwords(query)
+
+        words.map do |word|
+          if word =~ /^(\w+):(.+)$/ && fields.include?($1)
+            match_word $2, [$1]
+          else
+            match_word word, fields
+          end
+        end.join(' AND ')
+      end
+
+      def match_word(word, fields)
+        word = escape(word)
+        if word =~ / /
+          word = "\"#{word}\""
+        else
+          word = "#{word}*"
+        end
+
+        or_query = fields.map { |field| "#{field}:#{word}" }.join(' OR ')
+
+        "(#{or_query})"
+      end
+    end
+  end
+end

data/test/elastic_record/lucene_test.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+class ElasticRecord::LuceneTest < MiniTest::Spec
+  def test_escape
+    assert_equal "\\\\", ElasticRecord::Lucene.escape("\\")
+    assert_equal "Matt \\&& Joe", ElasticRecord::Lucene.escape("Matt && Joe")
+  end
+
+  def test_smart_search
+    assert_smart_escape nil, '', ['name']
+    assert_smart_escape nil, nil, ['name']
+
+    assert_smart_escape '(name:foo*)', 'foo', ['name']
+    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)
+    end
+end

data/test/support/widget.rb

@@ -6,10 +6,10 @@ class Widget
   include ElasticRecord::Model
   include ElasticRecord::Callbacks
 
-  self.elastic_index.mapping[:properties].update(color: {
-    type: 'string',
-    index: 'not_analyzed'
-  })
+  self.elastic_index.mapping[:properties].update(
+    name: {type: 'string', index: 'analyzed'},
+    color: {type: 'string', index: 'not_analyzed'}
+  )
 
   class << self
     def find(ids)
@@ -31,7 +31,7 @@ class Widget
     end
   end
 
-  attr_accessor :id, :color
+  attr_accessor :id, :name, :color
   def initialize(attributes = {})
     attributes.each do |key, val|
       send("#{key}=", val)
@@ -39,6 +39,6 @@ class Widget
   end
 
   def as_search
-    {color: color}
+    {name: name, color: color}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212670043440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212670043440
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212670041220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70212670041220
 description: Find your records with elastic search
 email: developer@matthewhiggins.com
 executables: []
@@ -67,6 +57,7 @@ files:
 - lib/elastic_record/index/mapping.rb
 - lib/elastic_record/index/percolator.rb
 - lib/elastic_record/log_subscriber.rb
+- lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb
 - lib/elastic_record/orm/active_record.rb
 - lib/elastic_record/railtie.rb
@@ -88,6 +79,7 @@ files:
 - test/elastic_record/index/percolator_test.rb
 - test/elastic_record/index_test.rb
 - test/elastic_record/log_subscriber_test.rb
+- test/elastic_record/lucene_test.rb
 - test/elastic_record/model_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb
@@ -120,8 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Use Elastic Search with your objects
 test_files: []
+has_rdoc: