elastic_record 0.4.0 → 0.4.1

data/elastic_record.gemspec

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

data/lib/elastic_record/index.rb

@@ -9,17 +9,27 @@ module ElasticRecord
     include Mapping
 
     attr_accessor :model
+    attr_accessor :disabled
 
     def initialize(model)
       @model = model
+      @disabled = false
     end
 
     def alias_name
-      model.model_name.collection
+      @alias_name ||= model.base_class.model_name.collection
     end
 
     def type
-      model.model_name.element
+      @type ||= model.base_class.model_name.element
+    end
+
+    def disable!
+      @disabled = true
+    end
+
+    def enable!
+      @disabled = false
     end
 
     private

data/lib/elastic_record/index/documents.rb

@@ -2,8 +2,10 @@ module ElasticRecord
   class Index
     module Documents
       def index_record(record, index_name = nil)
+        return if disabled
+
         index_name ||= alias_name
-        document = record.respond_to?(:as_search) ? record.as_search : record.default_as_search
+        document = record.respond_to?(:as_search) ? record.as_search : {}
 
         connection.index(document, id: record.id, index: index_name)
         # json_put "#{index_name}/#{type}/#{record.id}", document
@@ -21,6 +23,8 @@ module ElasticRecord
       end
 
       def bulk_add(batch, index_name = nil)
+        return if disabled
+
         index_name ||= alias_name
 
         connection.bulk do

data/lib/elastic_record/model.rb

@@ -2,8 +2,6 @@ module ElasticRecord
   module Model
     def self.included(base)
       base.class_eval do
-        include Callbacks
-
         extend Connection, Searching, ClassMethods
       end
     end

data/test/elastic_record/index/documents_test.rb

@@ -26,7 +26,7 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
     refute index.record_exists?('abc')
   end
 
-  def test_bulk
+  def test_bulk_add
     record = Widget.new(id: 'abc', color: 'red')
     
     index.bulk_add [record]

data/test/elastic_record/index_test.rb

@@ -7,4 +7,21 @@ class ElasticRecord::IndexTest < MiniTest::Spec
     assert_equal 'widgets', index.alias_name
     assert_equal 'widget', index.type
   end
+
+  def test_disable
+    index = ElasticRecord::Index.new(Widget)
+
+    index.disable!
+
+    assert index.disabled
+  end
+
+  def test_enable
+    index = ElasticRecord::Index.new(Widget)
+
+    index.disable!
+    index.enable!
+
+    refute index.disabled
+  end
 end

data/test/elastic_record/model_test.rb

@@ -13,4 +13,4 @@ class ElasticRecord::ModelTest < MiniTest::Spec
 
     assert_equal Widget, index.model
   end
-end
+end

data/test/support/widget.rb

@@ -4,6 +4,7 @@ class Widget
   define_model_callbacks :save, :destroy
 
   include ElasticRecord::Model
+  include ElasticRecord::Callbacks
 
   self.elastic_index.mapping[:properties].update(color: {
     type: 'string',
@@ -24,6 +25,10 @@ class Widget
         instance_eval(&block)
       end
     end
+
+    def base_class
+      self
+    end
   end
 
   attr_accessor :id, :color

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors: