sidekiq-logging-json 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8f711705c47d1037ccea63b2d4cd60b39ff3bd
-  data.tar.gz: 4209ac39e4ce4c9dd216016a1ead06bd4bd222ad
+  metadata.gz: 03cd71e6c21bb683257e7aaf1c128ca6b5681162
+  data.tar.gz: b92630293df56537d41fbaf7b6be325509c2a16f
 SHA512:
-  metadata.gz: 7e27dee5aca587510e0131e9e884e5b854b011246046d45f3f4c41b054c272f0688c10b85776dd67c4988f2c5478fa7d294fd28f5ab83de4fcd47ccd32717872
-  data.tar.gz: 965bb8d30b02661554a45093c1166cfae558f84453ab4432dd70947dccc76efb26b3858fa02954d6501a3e55e015068b99ad3d36e0852aa6ecd5be9cf2d2ad11
+  metadata.gz: 8d0cdced997fb5ad78700c11d9a75e25d717cfa0e0a73fb32c2d3e7c264f0293704f2b0b532f841a9c4d9f4c24c854b7b6134a7a043c336df549b94052364dab
+  data.tar.gz: e5b4fd9fc7fbe6716bcc4a9dc958d1ed2254b5e112d735bf847648827465f71ab959ba93fff208d6a555dc0fdfe0625b77459a1c566676481892181a70348f4f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### v0.0.19
+  * Made sure the `sidekiq` gem itself is required first to resolve loading
+  errors. Thanks @dansajner !
+  * General code cleanup (specs, removed unnecessary requires, relaxed
+  development gem version requirements)
+
 ### v0.0.18
   * Updated Sidekiq dependency so it works with 3 and higher
 

data/README.md

@@ -53,7 +53,7 @@ Sidekiq.logger.formatter = Sidekiq::Logging::Json::Logger.new
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/sidekiq-logging-json/fork )
+1. Fork it ( https://github.com/springest/sidekiq-logging-json/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/sidekiq/logging/json.rb

@@ -1,12 +1,10 @@
+require "sidekiq"
 require "sidekiq/logging/json/version"
-require "sidekiq/logging/json"
-require "json"
 
 module Sidekiq
   module Logging
     module Json
       class Logger < Sidekiq::Logging::Pretty
-        # Provide a call() method that returns the formatted message.
         def call(severity, time, program_name, message)
           {
             '@timestamp' => time.utc.iso8601,
@@ -24,10 +22,15 @@ module Sidekiq
           }.merge(process_message(message)).to_json + "\n"
         end
 
+        private
+
         def process_message(message)
           case message
           when Exception
-            { '@status' => 'exception', '@message' => message.message }
+            {
+              '@status' => 'exception',
+              '@message' => message.message
+            }
           when Hash
             if message["retry"]
               {

data/lib/sidekiq/logging/json/version.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   module Logging
     module Json
-      VERSION = "0.0.18"
+      VERSION = "0.0.19"
     end
   end
 end

data/sidekiq-logging-json.gemspec

@@ -23,8 +23,8 @@ DESC
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3"
 
   spec.add_runtime_dependency "sidekiq", ">= 3"

data/spec/sidekiq/logging/json_spec.rb

@@ -1,63 +1,80 @@
 require 'spec_helper'
 
 describe "Sidekiq::Logging::Json" do
-  describe "process_message" do
-    subject { JSON.parse(Sidekiq::Logging::Json::Logger.new.call(severity, time, program_name, logentry)) }
-    let(:logentry) { "Some random message" }
-    let(:message) { subject["@message"] }
-    let(:status) { subject["@status"] }
-    let(:run_time) { subject["@run_time"] }
-    let(:severity) { "INFO" }
-    let(:time) { Time.now }
-    let(:program_name) { "RSpec" }
-
-    it { expect(message).to match(/#{logentry}/) }
-    it { expect(status).to eq(nil) }
-    it { expect(run_time).to eq(nil) }
+  subject do
+    logger = Sidekiq::Logging::Json::Logger.new
+    result = logger.call(severity, time, program_name, logentry)
+    JSON.parse(result)
+  end
 
-    context "start" do
-      let(:logentry) { "start" }
+  let(:logentry) { "Some random message" }
+  let(:message) { subject["@message"] }
+  let(:status) { subject["@status"] }
+  let(:run_time) { subject["@run_time"] }
+  let(:severity) { "INFO" }
+  let(:time) { Time.now }
+  let(:program_name) { "RSpec" }
 
-      it { expect(message).to match(/#{logentry}/) }
-      it { expect(status).to eq("start") }
-      it { expect(run_time).to eq(nil) }
-    end
+  it { expect(message).to eq "Some random message" }
+  it { expect(status).to eq(nil) }
+  it { expect(run_time).to eq(nil) }
 
-    context "done" do
-      let(:logentry) { "done: 51.579 sec" }
+  context "start" do
+    let(:logentry) { "start" }
 
-      it { expect(message).to match(/#{logentry}/) }
-      it { expect(status).to eq("done") }
-      it { expect(run_time).to eq(51.579) }
-    end
+    it { expect(message).to eq("start") }
+    it { expect(status).to eq("start") }
+    it { expect(run_time).to eq(nil) }
+  end
 
-    context "exception" do
-      let(:exception_message) { "This is the message that should be logged." }
-      let(:logentry) { NoMethodError.new(exception_message) }
+  context "done" do
+    let(:logentry) { "done: 51.579 sec" }
 
-      it { expect(message).to match(exception_message) }
-      it { expect(status).to eq("exception") }
-      it { expect(run_time).to eq(nil) }
-    end
+    it { expect(message).to eq("done: 51.579 sec") }
+    it { expect(status).to eq("done") }
+    it { expect(run_time).to eq(51.579) }
+  end
 
-    context "retry" do
-      let(:logentry) do
-        {"retry"=>true, "queue"=>"default", "class"=>"MarkTest", "args"=>["markie"], "jid"=>"0ca71f2580fdc0ae19a59063", "enqueued_at"=>1405957471.1871092}
-      end
+  context "exception" do
+    let(:exception_message) { "This is the message that should be logged." }
+    let(:logentry) { NoMethodError.new(exception_message) }
 
-      it { expect(message).to match("MarkTest failed, retrying.") }
-      it { expect(status).to eq("retry") }
-      it { expect(run_time).to eq(nil) }
+    it { expect(message).to eq(exception_message) }
+    it { expect(status).to eq("exception") }
+    it { expect(run_time).to eq(nil) }
+  end
+
+  context "retry" do
+    let(:logentry) do
+      {
+        "retry"=>true,
+        "queue"=>"default",
+        "class"=>"LogTest",
+        "args"=>["argument_1"],
+        "jid"=>"0ca71f2580fdc0ae19a59063",
+        "enqueued_at"=>1405957471.1871092
+      }
     end
 
-    context "dead" do
-      let(:logentry) do
-        {"retry"=>false, "queue"=>"default", "class"=>"MarkTest", "args"=>["markie"], "jid"=>"0ca71f2580fdc0ae19a59063", "enqueued_at"=>1405957471.1871092}
-      end
+    it { expect(message).to eq("LogTest failed, retrying with args [\"argument_1\"].") }
+    it { expect(status).to eq("retry") }
+    it { expect(run_time).to eq(nil) }
+  end
 
-      it { expect(message).to match("MarkTest failed with args #{logentry["args"]}, not retrying.") }
-      it { expect(status).to eq("dead") }
-      it { expect(run_time).to eq(nil) }
+  context "dead" do
+    let(:logentry) do
+      {
+        "retry"=>false,
+        "queue"=>"default",
+        "class"=>"LogTest",
+        "args"=>["argument_1"],
+        "jid"=>"0ca71f2580fdc0ae19a59063",
+        "enqueued_at"=>1405957471.1871092
+      }
     end
+
+    it { expect(message).to eq("LogTest failed with args [\"argument_1\"], not retrying.") }
+    it { expect(status).to eq("dead") }
+    it { expect(run_time).to eq(nil) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-logging-json
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Wouter de Vos
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Sidekiq JSON log format, e.g. for Logstash.