es-elasticity 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45df14b8d96ab9f324461a6c62c226c3166b03c
-  data.tar.gz: 78f6f7b959299ddd2836676e236f5e59e653d37d
+  metadata.gz: 92bedfd2fa34df6c303c9c0945ba55c7613c7a31
+  data.tar.gz: bc68cc7bd8bd36ec8d195a53df1684871b20caec
 SHA512:
-  metadata.gz: 86bd2492bb54b2286b380635e9b09fd2a4f1b701ad57648b34b703c1c708d156ae6e1765867d213b539f47d1072003be2a92c00a600a0c083b0be08b30d81ff4
-  data.tar.gz: c2197c269b55a016880aedd536c85945d0ba9978f32adb19d434da68a3bc22bc7d6dda8fe55f6def39f4ad6fee5cb7671c81b645e4489572a5fb17247f638f0a
+  metadata.gz: 87b00d0798444997de4c2fe057a5cd1c7bd4990a38b3cecaa78795fb0dd1a069ab3aff3311df61abfd828175e1db9f7cebb66a36007c643d68b4a4cfc883b92e
+  data.tar.gz: ea32e3c290a7ec6238fc64e43f0b2792ea259ab444ac3868eb8a9ff1944ff05c59cd2fdd1de410a9353eb91db52d98a3a8cd811d7c7751534e884628ed30deb0

data/lib/elasticity/document.rb

@@ -23,13 +23,6 @@ module Elasticity
       self.index.delete
     end
 
-    # The index name to be used for indexing and storing data for this document model.
-    # By default, it's the class name converted to underscore and plural.
-    def self.index_name
-      return @index_name if defined?(@index_name)
-      @index_name = self.name.underscore.pluralize
-    end
-
     # Sets the index name to something else than the default
     def self.index_name=(name)
       @index_name = name
@@ -38,7 +31,7 @@ module Elasticity
 
     # Namespaced index name
     def self.namespaced_index_name
-      name = self.index_name
+      name = @index_name || self.name.underscore.pluralize
 
       if namespace = Elasticity.config.namespace
         name = "#{namespace}_#{name}"
@@ -99,7 +92,7 @@ module Elasticity
     end
 
     # Define common attributes for all documents
-    attr_accessor :_id
+    attr_accessor :_id, :highlighted
 
     # Creates a new Document instance with the provided attributes.
     def initialize(attributes = {})
@@ -114,6 +107,7 @@ module Elasticity
 
     # Defines equality by comparing the ID and values of each instance variable.
     def ==(other)
+      return false if other.nil?
       return false if _id != other._id
 
       instance_variables.all? do |ivar|

data/lib/elasticity/search.rb

@@ -99,7 +99,23 @@ module Elasticity
 
       def map(hits)
         hits.map do |hit|
-          @document_klass.new(hit["_source"].merge(_id: hit['_id']))
+          attrs = hit["_source"].merge(_id: hit['_id'])
+
+          if hit["highlight"]
+            highlighted_attrs = attrs.dup
+            attrs_set = Set.new
+
+            hit["highlight"].each do |name, v|
+              name = name.gsub(/\..*\z/, '')
+              next if attrs_set.include?(name)
+              highlighted_attrs[name] = v
+              attrs_set << name
+            end
+
+            highlighted = @document_klass.new(highlighted_attrs)
+          end
+
+          @document_klass.new(attrs.merge(highlighted: highlighted))
         end
       end
     end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/units/document_spec.rb

@@ -47,7 +47,6 @@ RSpec.describe Elasticity::Document do
     subject { klass }
 
     it "extracts index name and document type from the class name" do
-      expect(subject.index_name).to eq "class_names"
       expect(subject.namespaced_index_name).to eq "elasticity_test_class_names"
       expect(subject.document_type).to eq "class_name"
       expect(subject.index.name).to eq "elasticity_test_class_names"

data/spec/units/multi_search_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Elasticity::MultiSearch do
   let :klass do
     Class.new do
       include ActiveModel::Model
-      attr_accessor :_id, :name
+      attr_accessor :_id, :name, :highlighted
 
       def ==(other)
         self._id == other._id && self.name == other.name

data/spec/units/search_spec.rb

@@ -23,10 +23,16 @@ RSpec.describe "Search" do
     { "hits" => { "total" => 0, "hits" => [] }}
   end
 
+  let :highlight_response do
+    { "hits" => { "total" => 1, "hits" => [
+      { "_id" => 1, "_source" => { "name" => "foo", "age" => 21 }, "highlight" => { "name" => "<em>foo</em>" } },
+    ]}}
+  end
+
   let :klass do
     Class.new do
       include ActiveModel::Model
-      attr_accessor :_id, :name
+      attr_accessor :_id, :name, :age, :highlighted
 
       def ==(other)
         self._id == other._id && self.name == other.name
@@ -82,6 +88,14 @@ RSpec.describe "Search" do
 
       expect(subject.active_records(relation).mapping).to be relation
     end
+
+    it "creates highlighted object for documents" do
+      expect(index).to receive(:search).with(document_type, body).and_return(highlight_response)
+      doc = subject.documents(klass).first
+
+      expect(doc).to_not be_nil
+      expect(doc.highlighted).to eq klass.new(_id: 1, name: "<em>foo</em>", age: 21)
+    end
   end
 
   describe Elasticity::DocumentSearchProxy do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler