waistband 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4518168ed8f8c82ae7a2f49c130c0820caa73055b8688cc0625f687b586801a9
-  data.tar.gz: e517b0570a28ad0d6d4bdf3dcd07662d5983a84185ddeeffc6759f244b09b82b
+  metadata.gz: c663d799154fe793531c32248de60aa7942f34dbb54b0c04cf3373f9df652b0a
+  data.tar.gz: 9cc04d751ab8bf8911cc2c5925c805e7656a73bdc1a31e6092f873f14f025006
 SHA512:
-  metadata.gz: bb73344c8aa5e5432a3c66ef88bba5ed4feeca510ab88d8084ecf8636cac9c06751e58b0595750eff0215378b8d1eeb7c12074443f148d4969d83f951b64abb9
-  data.tar.gz: bf1eda0b6660ee7a2294ffe90e70759c44c2b4335a7df80d26df53a211bbc45f5cad5b304ee3de1faa5bfe85b910dca81208d92f805633621ab34de22b22fca1
+  metadata.gz: 84ed774572d1aa01b615987c5bc8de1b8f6a55532307fc140a7a370652822b0c60e26ce7211e63cb0e5b83c713472f4988b8734f3382a7e6b43f3a9eb7bcbd4d
+  data.tar.gz: 2524de64e2658792fd7eb71efdd9e357f246d94bcfe9ebace8f6aeae98c8984c3d6bdd17491821ac3efd389a6873f5a306c8ec49253a6d4a2588f85a1360e47f

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p648
+3.1.4

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.3.0] - 2023-10-11
+### Added
+  - Support for Ruby 3.1 and its attendant Psych version
+
 ## [6.2.0] - 2019-10-30
 ### Added
   - `#update`

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rspec', '~> 3.1.0'
-gem 'timecop', '~> 0.7.1'
+gem 'timecop'
 
 unless ENV['ON_TRAVIS']
   gem 'byebug'

data/lib/waistband/configuration.rb

@@ -63,9 +63,9 @@ module Waistband
 
       def load_yml_with_erb(file)
         if defined?(ERB)
-          YAML.load(ERB.new(File.read(file)).result)
+          YAML.safe_load(ERB.new(File.read(file)).result, aliases: true, permitted_classes: [Symbol])
         else
-          YAML.load_file(file)
+          YAML.safe_load_file(file, aliases: true, permitted_classes: [Symbol])
         end
       end
 

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "6.2.0"
+  VERSION = "6.3.0"
 end

data/spec/lib/configuration_spec.rb

@@ -25,11 +25,11 @@ describe Waistband::Configuration do
   end
 
   it "permits passing in an adapter to use to the client" do
-    original_config = YAML.load_file(File.join(::Waistband.config.config_dir, 'waistband.yml'))['test']
+    original_config = YAML.safe_load_file(File.join(::Waistband.config.config_dir, 'waistband.yml'), aliases: true, permitted_classes: [Symbol])['test']
 
     expect(::Waistband.config.instance_variable_get('@adapter')).to be_nil
 
-    expect(YAML).to receive(:load).and_return({'test' => original_config.merge({'adapter' => :net_http})}).at_least(:once)
+    expect(YAML).to receive(:safe_load).and_return({'test' => original_config.merge({'adapter' => :net_http})}).at_least(:once)
     ::Waistband.config.setup
     expect(::Waistband.config.instance_variable_get('@adapter')).to eql :net_http
     expect(::Waistband.client.transport.options[:adapter]).to eql :net_http

data/spec/lib/index/index_spec.rb

@@ -94,7 +94,7 @@ describe Waistband::Index do
   describe "storing" do
     it "stores data" do
       expect(index.save('__test_write', {'ok' => 'yeah'})).to be_present
-      expect(index.read('__test_write')).to eql({
+      expect(index.read('__test_write')).to match a_hash_including({
         '_id' => '__test_write',
         '_index' => 'events_test',
         '_source' => {'ok' => 'yeah'},
@@ -107,7 +107,7 @@ describe Waistband::Index do
     it "can partially updates documents" do
       expect(index.save('__test_write', {'ok' => 'yeah', 'not_ok' => 'yeah'})).to be_present
       expect(index.update('__test_write', {'not_ok' => 'no'})).to be_present
-      expect(index.read('__test_write')).to eql({
+      expect(index.read('__test_write')).to match a_hash_including({
         '_id' => '__test_write',
         '_index' => 'events_test',
         '_source' => {'ok' => 'yeah', 'not_ok' => 'no'},

data/waistband.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'activesupport', '< 7.1.0'
   spec.add_dependency 'elasticsearch',  '~> 6.0'
   spec.add_dependency 'json'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.4"
   spec.add_development_dependency "rake",    "~> 10.3"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - David Jairala
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ homepage: https://github.com/taskrabbit/waistband
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Configuration and sensible defaults for ElasticSearch on Ruby
 test_files: