wj-mongoid-elasticsearch 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc3e33f5abe8cb10787af60e2a9d8dbdb90154e
-  data.tar.gz: d3dd2b90f47f9350a00cc84afc50c6c045ed7afe
+  metadata.gz: 578a2f4897aa691d5e5be10fe7101e434b566795
+  data.tar.gz: 37be0ba588cc85d59df49e520bcee7c34640f18e
 SHA512:
-  metadata.gz: 97e5e116bf33cd9c1bd868d6f0c56a41e161b0f28d00d96b73431f9be3ca4cadecb95f5de306ab0feb2be38659882a5cc19065e9657ec42b85f9bfe756242a15
-  data.tar.gz: b4c74b6c8b07e1cbe8390eeed2848ab9cdb4e794e90519d8cc29cd67eb420e66168c628cfd2bd7e31c50c57413ee8031b5dff052abdf2c7ef790ae5b0bc688c2
+  metadata.gz: a06026e6ea7f345909c325e3b671cc6236304154715295ba680141f32169a0446d990f889bdfe3d52c61e46bb3e65cd14436395833129f28caca8d72fe58fb0b
+  data.tar.gz: adbf2fa97b6f63a9c2d2218e3a7ab1621609ba148f0070b5faefdffbca7cca3a561f1bbc4d6646cb3a0936c97a31765cd9c0c151431d640b8e1bdb59ad444594

data/Gemfile.lock

@@ -1,133 +1,150 @@
 GIT
   remote: git://github.com/DatabaseCleaner/database_cleaner.git
-  revision: 49ca0f3e8ac4c096129442d0f942d39f2c0d7dde
+  revision: b393fa81fc864805e79913f4377e316be40f8900
   specs:
-    database_cleaner (1.5.2)
+    database_cleaner (1.6.3)
 
 PATH
   remote: .
   specs:
-    mongoid-elasticsearch (0.9.1)
+    wj-mongoid-elasticsearch (0.0.2)
       elasticsearch (~> 1.0.13)
+      faraday_middleware
+      faraday_middleware-aws-sigv4
       mongoid (>= 3.0, < 6.0)
+      patron
       ruby-progressbar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activesupport (4.2.6)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    bson (4.1.0)
-    builder (3.2.2)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    arel (6.0.4)
+    aws-sigv4 (1.0.2)
+    bson (4.3.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    crass (1.0.3)
+    diff-lcs (1.3)
     docile (1.1.5)
-    elasticsearch (1.0.17)
-      elasticsearch-api (= 1.0.17)
-      elasticsearch-transport (= 1.0.17)
-    elasticsearch-api (1.0.17)
+    elasticsearch (1.0.18)
+      elasticsearch-api (= 1.0.18)
+      elasticsearch-transport (= 1.0.18)
+    elasticsearch-api (1.0.18)
       multi_json
-    elasticsearch-transport (1.0.17)
+    elasticsearch-transport (1.0.18)
       faraday
       multi_json
     erubis (2.7.0)
-    faraday (0.9.2)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    faraday_middleware-aws-sigv4 (0.2.4)
+      aws-sigv4 (~> 1.0)
+      faraday (>= 0.9)
     glebtv-httpclient (3.2.8)
       lru_redux
-    hashie (3.4.3)
-    i18n (0.7.0)
-    json (1.8.3)
-    kaminari (0.16.3)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    loofah (2.0.3)
+    hashie (3.5.7)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    loofah (2.2.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    mongo (2.2.4)
-      bson (~> 4.0)
-    mongoid (5.1.2)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    mongo (2.5.1)
+      bson (>= 4.3.0, < 5.0.0)
+    mongoid (5.2.1)
       activemodel (~> 4.0)
-      mongo (~> 2.1)
-      origin (~> 2.2)
+      mongo (>= 2.4.1, < 3.0.0)
+      origin (~> 2.3)
       tzinfo (>= 0.3.37)
-    mongoid-compatibility (0.3.1)
+    mongoid-compatibility (0.5.1)
       activesupport
       mongoid (>= 2.0)
     mongoid-slug (5.0.0)
       mongoid (>= 3.0)
       mongoid-compatibility
       stringex (~> 2.0)
-    multi_json (1.11.2)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    origin (2.2.0)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    origin (2.3.1)
+    patron (0.12.1)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rake (11.1.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby-progressbar (1.7.5)
-    simplecov (0.11.2)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    ruby-progressbar (1.9.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    stringex (2.6.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    stringex (2.8.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tins (1.6.0)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.16.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -140,10 +157,10 @@ DEPENDENCIES
   glebtv-httpclient
   hashie
   kaminari
-  mongoid-elasticsearch!
   mongoid-slug (~> 5.0.0)
   rake
   rspec
+  wj-mongoid-elasticsearch!
 
 BUNDLED WITH
-   1.11.2
+   1.13.7

data/lib/mongoid/elasticsearch.rb

@@ -23,6 +23,9 @@ module Mongoid
     mattr_accessor :client_options
     self.client_options = {}
 
+    mattr_accessor :create_aws_client
+    self.create_aws_client = false
+
     mattr_accessor :registered_indexes
     self.registered_indexes = []
     
@@ -51,6 +54,7 @@ module Mongoid
           prefix_name: true,
           index_name: nil,
           client_options: {},
+          create_aws_client: false,
           index_options: {},
           index_mappings: nil,
           wrapper: :model,
@@ -62,11 +66,12 @@ module Mongoid
           attr_accessor :_type, :_score, :_source
         end
 
-        cattr_accessor :es_client_options, :es_index_name, :es_index_options, :es_wrapper, :es_skip_create
+        cattr_accessor :es_client_options, :es_index_name, :es_index_options, :es_wrapper, :es_skip_create, :es_create_aws_client
 
         self.es_client_options = Mongoid::Elasticsearch.client_options.dup.merge(options[:client_options])
         self.es_index_name     = (options[:prefix_name] ? Mongoid::Elasticsearch.prefix : '') + (options[:index_name] || model_name.plural)
         self.es_index_options  = options[:index_options]
+        self.es_create_aws_client = options[:create_aws_client]
         self.es_wrapper        = options[:wrapper]
         self.es_skip_create    = options[:skip_create]
 
@@ -106,8 +111,9 @@ module Mongoid
       end
       # use `_all` or empty string to perform the operation on all indices
       # regardless whether they are managed by Mongoid::Elasticsearch or not
+      ## removed ignore_missing since it is not compatible with elasticsearch 6.2.3
       unless query.key?(:index)
-        query.merge!(index: Mongoid::Elasticsearch.registered_indexes.join(','), ignore_indices: 'missing', ignore_unavailable: true)
+        query.merge!(index: Mongoid::Elasticsearch.registered_indexes.join(','), ignore_unavailable: true)
       end
 
       page = options[:page]

data/lib/mongoid/elasticsearch/es.rb

@@ -1,3 +1,7 @@
+require 'patron'
+require 'faraday_middleware'
+require 'faraday_middleware/aws_sigv4'
+
 module Mongoid
   module Elasticsearch
     class Es
@@ -10,8 +14,18 @@ module Mongoid
       end
 
       def client
-        # dup is needed because Elasticsearch::Client.new changes options hash inplace
-        @client ||= ::Elasticsearch::Client.new klass.es_client_options.dup
+        if klass.es_create_aws_client
+          @client ||= ::Elasticsearch::Client.new(host: ENV["AWS_ES_HOST"], port: ENV["AWS_ES_PORT"]) do |f|
+            f.request :aws_sigv4,
+              credentials: Aws::Credentials.new(ENV["AWS_KEY"],ENV["AWS_SECRET"]),
+              service: ENV["AWS_ES_SERVICE"],
+              region: ENV["AWS_ES_REGION"]
+            f.response :logger
+            f.adapter  Faraday.default_adapter
+          end 
+        else
+          @client ||= ::Elasticsearch::Client.new klass.es_client_options.dup
+        end
       end
 
       def index

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mongoid", [">= 3.0", "< 6.0"]
   spec.add_dependency "elasticsearch", "~> 1.0.13"
   spec.add_dependency "ruby-progressbar"
-
+  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'faraday_middleware-aws-sigv4'
+  spec.add_dependency 'patron'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wj-mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -58,6 +58,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware-aws-sigv4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: patron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement