beaneater 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e34aa7bfb6dc0a66ce540b609fa2ed112af52a7defcb3d7148efdbf9a8d213
-  data.tar.gz: 36c9c9cf9a1d2330243f4f8dbd664318bda4b702ecc1c160e9a288255b211764
+  metadata.gz: ffe398358517da9e09fd22e17ddd4421e7a0f2b7fa2ae816e8ad0a308466f2d8
+  data.tar.gz: 7f9d831b5318de310462d8d4405acc0dbedb82463d5b252dec9b63fbcb39677b
 SHA512:
-  metadata.gz: e447f52b2790b98867e613009d7a31b3cc2af0c116656fe209514000f0a023d662a850328a3242609590f1a2fdfd9f006936f24aaf9b04d86d44f2a7b40a2dd4
-  data.tar.gz: 90eca2d3c5db4c0c96a0bfccc774d894c2d942f9ea52979f15a0a5f6b0bb39990299896a994e56f7c60537e015fc152b7fa030293c980498b545e8f5c52cb411
+  metadata.gz: 0fd5812759fa6e28a830cecacdd7a22447ce94705b044d9c28062bb868a082ea3679a29b18e3c4f421a6abf90fb3ba28551a2715eb5e8b38782a6e842548dc08
+  data.tar.gz: 919952687b5f715aca936c4c40af28a0db741e6c7539dfdcb78c6e5834a855fb91800e5a2e5fc2cb0e201e6422b5522f7c944be787fa0ca7b145f6b3edf83091

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG for Beaneater
 
+## 1.1.3 (Oct 14 2022)
+
+* Fixes issue introduced in 1.1.2 re YML parsing (@pond)
+* Fix job lookup test so it passes again
+
+## 1.1.2 (Oct 10 2022)
+
+* Fixes beaneater when used with Ruby 3.1 and YAML 4 (@pond)
+
 ## 1.1.1 (April 27th 2021)
 
 * Support Ruby 3 keyword arguments (@yahonda)

data/lib/beaneater/connection.rb

@@ -150,7 +150,12 @@ class Beaneater
       if ['OK','FOUND', 'RESERVED'].include?(status)
         bytes_size = body_values[-1].to_i
         raw_body = connection.read(bytes_size)
-        body = status == 'OK' ? YAML.load(raw_body) : config.job_parser.call(raw_body)
+        body = if status == 'OK'
+          psych_v4_valid_body = raw_body.gsub(/^(.*?): (.*)$/) { "#{$1}: #{$2.gsub(/[\:\-\~]/, '_')}" }
+          YAML.load(psych_v4_valid_body)
+        else
+          config.job_parser.call(raw_body)
+        end
         crlf = connection.read(2) # \r\n
         raise ExpectedCrlfError.new('EXPECTED_CRLF', cmd) if crlf != "\r\n"
       end

data/lib/beaneater/version.rb

@@ -1,4 +1,4 @@
 class Beaneater
   # Current version of gem.
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

data/test/jobs_test.rb

@@ -28,8 +28,12 @@ describe Beaneater::Jobs do
       assert_equal "foo find #{@time}", @jobs.find(@job.id).body
     end
 
-    it "should return nil for invalid id" do
-      assert_nil @jobs.find(-1)
+    it "should return nil for invalid negative id" do
+      assert_nil @jobs.find(10000) 
+    end
+
+    it "should return nil for invalid negative id" do
+      assert_raises(Beaneater::BadFormatError) { @jobs.find(-1) }
     end
   end # find
 

data/test/test_helper.rb

@@ -7,7 +7,7 @@ $:.unshift File.expand_path("../../lib")
 require 'beaneater'
 require 'timeout'
 begin
-  require 'mocha/setup'
+  require 'mocha/minitest'
 rescue LoadError
   require 'mocha'
 end

data/test/tube_test.rb

@@ -89,9 +89,9 @@ describe Beaneater::Tube do
 
     it "should support custom parser" do
       Beaneater.configure.job_parser = lambda { |b| JSON.parse(b) }
-      json = '{"message":"hi"}'
+      json = '{"message": "hi: there! this: is a long message"}'
       @tube.put(json)
-      assert_equal 'hi', @tube.peek(:ready).body['message']
+      assert_equal 'hi: there! this: is a long message', @tube.peek(:ready).body['message']
     end
 
     after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaneater
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Nico Taing
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest