logasm 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0febb284b9f4f18ecadc490ef8d457561d5b324
-  data.tar.gz: 69a11f1ef1850df831df878f0dced4cac3a4c733
+  metadata.gz: b337bd71343caed24d803eb66ef0894db28cd135
+  data.tar.gz: 61c6bdcdf09b7309e335c996388933e315b892bc
 SHA512:
-  metadata.gz: 5360b860e911a0dfbdef2b3eaba176e9eb762f843b5ed5a8b1cb39196d6356394b7fe9b1e1e5316b5118a84ae3a325085a0445621d11bf1905acf446075deee5
-  data.tar.gz: b69312ebcc6f5073d8280aa052ab34a6c38ddb065285634e0d3d8b054ce5de429fe4749cb9a3f7e82f30669d8f45c7d17f0edbd92bb2eb20bdb0222d3ee07f06
+  metadata.gz: 5206acdaa98e5fcfa8a5565d3be91dda8db603f23d722234dbb261104d380899564ac0692d93813eee76950bdcd9f5bc2ee196edde1890fb8998c9a1a0302d2b
+  data.tar.gz: 7e754346d1e30e11f827fad0db9438741e0a471ccf3315140b6d73acd2d6e9b66a89deb0a7e7bc4f9082d7d2f106bdd96c815fc7890b268a86aa9a62fc64fe85

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.2
+  - 2.3
+  - 2.4
+  - jruby

data/lib/logasm.rb

@@ -1,5 +1,4 @@
 require 'logger'
-require 'oj'
 require_relative 'logasm/adapters'
 require_relative 'logasm/utils'
 require_relative 'logasm/null_logger'

data/lib/logasm/adapters/stdout_adapter.rb

@@ -19,7 +19,7 @@ class Logasm
         data = metadata.select { |key, value| key != :message }
         log_data = [
           message,
-          data.empty? ? nil : Oj.dump(data, mode: :compat, time_format: :ruby)
+          data.empty? ? nil : Utils.generate_json(data)
         ].compact.join(' ')
 
         @logger.public_send level, log_data

data/lib/logasm/adapters/stdout_json_adapter.rb

@@ -10,7 +10,7 @@ class Logasm
       def log(level, metadata = {})
         if meets_threshold?(level)
           message = Utils.build_event(metadata, level, @application_name)
-          STDOUT.puts(Oj.dump(message, mode: :compat, time_format: :ruby))
+          STDOUT.puts(Utils.generate_json(message))
         end
       end
 

data/lib/logasm/utils.rb

@@ -13,10 +13,10 @@ class Logasm
     # @return [Hash]
     def self.build_event(metadata, level, application_name)
       overwritable_params
-        .merge(serialize_time_objects!(metadata.dup))
+        .merge(metadata)
         .merge(
           application: application_name,
-          level: level.to_s
+          level: level
         )
     end
 
@@ -54,6 +54,28 @@ class Logasm
       end
     end
 
+    if RUBY_PLATFORM =~ /java/
+      require 'jrjackson'
+
+      DUMP_OPTIONS = {
+        timezone: 'utc',
+        date_format: "YYYY-MM-dd'T'HH:mm:ss.SSSX"
+      }.freeze
+
+      def self.generate_json(obj)
+        JrJackson::Json.dump(obj, DUMP_OPTIONS)
+      end
+    else
+      require 'oj'
+      DUMP_OPTIONS = { mode: :compat, time_format: :ruby }.freeze
+
+      def self.generate_json(obj)
+        serialize_time_objects!(obj)
+
+        Oj.dump(obj, DUMP_OPTIONS)
+      end
+    end
+
     def self.underscore(input)
       word = input.to_s.dup
       word.gsub!(/::/, '/')

data/logasm.gemspec

@@ -3,8 +3,13 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
-  gem.name          = "logasm"
-  gem.version       = '1.1.0'
+  if RUBY_PLATFORM =~ /java/
+    gem.name = 'logasm-jruby'
+  else
+    gem.name = 'logasm'
+  end
+
+  gem.version       = '1.2.0'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}
@@ -17,7 +22,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'lru_redux'
-  gem.add_dependency 'oj'
+
+  if RUBY_PLATFORM =~ /java/
+    gem.add_dependency 'jrjackson'
+  else
+    gem.add_dependency 'oj'
+  end
 
   gem.add_development_dependency "bundler", "~> 1.3"
   gem.add_development_dependency "rake"

data/spec/adapters/stdout_json_adapter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'json'
 require_relative '../../lib/logasm/adapters/stdout_json_adapter'
 
 describe Logasm::Adapters::StdoutJsonAdapter do
@@ -12,7 +13,7 @@ describe Logasm::Adapters::StdoutJsonAdapter do
       let(:adapter) { described_class.new(debug_level_code, service_name) }
       let(:metadata) { {x: 'y'} }
       let(:event) { {a: 'b', x: 'y'} }
-      let(:serialized_event) { Oj.dump(event, mode: :compat, time_format: :ruby) }
+      let(:serialized_event) { JSON.dump(event) }
       let(:service_name) { 'my-service' }
       let(:application_name) { 'my_service' }
 

data/spec/utils_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe Logasm::Utils do
+  let(:now) { Time.utc(2015, 10, 11, 23, 10, 21, 123456) }
+
+  before do
+    allow(Time).to receive(:now) { now }
+  end
+
   describe '.build_event' do
     subject(:event) { described_class.build_event(metadata, level, application_name) }
 
@@ -8,16 +14,12 @@ describe Logasm::Utils do
     let(:level)  { :info }
     let(:metadata) { {x: 'y'} }
 
-    before do
-      allow(Time).to receive(:now) { Time.utc(2015, 10, 11, 23, 10, 21, 123456) }
-    end
-
     it 'includes it in the event as application' do
       expect(event[:application]).to eq(application_name)
     end
 
     it 'includes log level' do
-      expect(event[:level]).to eq('info')
+      expect(event[:level]).to eq(:info)
     end
 
     it 'includes timestamp' do
@@ -41,13 +43,42 @@ describe Logasm::Utils do
         expect(subject[:host]).to eq('xyz')
       end
     end
+  end
 
-    context 'when time object in metadata' do
-      let(:metadata) { {time: Time.utc(2016, 1, 5, 10, 38)} }
+  describe '.serialize_time_objects!' do
+    let(:object) do
+      {
+        time: Time.now,
+        hash: {
+          time: Time.now
+        },
+        array: [
+          Time.now,
+          {
+            time: Time.now
+          }
+        ]
+      }
+    end
 
-      it 'serializes as iso8601 format' do
-        expect(subject[:time]).to eq("2016-01-05T10:38:00Z")
-      end
+    let(:serialized_time) { now.iso8601 }
+
+    it 'recursively serializes time objects to iso8601' do
+      o = object.dup
+      described_class.serialize_time_objects!(o)
+
+      expect(o).to eq(
+        time: serialized_time,
+        hash: {
+          time: serialized_time
+        },
+        array: [
+          serialized_time,
+          {
+            time: serialized_time
+          }
+        ]
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logasm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -105,6 +105,7 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile