elasticsearch-rails-dynamic-json-support 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b37af1ee28910aab83131ad0199d69d96abc349
-  data.tar.gz: f174cc88ec1fec1a497e5745bbc17ae4fd4237e7
+  metadata.gz: fe860b9480e7641fdbc37cbfe277d74711d09bf1
+  data.tar.gz: 89c418f859ae3655cf211fcee5e08243b936b85b
 SHA512:
-  metadata.gz: d62d946b3f75dbd1956b8c5329abbcc06bc8270fdec74cd0e2fd282f83567d518aa6ca9f19894bfc968d39d19aee4b6ff7a823ee6c2e791a9d2b668836838810
-  data.tar.gz: f08400be2aaa2b8caa3529f4de1085610233c90ec8a0b552d5447474084976bd578561c7acb1ce61e4adc4c9f0be558a11ad4e8f9b0a98d906280924d12f0761
+  metadata.gz: 3fdf55972b55e9b58318f3c93bc166898e0cda08d310376cb4b029dd7e728aff59ccba3a83d50fee600c7913511d711634c9c13f3d4c6153bcd86af1b13c1be4
+  data.tar.gz: 4bce5020b172490d3a0a41db30af6f843ee668656e909e6c30a850851b85588cd90fbf02226e56abba5dc891518866f547023a2fa3b99e5850998db2a7719042

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/elasticsearch-rails-dynamic-json-support.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: elasticsearch-rails-dynamic-json-support 0.0.10 ruby lib
+# stub: elasticsearch-rails-dynamic-json-support 0.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "elasticsearch-rails-dynamic-json-support".freeze
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Song Yangyu".freeze]
-  s.date = "2016-10-10"
+  s.date = "2016-10-14"
   s.description = "Enhance elasticsearch-rails with `elasticsearch_json_changes` to translate the attribute changes into document updates".freeze
   s.email = "flyfy1@gmail.com".freeze
   s.extra_rdoc_files = [

data/lib/elasticsearch/model/indexing_decorator.rb

@@ -21,8 +21,8 @@ module Elasticsearch
         private
         def _should_pass_to_es
           tclz = target.class
-          return true unless tclz.class_variable_defined?(:@@_es_condition_block)
-          condition_blk = tclz.class_variable_get(:@@_es_condition_block)
+          return true unless tclz.instance_variable_defined?(:@_es_condition_block)
+          condition_blk = tclz.instance_variable_get :@_es_condition_block
           !condition_blk || condition_blk[self]
         end
       end

data/spec/cascade_update_spec.rb

@@ -121,7 +121,7 @@ RSpec.describe Elasticsearch::Model::CascadeUpdate, type: :model do
         before do
           @clz.class_eval do
             es_register_attrs :title
-            es_register_assoc(:reviews, reverse_relationship: 'article', 
+            es_register_assoc(:reviews, reverse_relationship: 'article',
                               reverse_trigger: lambda {|review, changes| changes.has_key? :content }
                              ) do |review|
               review.as_json(only: [:content])
@@ -166,4 +166,23 @@ RSpec.describe Elasticsearch::Model::CascadeUpdate, type: :model do
       end
     end
   end
+
+  context 'searchable' do
+    before do
+      @clz.class_eval do
+        es_register_attrs :title
+        es_to_json_when(:searchable) {|record| record.is_searchable }
+      end
+    end
+
+
+    it 'not send to es upon creation & update' do
+      @article = @clz.new title: 'oops', content: 'OooPs', is_searchable: false
+      expect(@article.__elasticsearch__).to receive(:update_document_attributes).never
+      @article.save!
+      @article.update(title: 'is changed')
+    end
+
+  end
+
 end

data/spec/db.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define(version: 1) do
   create_table :articles do |t|
     t.string :title, null: false
     t.string :content, null: false
+    t.boolean :is_searchable, null: false, default: true
   end
 
   create_table :reviews do |t|
@@ -19,6 +20,8 @@ ActiveRecord::Schema.define(version: 1) do
 end
 
 class Article < ActiveRecord::Base
+  scope :searchable, -> { where(is_searchable: true) }
+
   validates_presence_of :title
   validates_presence_of :content
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails-dynamic-json-support
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Song Yangyu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model