lenjador 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e0eaa5dd3548c6bfc7ff8c980e7e500ee4d297
-  data.tar.gz: c2dd081c02374b3144f3a7c77494c3f19b7ef464
+  metadata.gz: ecb260502893758ca056faa11a5e4b5347d450c1
+  data.tar.gz: f3dab9f737b556ae47c9d2095b07076963ee31b6
 SHA512:
-  metadata.gz: d3766944053913a9345b4a8415f9de802c93de119affebd85fe43fe8696047ee656e586d84c6e0bf45cacdbcb376fafd443bea60c92728265f53c5bfa457daaa
-  data.tar.gz: e87536d2ccc0abf5176f474f782458877832b47335c30ae0d6f714bae688b10e934627446dc9d1a879a488c5e023585db1ba928575502ce2c962e9d19832c8cb
+  metadata.gz: 19d983bb91596e4e4c2da6c88d98ba765c3d3e5dceb579b9fb6598868935ca0392c18293b3ac4cc5fb7a018acb19761cf00352f76f8c1c3fda066a04be66cb8a
+  data.tar.gz: 9dabc7e541b8f41bc03e0ec9cf899771bd2d625ea22733d986aed483fe0be89cb6195a5b94f593ae141df1f9f9e452368b4ad3581b343470ffeb42157947aeeb

data/lenjador.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = RUBY_PLATFORM =~ /java/ ? 'lenjador-jruby' : 'lenjador'
-  gem.version       = '1.3.0'
+  gem.version       = '1.4.0'
   gem.authors       = ['Salemove']
   gem.email         = ['support@salemove.com']
   gem.description   = "It's lenjadoric"
@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   if RUBY_PLATFORM =~ /java/
     gem.add_dependency 'jrjackson'
   else
-    gem.add_dependency 'oj'
+    gem.add_dependency 'oj', '~> 3.6'
     gem.add_development_dependency 'ruby-prof'
   end
 

data/lib/lenjador/utils.rb

@@ -38,27 +38,11 @@ class Lenjador
 
     def self.overwritable_params
       {
-        :@timestamp => Time.now.utc.iso8601(DECIMAL_FRACTION_OF_SECOND)
+        :@timestamp => Time.now
       }
     end
     private_class_method :overwritable_params
 
-    def self.serialize_time_objects!(object)
-      if object.is_a?(Hash)
-        object.each do |key, value|
-          object[key] = serialize_time_objects!(value)
-        end
-      elsif object.is_a?(Array)
-        object.each_index do |index|
-          object[index] = serialize_time_objects!(object[index])
-        end
-      elsif object.is_a?(Time) || object.is_a?(Date)
-        object.iso8601
-      else
-        object
-      end
-    end
-
     if RUBY_PLATFORM =~ /java/
       require 'jrjackson'
 
@@ -72,11 +56,13 @@ class Lenjador
       end
     else
       require 'oj'
-      DUMP_OPTIONS = {mode: :compat, time_format: :ruby}.freeze
+      DUMP_OPTIONS = {
+        mode: :custom,
+        time_format: :xmlschema,
+        second_precision: 3
+      }.freeze
 
       def self.generate_json(obj)
-        serialize_time_objects!(obj)
-
         Oj.dump(obj, DUMP_OPTIONS)
       end
     end

data/spec/lenjador/utils_spec.rb

@@ -25,7 +25,7 @@ describe Lenjador::Utils do
     end
 
     it 'includes timestamp' do
-      expect(event[:@timestamp]).to eq('2015-10-11T23:10:21.123Z')
+      expect(event[:@timestamp]).to eq(now)
     end
 
     context 'when @timestamp provided' do
@@ -89,40 +89,11 @@ describe Lenjador::Utils do
     end
   end
 
-  describe '.serialize_time_objects!' do
-    let(:object) do
-      {
-        time: Time.now,
-        hash: {
-          time: Time.now
-        },
-        array: [
-          Time.now,
-          {
-            time: Time.now
-          }
-        ]
-      }
-    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
-          }
-        ]
-      )
+  describe '.generate_json' do
+    it 'serializes time objects to iso8601' do
+      serialized_time = now.iso8601(3)
+      json = described_class.generate_json(time: now)
+      expect(json).to eq(%({"time":"#{serialized_time}"}))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lenjador
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -28,16 +28,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement