elasticsearch-rails-dynamic-json-support 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92105a25788097c08f205783d49a2ca4ffc488d
-  data.tar.gz: 27ad97de60bfef4b595e836913799ebf5eba7592
+  metadata.gz: 566cc9fe9bf6aa1283f82504a7827327076adaf9
+  data.tar.gz: 1d6b9bfc94575e2d0be746d8ddf213e8e6da2335
 SHA512:
-  metadata.gz: 1de5aa05408a2f2bb3fc5d5a56669d77a24bb72a35a19c727d4390965e816b88694f62045fc7e1f12cf10eb19aac5061ad0e9af7405fefc138283a269f1704e4
-  data.tar.gz: 2c1ed2db427152286624d55d020c227f4175fe72fa9ab2f07c6f070052c88740a57e0d2905642e3a467b2a12525da886558944818c96e1a7f695ab7e3cb27426
+  metadata.gz: e007c4d66893a761c4bdda9a98ca0e2f969ba0f8a0447e7e08bc785e910e9ccc693b7cd7ebe07fcc453432dd74e1b9bde0cc90996e4af6bfa65ed1335b7d2abf
+  data.tar.gz: 7e491753074c9b82dd1dfe576bd53d7f1c5354522f6ff9a5f03d2fa706adc5d84d664c3df4c22671d63434f1b5aa3632d6c8fcc7db598db1408f0a3be76e145e

data/README.md

@@ -97,6 +97,13 @@ Example usage (which solves the 2 issues above) is as given below:
 		end
     ```
 
+# More features
+- Exclusion of keys: simply call 
+  `record.as_indexed_json: exclude_keys: %w[keys you do not like]`.
+- Selective Import: `es_to_json_when(scope_name, &condition_check_block)`. if
+  the scope_name is not given, it would import all by default.
+  `condition_check_block` is for checking before making the import
+
 # ToDos
 
 - [ ] Tests.. since I don't have time to write test case for this project yet.

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

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.5 ruby lib
+# stub: elasticsearch-rails-dynamic-json-support 0.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "elasticsearch-rails-dynamic-json-support".freeze
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-08-31"
+  s.date = "2016-09-01"
   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 = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "elasticsearch-rails-dynamic-json-support.gemspec",
     "lib/elasticsearch-rails-dynamic-json-support.rb",
     "lib/elasticsearch/model/cascade_update.rb",
+    "lib/elasticsearch/model/importing_decorator.rb",
     "lib/elasticsearch/model/indexing_decorator.rb",
     "test/helper.rb",
     "test/test_elasticsearch-rails-dynamic-json-support.rb"

data/lib/elasticsearch/model/cascade_update.rb

@@ -39,6 +39,10 @@ module Elasticsearch
       end
 
       class_methods do
+        def es_to_json_when(scope_name, &condition_block)
+          @@_es_condition_block = condition_block
+          @@_es_scope_name = scope_name
+        end
 
         # attributes is a pair of <key, block>
         def es_register_attrs *attributes
@@ -59,9 +63,6 @@ module Elasticsearch
           key_name = key_name.to_s
           return json_relationship_registry[key_name] unless blk
 
-          # If key_name has been defined, then fail fast
-          fail "json key_name has been already defined: #{key_name} for class #{self.name}" if json_relationship_registry[key_name]
-
           relationship_name = key_name unless relationship_name
           relationship_name = relationship_name.to_s
 
@@ -70,10 +71,6 @@ module Elasticsearch
 
           reflection = reflect_on_association relationship_name
 
-          # The fail is safe since it's in the initialization process
-          # TODO: make the initializer to include the fail
-          fail "Reflection not found for #{relationship_name} from class: #{self.name}" unless reflection
-
           reflected_class = reflection.class_name.constantize
 
           actor = Actor.new relationship_name, get_singularity(reflection), blk

data/lib/elasticsearch/model/importing_decorator.rb

@@ -0,0 +1,16 @@
+module Elasticsearch
+  module Model
+    module Importing
+      module PrecheckAspect
+        def import options={}, &blk
+          options[:scope] = self.class_variable_get(:@@_es_scope_name) if self.class_variable_defined?(:@@_es_scope_name) && !options[:scope]
+          super options, &blk
+        end
+      end
+
+      module ClassMethods
+        prepend PrecheckAspect
+      end
+    end
+  end
+end

data/lib/elasticsearch/model/indexing_decorator.rb

@@ -1,6 +1,32 @@
 module Elasticsearch
   module Model
     module Indexing
+			module PrecheckAspect
+        def index_document(*args)
+          super if _should_pass_to_es
+        end
+
+        def delete_document(*args)
+          super if _should_pass_to_es
+        end
+
+        def update_document(*args)
+          super if _should_pass_to_es
+        end
+
+        def update_document_attributes(*args)
+          super if _should_pass_to_es
+        end
+
+        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)
+          !condition_blk || condition_blk[self]
+        end
+      end
+
       module InstanceMethods
         def update_document options = {}
           if changed_attributes = self.instance_variable_get(:@__changed_attributes)
@@ -17,6 +43,8 @@ module Elasticsearch
             index_document(options)
           end
         end
+
+        prepend PrecheckAspect
       end
     end
   end

data/lib/elasticsearch-rails-dynamic-json-support.rb

@@ -1,4 +1,5 @@
 require 'elasticsearch/model'
 
 require_relative 'elasticsearch/model/indexing_decorator'
+require_relative 'elasticsearch/model/importing_decorator'
 require_relative 'elasticsearch/model/cascade_update'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails-dynamic-json-support
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Song Yangyu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-rails
@@ -127,6 +127,7 @@ files:
 - elasticsearch-rails-dynamic-json-support.gemspec
 - lib/elasticsearch-rails-dynamic-json-support.rb
 - lib/elasticsearch/model/cascade_update.rb
+- lib/elasticsearch/model/importing_decorator.rb
 - lib/elasticsearch/model/indexing_decorator.rb
 - test/helper.rb
 - test/test_elasticsearch-rails-dynamic-json-support.rb