chewy 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 366a83f019d42b9edab700ebfa189d949f5937fb
-  data.tar.gz: 65c60e5fa14b6f96b9cd13e49ba752ad64b7a271
+  metadata.gz: 99f0c4b83cadcf35bdf475f7f68e16120ed4674d
+  data.tar.gz: b9653b8e9bfb3e2e8f8b98662495f13a6b2d56e8
 SHA512:
-  metadata.gz: dbee3534a08ddc5c0a3080d159602c1d1d334657abc321f5ef87fdfdc2729e13a97febd9686193f578b1845b083556893865df05dbd058cfa9874819af46d3b8
-  data.tar.gz: 0257820ba35319dc0b8a1bd9b21f15acec62ca57701abbf35a49f0fc37a5999ee0875fc8dc043d1bc844a44ca0b7f36b636c3408ff2db01d35e78124e229b4e1
+  metadata.gz: 7c28d1f97d185c70c986c4d7250e566bb196adc2f7230a7ff76939e3cbc589fabcb0a4ac6b26fe80ec267ec6c7d6a80cea766f4ea5fb6d67dd6cc76b47038cf1
+  data.tar.gz: b1418935e1d6bff9e2fc93676ac8d93ee4f4c6a3ee30e1a5371781e1004adf1cddd24fd326f8a368fc692823a5a96464a555c14de82c8e1117a1dbaf0cc3a6da

data/.travis.yml

@@ -5,7 +5,8 @@ services:
 rvm:
   - 2.0
   - 2.1
-  - 2.2
+  - 2.2.3
+  - 2.3.0
   # - rbx
 gemfile:
   - gemfiles/rails.3.2.activerecord.gemfile
@@ -20,24 +21,55 @@ gemfile:
   - gemfiles/rails.4.2.activerecord.gemfile
   - gemfiles/rails.4.2.activerecord.kaminari.gemfile
   - gemfiles/rails.4.2.activerecord.will_paginate.gemfile
-  - gemfiles/rails.4.0.mongoid.gemfile
-  - gemfiles/rails.4.0.mongoid.kaminari.gemfile
-  - gemfiles/rails.4.0.mongoid.will_paginate.gemfile
-  - gemfiles/rails.4.1.mongoid.gemfile
-  - gemfiles/rails.4.1.mongoid.kaminari.gemfile
-  - gemfiles/rails.4.1.mongoid.will_paginate.gemfile
-  - gemfiles/rails.4.2.mongoid.gemfile
-  - gemfiles/rails.4.2.mongoid.kaminari.gemfile
-  - gemfiles/rails.4.2.mongoid.will_paginate.gemfile
-  - gemfiles/sequel.4.28.gemfile
+  - gemfiles/rails.5.0.0.beta3.activerecord.gemfile
+  - gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile
+  - gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile
+  - gemfiles/rails.4.0.mongoid.4.0.0.gemfile
+  - gemfiles/rails.4.0.mongoid.4.0.0.kaminari.gemfile
+  - gemfiles/rails.4.0.mongoid.4.0.0.will_paginate.gemfile
+  - gemfiles/rails.4.0.mongoid.5.1.0.gemfile
+  - gemfiles/rails.4.0.mongoid.5.1.0.kaminari.gemfile
+  - gemfiles/rails.4.0.mongoid.5.1.0.will_paginate.gemfile
+  - gemfiles/rails.4.1.mongoid.4.0.0.gemfile
+  - gemfiles/rails.4.1.mongoid.4.0.0.kaminari.gemfile
+  - gemfiles/rails.4.1.mongoid.4.0.0.will_paginate.gemfile
+  - gemfiles/rails.4.1.mongoid.5.1.0.gemfile
+  - gemfiles/rails.4.1.mongoid.5.1.0.kaminari.gemfile
+  - gemfiles/rails.4.1.mongoid.5.1.0.will_paginate.gemfile
+  - gemfiles/rails.4.2.mongoid.4.0.0.gemfile
+  - gemfiles/rails.4.2.mongoid.4.0.0.kaminari.gemfile
+  - gemfiles/rails.4.2.mongoid.4.0.0.will_paginate.gemfile
+  - gemfiles/rails.4.2.mongoid.5.1.0.gemfile
+  - gemfiles/rails.4.2.mongoid.5.1.0.kaminari.gemfile
+  - gemfiles/rails.4.2.mongoid.5.1.0.will_paginate.gemfile
+  - gemfiles/sequel.4.31.gemfile
+
 matrix:
   exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/rails.5.0.0.beta3.activerecord.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails.5.0.0.beta3.activerecord.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails.5.0.0.beta3.activerecord.kaminari.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails.5.0.0.beta3.activerecord.will_paginate.gemfile
     - rvm: 2.2
       gemfile: gemfiles/rails.3.2.activerecord.gemfile
     - rvm: 2.2
       gemfile: gemfiles/rails.3.2.activerecord.kaminari.gemfile
     - rvm: 2.2
       gemfile: gemfiles/rails.3.2.activerecord.will_paginate.gemfile
+    - rvm: 2.3
+      gemfile: gemfiles/rails.3.2.activerecord.gemfile
+    - rvm: 2.3
+      gemfile: gemfiles/rails.3.2.activerecord.kaminari.gemfile
+    - rvm: 2.3
+      gemfile: gemfiles/rails.3.2.activerecord.will_paginate.gemfile
 before_install:
   - curl -# https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.2.tar.gz | tar xz -C /tmp
 before_script:

data/Appraisals

@@ -22,28 +22,55 @@
   end
 end
 
-%w(4.0 4.1 4.2).each do |version|
-  appraise "rails.#{version}.mongoid" do
-    gem 'mongoid', '~> 4.0.0'
-    gem 'activesupport', "~> #{version}.0"
+'5.0.0.beta3'.tap do |version|
+  appraise "rails.#{version}.activerecord" do
+    gem 'activerecord', "~> #{version}"
+    gem 'activesupport', "~> #{version}"
+    gem 'activejob', "~> #{version}"
     gem 'resque', require: false
     gem 'sidekiq', require: false
   end
 
-  appraise "rails.#{version}.mongoid.kaminari" do
-    gem 'mongoid', '~> 4.0.0'
-    gem 'activesupport', "~> #{version}.0"
+  appraise "rails.#{version}.activerecord.kaminari" do
+    gem 'activerecord', "~> #{version}"
+    gem 'activesupport', "~> #{version}"
+    gem 'activejob', "~> #{version}"
+    gem 'actionpack', "~> #{version}"
     gem 'kaminari', '0.16.3', require: false
   end
 
-  appraise "rails.#{version}.mongoid.will_paginate" do
-    gem 'mongoid', '~> 4.0.0'
-    gem 'activesupport', "~> #{version}.0"
+  appraise "rails.#{version}.activerecord.will_paginate" do
+    gem 'activerecord', "~> #{version}"
+    gem 'activesupport', "~> #{version}"
+    gem 'activejob', "~> #{version}" if version >= '4.2'
     gem 'will_paginate', require: false
   end
 end
 
-appraise "sequel.4.28" do
-  gem 'sequel', "~> 4.28.0"
+%w(4.0 4.1 4.2).each do |activesupport|
+  %w(4.0.0 5.1.0).each do |mongoid|
+    appraise "rails.#{activesupport}.mongoid.#{mongoid}" do
+      gem 'mongoid', "> #{mongoid}"
+      gem 'activesupport', "~> #{activesupport}.0"
+      gem 'resque', require: false
+      gem 'sidekiq', require: false
+    end
+
+    appraise "rails.#{activesupport}.mongoid.#{mongoid}.kaminari" do
+      gem 'mongoid', "> #{mongoid}"
+      gem 'activesupport', "~> #{activesupport}.0"
+      gem 'kaminari', '0.16.3', require: false
+    end
+
+    appraise "rails.#{activesupport}.mongoid.#{mongoid}.will_paginate" do
+      gem 'mongoid', "> #{mongoid}"
+      gem 'activesupport', "~> #{activesupport}.0"
+      gem 'will_paginate', require: false
+    end
+  end
+end
+
+appraise "sequel.4.31" do
+  gem 'sequel', "~> 4.31.0"
   gem 'activesupport', '~> 4.2.0'
 end

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # master
 
+## Changes
+
+  * Brand new import `:bulk_size` option, set desired ElasticSearch bulk size in bytes
+
+  * Witchcraft™ technology
+
+  * Configurable per-type default import options (@barthez, #341)
+
+  * Various codebase optimizations (@DNNX, @pyromaniac)
+
+  * `update_index` Rspec matcher messages improvements
+
+  * `:all` rake tasks deprecation
+
+  * Scoped notification subscriptions in rake tasks (@0x0badc0de, #335)
+
+  * Async strategies workers accept options (@dnd, #321)
+
+  * Prefix is configurable per-index (@mikeyhogarth, #314)
+
+  * Ability to pass proc for transport configuration (@feymartynov, @reidab, #302, #339)
+
+  * ElasticSearch 2 support (@sergeygaychuk, #297)
+
+  * Accessing types with methods is deprecated. Use `MyIndex::MyType` constant reference instead of `MyIndex.my_type` method.
+
+  * Sequel adapter improvements (@mrbrdo, #294)
+
+## Bugfixes
+
+  * Mongoid atomic strategy fix (#325)
+
+  * Method missing fix (@jesjos, #324)
+
+  * Hash fields composition fix (@eproulx-petalmd, #319)
+
+  * Better errors handling in strategies (@barthez, #306)
+
+  * Assets strategies silencer fix for Rails 5 API mode (@clupprich, #303)
+
+# Version 0.8.3
+
 ## Changes
 
   * Sequel support completely reworked to use common ORM implementations + better sequel specs covarage.

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-# gem 'activerecord'
+gem 'activerecord'
 # gem 'mongoid'
 # gem 'sequel'
 

data/README.md

@@ -236,6 +236,23 @@ See [config.rb](lib/chewy/config.rb) for more details.
   User.plugin :chewy_observe           # just for User
   ```
 
+### Type default import options
+
+Every type has `default_import_options` configuration to specify, suddenly, default import options:
+
+```ruby
+class ProductsIndex < Chewy::Index
+  define_type Post.includes(:tags) do
+    default_import_options batch_size: 100, bulk_size: 10.megabytes, refresh: false
+
+    field :name
+    field :tags, value: -> { tags.map(&:name) }
+  end
+end
+```
+
+See [import.rb](lib/chewy/type/import.rb) for available options.
+
 ### Multi (nested) and object field types
 
 To define an objects field you can simply nest fields in the DSL:
@@ -253,7 +270,7 @@ To define a multi field you have to specify any type except for `object` or `nes
 
 ```ruby
 field :full_name, type: 'string', value: ->{ full_name.strip } do
-  field :ordered, analyzer: `ordered`
+  field :ordered, analyzer: 'ordered'
   field :untouched, index: 'not_analyzed'
 end
 ```
@@ -310,7 +327,7 @@ Then you can replace Rails associations with Chewy Crutches™ technology:
 
 ```ruby
 class ProductsIndex < Chewy::Index
-  define_type Product.includes(:categories) do
+  define_type Product do
     crutch :categories do |collection| # collection here is a current batch of products
       # data is fetched with a lightweight query without objects initialization
       data = ProductCategory.joins(:category).where(product_id: collection.map(&:id)).pluck(:product_id, 'categories.name')
@@ -343,6 +360,43 @@ end
 
 So Chewy Crutches™ technology is able to increase your indexing performance in some cases up to a hundredfold or even more depending on your associations complexity.
 
+### Witchcraft™ technology
+
+One more experimental technology to increase import performance. As far as you know, chewy defines value proc for every imported field in mapping, so at the import time each of this procs is executed on imported object to extract result document to import. It would be great for performance to use one huge whole-document-returning proc instead. So basically the idea or Witchcraft™ technology is to compile a single document-returning proc from the type definition.
+
+```ruby
+define_type Product do
+  witchcraft!
+
+  field :title
+  field :tags, value: -> { tags.map(&:name) }
+  field :categories do
+    field :name, value: -> (product, category) { category.name }
+    field :type, value: -> (product, category, crutch) { crutch.types[category.name] }
+  end
+end
+```
+
+The type definition above will be compiled to something close to:
+
+```ruby
+-> (object, crutches) do
+  {
+    title: object.title,
+    tags: object.tags.map(&:name),
+    categories: object.categories.map do |object2|
+      {
+        name: object2.name
+        type: crutches.types[object2.name]
+      }
+    end
+  }
+end
+```
+
+And don't even ask how is it possible, it is a witchcraft.
+Obviously not every type of definition might be compiled, so use reasonable formatting to make `method_source` be able to extract field value proc sources. Also value procs with splat arguments are not supported right now. However, it is quite possible that your type definition will be supported by Witchcraft™ technology out of the box in the most of the cases.
+
 ### Types access
 
 You can access index-defined types with the following API:
@@ -350,7 +404,6 @@ You can access index-defined types with the following API:
 ```ruby
 UsersIndex::User # => UsersIndex::User
 UsersIndex.type_hash['user'] # => UsersIndex::User
-UsersIndex.user # => UsersIndex::User
 UsersIndex.types # => [UsersIndex::User]
 UsersIndex.type_names # => ['user']
 ```
@@ -514,7 +567,7 @@ There are a couple of predefined strategies for your Rails application. Initiall
 
 Migrations are wrapped with the `:bypass` strategy. Because the main behavior implies that indices are reset after migration, there is no need for extra index updates. Also indexing might be broken during migrations because of the outdated schema.
 
-Controller actions are wrapped with the `:atomic` strategy with middleware just to reduce the number of index update requests inside actions.
+Controller actions are wrapped with the configurable value of `Chewy.request_strategy` and defaults to `:atomic`. This is done at the middleware level to reduce the number of index update requests inside actions.
 
 It is also a good idea to set up the `:bypass` strategy inside your test suite and import objects manually only when needed, and use `Chewy.massacre` when needed to flush test ES indices before every example. This will allow you to minimize unnecessary ES requests and reduce overhead.
 
@@ -920,9 +973,9 @@ avg_johns_rating = all_johns.aggs
 ```
 
 It is possible to run into collisions between named aggregations. This occurs when there is more than one aggregation
- with the same name. To explicitly reference an aggregation you provide a string to the #aggs method of the form: 
+ with the same name. To explicitly reference an aggregation you provide a string to the #aggs method of the form:
  `index_name#document_type.aggregation_name`
- 
+
 Consider this example where there are two separate aggregations named `avg_rating`
 
 ```ruby
@@ -949,7 +1002,7 @@ end
 
 all_docs = UsersIndex.filter {match_all}.aggs("users#user.avg_rating")
 all_docs.aggs
-# => {"users#user.avg_rating"=>{"value"=>3.5}} 
+# => {"users#user.avg_rating"=>{"value"=>3.5}}
 ```
 
 ### Script fields

data/chewy.gemspec

@@ -8,27 +8,34 @@ Gem::Specification.new do |spec|
   spec.version       = Chewy::VERSION
   spec.authors       = ['pyromaniac']
   spec.email         = ['kinwizard@gmail.com']
-  spec.summary       = %q{Elasticsearch ODM client wrapper}
-  spec.description   = %q{Chewy provides functionality for Elasticsearch index handling, documents import mappings and chainable query DSL}
+  spec.summary       = 'Elasticsearch ODM client wrapper'
+  spec.description   = 'Chewy provides functionality for Elasticsearch index handling, documents import mappings and chainable query DSL'
   spec.homepage      = 'https://github.com/toptal/chewy'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($RS)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.4.0'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rspec-collection_matchers'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'database_cleaner', '~> 1.3.0'
+  spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'elasticsearch-extensions'
   spec.add_development_dependency 'resque_spec'
   spec.add_development_dependency 'rubysl', '~> 2.0' if RUBY_ENGINE == 'rbx'
 
+  spec.add_development_dependency 'method_source'
+  if RUBY_VERSION < '2.1.0'
+    spec.add_development_dependency 'unparser', '0.2.4'
+  else
+    spec.add_development_dependency 'unparser'
+  end
+
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'elasticsearch', '>= 1.0.0'
 end

data/gemfiles/{rails.4.0.mongoid.gemfile → rails.4.0.mongoid.4.0.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0"
+gem "mongoid", "> 4.0.0"
 gem "activesupport", "~> 4.0.0"
 gem "resque", :require => false
 gem "sidekiq", :require => false

data/gemfiles/{rails.4.0.mongoid.kaminari.gemfile → rails.4.0.mongoid.4.0.0.kaminari.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0"
+gem "mongoid", "> 4.0.0"
 gem "activesupport", "~> 4.0.0"
 gem "kaminari", "0.16.3", :require => false
 

data/gemfiles/{rails.4.0.mongoid.will_paginate.gemfile → rails.4.0.mongoid.4.0.0.will_paginate.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0"
+gem "mongoid", "> 4.0.0"
 gem "activesupport", "~> 4.0.0"
 gem "will_paginate", :require => false
 

data/gemfiles/rails.4.0.mongoid.5.1.0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "> 5.1.0"
+gem "activesupport", "~> 4.0.0"
+gem "resque", :require => false
+gem "sidekiq", :require => false
+
+group :test do
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec :path => "../"

data/gemfiles/rails.4.0.mongoid.5.1.0.kaminari.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "> 5.1.0"
+gem "activesupport", "~> 4.0.0"
+gem "kaminari", "0.16.3", :require => false
+
+group :test do
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec :path => "../"

data/gemfiles/rails.4.0.mongoid.5.1.0.will_paginate.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "> 5.1.0"
+gem "activesupport", "~> 4.0.0"
+gem "will_paginate", :require => false
+
+group :test do
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec :path => "../"