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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e90128e9d7f2fba2eace315fe74fc64f5bae2697
-  data.tar.gz: d3cc2b9c4a717af5a2e161e8de4ed57f94d8d089
+  metadata.gz: e92105a25788097c08f205783d49a2ca4ffc488d
+  data.tar.gz: 27ad97de60bfef4b595e836913799ebf5eba7592
 SHA512:
-  metadata.gz: bdc56f2cff4774c20d42ec2f7b25fbd775a263ca2dd32f8d47665488e6c96b5e590343c1bbdfae4b7436b88d1667175258ca20621d13bbbfa1273fa47ecc228c
-  data.tar.gz: 619d02707e0a92fcc7757506175171b9c83218c171e9a176c6f65b037e59b3aec6e8bb1e886ea9276d5c0efacd4771e903e9e7268d19751851903dc5f927d820
+  metadata.gz: 1de5aa05408a2f2bb3fc5d5a56669d77a24bb72a35a19c727d4390965e816b88694f62045fc7e1f12cf10eb19aac5061ad0e9af7405fefc138283a269f1704e4
+  data.tar.gz: 2c1ed2db427152286624d55d020c227f4175fe72fa9ab2f07c6f070052c88740a57e0d2905642e3a467b2a12525da886558944818c96e1a7f695ab7e3cb27426

data/README.md

@@ -97,25 +97,25 @@ Example usage (which solves the 2 issues above) is as given below:
 		end
     ```
 
-# Issues
+# ToDos
 
-- Tests.. since I don't have time to write test case for this project yet.
-- Due to the `lazy-loading` of model in rails, you need to specifically specify
-  the model in rails. Like in the `Review` class above, it's reference to
-  `Article` 
+- [ ] Tests.. since I don't have time to write test case for this project yet.
+- [ ] Due to the `lazy-loading` of model in rails, you need to specifically 
+  specify the model in rails. Like in the `Review` class above, it's reference
+  to `Article` (to make sure that `Article` class is loaded before `Review`)
+- [ ] Auto generation of mapping
 
-== Contributing to elasticsearch-rails-dynamic-json-support
+# Contributing to elasticsearch-rails-dynamic-json-support
  
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2016 Song Yangyu. See LICENSE.txt for
-further details.
+- Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+- Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+- Fork the project.
+- Start a feature/bugfix branch.
+- Commit and push until you are happy with your contribution.
+- Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+- Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+# Copyright
+
+Copyright (c) 2016 Song Yangyu. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

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.4 ruby lib
+# stub: elasticsearch-rails-dynamic-json-support 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "elasticsearch-rails-dynamic-json-support".freeze
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   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-30"
+  s.date = "2016-08-31"
   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/cascade_update.rb

@@ -41,7 +41,7 @@ module Elasticsearch
       class_methods do
 
         # attributes is a pair of <key, block>
-        def es_register_attributes *attributes
+        def es_register_attrs *attributes
           hashed_attributes = attributes.extract_options!
 
           attributes.each do |k|
@@ -59,6 +59,9 @@ 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
 
@@ -87,11 +90,19 @@ module Elasticsearch
 
         def to_indexed_json(record, options = {})
           result = {}
+          exclude_keys = options[:exclude_keys]
+          exclude_keys = [] unless exclude_keys
+          exclude_keys = exclude_keys.map(&:to_s)
+
           json_attribute_registry.each do |k, blk|
+            k = k.to_s
+            next if exclude_keys.include? k
             result[k] = blk[record]
           end
 
           json_relationship_registry.each do |k, actor|
+            k = k.to_s
+            next if exclude_keys.include? k
             result[k] = actor.to_json(record)
           end
 

metadata

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