loga 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc2c1df2c8703af85a48cec027481b51e963a7d
-  data.tar.gz: 81e5b8afc0c7bf47a65e68b2682ceb3f764b56c1
+  metadata.gz: 17260ebae7ab260f967e12b4ccbc3a0759198c48
+  data.tar.gz: b9d0b278cecffc630df5c3799534212a299947b5
 SHA512:
-  metadata.gz: 35ac2f6b11c4adb23ebf976bef30c6e3bdd59da23ecf62e93a1ebc74d8a49378e2bc87ec9725622c8518b1f0da75d080080604d8993fd9adef065f7dd440d43d
-  data.tar.gz: bb92378034091e09808ad93a4e549102a2173330bdd8eaf372eee3b93b6f6fe79e6b883479b481bee0fd7f245a46a8ccc055ab7786562d1d26bc6bb46ad84108
+  metadata.gz: fae482314860b620502fbf5e122cc08cf06cd75395feed1686dfa6730226077960e08a3a0a6395acd76e5bbff50b0c37315b1cc1c82da38fab20121b0ff57f3e
+  data.tar.gz: f9b6740e461e66035880ce0072d6427db6120c91bf6a3662707989a3bfda872b2a1dbae0659b00b5f6877fbc0b4b77e6afc557451a837b1963c121646b337013

data/README.md

@@ -92,7 +92,7 @@ Loga.logger.info('Hello World')
   "level":             6,
   "_service.name":     "marketplace",
   "_service.version":  "v1.0.0",
-  "_tags":             []
+  "_tags":             ""
 }
 ```
 

data/circle.yml

@@ -1,15 +1,15 @@
 dependencies:
   override:
-    - rvm-exec 2.0.0-p353 bundle install -j 4
-    - rvm-exec 2.0.0-p353 bundle exec appraisal install -j 4
+    - rvm-exec 2.1.0 bundle install -j 4
+    - rvm-exec 2.1.0 bundle exec appraisal install -j 4
     - rvm-exec 2.2.2 bundle install -j 4
     - rvm-exec 2.2.2 bundle exec appraisal install -j 4
 test:
   override:
-    - RACK_ENV=development rvm-exec 2.0.0-p353 bundle exec appraisal rspec
-    - RACK_ENV=production  rvm-exec 2.0.0-p353 bundle exec appraisal rspec
-    - RACK_ENV=development rvm-exec 2.2.2      bundle exec appraisal rspec
-    - RACK_ENV=production  rvm-exec 2.2.2      bundle exec appraisal rspec
+    - RACK_ENV=development rvm-exec 2.1.0 bundle exec appraisal rspec
+    - RACK_ENV=production  rvm-exec 2.1.0 bundle exec appraisal rspec
+    - RACK_ENV=development rvm-exec 2.2.2 bundle exec appraisal rspec
+    - RACK_ENV=production  rvm-exec 2.2.2 bundle exec appraisal rspec
     - rvm-exec 2.2.2 bundle exec rubocop
 deployment:
   gemfury:

data/lib/loga/formatter.rb

@@ -97,7 +97,7 @@ module Loga
           name:    @service_name,
           version: @service_version,
         },
-        tags: current_tags,
+        tags: current_tags.join(' '),
       }
     end
   end

data/lib/loga/version.rb

@@ -1,3 +1,3 @@
 module Loga
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/loga.gemspec

@@ -17,8 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 2.3.8'
-  spec.add_dependency 'rack'
+  if RUBY_VERSION < '2.2'
+    spec.add_dependency 'activesupport', '>= 2.3.8', '< 5.0'
+    spec.add_dependency 'rack', '< 2.0'
+  else
+    spec.add_dependency 'activesupport', '>= 2.3.8'
+    spec.add_dependency 'rack'
+  end
 
   spec.add_development_dependency 'appraisal', '~> 2.0.2'
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/fixtures/rails32/config/application.rb

@@ -60,7 +60,7 @@ module Rails32
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
     # config.active_record.whitelist_attributes = true
-    config.log_tags = [:uuid]
+    config.log_tags = [ :uuid, 'TEST_TAG' ]
     config.loga.configure do |loga|
       loga.service_name = 'hello_world_app'
       loga.service_version = '1.0'

data/spec/fixtures/rails40/config/application.rb

@@ -26,7 +26,7 @@ module Rails40
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    config.log_tags = [:uuid]
+    config.log_tags = [ :uuid, 'TEST_TAG' ]
     config.loga.configure do |loga|
       loga.service_name = 'hello_world_app'
       loga.service_version = '1.0'

data/spec/integration/sinatra_spec.rb

@@ -24,7 +24,7 @@ describe 'Rack request logger with Sinatra', timecop: true do
       set :show_exceptions, false
 
       use Loga::Rack::RequestId
-      use Loga::Rack::Logger, Loga.logger, [:uuid]
+      use Loga::Rack::Logger, Loga.logger, [:uuid, 'TEST_TAG']
 
       error do
         status 500

data/spec/support/request_spec.rb

@@ -22,7 +22,7 @@ RSpec.shared_examples 'request logger' do
         '_request.status'     => 200,
         '_request.request_id' => '471a34dc',
         '_request.duration'   => 0,
-        '_tags'               => ['471a34dc'],
+        '_tags'               => '471a34dc TEST_TAG',
       )
     end
   end
@@ -52,7 +52,7 @@ RSpec.shared_examples 'request logger' do
         '_request.status'     => 200,
         '_request.request_id' => '471a34dc',
         '_request.duration'   => 0,
-        '_tags'               => ['471a34dc'],
+        '_tags'               => '471a34dc TEST_TAG',
       )
     end
 
@@ -83,7 +83,7 @@ RSpec.shared_examples 'request logger' do
         '_request.status'     => 302,
         '_request.request_id' => '471a34dc',
         '_request.duration'   => 0,
-        '_tags'               => ['471a34dc'],
+        '_tags'               => '471a34dc TEST_TAG',
       )
     end
   end
@@ -114,7 +114,7 @@ RSpec.shared_examples 'request logger' do
         '_exception.klass'     => 'NoMethodError',
         '_exception.message'   => "undefined method `name' for nil:NilClass",
         '_exception.backtrace' => be_a(String),
-        '_tags'               => ['471a34dc'],
+        '_tags'               => '471a34dc TEST_TAG',
       )
     end
   end
@@ -140,7 +140,7 @@ RSpec.shared_examples 'request logger' do
         '_request.status'      => 404,
         '_request.request_id'  => '471a34dc',
         '_request.duration'    => 0,
-        '_tags'               => ['471a34dc'],
+        '_tags'               => '471a34dc TEST_TAG',
       )
     end
   end

data/spec/unit/loga/formatter_spec.rb

@@ -26,7 +26,7 @@ describe Loga::Formatter do
     it 'includes Loga additional fields' do
       expect(json).to include('_service.name'    => service_name,
                               '_service.version' => service_version,
-                              '_tags'            => [])
+                              '_tags'            => '')
     end
 
     it 'outputs the timestamp in seconds since UNIX epoch' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Funding Circle