semlogr 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bd4e69c32518a7128075aabc31c8ec3384dd4c8b
-  data.tar.gz: 1e264cb0025475bf2774b05d5484756f99585131
+SHA256:
+  metadata.gz: 04f7bde6911c8bd520d668999123bee16925a9644534d58ac37c1fd49fd7aa1a
+  data.tar.gz: 9f0630873b93a64ab66c945fb2ce989563289c8b84086bbc6dc5f25cda941fe4
 SHA512:
-  metadata.gz: e556941e43501f47c519d55eeed10f99317d7ec7ec804e9c537da9d82185a881ca4a0f8309f4856af63639eab3314f6606e142d4d4aeaf5155c1ed8b702a9090
-  data.tar.gz: 465b051b985524bd0d1c2012df6e0a52c982c0f93fd5c2d0e76cad325f0603ec372912ab8b0940ca552dc34efbec9662b6c1427c712e104731f221afea0b0d8f
+  metadata.gz: 22e8460c99bc7e229cb62364097ab079675c7a91bbf19e69fe03e62b0f2f0ef2ba90e24c80063a4c04227eb6fc04fd9e187083b950ed89b922e454b8d30e7149
+  data.tar.gz: a9be37b00ccec91882e140390099c064544c955486c726545c86d8494bf2d951dc2d9bb9d7757baef2aafd1640f7283cd857a17e544eb2e13d10c4ee4c9b45fb

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.2.1
+
+* Add raw template text to template
+* Add way to fully customize the object that is serialized by the JsonFormatter
+* Upgrade to latest versions of dependencies
+* Allow Oj configuration options to be passed to the JsonFormatter
+
 ### 0.2.0
 
 * Introduce simpler logger configuration

data/README.md

@@ -38,7 +38,7 @@ More configuration examples can be found inside the samples directory.
 
 ## Development
 
-After cloning the repository run `bundle install` to get up and running, to run the specs just run `rake spec`. You can also experiment in an interactive pry console using `bin/console`.
+After cloning the repository run `bundle install` to get up and running, to run the specs just run `bundle exec rake`. You can also experiment in an interactive pry console using `bin/console`.
 
 ## Contributing
 

data/lib/semlogr/context/log_context.rb

@@ -15,8 +15,7 @@ module Semlogr
 
       def self.get_property(key)
         LogContext.current
-          .reverse_each
-          .each do |properties|
+          .reverse_each do |properties|
             return properties[key] if properties.key?(key)
           end
 

data/lib/semlogr/formatters/json_formatter.rb

@@ -3,19 +3,29 @@ require 'oj'
 module Semlogr
   module Formatters
     class JsonFormatter
+      def initialize(opts = {})
+        default_opts = {
+          mode: :custom,
+          time_format: :ruby,
+          use_to_json: true
+        }
+
+        @opts = default_opts.merge(opts)
+      end
+
       def format(log_event)
         event = {
           timestamp: log_event.timestamp.iso8601(3),
-          severity: log_event.severity,
+          severity: log_event.severity.to_s,
+          message_template: log_event.template.text,
           message: log_event.to_s
         }
 
         add_error(event, log_event.error)
         add_properties(event, log_event.properties)
 
-        yield(event) if block_given?
-
-        event_json = Oj.dump(event, mode: :compat, use_as_json: true, use_to_json: true)
+        event = yield(event) if block_given?
+        event_json = Oj.dump(event, @opts)
         "#{event_json}\n"
       end
 

data/lib/semlogr/log_severity.rb

@@ -30,10 +30,6 @@ module Semlogr
       @value <=> other.value
     end
 
-    def as_json
-      to_s
-    end
-
     def to_s
       @display_string
     end

data/lib/semlogr/properties/output_properties.rb

@@ -4,7 +4,7 @@ module Semlogr
       def self.create(log_event)
         properties = log_event.properties.merge(
           timestamp: log_event.timestamp,
-          severity: log_event.severity
+          severity: log_event.severity.to_s
         )
 
         properties[:error] = log_event.error if log_event.error

data/lib/semlogr/sinks/colored_console.rb

@@ -78,7 +78,7 @@ module Semlogr
       end
 
       def colorize(output, color)
-        color = :white unless color
+        color ||= :white
 
         output << "\e[#{COLOR_CODES[color]}m"
         yield

data/lib/semlogr/templates/parser.rb

@@ -28,7 +28,7 @@ module Semlogr
           tokens.push(property_token) if property_token
         end
 
-        @template_cache[template] = Template.new(tokens)
+        @template_cache[template] = Template.new(template, tokens)
       end
 
       def self.parse_text_token(template, start)

data/lib/semlogr/templates/template.rb

@@ -3,9 +3,10 @@ require 'semlogr/templates/text_token'
 module Semlogr
   module Templates
     class Template
-      attr_accessor :tokens
+      attr_accessor :text, :tokens
 
-      def initialize(tokens)
+      def initialize(text, tokens)
+        @text = text
         @tokens = tokens
       end
 
@@ -15,7 +16,7 @@ module Semlogr
         end
       end
 
-      EMPTY = Template.new([TextToken::EMPTY])
+      EMPTY = Template.new('', [TextToken::EMPTY])
     end
   end
 end

data/lib/semlogr/version.rb

@@ -1,3 +1,3 @@
 module Semlogr
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/semlogr.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'semlogr/version'
@@ -21,15 +19,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'lru_redux', '~> 1.1.0'
-  spec.add_dependency 'oj', '~> 2.18.1'
+  spec.add_dependency 'lru_redux', '~> 1.1'
+  spec.add_dependency 'oj', '~> 3.5'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'pry', '~> 0.10.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '0.49.1'
-  spec.add_development_dependency 'simplecov', '~>0.15.1'
-  spec.add_development_dependency 'benchmark-memory', '~>0.1.2'
-  spec.add_development_dependency 'benchmark-ips', '~>2.7.2'
+  spec.add_development_dependency 'benchmark-ips', '~>2.7'
+  spec.add_development_dependency 'benchmark-memory', '~>0.1'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rubocop', '0.53'
+  spec.add_development_dependency 'simplecov', '~>0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semlogr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Stefan Sedich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -16,140 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.1
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.18.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: benchmark-memory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: benchmark-memory
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.53'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.53'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '0.15'
 description: A modern semantic logger for Ruby inspired by Serilog.
 email:
 - stefan.sedich@gmail.com
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Semantic logging for Ruby