logasm 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d75c7fbd5b6b266b767c92aa55f963dd3d058e
-  data.tar.gz: e3425797d5df21071db126019373df4b10036dd7
+  metadata.gz: f4fb5320608a9281ac19839580efd95841f32aab
+  data.tar.gz: 8430bbe0cbc2da45220dc0561ef930e89186d1bb
 SHA512:
-  metadata.gz: e977d912a5e4edf5fb42a426de334131c9802e01759dc0683f2946131308f96c02b5f4b4f39b9e25af114d925cefc20f1ee0d43a9e2915c595b32ff99c890b2d
-  data.tar.gz: 8222dd3db656c1796075e7df9c25f90dc1aec98ba3ee0163be9385fa87e04ee553f79f6cf286358ee73bb2e536ca0b1a25e8580e435cef31906308abd3e4a197
+  metadata.gz: 11bd6d3a0334fab84540705fccb166a50089de39874d6547ce91317ffe798e3d642f7e7f046c1c31a4a93211b3fb31a920e3bd2a9ee564c3f67bf530a97f0288
+  data.tar.gz: 2886b7fd506e8da359889c313cf914d85b8083eff115673bf86d7781e2d0569a6a67967daf3ee0b4900b8285767fda433c6c2b64f8906625c5b9d827eb9b2450

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    logasm (0.2.3)
+    logasm (0.2.4)
       inflecto
 
 GEM
@@ -13,7 +13,7 @@ GEM
       amq-protocol (>= 1.9.2)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    freddy (0.4.1)
+    freddy (0.4.2)
       bunny (= 1.6.3)
       hamster (~> 1.0.1.pre.rc3)
       symbolizer

data/Rakefile

@@ -1,3 +1,5 @@
+require "bundler/gem_tasks"
+
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/logasm/utils.rb

@@ -12,12 +12,12 @@ class Logasm
     #
     # @return [Hash]
     def self.build_event(metadata, level, service_name)
-      metadata.merge(
-        application: application_name(service_name),
-        level: level.to_s.downcase,
-        host: HOST,
-        :@timestamp => Time.now.utc.iso8601(3)
-      )
+      overwritable_params
+        .merge(metadata)
+        .merge(
+          application: application_name(service_name),
+          level: level.to_s.downcase
+        )
     end
 
     # Return application name
@@ -31,5 +31,13 @@ class Logasm
     def self.application_name(service_name)
       Inflecto.underscore(service_name)
     end
+
+    def self.overwritable_params
+      {
+        :@timestamp => Time.now.utc.iso8601,
+        host: HOST
+      }
+    end
+    private_class_method :overwritable_params
   end
 end

data/logasm.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "logasm"
-  gem.version       = '0.2.3'
+  gem.version       = '0.2.4'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}

data/spec/utils_spec.rb

@@ -33,5 +33,23 @@ describe Logasm::Utils do
     it 'includes the host' do
       expect(event[:host]).to be_a(String)
     end
+
+    context 'when @timestamp provided' do
+      let(:metadata) { {message: 'test', :@timestamp => 'a timestamp'} }
+
+      it 'overwrites @timestamp' do
+        expect(subject[:message]).to eq('test')
+        expect(subject[:@timestamp]).to eq('a timestamp')
+      end
+    end
+
+    context 'when host provided' do
+      let(:metadata) { {message: 'test', host: 'xyz'} }
+
+      it 'overwrites host' do
+        expect(subject[:message]).to eq('test')
+        expect(subject[:host]).to eq('xyz')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logasm
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflecto