marlowe 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 138fa6a06399a2de3f1728a7d22c6e30c2911f27
-  data.tar.gz: ca42fe17d9f5463c905845d99a12bec35acfd96b
+  metadata.gz: 1a7fdda3d50c8438774a6685320096f240248134
+  data.tar.gz: c15b495dd3826cf26c1ee626cc203e61a84f2576
 SHA512:
-  metadata.gz: 40aa66da8708cecb902f47d682f73340b3e4d91421e5ec5862fb306d493b3e2440e006ff97d350373677450fc09669815ceb833c4b12e4c0ee88ec6d19f01232
-  data.tar.gz: 25c2d9a63f75ed0de4a9d09cd8d90a5739ccf0fc7bdcddaa95b8742ca10fde6b328089d9abf2c51229576605c62743b75f2608770b8b035255d831d02fd4029c
+  metadata.gz: 4d902634019be7e55e40ce4078477a78dc6fd9c78867f2b1c78f562a72170ee989adc1e6d64273b5f23cc18685530007e89a88991f66a8b39947146f88e90ecd
+  data.tar.gz: 24a7328086863aa5b74f77e2213a3a149519613e858bce9716fa7dd4999eed30c324b44758d63ff458b4fb249335e71751d86d2becd96e322d6351944a7787b8

data/Gemfile

@@ -0,0 +1,9 @@
+# -*- ruby -*-
+
+# NOTE: This file is present to keep Travis CI happy. Edits to it will not
+# be accepted.
+
+source 'https://rubygems.org/'
+gemspec
+
+# vim: filetype=ruby

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 1.0.2 / 2015-11-24
+
+* Add documentation for using Marlowe with {lograge}[https://github.com/roidrage/lograge]
+
 === 1.0.1 / 2015-10-20
 
 * Update gemspec with homepage

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+Gemfile
 History.rdoc
 Licence.rdoc
 Manifest.txt
@@ -9,3 +10,5 @@ lib/marlowe/formatter.rb
 lib/marlowe/middleware.rb
 lib/marlowe/rails.rb
 lib/marlowe/simple_formatter.rb
+test/minitest_config.rb
+test/test_marlowe.rb

data/README.rdoc

@@ -52,6 +52,23 @@ You can use this pattern if you've rolled your own logger/formatter:
     end
   end
 
+=== Lograge
+
+As {lograge}[https://github.com/roidrage/lograge] supplies it's own formatter,
+you will need to do something a little different:
+
+  # config/application.rb
+  
+  class Application < Rails::Application
+    config.before_initialize do
+      ...
+      # use lograge for all request logs
+      config.lograge.enabled = true
+      config.lograge.custom_options = lambda do |event|
+        { correlation_id: RequestStore[:correlation_id] }
+      end
+    end
+  end
 
 == Clients
 
@@ -96,4 +113,3 @@ or
   client.before_call(Correlator.new)
 
 
-

data/Rakefile

@@ -1,14 +1,61 @@
 # -*- ruby -*-
 
-require "rubygems"
-require "hoe"
+require 'rubygems'
+require 'hoe'
 
-Hoe.plugin :minitest
+Hoe.plugin :doofus
+Hoe.plugin :email unless ENV['CI'] or ENV['TRAVIS']
+Hoe.plugin :gemspec2
 Hoe.plugin :git
+Hoe.plugin :minitest
+Hoe.plugin :rubygems
+Hoe.plugin :travis
+
+Hoe.spec 'marlowe' do
+  developer('Trevor Oke', 'toke@kineticcafe.com')
+  developer('Kinetic Cafe', 'dev@kineticcafe.com')
+
+  self.history_file = 'History.rdoc'
+  self.readme_file = 'README.rdoc'
+
+  license 'MIT'
+
+  extra_deps << ['request_store', '~> 1.2']
+  extra_deps << ['rack',  '>= 0.9', '< 2']
+
+  extra_dev_deps << ['rack-test', '~> 0.6']
+  self.extra_dev_deps << ['rake', '~> 10.0']
+  self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
+  self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
+  self.extra_dev_deps << ['hoe-git', '~> 1.5']
+  self.extra_dev_deps << ['hoe-travis', '~> 1.2']
+  self.extra_dev_deps << ['minitest', '~> 5.4']
+  self.extra_dev_deps << ['minitest-autotest', '~> 1.0']
+  self.extra_dev_deps << ['minitest-bisect', '~> 1.2']
+  self.extra_dev_deps << ['minitest-focus', '~> 1.1']
+  self.extra_dev_deps << ['minitest-moar', '~> 0.0']
+  self.extra_dev_deps << ['simplecov', '~> 0.7']
+end
+
+module Hoe::Publish
+  alias_method :original_make_rdoc_cmd, :make_rdoc_cmd
+
+  def make_rdoc_cmd(*extra_args) # :nodoc:
+    spec.extra_rdoc_files.reject! { |f| f == 'Manifest.txt' }
+    original_make_rdoc_cmd(*extra_args)
+  end
+end
 
-Hoe.spec "marlowe" do
-  developer("Trevor Oke", "toke@kineticcafe.com")
-  license "MIT"
+namespace :test do
+  task :coverage do
+    prelude = <<-EOS
+require 'simplecov'
+SimpleCov.start('test_frameworks') { command_name 'Minitest' }
+gem 'minitest'
+    EOS
+    spec.test_prelude = prelude.split($/).join('; ')
+    Rake::Task['test'].execute
+  end
 end
 
 # vim: syntax=ruby

data/lib/marlowe.rb

@@ -1,6 +1,6 @@
 # Marlowe, a correlation id injector.
 module Marlowe
-  VERSION = '1.0.1' #:nodoc:
+  VERSION = '1.0.2' #:nodoc:
 
   require 'marlowe/middleware'
   require 'marlowe/rails' if defined? Rails::Railtie

data/test/minitest_config.rb

@@ -0,0 +1,24 @@
+# -*- ruby encoding: utf-8 -*-
+
+gem 'minitest'
+
+require 'rack/test'
+require 'rack/mock'
+require 'pry'
+require 'minitest/autorun'
+require 'minitest/pretty_diff'
+require 'minitest/focus'
+require 'minitest/moar'
+require 'minitest/bisect'
+
+require 'request_store'
+require 'marlowe'
+
+class RackApp
+  def call(env)
+  end
+
+  def coordination_id
+    RequestStore[:correlation_id]
+  end
+end

data/test/test_marlowe.rb

@@ -0,0 +1,19 @@
+require 'minitest_config'
+
+class TestMarlowe < Minitest::Test
+  def setup
+    @app = RackApp.new
+    @middleware = Marlowe::Middleware.new(@app)
+  end
+
+  def test_no_header
+    @middleware.call({})
+    refute_empty @app.coordination_id
+  end
+
+  def test_with_header
+    @middleware.call({'HTTP_CORRELATION_ID' => 'testvalue'})
+    refute_empty @app.coordination_id
+    assert_equal 'testvalue', @app.coordination_id
+  end
+end

metadata

@@ -1,15 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: marlowe
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Trevor Oke
+- Kinetic Cafe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +73,160 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: hoe-doofus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hoe-gemspec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: hoe-git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: hoe-travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: minitest-autotest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-bisect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-moar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +246,7 @@ description: "{marlowe}[https://github.com/KineticCafe/marlowe] provides a corre
   \nacross multiple services."
 email:
 - toke@kineticcafe.com
+- dev@kineticcafe.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -66,6 +256,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".autotest"
+- Gemfile
 - History.rdoc
 - Licence.rdoc
 - Manifest.txt
@@ -76,6 +267,8 @@ files:
 - lib/marlowe/middleware.rb
 - lib/marlowe/rails.rb
 - lib/marlowe/simple_formatter.rb
+- test/minitest_config.rb
+- test/test_marlowe.rb
 homepage: 
 licenses:
 - MIT