es-elasticity 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858cb2be175394c54d6764ee32e64e467c82ae42
-  data.tar.gz: a78140e39c9a3eba158aa9c8196622de078206e5
+  metadata.gz: 930171d9343f5f51201e859afbc8f227e108a855
+  data.tar.gz: 7a949337b0c6265451e00bf5bc8ac9eef3170321
 SHA512:
-  metadata.gz: 3b76a96bc437e1a3015c3e2cde9ce3eb41777163cd572ae23fac8a344234e0d6d4f7e4d545b44e177d5ac8a11a15e90236f6fe8d87f3ebdc37a5484b31c7a07b
-  data.tar.gz: d4fc42b3ca6f553ceeb4a761cb7a89146a008bafbadfcbb9076c6622ff59d39f8a135e751c93e8509628f8dd3bd4c1411208a029a7b546b1c0f0c7406ff095ac
+  metadata.gz: 4f9cc21bea9324244cc52ffee24d4f4b6feddfaf59cc01962ce13162f99ff1af50a740a85408426328c98dd2566caab4524d7525a585d9efe04f2e82ce9abd1d
+  data.tar.gz: 16752b85bdcd775b75b59e0e9b11a2a1b53bbaad7e44e40485e700888214df93d9978e1a0330055ebf7dc86ce6783010aef7905a9686e155529039b49017afb1

data/README.md

@@ -105,12 +105,16 @@ adults.active_recors(Database::User) # => Array of Database::User instances
 
 ## Roadmap
 
+- [ ] Use mapping instead of mappings, we wanna be consistent to ES not to elasticsearch-ruby
+- [ ] Better automatic index name and document type
+- [ ] Support for multiple document types
 - [ ] Write more detailed documentation section for:
   - [ ] Model definition
   - [ ] Indexing, Bulk Indexing and Delete By Query
   - [ ] Search and Multi Search
   - [ ] ActiveRecord integration
 - [ ] Get rid of to_document, generate automatically based on attributes
+- [ ] Add some delegations on Document to Index
 - [ ] Define from_active_record interface
 
 ## Contributing

data/lib/elasticity/document.rb

@@ -70,7 +70,7 @@ module Elasticity
     # Fetches one specific document from the index by ID.
     def self.get(id)
       if doc = index.get_document(document_type, id)
-        new(doc["_source"])
+        new(doc["_source"].merge(_id: doc['_id']))
       end
     end
 
@@ -88,22 +88,28 @@ module Elasticity
     def self.bulk_index(documents)
       index.bulk do |b|
         documents.each do |doc|
-          b.index(self.document_type, doc.id, doc.to_document)
+          b.index(self.document_type, doc._id, doc.to_document)
         end
       end
     end
 
     # Define common attributes for all documents
-    attr_accessor :id
+    attr_accessor :_id
 
     # Creates a new Document instance with the provided attributes.
     def initialize(attributes = {})
       super(attributes)
     end
 
+    def attributes=(attributes)
+      attributes.each do |attr, value|
+        self.public_send("#{attr}=", value)
+      end
+    end
+
     # Defines equality by comparing the ID and values of each instance variable.
     def ==(other)
-      return false if id != other.id
+      return false if _id != other._id
 
       instance_variables.all? do |ivar|
         instance_variable_get(ivar) == other.instance_variable_get(ivar)
@@ -119,7 +125,7 @@ module Elasticity
 
     # Update this object on the index, creating or updating the document.
     def update
-      self.class.index.index_document(self.class.document_type, id, to_document)
+      self.class.index.index_document(self.class.document_type, _id, to_document)
     end
   end
 end

data/lib/elasticity/search.rb

@@ -24,7 +24,7 @@ module Elasticity
     # into ActiveRecord models using the provided relation.
     def active_records(relation)
       return @active_record if defined?(@active_record)
-      response = @index.search(@document_type, @body.merge(_source: []))
+      response = @index.search(@document_type, @body.merge(_source: false))
       @active_record = Result.new(response, ActiveRecordMapper.new(relation))
     end
 
@@ -95,7 +95,7 @@ module Elasticity
 
       def map(hits)
         hits.map do |hit|
-          @document_klass.new(hit["_source"])
+          @document_klass.new(hit["_source"].merge(_id: hit['_id']))
         end
       end
     end
@@ -106,7 +106,7 @@ module Elasticity
       end
 
       def map(hits)
-        ids = hits.map { |h| h["_source"]["id"] }
+        ids = hits.map { |h| h["_id"] }
 
         if ids.any?
           id_col = "#{quote(@relation.table_name)}.#{quote(@relation.klass.primary_key)}"

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/units/document_spec.rb

@@ -3,7 +3,6 @@ require "elasticity/search"
 RSpec.describe Elasticity::Document do
   mappings = {
     properties: {
-      id: { type: "integer" },
       name: { type: "string" },
 
       items: {
@@ -27,7 +26,7 @@ RSpec.describe Elasticity::Document do
       attr_accessor :name, :items
 
       def to_document
-        { id: id, name: name, items: items}
+        { name: name, items: items }
       end
     end
   end
@@ -78,9 +77,9 @@ RSpec.describe Elasticity::Document do
     end
 
     it "gets specific document from the index" do
-      doc = { "_source" => { "id" => 1, "name" => "Foo", "items" => [{ "name" => "Item1" }]}}
+      doc = { "_id" => 1, "_source" => { "name" => "Foo", "items" => [{ "name" => "Item1" }]}}
       expect(index).to receive(:get_document).with("class_name", 1).and_return(doc)
-      expect(subject.get(1)).to eq klass.new(id: 1, name: "Foo", items: [{ "name" => "Item1" }])
+      expect(subject.get(1)).to eq klass.new(_id: 1, name: "Foo", items: [{ "name" => "Item1" }])
     end
 
     it "deletes specific document from index" do
@@ -91,10 +90,10 @@ RSpec.describe Elasticity::Document do
   end
 
   context "instance" do
-    subject { klass.new id: 1, name: "Foo", items: [{ name: "Item1" }] }
+    subject { klass.new _id: 1, name: "Foo", items: [{ name: "Item1" }] }
 
     it "stores the document in the index" do
-      expect(index).to receive(:index_document).with("class_name", 1, {id: 1, name: "Foo", items: [{ name: "Item1" }]})
+      expect(index).to receive(:index_document).with("class_name", 1, { name: "Foo", items: [{ name: "Item1" }] })
       subject.update
     end
   end

data/spec/units/multi_search_spec.rb

@@ -5,10 +5,10 @@ RSpec.describe Elasticity::MultiSearch do
   let :klass do
     Class.new do
       include ActiveModel::Model
-      attr_accessor :id, :name
+      attr_accessor :_id, :name
 
       def ==(other)
-        self.id == other.id && self.name == other.name
+        self._id == other._id && self.name == other.name
       end
     end
   end
@@ -16,8 +16,8 @@ RSpec.describe Elasticity::MultiSearch do
   let :response do
     {
       "responses" => [
-        { "hits" => { "total" => 2, "hits" => [{"_source" => { "id" => 1, "name" => "foo" }}, {"_source" => { "id" => 2, "name" => "bar" }}]}},
-        { "hits" => { "total" => 1, "hits" => [{"_source" => { "id" => 3, "name" => "baz" }}]}},
+        { "hits" => { "total" => 2, "hits" => [{ "_id" => 1, "_source" => { "name" => "foo" }}, { "_id" => 2, "_source" => { "name" => "bar" }}]}},
+        { "hits" => { "total" => 1, "hits" => [{ "_id" => 3, "_source" => { "name" => "baz" }}]}},
       ]
     }
   end
@@ -31,7 +31,7 @@ RSpec.describe Elasticity::MultiSearch do
       { index: "index_second", type: "document_second", search: { search: :second } },
     ]).and_return(response)
 
-    expect(Array(subject[:first])). to eq [klass.new(id: 1, name: "foo"), klass.new(id: 2, name: "bar")]
-    expect(Array(subject[:second])). to eq [klass.new(id: 3, name: "baz")]
+    expect(Array(subject[:first])). to eq [klass.new(_id: 1, name: "foo"), klass.new(_id: 2, name: "bar")]
+    expect(Array(subject[:second])). to eq [klass.new(_id: 3, name: "baz")]
   end
 end

data/spec/units/search_spec.rb

@@ -7,15 +7,15 @@ RSpec.describe "Search" do
 
   let :full_response do
     { "hits" => { "total" => 2, "hits" => [
-      {"_source" => { "id" => 1, "name" => "foo" }},
-      {"_source" => { "id" => 2, "name" => "bar" }},
+      { "_id" => 1, "_source" => { "name" => "foo" } },
+      { "_id" => 2, "_source" => { "name" => "bar" } },
     ]}}
   end
 
   let :ids_response do
     { "hits" => { "total" => 2, "hits" => [
-      {"_source" => { "id" => 1, "name" => "foo" }},
-      {"_source" => { "id" => 2, "name" => "bar" }},
+      { "_id" => 1 },
+      { "_id" => 2 },
     ]}}
   end
 
@@ -26,10 +26,10 @@ RSpec.describe "Search" do
   let :klass do
     Class.new do
       include ActiveModel::Model
-      attr_accessor :id, :name
+      attr_accessor :_id, :name
 
       def ==(other)
-        self.id == other.id && self.name == other.name
+        self._id == other._id && self.name == other.name
       end
     end
   end
@@ -43,7 +43,7 @@ RSpec.describe "Search" do
       expect(index).to receive(:search).with(document_type, body).and_return(full_response)
 
       docs = subject.documents(klass)
-      expected = [klass.new(id: 1, name: "foo"), klass.new(id: 2, name: "bar")]
+      expected = [klass.new(_id: 1, name: "foo"), klass.new(_id: 2, name: "bar")]
 
       expect(docs.total).to eq 2
       expect(docs.size).to eq expected.size
@@ -59,7 +59,7 @@ RSpec.describe "Search" do
     end
 
     it "searches the index and return active record models" do
-      expect(index).to receive(:search).with(document_type, body.merge(_source: [])).and_return(ids_response)
+      expect(index).to receive(:search).with(document_type, body.merge(_source: false)).and_return(ids_response)
 
       relation = double(:relation,
         connection: double(:connection),
@@ -75,7 +75,7 @@ RSpec.describe "Search" do
     end
 
     it "return relation.none from activerecord relation with no matches" do
-      expect(index).to receive(:search).with(document_type, body.merge(_source: [])).and_return(empty_response)
+      expect(index).to receive(:search).with(document_type, body.merge(_source: false)).and_return(empty_response)
 
       relation = double(:relation)
       expect(relation).to receive(:none).and_return(relation)
@@ -95,7 +95,7 @@ RSpec.describe "Search" do
 
     it "automatically maps the documents into the provided Document class" do
       expect(index).to receive(:search).with(document_type, body).and_return(full_response)
-      expect(Array(subject)).to eq [klass.new(id: 1, name: "foo"), klass.new(id: 2, name: "bar")]
+      expect(Array(subject)).to eq [klass.new(_id: 1, name: "foo"), klass.new(_id: 2, name: "bar")]
     end
 
     it "delegates active_records for the underlying search" do

metadata

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