elasticsearch-model-extensions 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 230f4b0043c57c9df059dbf2e374a04f4d1c664d
-  data.tar.gz: ed147cfd9c46fd23479c3c172669a30c9f4cb55d
+  metadata.gz: 187c414c19b2a65be386cf8c75eb4ee039440b2f
+  data.tar.gz: 18ef824732bed168ee717707eba28d5717418cde
 SHA512:
-  metadata.gz: ccfbe7336e23b8b8ce8c50127181cbbe3c44cbd66ef165a7a58a777c23e84c84540ab17b54d755b3d65a2cc8b2896ce7efe0751672a11432c716664965d06dc6
-  data.tar.gz: ff730a3b4d8de0ee4350f3fbb5d8fabc34dd8c77105d0f2182b1042e38d92e659a524392c6c2bb0b0cb2c1e280a8d892800db0ce55188afe1750118865e962c3
+  metadata.gz: 6c8f14d33a0eb2e91ac6c8aaaa3de81a598e3593fc016690c99ec74e21acde23bdf82d14626ce8829f3aa05361f2398a04e0fee068001a4a5b22537524c8c6bf
+  data.tar.gz: 69cc264beccef5a22492fe67597a843af325db385e56303739e4a09a51fc896f6a22b73a7799115b692370914a8d2bd1d660986ada30a8f3de7c1d2a8fdbce43

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elasticsearch-model-extensions.gemspec
 gemspec
+
+group :test do
+  gem 'rspec', '~> 3.1.0'
+  gem 'activerecord', '~> 3.2'
+  gem 'sqlite3'
+  gem 'elasticsearch-model'
+end

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

@@ -0,0 +1,5 @@
+require_relative 'index_operations'
+require_relative 'batch_updating'
+require_relative 'dependency_tracking'
+require_relative 'outer_document_updating'
+require_relative 'partial_updating'

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

@@ -4,13 +4,14 @@ module Elasticsearch
       class Configuration
         attr_reader :delayed
 
-        def initialize(active_record_class, parent_class: parent_class, delayed:, if: -> r { true }, records_to_update_documents: nil)
+        def initialize(active_record_class, parent_class: parent_class, delayed:, only_if: -> r { true }, records_to_update_documents: nil, field_to_update: nil)
           @delayed = @delayed
 
           @active_record_class = active_record_class
           @parent_class = parent_class
-          @if = binding.local_variable_get(:if)
+          @if = binding.local_variable_get(:only_if)
           @records_to_update_documents = records_to_update_documents
+          @field_to_update = field_to_update
         end
 
         def to_hash
@@ -38,13 +39,15 @@ module Elasticsearch
         def build_hash
           child_class = @active_record_class
 
-          path = child_class.path_from(@parent_class)
-          parent_to_child_path = path.map(&:name)
+          field_to_update = -> {
+            path = child_class.path_from(@parent_class)
+            parent_to_child_path = path.map(&:name)
 
-          # a has_a b has_a cという関係のとき、cが更新されたらaのフィールドbをupdateする必要がある。
-          # そのとき、
-          # 親aから子cへのパスが[:b, :c]だったら、bだけをupdateすればよいので
-          field_to_update = parent_to_child_path.first
+            # a has_a b has_a cという関係のとき、cが更新されたらaのフィールドbをupdateする必要がある。
+            # そのとき、
+            # 親aから子cへのパスが[:b, :c]だったら、bだけをupdateすればよいので
+            parent_to_child_path.first
+          }.call || @field_to_update
 
           puts "#{child_class.name} updates #{@parent_class.name}'s #{field_to_update}"
 

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

@@ -104,20 +104,26 @@ module Elasticsearch
               first
           end
 
-          def initialize_active_record!(active_record_class, parent_class: parent_class, delayed:, if: -> r { true }, records_to_update_documents: nil)
-            config = Elasticsearch::Model::Extensions::Configuration.new(active_record_class, parent_class: parent_class, delayed: delayed, if: binding.local_variable_get(:if), records_to_update_documents: records_to_update_documents)
+          def initialize_active_record!(active_record_class, parent_class: parent_class, delayed:, only_if: -> r { true }, records_to_update_documents: nil, field_to_update: nil)
+            config = Elasticsearch::Model::Extensions::Configuration.new(active_record_class, parent_class: parent_class, delayed: delayed, only_if: binding.local_variable_get(:only_if), records_to_update_documents: records_to_update_documents,
+            field_to_update: field_to_update)
 
             active_record_class.after_commit Elasticsearch::Model::Extensions::UpdateCallback.new(config)
             active_record_class.after_commit Elasticsearch::Model::Extensions::DestroyCallback.new(config), on: :destroy
           end
 
-          def partially_updates_document_of(parent_class, delayed:, if: -> r { true }, records_to_update_documents: nil)
+          def partially_updates_document_of(parent_class, options)
+            options ||= {}
+            delayed = options[:delayed] || nil
+            only_if = options[:if] || (-> r { true })
+            records_to_update_documents = options[:records_to_update_documents] || nil
+
             initialize_active_record!(
               self,
-              parent_class: parent_class,
-              delayed: delayed,
-              if: binding.local_variable_get(:if),
-              records_to_update_documents: records_to_update_documents
+              :parent_class => parent_class,
+              :delayed => delayed,
+              :only_if => only_if,
+              :records_to_update_documents => records_to_update_documents
             )
           end
 

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

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Model
     module Extensions
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/spec/integration_spec.rb

@@ -0,0 +1,46 @@
+require 'elasticsearch/model/extensions/all'
+
+RSpec.describe 'example' do
+  before :all do
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :articles do |t|
+        t.string :title
+        t.datetime :created_at, :default => 'NOW()'
+      end
+    end
+
+    class ::Article < ActiveRecord::Base
+      include Elasticsearch::Model
+      include Elasticsearch::Model::Callbacks
+      include Elasticsearch::Model::Extensions::IndexOperations
+      include Elasticsearch::Model::Extensions::BatchUpdating
+      include Elasticsearch::Model::Extensions::PartialUpdating
+
+      DEPENDENT_CUSTOM_ATTRIBUTES = {}
+
+      include Elasticsearch::Model::Extensions::DependencyTracking
+
+      settings index: {number_of_shards: 1, number_of_replicas: 0} do
+        mapping do
+          indexes :title, type: 'string', analyzer: 'snowball'
+          indexes :created_at, type: 'date'
+        end
+      end
+    end
+
+    Article.delete_all
+    Article.__elasticsearch__.create_index! force: true
+
+    ::Article.create! title: 'Test'
+    ::Article.create! title: 'Testing Coding'
+    ::Article.create! title: 'Coding'
+
+    Article.__elasticsearch__.refresh_index!
+  end
+
+  subject {
+    ::Article.create(title: 'foo', created_at: Time.now)
+  }
+
+  it { is_expected.not_to be_nil }
+end

data/spec/spec_helper.rb

@@ -0,0 +1,35 @@
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.profile_examples = 10
+
+  config.order = :random
+
+  Kernel.srand config.seed
+
+  config.before(:all) do
+    require 'active_record'
+    require 'logger'
+    require 'elasticsearch/model'
+
+    ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
+    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']
+
+    ActiveRecord::LogSubscriber.colorize_logging = false
+    ActiveRecord::Migration.verbose = false
+
+    tracer = ::Logger.new(STDERR)
+    tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }}\n" }
+
+    Elasticsearch::Model.client = Elasticsearch::Client.new host: "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9250)}",
+                                                            tracer: (ENV['QUIET'] ? nil : tracer)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - Rakefile
 - elasticsearch-model-extensions.gemspec
 - lib/elasticsearch/model/extensions.rb
+- lib/elasticsearch/model/extensions/all.rb
 - lib/elasticsearch/model/extensions/batch_updating.rb
 - lib/elasticsearch/model/extensions/callback.rb
 - lib/elasticsearch/model/extensions/configuration.rb
@@ -66,6 +67,8 @@ files:
 - lib/elasticsearch/model/extensions/shortest_path.rb
 - lib/elasticsearch/model/extensions/update_callback.rb
 - lib/elasticsearch/model/extensions/version.rb
+- spec/integration_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/crowdworks/elasticsearch-model-extensions
 licenses:
 - MIT
@@ -92,4 +95,6 @@ specification_version: 4
 summary: A set of extensions for elasticsearch-model which aims to ease the burden
   of things like re-indexing, verbose/complex mapping that you may face once you started
   using elasticsearch seriously.
-test_files: []
+test_files:
+- spec/integration_spec.rb
+- spec/spec_helper.rb