sequel-elasticsearch 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 181431ca4bddeae82a6126453bf9439679feeb08243cf6d8a3158438cf5aed40
-  data.tar.gz: 80660bb4500762573c1e1cfc60b0242fff8cbb4ba0cf2d5bc922084eabd15a4a
+  metadata.gz: 127744853b0d25416671270e0c75376721284923f3b3194a2304c819f0571e06
+  data.tar.gz: 2aa0e317aa39975bcf71fa5c50d759fd9acc448551af6165be298a97280f066b
 SHA512:
-  metadata.gz: 31071ac5cbeab5900fb4f505bd7d4357b5c45823a839fb7fa25a7192ed4aaa76cd77d3400322acc2bd70aeb213ebd6d12671f99e97b7bb9986823ae1aefdf000
-  data.tar.gz: 5e326ca98cad26b326e169a87d550d6ebcf00a12f01b22c2906a4dae7af71570080e469e79d8446b969fe93fb64cdbab34a2bd1074f7704f7eb182b859eabc40
+  metadata.gz: 4fa15223dff93ee23bc8ec8a1c42d02db514e4888514a2aa049fc1e118f4f5565f2a18e73ad0bc21da0ba08c98926f3005ff02b81467ec111d8fcb3dcca75f04
+  data.tar.gz: 50ff3ef8237090863eb7d62d83ddb79477e32b95ebe0458bda0abf1bd4c0b73c90887aafe5be9bb4035294900a0ff04e58e244d3d1e3aba1b68ed4218874a91f

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

@@ -4,6 +4,6 @@ module Sequel
   # See https://jrgns.github.io/sequel-elasticsearch
   module Elasticsearch
     # The Gem's version.
-    VERSION = '0.4.9'.freeze
+    VERSION = '0.4.10'.freeze
   end
 end

data/lib/sequel/plugins/elasticsearch.rb

@@ -21,16 +21,9 @@ module Sequel
 
       # Configure the plugin
       def self.configure(model, opts = OPTS)
-        environment_scoped = if opts[:environment_scoped].nil?
-                               model.environment != 'test'
-                             else
-                               opts[:environment_scoped]
-                             end
-
         model.elasticsearch_opts = opts[:elasticsearch] || {}
         model.elasticsearch_index = (opts[:index] || model.table_name).to_sym
         model.elasticsearch_type = (opts[:type] || :_doc).to_sym
-        model.elasticsearch_environment_scoped = environment_scoped
         model
       end
 
@@ -39,11 +32,9 @@ module Sequel
         # The extra options that will be passed to the Elasticsearch client.
         attr_accessor :elasticsearch_opts
         # The Elasticsearch index to which the documents will be written.
-        attr_writer :elasticsearch_index
+        attr_accessor :elasticsearch_index
         # The Elasticsearch type to which the documents will be written.
         attr_accessor :elasticsearch_type
-        # If generated indices should include the environment name
-        attr_accessor :elasticsearch_environment_scoped
 
         # Return the Elasticsearch client used to communicate with the cluster.
         def es_client
@@ -129,6 +120,7 @@ module Sequel
           alias_index(index_name)
         end
 
+        # Remove previous aliases and point the `elasticsearch_index` to the new index.
         def alias_index(new_index)
           es_client.indices.update_aliases body: {
             actions: [
@@ -143,29 +135,14 @@ module Sequel
           es_client.indices.get_alias(name: elasticsearch_index)&.keys&.sort&.first
         end
 
-        def elasticsearch_index
-          return @elasticsearch_index unless elasticsearch_environment_scoped
-
-          "#{@elasticsearch_index}-#{environment}".to_sym
-        end
-
-        # Generate a timestamped index name according to the environment.
-        # This will use the +APP_ENV+ or +RACK_ENV+ ENV variable and a timestamp
-        # to construct index names like this:
-        #
-        #    base-name-staging-20191004.123456 # This is a staging index
-        #    base-name-production-20191005.171213 # This is a production index
+        # Generate a timestamped index name.
+        # This will use the current timestamp to construct index names like this:
         #
-        # The adding of the environment name to the index can be turned off by
-        # setting +elasticsearch_environment_scoped+ to false.
+        #    base-name-20191004.123456
         def timestamped_index
-          time_str = Time.now.strftime('%Y%m%d.%H%M%S')
+          time_str = Time.now.strftime('%Y%m%d.%H%M%S') # TODO: Make the format configurable
           "#{elasticsearch_index}-#{time_str}".to_sym
         end
-
-        def environment
-          ENV['APP_ENV'] || ENV['RACK_ENV'] || 'development'
-        end
       end
 
       # The instance methods that will be added to the Sequel::Model

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch