es-elasticity 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4316eca2c0cf5953a781ed8233e13eb6b6ae90fd
-  data.tar.gz: f37edd93770533fc4cb5c05b515438abf481aea9
+  metadata.gz: 5e2ae11b9e3555edb1f1ad24788f4066a0f489da
+  data.tar.gz: 355f78e40852e671ac9cb28d374d45426cf0f687
 SHA512:
-  metadata.gz: dfc1d0d24057f8e8a3bb890ff6b2812d3db20dbd0972ba07aa957e454bdc61f261fba3eca868397db40e14c6ae649ffb3314312ae288b005c532a7e855bd14d9
-  data.tar.gz: f76f11327b69c509442cda2a6788c5e13252e44a86146d6c5424981508fab1e480592f95a028aee8bf708768418de347255445e6c4d4a7bea3cfedcceb40dc4a
+  metadata.gz: d913071dab846c9b9f4856fec74567c3154088a20f827afe9529880a184913bc67a8ff51afe38402d68524d5a41cf53c605dc68bd23edb849c90da41f8813757
+  data.tar.gz: f93771839ddf6e8ae78e0d305e8c1a869de0262c78677a65c0de1f6a9360ec633f014258264886d6e801bfaba7b0f5b458648c5cd4ac71d2ac02b8d1a0a3cb68

data/README.md

@@ -110,6 +110,8 @@ adults.active_recors(Database::User) # => Array of Database::User instances
   - [ ] Indexing, Bulk Indexing and Delete By Query
   - [ ] Search and Multi Search
   - [ ] ActiveRecord integration
+- [ ] Get rid of to_document, generate automatically based on attributes
+- [ ] Define from_active_record interface
 
 ## Contributing
 

data/lib/elasticity/document.rb

@@ -4,28 +4,49 @@ module Elasticity
 
     # Returns the instance of Elasticity::Index associated with this document.
     def self.index
-      return @index if defined?(@index)
-
-      index_name = self.name.underscore.pluralize
+      return @index if @index.present?
+      @index = Index.new(Elasticity.config.client, self.index_name)
+    end
 
-      if namespace = Elasticity.config.namespace
-        index_name = "#{namespace}_#{index_name}"
-      end
+    # Creates the index for this document
+    def self.create_index
+      self.index.create_if_undefined(settings: Elasticity.config.settings, mappings: { document_type => @mappings })
+    end
 
-      @index = Index.new(Elasticity.config.client, index_name)
-      @index.create_if_undefined(settings: Elasticity.config.settings, mappings: @mappings)
-      @index
+    # Re-creates the index for this document
+    def self.recreate_index
+      self.index.recreate(settings: Elasticity.config.settings, mappings: { document_type => @mappings })
     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
-      self.index.name
+      return @index_name if defined?(@index_name)
+
+      @index_name = self.name.underscore.pluralize
+
+      if namespace = Elasticity.config.namespace
+        @index_name = "#{namespace}_#{index_name}"
+      end
+
+      @index_name
+    end
+
+    # Sets the index name to something else than the default
+    def self.index_name=(name)
+      @index_name = name
+      @index      = nil
     end
 
     # The document type to be used, it's inferred by the class name.
     def self.document_type
-      self.name.underscore
+      return @document_type if defined?(@document_type)
+      @document_type = self.name.demodulize.underscore
+    end
+
+    # Sets the document type to something different than the default
+    def self.document_type=(document_type)
+      @document_type = document_type
     end
 
     # Sets the mapping for this model, which will be used to create the associated index and

data/lib/elasticity/index.rb

@@ -7,13 +7,17 @@ module Elasticity
       @name      = index_name
     end
 
+    def exists?
+      @client.indices.exists(index: @name)
+    end
+
     def create(index_def)
       args = { index: @name, body: index_def }
       instrument("index_create", args) { @client.indices.create(args) }
     end
 
     def create_if_undefined(index_def)
-      create(index_def) unless @client.indices.exists(index: @name)
+      create(index_def) unless exists?
     end
 
     def delete
@@ -22,7 +26,7 @@ module Elasticity
     end
 
     def delete_if_defined
-      delete if @client.indices.exists(index: @name)
+      delete if exists?
     end
 
     def recreate(index_def = nil)

data/lib/elasticity/multi_search.rb

@@ -29,7 +29,7 @@ module Elasticity
 
     def fetch
       multi_body = @searches.map do |name, search, _|
-        { index: search.index.name, type: search.document_type, body: search.body }
+        { index: search.index.name, type: search.document_type, search: search.body }
       end
 
       results = {}

data/lib/elasticity/search.rb

@@ -66,21 +66,7 @@ module Elasticity
         @mapper   = mapper
       end
 
-      def [](idx)
-        mapping[idx]
-      end
-
-      def each(&block)
-        mapping.each(&block)
-      end
-
-      def to_ary
-        mapping.to_ary
-      end
-
-      def size
-        mapping.size
-      end
+      delegate :[], :each, :to_ary, :size, :+, :-, to: :mapping
 
       # The total number of entries as returned by ES
       def total
@@ -144,6 +130,18 @@ module Elasticity
       @document_klass = document_klass
     end
 
+    def index
+      @search.index
+    end
+
+    def document_type
+      @search.document_type
+    end
+
+    def body
+      @search.body
+    end
+
     def active_records(relation)
       @search.active_records(relation)
     end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/units/document_spec.rb

@@ -60,7 +60,6 @@ RSpec.describe Elasticity::Document do
       Elasticity.config.client   = client
 
       expect(Elasticity::Index).to receive(:new).with(client, "elasticity_test_class_names").and_return(index)
-      expect(index).to receive(:create_if_undefined).with(settings: settings, mappings: mappings)
 
       expect(subject.index).to be index
     end

data/spec/units/multi_search_spec.rb

@@ -27,8 +27,8 @@ RSpec.describe Elasticity::MultiSearch do
     subject.add(:second, Elasticity::Search.new(double(:index, name: "index_second"), "document_second", { search: :second }), documents: klass)
 
     expect(Elasticity.config.client).to receive(:msearch).with(body: [
-      { index: "index_first", type: "document_first", body: { search: :first } },
-      { index: "index_second", type: "document_second", body: { search: :second } },
+      { index: "index_first", type: "document_first", search: { search: :first } },
+      { 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")]

data/spec/units/search_spec.rb

@@ -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: ["id"])).and_return(ids_response)
+      expect(index).to receive(:search).with(document_type, body.merge(_source: [])).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: ["id"])).and_return(empty_response)
+      expect(index).to receive(:search).with(document_type, body.merge(_source: [])).and_return(empty_response)
 
       relation = double(:relation)
       expect(relation).to receive(:none).and_return(relation)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rodrigo Kochenburger