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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 566cc9fe9bf6aa1283f82504a7827327076adaf9
-  data.tar.gz: 1d6b9bfc94575e2d0be746d8ddf213e8e6da2335
+  metadata.gz: 116ff0923afb01ab10a9ad5f3eb9792439ccb93e
+  data.tar.gz: a7478fbbab3f9626369a734cef52c67344b3e6fa
 SHA512:
-  metadata.gz: e007c4d66893a761c4bdda9a98ca0e2f969ba0f8a0447e7e08bc785e910e9ccc693b7cd7ebe07fcc453432dd74e1b9bde0cc90996e4af6bfa65ed1335b7d2abf
-  data.tar.gz: 7e491753074c9b82dd1dfe576bd53d7f1c5354522f6ff9a5f03d2fa706adc5d84d664c3df4c22671d63434f1b5aa3632d6c8fcc7db598db1408f0a3be76e145e
+  metadata.gz: 7ff38c240e1395797a06ce9ef10d3ff2afb55a4fb56e0ebbe0a5330ca59586cc28e7964c6e9a05f2104eb22a748b35cd0aeed3278693db772c21e272acf2ec3a
+  data.tar.gz: 461b3a61dc3b270eab43211e7485ad6dccaee47e5b697addeea62305215877fcd73934bfb2f908746ec07a50fbfd17946f776357f5ee964fc13cac762931d174

data/Gemfile

@@ -6,13 +6,21 @@ source "https://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 
+gem 'elasticsearch-model', "~> 0.1.9"
 gem 'elasticsearch-rails', "~> 0.1.9"
 
 group :development do
-  gem 'shoulda', '>= 0'
+  gem 'rspec', '>= 0'
   gem 'rdoc', '~> 3.12'
   gem 'bundler', '~> 1.0'
   gem 'jeweler', '~> 2.0.1'
   gem 'simplecov', '>= 0'
   gem 'concurrent-ruby'
+  gem 'activerecord'
+  gem 'activerecord-nulldb-adapter'
 end
+
+group :test do
+  gem 'sqlite3'
+end
+

data/Gemfile.lock

@@ -1,18 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0.1)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activerecord-nulldb-adapter (0.3.4)
+      activerecord (>= 2.0.0)
+    activesupport (5.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
+    arel (7.1.1)
     builder (3.2.2)
     concurrent-ruby (1.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     docile (1.1.5)
+    elasticsearch (2.0.0)
+      elasticsearch-api (= 2.0.0)
+      elasticsearch-transport (= 2.0.0)
+    elasticsearch-api (2.0.0)
+      multi_json
+    elasticsearch-model (0.1.9)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
     elasticsearch-rails (0.1.9)
+    elasticsearch-transport (2.0.0)
+      faraday
+      multi_json
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
@@ -55,17 +77,25 @@ GEM
     rake (11.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    sqlite3 (1.3.11)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -74,10 +104,17 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
+  activerecord-nulldb-adapter
   bundler (~> 1.0)
   concurrent-ruby
+  elasticsearch-model (~> 0.1.9)
   elasticsearch-rails (~> 0.1.9)
   jeweler (~> 2.0.1)
   rdoc (~> 3.12)
-  shoulda
+  rspec
   simplecov
+  sqlite3
+
+BUNDLED WITH
+   1.12.5

data/README.md

@@ -6,30 +6,30 @@ ElasticsearchRails DynamicJsonSupport - Small little change to help your model u
 
 In ElasicSearch, if you define your model the following way:
 
-    ```ruby
-		# app/models/article.rb
-		class Article < ActiveRecord::Base
-			include Elasticsearch::Model
-			include Elasticsearch::Model::Callbacks
-
-			has_many :reviews
-
-			def as_indexed_json options={}
-				{
-						id: id,
-						title: title,
-						article: content,
-						created_at: created_at,
-						updated_at: updated_at,
-						reviews: reviews.map(&:as_json),
-				}
-			end
-
-		# app/models/review.rb
-		class Review < ActiveRecord::Base
-			belongs_to :article
-		end
-    ```
+```ruby
+# app/models/article.rb
+class Article < ActiveRecord::Base
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+
+  has_many :reviews
+
+  def as_indexed_json options={}
+    {
+        id: id,
+        title: title,
+        article: content,
+        created_at: created_at,
+        updated_at: updated_at,
+        reviews: reviews.map(&:as_json),
+    }
+  end
+
+# app/models/review.rb
+class Review < ActiveRecord::Base
+  belongs_to :article
+end
+```
 
 There're 2 issues with the implementation above:
 
@@ -56,46 +56,63 @@ This library aims to solve these 2 issues, with the following convention:
 
 Example usage (which solves the 2 issues above) is as given below:
 
-    ```ruby
-		# app/models/article.rb
-		class Article < ActiveRecord::Base
-			include Elasticsearch::Model
-			include Elasticsearch::Model::Callbacks
-			include Elasticsearch::Model::CascadeUpdate
-
-			has_many :reviews
-			es_register_attributes id: nil, title: nil, article: lambda {|rec| rec.content }, created_at: nil, updated_at: nil
-			es_register_assoc(:reviews) { |review| review.as_indexed_json }
-
-			def elasticsearch_json_changes(changed_attributes)
-				keys_to_update = changed_attributes.keys.map {|k| key_map k}
-				self.as_indexed_json.select { |k,_| keys_to_update.include? k.to_s }
-			end
-
-			private
-			def key_map(key)
-				key = key.to_s
-				case key
-				when 'content'
-					'article'
-				else
-					key
-				end
-			end
-		end
-
-		# app/models/review.rb
-		class Review < ActiveRecord::Base
-			# Make sure to register Article
-			Article
-
-			belongs_to :article
-
-			def as_indexed_json(options = {})
-				as_json
-			end
-		end
-    ```
+```ruby
+# app/models/article.rb
+class Article < ActiveRecord::Base
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+  include Elasticsearch::Model::CascadeUpdate
+
+  has_many :reviews
+  es_register_attributes :id, :title, article: lambda {|rec| rec.content }
+
+  # silent attribute would not be output by default
+  es_register_silent_attributes :created_at, :updated_at 
+
+  # register association, with: 
+  #   - key_name = :reviews
+  #   - get_assoc: default to be `#reviews` (the key_name)
+  #   - &blk: the render_assoc, default to be: `object#as_indexed_json`. 
+  #         it would use a `map` by default for the has_many relationships
+  #   - reverse_class: default to guess from the relationship
+  #   - reverse_trigger: lambda {|obj, changes| do_things }
+  #         the reverse_trigger, when the model change, to render the json
+  #         document and update the objects. the returns is an array of the
+  #         original object to be updated
+  es_register_assoc(:reviews) { |review| review.as_indexed_json }
+
+  # for the given changed_attributes, it would return the json to be fed
+  # into the `#update_document` method. What's given here is the default
+  # behaviour -- which is to find the keys, and do a matching
+  def elasticsearch_json_changes(changed_attributes)
+    keys_to_update = changed_attributes.keys.map {|k| key_map k}
+    self.as_indexed_json.select { |k,_| keys_to_update.include? k.to_s }
+  end
+
+  private
+  def key_map(key)
+    key = key.to_s
+    case key
+    when 'content'
+      'article'
+    else
+      key
+    end
+  end
+end
+
+# app/models/review.rb
+class Review < ActiveRecord::Base
+  # Make sure to register Article
+  Article
+
+  belongs_to :article
+
+  def as_indexed_json(options = {})
+    as_json
+  end
+end
+```
 
 # More features
 - Exclusion of keys: simply call 

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

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.6 ruby lib
+# stub: elasticsearch-rails-dynamic-json-support 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "elasticsearch-rails-dynamic-json-support".freeze
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   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-09-01"
+  s.date = "2016-09-20"
   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 = [
@@ -31,8 +31,9 @@ Gem::Specification.new do |s|
     "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"
+    "spec/cascade_update_spec.rb",
+    "spec/db.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/flyfy1/elasticsearch-rails-dynamic-json-support".freeze
   s.licenses = ["MIT".freeze]
@@ -43,30 +44,39 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<elasticsearch-model>.freeze, ["~> 0.1.9"])
       s.add_runtime_dependency(%q<elasticsearch-rails>.freeze, ["~> 0.1.9"])
-      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<concurrent-ruby>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activerecord>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activerecord-nulldb-adapter>.freeze, [">= 0"])
     else
+      s.add_dependency(%q<elasticsearch-model>.freeze, ["~> 0.1.9"])
       s.add_dependency(%q<elasticsearch-rails>.freeze, ["~> 0.1.9"])
-      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
       s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
       s.add_dependency(%q<jeweler>.freeze, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<concurrent-ruby>.freeze, [">= 0"])
+      s.add_dependency(%q<activerecord>.freeze, [">= 0"])
+      s.add_dependency(%q<activerecord-nulldb-adapter>.freeze, [">= 0"])
     end
   else
+    s.add_dependency(%q<elasticsearch-model>.freeze, ["~> 0.1.9"])
     s.add_dependency(%q<elasticsearch-rails>.freeze, ["~> 0.1.9"])
-    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
     s.add_dependency(%q<jeweler>.freeze, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<concurrent-ruby>.freeze, [">= 0"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 0"])
+    s.add_dependency(%q<activerecord-nulldb-adapter>.freeze, [">= 0"])
   end
 end
 

data/lib/elasticsearch/model/cascade_update.rb

@@ -1,25 +1,6 @@
 module Elasticsearch
   module Model
     module CascadeUpdate
-
-      # Only for internal use. Holds the mapping from relationship, to the corresponding json
-      class Actor
-        def initialize(relationship_name, singularity, resource_to_json)
-          @relationship_name = relationship_name
-          @singularity = singularity.to_sym
-          @resource_to_json = resource_to_json
-        end
-
-        def to_json(record)
-          resource = record.public_send @relationship_name
-          if(@singularity == :plural)
-            resource.map {|record| @resource_to_json[record] }
-          else  # treat it as singular otherwise
-            @resource_to_json[resource]
-          end
-        end
-      end
-
       extend ActiveSupport::Concern
 
       # update, just for a specific key, or set of keys
@@ -28,7 +9,7 @@ module Elasticsearch
 
         res_json = {}
         keys.each do |key|
-          res_json[key] = self.class.es_register_assoc(key).to_json(self)
+          res_json[key] = self.class.es_get_actor(key)[self]
         end
 
         self.__elasticsearch__.update_document_attributes res_json
@@ -40,91 +21,139 @@ module Elasticsearch
 
       class_methods do
         def es_to_json_when(scope_name, &condition_block)
-          @@_es_condition_block = condition_block
-          @@_es_scope_name = scope_name
+          instance_variable_set(:@_es_condition_block, condition_block)
+          instance_variable_set(:@_es_scope_name, scope_name)
+        end
+
+        def es_register_silent_attrs *attributes
+          __es_register_attrs __silent_attribute_registry, attributes
+        end
+
+        def es_get_actor(key, include_silent: true)
+          if include_silent
+            __load_attribute_registry[key] || __silent_attribute_registry[key]
+          else
+            __silent_attribute_registry[key]
+          end
         end
 
         # attributes is a pair of <key, block>
         def es_register_attrs *attributes
-          hashed_attributes = attributes.extract_options!
+          __es_register_attrs __load_attribute_registry, attributes
+        end
 
-          attributes.each do |k|
-            json_attribute_registry[k] = lambda { |record| record.public_send k }
+        # register association, with: 
+        #   - key_name = the key name of the json object
+        #   - relationship: can be nil, String or a Proc.
+        #       - if nil or string, then default to the key_name. In that case, 
+        #         the listening_class can be guessed intelligently if not given
+        #       - if lambda, then this is used to fetch the relationship
+        #   - listening_class: default to guess from the relationship, to set the
+        #                   listener upon
+        #   - reverse_trigger: lambda {|obj, changes| do_things }
+        #         the reverse_trigger, when the model change, to render the json
+        #         document and update the objects. the returns is an array of the
+        #         original object to be updated
+        #   - slient: default to false. If silent, then it's not exported by
+        #             default
+        #   - &blk: the render_assoc, default to be: `object#as_indexed_json`. 
+        #         it would use a `map` by default for the has_many relationships
+        def es_register_assoc key_name, relationship: nil, reverse_relationship: nil,
+                              listening_class: nil, reverse_trigger: nil, 
+                              silent: false, &blk
+          key_name = key_name.to_s
+          relationship ||= key_name 
+
+          relationship_getter = case relationship
+                                when String, Symbol
+                                  lambda {|obj| obj.public_send relationship}
+                                when Proc
+                                  relationship
+                                else
+                                  fail "relationsihp can only be empty, String, or Proc, #{relationsihp} given."
+                                end
+
+          single_to_json = blk || lambda do |r|
+            r.respond_to?(:as_indexed_json) ?  r.as_indexed_json : r.as_json
           end
 
-          hashed_attributes.each do |k, v|
-            k = k.to_s
-            json_attribute_registry[k] = v || lambda { |record| record.public_send k }
+          resource_to_json = lambda do |resource| 
+            resource.respond_to?(:map) ? resource.map(&single_to_json) : single_to_json[resource]
           end
-        end
 
-        # default `reverse_relationship_name` to be singular case if not given
-        def es_register_assoc key_name, relationship_name: nil, reverse_relationship_name: nil, &blk
-          key_name = key_name.to_s
-          return json_relationship_registry[key_name] unless blk
+          (silent ? __silent_attribute_registry : __load_attribute_registry )[key_name] = lambda do |record|
+            resource = relationship_getter[record]
+            resource_to_json[resource]
+          end
 
-          relationship_name = key_name unless relationship_name
-          relationship_name = relationship_name.to_s
+          reflection = nil
+          unless listening_class
+            # try to guess reverse class if not given
+            reflection = reflect_on_association relationship
+            listening_class = reflection.class_name.constantize
+          end
 
-          reverse_relationship_name = self.name.demodulize.downcase unless reverse_relationship_name
-          reverse_relationship_name = reverse_relationship_name.to_s
+          reverse_relationship = self.name.demodulize.downcase unless reverse_relationship
 
-          reflection = reflect_on_association relationship_name
+          listening_class.class_eval do
+            # include Elasticsearch::Model unless include? Elasticsearch::Model
+            before_save do |instance|
+              self.instance_variable_set(:@__changed_attributes__, instance.changes)
+            end
 
-          reflected_class = reflection.class_name.constantize
+            after_commit do |instance|
+              changes = instance.instance_variable_get(:@__changed_attributes__)
 
-          actor = Actor.new relationship_name, get_singularity(reflection), blk
-          json_relationship_registry[key_name] = actor
+              Array.wrap(self.public_send reverse_relationship).each do |record|
+                record.es_partial_update(key_name) 
+              end if !reverse_trigger || reverse_trigger[instance, changes]
 
-          reflected_class.class_eval do
-            after_commit do
-              Array.wrap(self.public_send reverse_relationship_name).each do |record|
-                record.es_partial_update(key_name)
-              end
+              instance.remove_instance_variable(:@__changed_attributes__)
             end
           end
         end
 
         def to_indexed_json(record, options = {})
           result = {}
-          exclude_keys = options[:exclude_keys]
-          exclude_keys = [] unless exclude_keys
-          exclude_keys = exclude_keys.map(&:to_s)
+          exclude_keys = (options[:exclude] || []).map(&:to_s)
+          include_keys = (options[:include] || []).map(&:to_s)
 
-          json_attribute_registry.each do |k, blk|
-            k = k.to_s
+          __load_attribute_registry.each do |k, blk|
             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)
+          __silent_attribute_registry.each do |k, blk|
+            next unless include_keys.include? k
+            result[k] = blk[record]
           end
 
           result
         end
 
         private
-        def json_relationship_registry
-          @@__json_actor_registry_ ||= {}
+        def __load_attribute_registry
+          instance_variable_set :@__json_attribute_registry, {} unless instance_variable_defined? :@__json_attribute_registry
+          instance_variable_get :@__json_attribute_registry
         end
-
-        def json_attribute_registry
-          @@__json_attribute_registry ||= {}
+        def __silent_attribute_registry
+          instance_variable_set :@__json_silent_attr_registry, {} unless instance_variable_defined? :@__json_silent_attr_registry
+          instance_variable_get :@__json_silent_attr_registry
         end
 
-        def get_singularity(reflection)
-          case reflection
-            when ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::ThroughReflection,
-                ActiveRecord::Reflection::HasAndBelongsToManyReflection
-            :plural
-          else
-            :singular
+        # attributes is a pair of <key, block>
+        def __es_register_attrs register_hash, attributes
+          hashed_attributes = attributes.extract_options!
+
+          attributes.each do |k|
+            register_hash[k.to_s] = lambda { |record| record.public_send k }
+          end
+
+          hashed_attributes.each do |k, v|
+            register_hash[k.to_s] = v || lambda { |record| record.public_send k }
           end
         end
       end
     end
   end
-end
+end

data/spec/cascade_update_spec.rb

@@ -0,0 +1,157 @@
+require_relative './spec_helper.rb'
+
+RSpec.describe Elasticsearch::Model::CascadeUpdate, type: :model do
+  @@counter = 0
+
+  before do
+    @clz = Article.dup
+    eval("ArticleD#{@@counter} = @clz")
+    @clz.table_name = 'articles'
+
+    @dep_clz = Review.dup
+    eval("ReviewD#{@@counter} = @dep_clz")
+    @dep_clz.table_name = 'reviews'
+
+    @@counter += 1
+
+    review_class = @dep_clz
+    @clz.class_eval do
+      has_many :reviews, class_name: review_class.name, foreign_key: 'article_id', inverse_of: :article
+    end
+
+    article_class = @clz
+    @dep_clz.class_eval do
+      belongs_to :article, class_name: article_class.name, foreign_key: 'article_id', inverse_of: :reviews
+    end
+
+    @clz.__send__ :include, Elasticsearch::Model
+    @clz.__send__ :include, Elasticsearch::Model::Callbacks
+    @clz.__send__ :include, Elasticsearch::Model::CascadeUpdate
+  end
+
+  context 'attrs' do
+    describe 'load'  do
+      before do
+        @clz.class_eval do 
+          es_register_attrs :title, :content
+        end
+
+        @article = @clz.new(title: 'nani', content: 'oops')
+      end
+
+      it { expect(@article.as_indexed_json).to eq({"title"=>"nani", "content"=>"oops"}) }
+    end
+
+    describe 'silent' do
+      before do
+        @clz.class_eval do 
+          es_register_silent_attrs :title
+          es_register_attrs :content, explicit_title: lambda {|o| o.title}
+        end
+
+        @article = @clz.new(title: 'nani', content: 'oops')
+      end
+
+      it { expect(@article.as_indexed_json(include: [:title])).to eq({
+        "explicit_title"=>"nani", "content"=>"oops", "title" => "nani"
+      }) }
+    end
+  end
+
+  context 'assoc' do
+    before do
+      @article = @clz.create!(title: 'nani', content: 'oops')
+      @article.reviews.create!(content: 'review 1')
+      @article.reviews.create!(content: 'review 2')
+    end
+
+    describe 'basis' do
+      before do
+        @clz.class_eval do
+          es_register_assoc :reviews, reverse_relationship: 'article'
+        end
+      end
+
+      it { expect(@article.as_indexed_json).to eq({
+        "reviews"=>[{"id"=>1, "article_id"=>1, "content"=>"review 1", "nonsense"=>nil}, 
+                    {"id"=>2, "article_id"=>1, "content"=>"review 2", "nonsense"=>nil}]
+      }) }
+    end
+
+    describe 'blk passed in' do
+      before do
+        @clz.class_eval do
+          es_register_assoc :reviews, reverse_relationship: 'article' do |review|
+            review.as_json(only: [:content])
+          end
+        end
+      end
+
+      it { expect(@article.as_indexed_json).to eq({
+        "reviews"=>[ {"content"=>"review 1"}, 
+                     {"content"=>"review 2"}]
+      }) }
+    end
+
+    describe 'reverse' do
+      context '#reverse_relationship' do
+        before do
+          @clz.class_eval do
+            es_register_attrs :title
+            es_register_assoc :reviews, reverse_relationship: 'article' do |review|
+              review.as_json(only: [:content])
+            end
+          end
+
+        end
+
+        it do 
+          expect(@article.__elasticsearch__).to receive(:update_document_attributes).with(
+            "reviews"=>[ {"content"=>"review 1"}, 
+                         {"content"=>"review 2 changed"}]
+          )
+
+          @review = @article.reviews[1]
+          @review.content = 'review 2 changed'
+          @review.save!
+        end
+      end
+
+      context '#reverse_trigger' do
+        before do
+          @clz.class_eval do
+            es_register_attrs :title
+            es_register_assoc(:reviews, reverse_relationship: 'article', 
+                              reverse_trigger: lambda {|review, changes| changes.has_key? :content }
+                             ) do |review|
+              review.as_json(only: [:content])
+            end
+          end
+        end
+
+        describe 'include changed key' do
+          it do 
+            expect(@article.__elasticsearch__).to receive(:update_document_attributes).with(
+              "reviews"=>[ {"content"=>"review 1"}, 
+                           {"content"=>"review 2 changed"}]
+            )
+
+            @review = @article.reviews[1]
+            @review.content = 'review 2 changed'
+            @review.save!
+          end
+        end
+
+        describe 'exclude changed key' do
+          it do 
+            expect(@article.__elasticsearch__).to receive(:update_document_attributes).never
+
+            @review = @article.reviews[1]
+            @review.nonsense = 'change does not matter much'
+            @review.save!
+          end
+        end
+      end
+    end
+  end
+end

data/spec/db.rb

@@ -0,0 +1,28 @@
+require 'active_record'
+require 'elasticsearch-rails-dynamic-json-support'
+
+ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
+ActiveRecord::Base.establish_connection( adapter: 'sqlite3', database: ":memory:" )
+ActiveRecord::Schema.define(version: 1) do
+  create_table :articles do |t|
+    t.string :title, null: false
+    t.string :content, null: false
+  end
+
+  create_table :reviews do |t|
+    t.integer :article_id, null: false
+    t.string :content, null: false
+    t.string :nonsense
+  end
+
+  add_index :reviews, :article_id
+end
+
+class Article < ActiveRecord::Base
+  validates_presence_of :title
+  validates_presence_of :content
+end
+
+class Review < ActiveRecord::Base
+  validates_presence_of :content
+end

data/{test/helper.rb → spec/spec_helper.rb}

@@ -14,21 +14,17 @@ end
 ENV["COVERAGE"] && SimpleCov.start do
   add_filter "/.rvm/"
 end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'elasticsearch-rails-dynamic-json-support'
 
-class Test::Unit::TestCase
+require 'rspec'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+
 end
+
+require_relative './db'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails-dynamic-json-support
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Song Yangyu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: elasticsearch-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: elasticsearch-rails
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.9
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-nulldb-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enhance elasticsearch-rails with `elasticsearch_json_changes` to translate
   the attribute changes into document updates
 email: flyfy1@gmail.com
@@ -129,8 +171,9 @@ files:
 - 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
+- spec/cascade_update_spec.rb
+- spec/db.rb
+- spec/spec_helper.rb
 homepage: http://github.com/flyfy1/elasticsearch-rails-dynamic-json-support
 licenses:
 - MIT

data/test/test_elasticsearch-rails-dynamic-json-support.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestElasticsearchRailsDynamicJsonSupport < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end