sequel-elasticsearch 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127744853b0d25416671270e0c75376721284923f3b3194a2304c819f0571e06
-  data.tar.gz: 2aa0e317aa39975bcf71fa5c50d759fd9acc448551af6165be298a97280f066b
+  metadata.gz: fcdb91c1414f1bad3b6ea789f58e96c7972c4581d8777769c9c5a93133afd578
+  data.tar.gz: '0599e138dc94ad85b12701dbd3df905838adaf4b2e0393e975956ce5aee095a4'
 SHA512:
-  metadata.gz: 4fa15223dff93ee23bc8ec8a1c42d02db514e4888514a2aa049fc1e118f4f5565f2a18e73ad0bc21da0ba08c98926f3005ff02b81467ec111d8fcb3dcca75f04
-  data.tar.gz: 50ff3ef8237090863eb7d62d83ddb79477e32b95ebe0458bda0abf1bd4c0b73c90887aafe5be9bb4035294900a0ff04e58e244d3d1e3aba1b68ed4218874a91f
+  metadata.gz: 6a50a93c261b7a462a848a80db8d27a65dc3ac72ad16b5f372278b75b52adbaf9d36193d35d7ec169bccf66d296ce7a09f18f23233a7aaedd96e97ae79d93988
+  data.tar.gz: 918f315cb32de7564c2fa9cb5aad8a97401d95365b7af2a87e08df6c25c7893b101af95539764fef8ea3908d02e997038ba9005d78ec3fb97df78688b625770b

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sequel-elasticsearch.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 libdir = File.expand_path(File.dirname(__FILE__) + '/lib')
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 

data/lib/sequel/plugins/elasticsearch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'elasticsearch'
 require 'sequel/plugins/elasticsearch/result'
 
@@ -22,7 +24,7 @@ module Sequel
       # Configure the plugin
       def self.configure(model, opts = OPTS)
         model.elasticsearch_opts = opts[:elasticsearch] || {}
-        model.elasticsearch_index = (opts[:index] || model.table_name).to_sym
+        model.elasticsearch_index = (opts[:index] || model.table_name.to_s.downcase).to_sym
         model.elasticsearch_type = (opts[:type] || :_doc).to_sym
         model
       end
@@ -85,7 +87,7 @@ module Sequel
         # Use the +reindex!+ method to create a completely new index and alias.
         def import!(index: nil, dataset: nil, batch_size: 100)
           dataset ||= self.dataset
-          index_name = index || last_index
+          index_name = index || last_index || elasticsearch_index
 
           # Index all the documents
           body = []
@@ -98,7 +100,7 @@ module Sequel
                   _index: index_name,
                   _type: elasticsearch_type,
                   _id: row.document_id,
-                  data: { doc: row.indexed_values, doc_as_upsert: true }
+                  data: { doc: row.as_indexed_json, doc_as_upsert: true }
                 }
               }
             end
@@ -133,6 +135,8 @@ module Sequel
         # Find the last created index that matches the specified index name.
         def last_index
           es_client.indices.get_alias(name: elasticsearch_index)&.keys&.sort&.first
+        rescue ::Elasticsearch::Transport::Transport::Errors::NotFound
+          nil
         end
 
         # Generate a timestamped index name.
@@ -181,6 +185,8 @@ module Sequel
           self.class.es_client
         end
 
+        # Mirror the Elasticsearch Rails plugin. Use this to override what data
+        # is sent to Elasticsearch
         def as_indexed_json
           indexed_values
         end
@@ -194,7 +200,7 @@ module Sequel
         # Create or update the document on the Elasticsearch cluster.
         def index_document(opts = {})
           params = document_path(opts)
-          params[:body] = indexed_values
+          params[:body] = as_indexed_json
           es_client.index params
         end
 

data/lib/sequel/plugins/elasticsearch/result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sequel
   module Plugins
     module Elasticsearch

data/lib/sequel/plugins/elasticsearch/version.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Sequel
   # The Sequel::Elasticsearch model plugin
   #
   # See https://jrgns.github.io/sequel-elasticsearch
   module Elasticsearch
     # The Gem's version.
-    VERSION = '0.4.10'.freeze
+    VERSION = '0.4.11'
   end
 end

data/sequel-elasticsearch.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sequel/plugins/elasticsearch/version'
 
@@ -27,8 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rubocop', '>= 0.52'
+  spec.add_development_dependency 'rubocop-rspec', '>= 1.37'
   spec.add_development_dependency 'simplecov', '~> 0.15'
-  spec.add_development_dependency 'webmock', '~> 3.2'
   spec.add_development_dependency 'sqlite3', '~> 1.4'
+  spec.add_development_dependency 'webmock', '~> 3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -84,16 +84,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.52'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.37'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.37'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -109,33 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.2'
 description: A plugin for the Sequel gem to sync data to Elasticsearch.
 email:
 - jrgns@jadeit.co.za