logasm 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb7e9b0c7705fcdbfd723890c04ccbb1f5aeb944
-  data.tar.gz: d554034a757044f6880a9e12a8e1fad0ff83d1fb
+  metadata.gz: c0febb284b9f4f18ecadc490ef8d457561d5b324
+  data.tar.gz: 69a11f1ef1850df831df878f0dced4cac3a4c733
 SHA512:
-  metadata.gz: 2bcf5f48bb51ed0f433919b8a64b0671510b17159daea4e5cded9a7666384de6468ed3ee47531fd9ee144425f5b7de46e6c657292c2e36823e404f65b99d1958
-  data.tar.gz: 5e6875c898fbb2f7239ab6c471aa1016f57ba789ecb9e32753e56039c9ab7751eb95ec6c54e08cdfd1794656dea6f3238d873e7e34334893f4f7b5cce9ace5bd
+  metadata.gz: 5360b860e911a0dfbdef2b3eaba176e9eb762f843b5ed5a8b1cb39196d6356394b7fe9b1e1e5316b5118a84ae3a325085a0445621d11bf1905acf446075deee5
+  data.tar.gz: b69312ebcc6f5073d8280aa052ab34a6c38ddb065285634e0d3d8b054ce5de429fe4749cb9a3f7e82f30669d8f45c7d17f0edbd92bb2eb20bdb0222d3ee07f06

data/lib/logasm.rb

@@ -1,4 +1,3 @@
-require 'inflecto'
 require 'logger'
 require 'oj'
 require_relative 'logasm/adapters'

data/lib/logasm/adapters/stdout_json_adapter.rb

@@ -4,11 +4,12 @@ class Logasm
       def initialize(level, service_name, *)
         @level = level
         @service_name = service_name
+        @application_name = Utils.application_name(service_name)
       end
 
       def log(level, metadata = {})
         if meets_threshold?(level)
-          message = Utils.build_event(metadata, level, @service_name)
+          message = Utils.build_event(metadata, level, @application_name)
           STDOUT.puts(Oj.dump(message, mode: :compat, time_format: :ruby))
         end
       end

data/lib/logasm/preprocessors.rb

@@ -1,8 +1,17 @@
 class Logasm
   module Preprocessors
     def self.get(type, arguments)
-      require_relative "preprocessors/#{type.to_s}"
-      preprocessor = const_get(Inflecto.camelize(type.to_s))
+      preprocessor =
+        case type.to_s
+        when 'blacklist'
+          require_relative 'preprocessors/blacklist'
+          Preprocessors::Blacklist
+        when 'whitelist'
+          require_relative 'preprocessors/whitelist'
+          Preprocessors::Whitelist
+        else
+          raise "Unknown preprocessor: #{type}"
+        end
       preprocessor.new(arguments)
     end
   end

data/lib/logasm/utils.rb

@@ -11,12 +11,12 @@ class Logasm
     # @param [String] service_name
     #
     # @return [Hash]
-    def self.build_event(metadata, level, service_name)
+    def self.build_event(metadata, level, application_name)
       overwritable_params
-        .merge(serialize_time_objects(metadata))
+        .merge(serialize_time_objects!(metadata.dup))
         .merge(
-          application: application_name(service_name),
-          level: level.to_s.downcase
+          application: application_name,
+          level: level.to_s
         )
     end
 
@@ -29,7 +29,7 @@ class Logasm
     #
     # @return [String]
     def self.application_name(service_name)
-      Inflecto.underscore(service_name)
+      underscore(service_name)
     end
 
     def self.overwritable_params
@@ -38,13 +38,15 @@ class Logasm
       }
     end
 
-    def self.serialize_time_objects(object)
+    def self.serialize_time_objects!(object)
       if object.is_a?(Hash)
-        object.reduce({}) do |hash, (key, value)|
-          hash.merge(key => serialize_time_objects(value))
+        object.each do |key, value|
+          object[key] = serialize_time_objects!(value)
         end
       elsif object.is_a?(Array)
-        object.map(&method(:serialize_time_objects))
+        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
@@ -52,6 +54,16 @@ class Logasm
       end
     end
 
+    def self.underscore(input)
+      word = input.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    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       = '1.0.0'
+  gem.version       = '1.1.0'
   gem.authors       = ["Salemove"]
   gem.email         = ["support@salemove.com"]
   gem.description   = %q{It's logasmic}
@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'inflecto'
   gem.add_dependency 'lru_redux'
   gem.add_dependency 'oj'
 

data/spec/adapters/stdout_json_adapter_spec.rb

@@ -14,10 +14,11 @@ describe Logasm::Adapters::StdoutJsonAdapter do
       let(:event) { {a: 'b', x: 'y'} }
       let(:serialized_event) { Oj.dump(event, mode: :compat, time_format: :ruby) }
       let(:service_name) { 'my-service' }
+      let(:application_name) { 'my_service' }
 
       before do
         allow(Logasm::Utils).to receive(:build_event)
-          .with(metadata, info_level, service_name)
+          .with(metadata, info_level, application_name)
           .and_return(event)
       end
 

data/spec/utils_spec.rb

@@ -2,31 +2,21 @@ require 'spec_helper'
 
 describe Logasm::Utils do
   describe '.build_event' do
-    subject(:event) { described_class.build_event(metadata, level, service_name) }
+    subject(:event) { described_class.build_event(metadata, level, application_name) }
 
-    let(:service_name) { 'test_service' }
-    let(:level)        { 'INFO' }
-    let(:metadata)     { {x: 'y'} }
+    let(:application_name) { 'test_service' }
+    let(:level)  { :info }
+    let(:metadata) { {x: 'y'} }
 
     before do
       allow(Time).to receive(:now) { Time.utc(2015, 10, 11, 23, 10, 21, 123456) }
     end
 
-    context 'when service name is in correct format' do
-      it 'includes it in the event as application' do
-        expect(event[:application]).to eq('test_service')
-      end
-    end
-
-    context 'when service name is in camelcase' do
-      let(:service_name) { 'InformationService' }
-
-      it 'includes it in the event as lower snake case' do
-        expect(event[:application]).to eq('information_service')
-      end
+    it 'includes it in the event as application' do
+      expect(event[:application]).to eq(application_name)
     end
 
-    it 'includes level as a lower case string' do
+    it 'includes log level' do
       expect(event[:level]).to eq('info')
     end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: logasm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: inflecto
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement