chewy 0.10.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f9741190c8e67f2cf5a4ae0a7270eb7716884b70
-  data.tar.gz: fc86af473569d271c43d3b39cd0f710234adae76
+SHA256:
+  metadata.gz: 2decd9fc56f1c1116f0470c5dfce2fb84b3dbbab25ed42bcc1813f2f91069292
+  data.tar.gz: 969f6d74cff1f399ffa9752d2559a9affcaa2fe96a63e05cdfe4aa2b0add0af4
 SHA512:
-  metadata.gz: 50ee0a42f751e1aba5639b139e236056aa067f07524eb7d3d1c7bfc80f47b73ad8d7c9f5ae4df2cceda03d9b22d1896def3dc311c9f348e17bfec241bdb6102d
-  data.tar.gz: bee6ca569f2568ab4c33f3fcc23ffca5e5cb121a1145a07e8dcb9f09a0d5333999e454f2ff220621b2aebaf14dc29a9ba4254e0e6cb0f195d8c83fd2d9a1a942
+  metadata.gz: e55c97184ed6f171f9383087b792b6261167687acad1add6ca2d5196e87676b1600c54277174e213fd07de6d6d811124a20130ac7ca7ccb5b7077a78a710fbbc
+  data.tar.gz: b0ceb62da09eea3332e1d67bdca2ab56dfadae6366ca27a8009e502da01057891e7c6a33bfb67f81f4b35119eff550b4390d40e9860e2441065d72c4d30fca78

data/.rubocop.yml

@@ -1,50 +1,50 @@
 inherit_from: .rubocop_todo.yml
 
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/AlignHash:
+Layout/AlignHash:
   EnforcedLastArgumentHashStyle: always_ignore
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/AndOr:
-  EnforcedStyle: conditionals
-
-Style/CaseIndentation:
+Layout/CaseIndentation:
   EnforcedStyle: end
 
-Style/DoubleNegation:
-  Enabled: false
-
-Style/IndentArray:
+Layout/IndentArray:
   EnforcedStyle: consistent
 
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
 
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/DoubleNegation:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - '**/*_spec.rb'

data/.travis.yml

@@ -5,48 +5,40 @@ services:
 jdk:
   - oraclejdk8
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.4.3
 env:
   global:
     - TEST_CLUSTER_NODES=1
   matrix:
-    - ES_VERSION=2.4.4
-    - ES_VERSION=5.4.0
+    - ES_VERSION=5.6.7
 gemfile:
-  - gemfiles/rails.4.0.activerecord.gemfile
-  - gemfiles/rails.4.1.activerecord.gemfile
-  - gemfiles/rails.4.2.activerecord.gemfile
   - gemfiles/rails.5.0.activerecord.gemfile
   - gemfiles/rails.5.1.activerecord.gemfile
-  - gemfiles/rails.4.2.mongoid.5.1.gemfile
-  - gemfiles/rails.5.0.mongoid.6.0.gemfile
-  - gemfiles/rails.5.1.mongoid.6.1.gemfile
+  - gemfiles/rails.5.0.mongoid.6.1.gemfile
+  - gemfiles/rails.5.1.mongoid.6.3.gemfile
   - gemfiles/sequel.4.45.gemfile
 matrix:
-  exclude:
-  - rvm: 2.2.7
-    env: ES_VERSION=5.4.0
-  - rvm: 2.3.4
-    env: ES_VERSION=2.4.4
-  - gemfile: gemfiles/rails.4.0.activerecord.gemfile
-    env: ES_VERSION=5.4.0
-  - gemfile: gemfiles/rails.4.1.activerecord.gemfile
-    env: ES_VERSION=5.4.0
-  - gemfile: gemfiles/rails.4.2.mongoid.5.1.gemfile
-    env: ES_VERSION=5.4.0
-  - gemfile: gemfiles/rails.5.1.mongoid.6.0.gemfile
-    env: ES_VERSION=5.4.0
-  - rvm: 2.4.1
+  include:
+  - rvm: 2.2.9
     gemfile: gemfiles/rails.4.0.activerecord.gemfile
-  - rvm: 2.4.1
+    env: ES_VERSION=2.4.6
+  - rvm: 2.2.9
     gemfile: gemfiles/rails.4.1.activerecord.gemfile
+    env: ES_VERSION=2.4.6
+  - rvm: 2.3.6
+    gemfile: gemfiles/rails.4.2.activerecord.gemfile
+    env: ES_VERSION=2.4.6
+  - rvm: 2.3.6
+    gemfile: gemfiles/rails.4.2.mongoid.5.2.gemfile
+    env: ES_VERSION=2.4.6
+  - rvm: 2.5.0
+    gemfile: gemfiles/rails.5.2.activerecord.gemfile
+    env: ES_VERSION=5.6.7
 before_install:
-  - curl -s https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.4/elasticsearch-2.4.4.tar.gz | tar xz -C /tmp
-  - curl -s https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.4.0.tar.gz | tar xz -C /tmp
+  - curl -s https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.6/elasticsearch-2.4.6.tar.gz | tar xz -C /tmp
+  - curl -s https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.7.tar.gz | tar xz -C /tmp
 before_script:
-  - /tmp/elasticsearch-2.4.4/bin/plugin install delete-by-query
+  - /tmp/elasticsearch-2.4.6/bin/plugin install delete-by-query
   - TEST_CLUSTER_COMMAND=/tmp/elasticsearch-$ES_VERSION/bin/elasticsearch TEST_CLUSTER_LOGS=/tmp/log rake es:start
 script:
   - bundle exec rspec

data/Appraisals

@@ -1,5 +1,3 @@
-# rubocop:disable Style/FileName
-
 %w[4.0 4.1 4.2].each do |activesupport|
   appraise "rails.#{activesupport}.activerecord" do
     gem 'activerecord', "~> #{activesupport}.0"
@@ -8,6 +6,7 @@
     gem 'activejob', "~> #{activesupport}.0" if activesupport >= '4.2'
     gem 'resque', require: false
     gem 'shoryuken', require: false
+    gem 'aws-sdk-sqs', require: false
     gem 'sidekiq', require: false
 
     gem 'kaminari', '~> 0.17.0', require: false
@@ -25,22 +24,40 @@ end
     gem 'activejob', "~> #{activesupport}.0"
     gem 'resque', require: false
     gem 'shoryuken', require: false
+    gem 'aws-sdk-sqs', require: false
     gem 'sidekiq', require: false
 
-    gem 'kaminari-core', '~> 1.0.0', require: false
+    gem 'kaminari-core', '~> 1.1.0', require: false
     gem 'will_paginate', require: false
 
     gem 'parallel', require: false
   end
 end
 
-appraise 'rails.4.2.mongoid.5.1' do
-  gem 'mongoid', '~> 5.1.0'
+appraise 'rails.5.2.activerecord' do
+  gem 'activerecord', '~> 5.2.0.rc1'
+  gem 'activesupport', '~> 5.2.0.rc1'
+
+  gem 'activejob', '~> 5.2.0.rc1'
+  gem 'resque', require: false
+  gem 'shoryuken', require: false
+  gem 'aws-sdk-sqs', require: false
+  gem 'sidekiq', require: false
+
+  gem 'kaminari-core', '~> 1.1.0', require: false
+  gem 'will_paginate', require: false
+
+  gem 'parallel', require: false
+end
+
+appraise 'rails.4.2.mongoid.5.2' do
+  gem 'mongoid', '~> 5.2.0'
   gem 'activesupport', '~> 4.2.0'
 
   gem 'activejob', '~> 4.2.0'
   gem 'resque', require: false
   gem 'shoryuken', require: false
+  gem 'aws-sdk-sqs', require: false
   gem 'sidekiq', require: false
 
   gem 'kaminari', '~> 0.17.0', require: false
@@ -49,7 +66,7 @@ appraise 'rails.4.2.mongoid.5.1' do
   gem 'parallel', require: false
 end
 
-{'5.0' => '6.0', '5.1' => '6.1'}.each do |activesupport, mongoid|
+{'5.0' => '6.1', '5.1' => '6.3'}.each do |activesupport, mongoid|
   appraise "rails.#{activesupport}.mongoid.#{mongoid}" do
     gem 'mongoid', "~> #{mongoid}.0"
     gem 'activesupport', "~> #{activesupport}.0"
@@ -57,9 +74,10 @@ end
     gem 'activejob', "~> #{activesupport}.0"
     gem 'resque', require: false
     gem 'shoryuken', require: false
+    gem 'aws-sdk-sqs', require: false
     gem 'sidekiq', require: false
 
-    gem 'kaminari-core', '~> 1.0.0', require: false
+    gem 'kaminari-core', '~> 1.1.0', require: false
     gem 'will_paginate', require: false
 
     gem 'parallel', require: false
@@ -69,9 +87,9 @@ end
 %w[4.45].each do |sequel|
   appraise "sequel.#{sequel}" do
     gem 'sequel', "~> #{sequel}.0"
-    gem 'activesupport', '~> 5.0.0'
+    gem 'activesupport', '~> 5.1.0'
 
-    gem 'kaminari-core', '~> 1.0.0', require: false
+    gem 'kaminari-core', '~> 1.1.0', require: false
     gem 'will_paginate', require: false
 
     gem 'parallel', require: false

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # master
 
+# Version 5.0.0
+
+## Breaking changes
+
+  * Try to align the gem version with the ElasticSearch version we support
+
+  * `Chewy.default_field_type` is `text` now.
+
+  * `Chewy::Stash` was split onto two indexes - `Chewy::Stash::Specification` and `Chewy::Stash::Journal`
+
+  * Data for journal and specification is stored in binary fields base64-encoded to bypass the limits of other fields.
+
+  * Don't underscore suggested index name (@dm1try, #626)
+
+## Changes
+
+  * `pipeline` import option support (@eManPrague, #598)
+
+  * Proper Rails check (@nattfodd, #625)
+
+  * Bypass strategy performance improvements (@DNNX, #623)
+
+  * Avoid index update calls for empty data (@robertasg, #620)
+
+  * Do not underscore suggested index name on `Chewy::Index.index_name` call.
+
+  * It is possible now to call `root` method several times inside a single type definition, the options will be merged. Also, the block isn't required anymore.
+
+  * Fixed some Sequel deprecation warnings (@arturtr - #565, @matchbookmac - #577)
+
+## Bugfixes
+
+  * Fixed index settings logic error (@yahooguntu, #593)
+
+  * Missed check in higlight method (@heartfulbird, #567)
+
 # Version 0.10.1
 
 ## Changes

data/Gemfile

@@ -8,9 +8,11 @@ gem 'activerecord'
 
 gem 'activejob', require: false
 gem 'resque', require: false
-gem 'shoryuken', require: false
 gem 'sidekiq', require: false
 
+gem 'aws-sdk-sqs', require: false
+gem 'shoryuken', require: false
+
 gem 'kaminari-core', require: false
 gem 'will_paginate', require: false
 

data/README.md

@@ -208,7 +208,7 @@ If you would like to use AWS's ElasticSearch using an IAM user policy, you will
 
     define_type User.active.includes(:country, :badges, :projects) do
       root date_detection: false do
-        template 'about_translations.*', type: 'string', analyzer: 'standard'
+        template 'about_translations.*', type: 'text', analyzer: 'standard'
 
         field :first_name, :last_name
         field :email, analyzer: 'email'
@@ -335,7 +335,7 @@ This will automatically set the type or root field to `object`. You may also spe
 To define a multi field you have to specify any type except for `object` or `nested` in the root field:
 
 ```ruby
-field :full_name, type: 'string', value: ->{ full_name.strip } do
+field :full_name, type: 'text', value: ->{ full_name.strip } do
   field :ordered, analyzer: 'ordered'
   field :untouched, index: 'not_analyzed'
 end
@@ -807,36 +807,86 @@ Chewy has notifying the following events:
 To integrate with NewRelic you may use the following example source (config/initializers/chewy.rb):
 
 ```ruby
-ActiveSupport::Notifications.subscribe('import_objects.chewy') do |name, start, finish, id, payload|
-  metric_name = "Database/ElasticSearch/import"
-  duration = (finish - start).to_f
-  logged = "#{payload[:type]} #{payload[:import].to_a.map{ |i| i.join(':') }.join(', ')}"
-
-  self.class.trace_execution_scoped([metric_name]) do
-    NewRelic::Agent.instance.transaction_sampler.notice_sql(logged, nil, duration)
-    NewRelic::Agent.instance.sql_sampler.notice_sql(logged, metric_name, nil, duration)
-    NewRelic::Agent.record_metric(metric_name, duration)
+require 'new_relic/agent/instrumentation/evented_subscriber'
+
+class ChewySubscriber < NewRelic::Agent::Instrumentation::EventedSubscriber
+  def start(name, id, payload)
+    event = ChewyEvent.new(name, Time.current, nil, id, payload)
+    push_event(event)
   end
-end
 
-ActiveSupport::Notifications.subscribe('search_query.chewy') do |name, start, finish, id, payload|
-  metric_name = "Database/ElasticSearch/search"
-  duration = (finish - start).to_f
-  logged = "#{payload[:type].presence || payload[:index]} #{payload[:request]}"
+  def finish(_name, id, _payload)
+    pop_event(id).finish
+  end
+
+  class ChewyEvent < NewRelic::Agent::Instrumentation::Event
+    OPERATIONS = {
+      'import_objects.chewy' => 'import',
+      'search_query.chewy' => 'search',
+      'delete_query.chewy' => 'delete'
+    }.freeze
+
+    def initialize(*args)
+      super
+      @segment = start_segment
+    end
+
+    def start_segment
+      segment = NewRelic::Agent::Transaction::DatastoreSegment.new product, operation, collection, host, port
+      if (txn = state.current_transaction)
+        segment.transaction = txn
+      end
+      segment.notice_sql @payload[:request].to_s
+      segment.start
+      segment
+    end
+
+    def finish
+      if (txn = state.current_transaction)
+        txn.add_segment @segment
+      end
+      @segment.finish
+    end
+
+    private
 
-  self.class.trace_execution_scoped([metric_name]) do
-    NewRelic::Agent.instance.transaction_sampler.notice_sql(logged, nil, duration)
-    NewRelic::Agent.instance.sql_sampler.notice_sql(logged, metric_name, nil, duration)
-    NewRelic::Agent.record_metric(metric_name, duration)
+    def state
+      @state ||= NewRelic::Agent::TransactionState.tl_get
+    end
+
+    def product
+      'Elasticsearch'
+    end
+
+    def operation
+      OPERATIONS[name]
+    end
+
+    def collection
+      payload.values_at(:type, :index)
+             .reject { |value| value.try(:empty?) }
+             .first
+             .to_s
+    end
+
+    def host
+      Chewy.client.transport.hosts.first[:host]
+    end
+
+    def port
+      Chewy.client.transport.hosts.first[:port]
+    end
   end
 end
+
+ActiveSupport::Notifications.subscribe(/.chewy$/, ChewySubscriber.new)
 ```
 
 ### Search requests
 
 Long story short: there is a new DSL that supports ES2 and ES5, the previous DSL version (which supports ES1 and ES2) documentation was moved to [LEGACY_DSL.md](LEGACY_DSL.md).
 
-If you want to use it - simply do `Chewy.search_class = Chewy::Query` somewhere before indices are initialized.
+If you want to use the old DSL - simply do `Chewy.search_class = Chewy::Query` somewhere before indices are initialized.
 
 The new DSL is enabled by default, here is a quick introduction.
 
@@ -936,9 +986,9 @@ rake chewy:reset[-users,places] # resets every index in the application except s
 
 Performs reset exactly the same way as `chewy:reset` does, but only when the index specification (setting or mapping) was changed.
 
-It works only when index specification is locked in `Chewy::Stash` index. The first run will reset all indexes and lock their specifications.
+It works only when index specification is locked in `Chewy::Stash::Specification` index. The first run will reset all indexes and lock their specifications.
 
-See [Chewy::Stash](lib/chewy/stash.rb) and [Chewy::Index::Specification](lib/chewy/index/specification.rb) for more details.
+See [Chewy::Stash::Specification](lib/chewy/stash.rb) and [Chewy::Index::Specification](lib/chewy/index/specification.rb) for more details.
 
 
 ```bash

data/chewy.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'chewy/version'
@@ -19,17 +17,17 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   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-its'
-  spec.add_development_dependency 'rspec-collection_matchers'
-  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'elasticsearch-extensions'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'resque_spec'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-collection_matchers'
+  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'rubocop', '0.52.1'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
-  spec.add_development_dependency 'rubocop', '0.48.1'
 
   spec.add_development_dependency 'method_source'
   spec.add_development_dependency 'unparser'