elasticsearch-model-extensions 0.2.2 → 0.3.0

data/spec/setup/articles_with_comments_and_delayed_jobs.rb

@@ -44,12 +44,10 @@ class ::Article < ActiveRecord::Base
   include Elasticsearch::Model::Extensions::BatchUpdating
   include Elasticsearch::Model::Extensions::PartialUpdating
 
-  DEPENDENT_CUSTOM_ATTRIBUTES = {
-    %w| comments | => %w| num_comments |
-  }
-
   include Elasticsearch::Model::Extensions::DependencyTracking
 
+  tracks_attributes_dependencies %w| comments | => %w| num_comments |
+
   settings index: {number_of_shards: 1, number_of_replicas: 0} do
     mapping do
       indexes :title, type: 'string', analyzer: 'snowball'

data/spec/setup/authors_and_books_with_tags.rb

@@ -0,0 +1,183 @@
+load 'setup/undefine.rb'
+
+require 'elasticsearch/model/extensions/all'
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :authors do |t|
+    t.string :nickname
+    t.datetime :created_at, :default => 'NOW()'
+  end
+
+  create_table :author_profiles do |t|
+    t.integer :author_id
+    t.string :description
+    t.datetime :created_at, :default => 'NOW()'
+  end
+
+  create_table :books do |t|
+    t.integer :author_id
+    t.string :title
+    t.datetime :created_at, :default => 'NOW()'
+  end
+
+  create_table :tags do |t|
+    t.string :taggable_type
+    t.integer :taggable_id
+    t.string :body
+    t.datetime :created_at, :default => 'NOW()'
+    t.datetime :deleted_at, :null => true
+  end
+end
+
+class Author < ActiveRecord::Base
+  has_many :books
+  has_one :profile, class_name: 'AuthorProfile'
+  has_many :tags, as: :taggable
+
+  accepts_nested_attributes_for :books
+  accepts_nested_attributes_for :profile
+  accepts_nested_attributes_for :tags
+
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+  include Elasticsearch::Model::Extensions::IndexOperations
+  include Elasticsearch::Model::Extensions::BatchUpdating
+  include Elasticsearch::Model::Extensions::PartialUpdating
+
+  include Elasticsearch::Model::Extensions::DependencyTracking
+
+  tracks_attributes_dependencies (
+                                   {
+                                     %w| books | => %w| num_books |,
+                                     %w| tags | => %w| num_tags |
+                                   }
+                                 )
+
+  settings index: {number_of_shards: 1, number_of_replicas: 0} do
+    mapping do
+      indexes :nickname, type: 'string', analyzer: 'snowball', include_in_all: true
+      indexes :created_at, type: 'date'
+      indexes :books, type: 'object' do
+        indexes :title, type: 'string', include_in_all: true
+      end
+      indexes :profile, type: 'object' do
+        indexes :description, type: 'string', include_in_all: true
+      end
+      indexes :tags, type: 'object' do
+        indexes :body, type: 'string', include_in_all: true
+      end
+      indexes :num_books, type: 'long'
+      indexes :num_tags, type: 'long'
+    end
+  end
+
+  def num_books
+    books.count
+  end
+
+  def num_tags
+    tags.count
+  end
+
+  # Required by AuthorProfile's `OuterDocumentUpdating`
+  include Elasticsearch::Model::Extensions::MappingReflection
+end
+
+class ::AuthorProfile < ActiveRecord::Base
+  belongs_to :author
+end
+
+class ::Book < ActiveRecord::Base
+  belongs_to :author
+  has_many :tags, as: :taggable
+
+  accepts_nested_attributes_for :tags
+
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+  include Elasticsearch::Model::Extensions::IndexOperations
+  include Elasticsearch::Model::Extensions::BatchUpdating
+  include Elasticsearch::Model::Extensions::PartialUpdating
+  include Elasticsearch::Model::Extensions::OuterDocumentUpdating
+
+  include Elasticsearch::Model::Extensions::DependencyTracking
+
+  tracks_attributes_dependencies %w| tags | => %w| num_tags |
+
+  settings index: {number_of_shards: 1, number_of_replicas: 0} do
+    mapping do
+      indexes :title, type: 'string', analyzer: 'snowball', include_in_all: true
+      indexes :created_at, type: 'date'
+      indexes :tags, type: 'object' do
+        indexes :body, type: 'string', include_in_all: true
+      end
+      indexes :num_tags, type: 'long'
+    end
+  end
+
+  def num_tags
+    tags.count
+  end
+
+  # Required by Review's `OuterDocumentUpdating`
+  include Elasticsearch::Model::Extensions::MappingReflection
+
+  partially_updates_document_of ::Author, records_to_update_documents: -> book { Author.find(book.author_id) } do |t, changed_fields|
+    t.partially_update_document(*changed_fields)
+  end
+end
+
+class ::Tag < ActiveRecord::Base
+  belongs_to :taggable, polymorphic: true
+
+  default_scope { where(arel_table[:deleted_at].eq(nil)) }
+
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Extensions::IndexOperations
+  include Elasticsearch::Model::Extensions::BatchUpdating
+  include Elasticsearch::Model::Extensions::PartialUpdating
+  include Elasticsearch::Model::Extensions::OuterDocumentUpdating
+
+  def assigned_to_author?
+    taggable_type == 'Author'
+  end
+
+  def assigned_to_book?
+    taggable_type == 'Book'
+  end
+
+  partially_updates_document_of ::Book, records_to_update_documents: -> tag { Book.find(tag.taggable_id) } do |t, changed_fields|
+    t.partially_update_document(*changed_fields)
+  end
+
+  partially_updates_document_of ::Author, records_to_update_documents: -> tag { Author.find(tag.taggable_id) } do |t, changed_fields|
+    t.partially_update_document(*changed_fields)
+  end
+end
+
+Book.delete_all
+Book.__elasticsearch__.create_index! force: true
+
+Author.delete_all
+Author.__elasticsearch__.create_index! force: true
+
+Author.create! nickname: 'Mikoto',
+               books_attributes: [
+                 {title: 'Test', tags_attributes: [{body: 'testing'}]}
+               ],
+               tags_attributes: [
+                 {body: 'testing'}
+               ]
+
+Author.create! nickname: 'Kuroko',
+               books_attributes: [
+                 {title: 'Code & Test', tags_attributes: [{body: 'testing'}, {body: 'coding'}]},
+                 {title: 'Code', tags_attributes: [{body: 'coding'}]}
+               ],
+               tags_attributes: [
+                 {body: 'testing'},
+                 {body: 'coding'}
+               ]
+
+Book.__elasticsearch__.refresh_index!
+Author.__elasticsearch__.refresh_index!

data/spec/setup/sqlite.rb

@@ -1,7 +1,7 @@
 require 'active_record'
 require 'logger'
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => "test.db")
 logger = ::Logger.new(STDERR)
 logger.formatter = lambda { |s, d, p, m| "\e[2;36m#{m}\e[0m\n" }
 ActiveRecord::Base.logger = logger unless ENV['QUIET']

data/spec/setup/undefine.rb

@@ -1,7 +1,7 @@
-if defined? ::Article
-  Object.send(:remove_const, :Article)
-end
-
-if defined? ::Comment
-  Object.send(:remove_const, :Comment)
+# Required to clear classes defined in `load 'setup/*.rb'` to make subsequent `load 'setup/*.rb'` to work correctly.
+%i| Article Comment AuthorProfile Author Tag Book |.each do |class_name|
+  if Object.const_defined?(class_name)
+    Object.send(:remove_const, class_name)
+    STDERR.puts "Undefined #{class_name}"
+  end
 end

data/spec/spec_helper.rb

@@ -40,4 +40,10 @@ RSpec.configure do |config|
       example.run
     end
   end
+
+  config.before(:each) do |s|
+    md = s.metadata
+    x = md[:example_group]
+    STDERR.puts "==>>> #{x[:file_path]}:#{x[:line_number]} #{md[:description_args]}"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,9 +54,15 @@ files:
 - README.md
 - Rakefile
 - elasticsearch-model-extensions.gemspec
+- gemfiles/rails41.gemfile
+- gemfiles/rails41.gemfile.lock
 - lib/elasticsearch/model/extensions.rb
 - lib/elasticsearch/model/extensions/all.rb
+- lib/elasticsearch/model/extensions/association_path_finding/association_path_finder.rb
+- lib/elasticsearch/model/extensions/association_path_finding/mapping_node.rb
+- lib/elasticsearch/model/extensions/association_path_finding/shortest_path.rb
 - lib/elasticsearch/model/extensions/batch_updating.rb
+- lib/elasticsearch/model/extensions/batch_updating/batch_updater.rb
 - lib/elasticsearch/model/extensions/callback.rb
 - lib/elasticsearch/model/extensions/configuration.rb
 - lib/elasticsearch/model/extensions/delayed_job.rb
@@ -65,15 +71,19 @@ files:
 - lib/elasticsearch/model/extensions/delayed_job/index_document_job.rb
 - lib/elasticsearch/model/extensions/delayed_job/partially_update_document_job.rb
 - lib/elasticsearch/model/extensions/dependency_tracking.rb
+- lib/elasticsearch/model/extensions/dependency_tracking/dependency_tracker.rb
 - lib/elasticsearch/model/extensions/destroy_callback.rb
 - lib/elasticsearch/model/extensions/index_operations.rb
-- lib/elasticsearch/model/extensions/mapping_node.rb
 - lib/elasticsearch/model/extensions/mapping_reflection.rb
+- lib/elasticsearch/model/extensions/mapping_reflection/mapping_reflector.rb
 - lib/elasticsearch/model/extensions/outer_document_updating.rb
 - lib/elasticsearch/model/extensions/partial_updating.rb
-- lib/elasticsearch/model/extensions/shortest_path.rb
+- lib/elasticsearch/model/extensions/partial_updating/partial_updater.rb
+- lib/elasticsearch/model/extensions/proxy.rb
 - lib/elasticsearch/model/extensions/update_callback.rb
 - lib/elasticsearch/model/extensions/version.rb
+- spec/batch_updating/batch_updater_spec.rb
+- spec/batch_updating_spec.rb
 - spec/example/articles_with_comments.rb
 - spec/integration_spec.rb
 - spec/outer_document_updating_spec.rb
@@ -81,9 +91,11 @@ files:
 - spec/setup/articles.rb
 - spec/setup/articles_with_comments.rb
 - spec/setup/articles_with_comments_and_delayed_jobs.rb
+- spec/setup/authors_and_books_with_tags.rb
 - spec/setup/elasticsearch/model.rb
 - spec/setup/elasticsearch/start.rb
 - spec/setup/elasticsearch/stop.rb
+- spec/setup/items_and_categories.rb
 - spec/setup/sqlite.rb
 - spec/setup/undefine.rb
 - spec/spec_helper.rb
@@ -114,6 +126,8 @@ summary: A set of extensions for elasticsearch-model which aims to ease the burd
   of things like re-indexing, verbose/complex mapping that you may face once you started
   using elasticsearch seriously.
 test_files:
+- spec/batch_updating/batch_updater_spec.rb
+- spec/batch_updating_spec.rb
 - spec/example/articles_with_comments.rb
 - spec/integration_spec.rb
 - spec/outer_document_updating_spec.rb
@@ -121,9 +135,11 @@ test_files:
 - spec/setup/articles.rb
 - spec/setup/articles_with_comments.rb
 - spec/setup/articles_with_comments_and_delayed_jobs.rb
+- spec/setup/authors_and_books_with_tags.rb
 - spec/setup/elasticsearch/model.rb
 - spec/setup/elasticsearch/start.rb
 - spec/setup/elasticsearch/stop.rb
+- spec/setup/items_and_categories.rb
 - spec/setup/sqlite.rb
 - spec/setup/undefine.rb
 - spec/spec_helper.rb

data/lib/elasticsearch/model/extensions/mapping_node.rb

@@ -1,65 +0,0 @@
-require_relative 'shortest_path'
-
-module Elasticsearch
-  module Model
-    module Extensions
-      class MappingNode < ShortestPath::Node
-        def self.from_class(klass)
-          name = klass.document_type.intern
-
-          new(klass: klass, name: name, mapping: klass.mapping.to_hash[name])
-        end
-
-        def initialize(klass:, name:, mapping:, through_class:nil)
-          @klass = klass
-          @name = name
-          @mapping = mapping
-          @through_class = through_class
-        end
-
-        def name
-          @name
-        end
-
-        def relates_to_class?(klass)
-          @klass == klass || @through_class == klass
-        end
-
-        def klass
-          @klass
-        end
-
-        def through_class
-          @through_class
-        end
-
-        def each(&block)
-          associations = @klass.reflect_on_all_associations
-
-          props = @mapping[:properties]
-          fields = props.keys
-
-          edges = fields.map { |f|
-            a = associations.find { |a| a.name == f }
-
-            if a && a.options[:polymorphic] != true
-              through_class = if a.options[:through]
-                                a.options[:through].to_s.classify.constantize
-                              end
-
-              dest = MappingNode.new(klass: a.class_name.constantize, name: f.to_s.pluralize.intern, mapping: props[f], through_class: through_class)
-
-              edge_class.new(name: f, destination: dest)
-            end
-          }.reject(&:nil?)
-
-          if block.nil?
-            edges
-          else
-            edges.each(&block)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/elasticsearch/model/extensions/shortest_path.rb

@@ -1,106 +0,0 @@
-module Elasticsearch
-  module Model
-    module Extensions
-      class ShortestPath
-        MAX_DEPTH = 5
-
-        class Node
-          include Enumerable
-
-          def each(&block)
-            raise "A required method #{self.class}#each is not implemented."
-          end
-
-          def name
-            raise "A required method #{self.class}#name is not implemented."
-          end
-
-          def each_with_name(&block)
-            iterator = each.lazy.map do |edge|
-              [edge, edge.name]
-            end
-
-            if block.nil?
-              iterator
-            else
-              iterator.each(&block)
-            end
-          end
-
-          def hash
-            name.hash
-          end
-
-          def eql?(other)
-            self.class == other.class && (name.eql? other.name)
-          end
-
-          def edge_class
-            ShortestPath::Edge
-          end
-
-          def breadth_first_search(&block)
-            ShortestPath.breadth_first_search self, &block
-          end
-        end
-
-        class Edge
-          def initialize(name:, destination:)
-            @name = name
-            @destination = destination
-          end
-
-          def name
-            @name
-          end
-
-          def destination
-            @destination
-          end
-        end
-
-        module ClassMethods
-          def breadth_first_search(node, &block)
-            original_paths = node.each.map { |e| [e] }
-            paths = original_paths
-
-            depth = 0
-
-            loop {
-              a = paths.select { |p|
-                if block.call(p.last)
-                  p
-                end
-              }
-
-              return a if a.size != 0
-              raise RuntimeError, 'Maximum depth exceeded while calculating the shortest path' if depth >= Elasticsearch::Model::Extensions::ShortestPath::MAX_DEPTH
-
-              paths = paths.flat_map { |p|
-                p.last.destination.each.map { |e|
-                  p + [e]
-                }
-              }
-
-              depth += 1
-            }
-          end
-
-          def depth_first_search(node, &block)
-            node.each.select do |edge|
-              if block.call(edge)
-                [[edge]]
-              else
-                depth_first_search(edge.destination, &block).map do |path|
-                  [edge] + path
-                end
-              end
-            end
-          end
-        end
-
-        extend ClassMethods
-      end
-    end
-  end
-end