yarder 0.0.2 → 0.1.0

data/test/logger_test.rb

@@ -72,6 +72,16 @@ class BufferedLoggerTest < ActiveSupport::TestCase
     assert @output.string.include?(@message)
   end
 
+  def test_env_should_have_data
+    assert_present @logger.env[:ruby]
+    assert_present @logger.env[:program]
+    assert_present @logger.env[:user]
+
+    assert_equal Dir.pwd, @logger.env[:pwd]
+    assert_equal 'test', @logger.env[:env].to_s
+    assert_equal Socket.gethostname, @logger.env[:host]
+  end
+
   def test_should_add_message_passed_as_block_when_using_shortcut
     @logger.level = Logger::INFO
     @logger.info {@message}

data/test/rack/logger_test.rb

@@ -12,6 +12,7 @@ class LoggerTest < ActiveSupport::IntegrationCase
   setup do
     @output = StringIO.new
     Rails.logger = Yarder::TaggedLogging.new(MyLogger.new(@output))
+    Rails.logger.log_namespace = :app
     visit('/widgets')
   end
 
@@ -20,49 +21,73 @@ class LoggerTest < ActiveSupport::IntegrationCase
   end
 
   test 'fills in the client_ip' do
-    assert_equal "127.0.0.1", entry['@fields']['client_ip']
+    assert_equal "127.0.0.1", entry['app']['rack']['client_ip']
   end
 
   test 'fills in the method' do
-    assert_equal "GET", entry['@fields']['method']
+    assert_equal "GET", entry['app']['rack']['method']
   end
 
   test 'fills in the path' do
-    assert_equal "/widgets", entry['@fields']['path']
+    assert_equal "/widgets", entry['app']['rack']['path']
+  end
+
+  test 'fills in the url' do
+    assert_equal "http://www.example.com/widgets", entry['app']['rack']['url']
   end
 
   test 'fills in the status' do
-    assert_equal "/widgets", entry['@fields']['path']
+    assert_equal "/widgets", entry['app']['rack']['path']
   end
 
   test 'fills in the total_duration' do
-    assert entry['@fields']['total_duration'].to_f >= 0, "total_duration was not a positive number"
+    assert entry['app']['duration']['total'].to_f > 0, "total duration was not a positive number"
   end
 
-  test 'fills in the rendering_duration' do
-    assert entry['@fields']['rendering_duration'].to_f >= 0, "rendering_duration was not a positive number"
+  test 'total_duration is greater than sql_duration' do
+    duration = entry['app']['duration']
+    assert duration['total'].to_f >= duration['sql'].to_f, "total duration is less than sql duration"
+  end
+
+  test 'total_duration is greater than controller_duration' do
+    duration = entry['app']['duration']
+    assert entry['app']['duration']['total'].to_f >= duration['controller'].to_f, "total_duration is less than controller_duration"
   end
 
   test 'fills in the sql_duration' do
-    assert entry['@fields']['rendering_duration'].to_f >= 0, "sql_duration was not a positive number"
+    duration = entry['app']['duration']
+    assert duration['sql'].to_f >= 0, "sql_duration was not a positive number"
   end
 
   test 'fills in the method name tag' do
-    assert_equal 32, entry['@fields']['uuid'].size
+    assert_equal 32, entry['app']['uuid'].size
   end
 
   test 'fills in the string tag' do
-    assert_match "Hello", entry['@tags'].first
+    assert_match "Hello", entry['tags'].first
   end
 
   test 'fills in the proc tag' do
-    assert_match "Proc", entry['@tags'].last
+    assert_match "Proc", entry['tags'].last
   end
 
-  #TODO Add tests for view and SQL rendering summaries
+  test 'fills in the sql query' do
+    assert entry['app']['sql'].last['sql'], '"SELECT "widgets".* FROM "widgets"'
+  end
+
+=begin TODO Add tests for view rendering
+  test 'fills in the rendering' do
+    assert_present entry['app']['rack']['rendering'] , "rendering is blank"
+  end
+
+  test 'fills in the rendering_duration' do
+    assert_present entry['app']['rack']['rendering_duration'] , "rendering_duration is blank"
+    assert Float(entry['app']['rack']['rendering_duration']) >= 0, "rendering_duration was not a positive number"
+  end
+=end
 
   def entry
     JSON.parse(@output.string)
   end
 
-end
+end

data/test/tagged_logging_test.rb

@@ -20,33 +20,33 @@ class TaggedLoggingTest < ActiveSupport::TestCase
 
   test 'fills in the severity' do
     @logger.info "Severity Test"
-    assert_equal "INFO", JSON.parse(@output.string)['@fields']['severity']
+    assert_equal "INFO", JSON.parse(@output.string)['severity']
   end
 
   test "tagged once" do
     @logger.tagged("BCX") { @logger.info "Funky time" }
-    assert_equal "BCX", JSON.parse(@output.string)['@tags'][0]
-    assert_equal "Funky time", JSON.parse(@output.string)['@message']
+    assert_equal "BCX", JSON.parse(@output.string)['tags'][0]
+    assert_equal "Funky time", JSON.parse(@output.string)['message']
   end
 
   test "tagged twice" do
     @logger.tagged("BCX") { @logger.tagged("Jason") { @logger.info "Funky time" } }
-    assert_equal "BCX", JSON.parse(@output.string)['@tags'][0]
-    assert_equal "Jason", JSON.parse(@output.string)['@tags'][1]
+    assert_equal "BCX", JSON.parse(@output.string)['tags'][0]
+    assert_equal "Jason", JSON.parse(@output.string)['tags'][1]
   end
 
   test "tagged thrice at once" do
     @logger.tagged("BCX", "Jason", "New") { @logger.info "Funky time" }
-    assert_equal "BCX", JSON.parse(@output.string)['@tags'][0]
-    assert_equal "Jason", JSON.parse(@output.string)['@tags'][1]
-    assert_equal "New", JSON.parse(@output.string)['@tags'][2]
+    assert_equal "BCX", JSON.parse(@output.string)['tags'][0]
+    assert_equal "Jason", JSON.parse(@output.string)['tags'][1]
+    assert_equal "New", JSON.parse(@output.string)['tags'][2]
   end
 
   test "tagged are flattened" do
     @logger.tagged("BCX", %w(Jason New)) { @logger.info "Funky time" }
-    assert_equal "BCX", JSON.parse(@output.string)['@tags'][0]
-    assert_equal "Jason", JSON.parse(@output.string)['@tags'][1]
-    assert_equal "New", JSON.parse(@output.string)['@tags'][2]
+    assert_equal "BCX", JSON.parse(@output.string)['tags'][0]
+    assert_equal "Jason", JSON.parse(@output.string)['tags'][1]
+    assert_equal "New", JSON.parse(@output.string)['tags'][2]
   end
 
 
@@ -59,44 +59,44 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     @logger.info 'c'
     assert_equal [], @logger.clear_tags!
     @logger.info 'd'
-   # assert_equal "[A] [B] [C] a\n[A] [B] b\n[A] c\nd\n",  JSON.parse(@output.string)['@tags']
+   # assert_equal "[A] [B] [C] a\n[A] [B] b\n[A] c\nd\n",  JSON.parse(@output.string)['tags']
 
     first_log = JSON.parse(@output.string.split("\n")[0])
-    assert_equal "A", first_log['@tags'][0]
-    assert_equal "B", first_log['@tags'][1]
-    assert_equal "C", first_log['@tags'][2]
-    assert_equal "a", first_log['@message']
+    assert_equal "A", first_log['tags'][0]
+    assert_equal "B", first_log['tags'][1]
+    assert_equal "C", first_log['tags'][2]
+    assert_equal "a", first_log['message']
 
     second_log = JSON.parse(@output.string.split("\n")[1])
-    assert_equal "A", second_log['@tags'][0]
-    assert_equal "B", second_log['@tags'][1]
-    assert_equal "b", second_log['@message']
+    assert_equal "A", second_log['tags'][0]
+    assert_equal "B", second_log['tags'][1]
+    assert_equal "b", second_log['message']
 
     third_log = JSON.parse(@output.string.split("\n")[2])
-    assert_equal "A", third_log['@tags'][0]
-    assert_equal "c", third_log['@message']
+    assert_equal "A", third_log['tags'][0]
+    assert_equal "c", third_log['message']
 
     fourth_log = JSON.parse(@output.string.split("\n")[3])
-    assert fourth_log['@tags'].empty?
-    assert_equal "d", fourth_log['@message']
+    assert fourth_log['tags'].empty?
+    assert_equal "d", fourth_log['message']
   end
 
 
 
   test "does not strip message content" do
     @logger.info " Hello"
-    assert_equal " Hello", JSON.parse(@output.string)['@message']
+    assert_equal " Hello", JSON.parse(@output.string)['message']
   end
 
   test "provides access to the logger instance" do
     @logger.tagged("BCX") { |logger| logger.info "Funky time" }
-    assert_equal "BCX", JSON.parse(@output.string)['@tags'][0]
-    assert_equal "Funky time", JSON.parse(@output.string)['@message']
+    assert_equal "BCX", JSON.parse(@output.string)['tags'][0]
+    assert_equal "Funky time", JSON.parse(@output.string)['message']
   end
 
   test "tagged once with blank and nil" do
     @logger.tagged(nil, "", "New") { @logger.info "Funky time" }
-    assert_equal "New", JSON.parse(@output.string)['@tags'].last
+    assert_equal "New", JSON.parse(@output.string)['tags'].first
   end
 
   test "keeps each tag in their own thread" do
@@ -109,13 +109,13 @@ class TaggedLoggingTest < ActiveSupport::TestCase
 
     # Sub-thread
     main_thread = JSON.parse(@output.string.split("\n").first)
-    assert_equal "OMG", main_thread['@tags'][0]
-    assert_equal "Cool story bro", main_thread['@message']
+    assert_equal "OMG", main_thread['tags'][0]
+    assert_equal "Cool story bro", main_thread['message']
 
     # Main thread
     main_thread = JSON.parse(@output.string.split("\n").last)
-    assert_equal "BCX", main_thread['@tags'][0]
-    assert_equal "Funky time", main_thread['@message']
+    assert_equal "BCX", main_thread['tags'][0]
+    assert_equal "Funky time", main_thread['message']
   end
 
   test "cleans up the taggings on flush" do
@@ -129,8 +129,8 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     end
 
     first_log = JSON.parse(@output.string.split("\n").first)
-    assert first_log['@tags'].empty?
-    assert_equal "Cool story bro", first_log['@message']
+    assert first_log['tags'].empty?
+    assert_equal "Cool story bro", first_log['message']
   end
 
 
@@ -141,15 +141,13 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     end
 
     first_log = JSON.parse(@output.string.split("\n").first)
-    assert_equal "BCX", first_log['@tags'][0]
-    assert_equal "Jason", first_log['@tags'][1]
-    assert_equal "Funky time", first_log['@message']
+    assert_equal "BCX", first_log['tags'][0]
+    assert_equal "Jason", first_log['tags'][1]
+    assert_equal "Funky time", first_log['message']
 
     second_log = JSON.parse(@output.string.split("\n").last)
-    assert_equal "BCX", second_log['@tags'][0]
-    assert_equal "Junky time!", second_log['@message']
+    assert_equal "BCX", second_log['tags'][0]
+    assert_equal "Junky time!", second_log['message']
   end
 
 end
-
-

metadata

@@ -1,86 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: yarder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
+  prerelease:
 platform: ruby
 authors:
 - Jeffrey Jones
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-event
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 1.2.02
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.02
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
-description: Replaces the default string based Ruby on Rails logging system with a
-  JSON based one
+    none: false
+  prerelease: false
+  type: :development
+description: Replaces the default string based Ruby on Rails logging system with a JSON based one
 email:
 - jjones@toppan-f.co.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/yarder.rb
 - lib/tasks/yarder_tasks.rake
+- lib/yarder/event.rb
+- lib/yarder/logger.rb
+- lib/yarder/railtie.rb
+- lib/yarder/tagged_logging.rb
+- lib/yarder/version.rb
 - lib/yarder/action_controller/log_subscriber.rb
 - lib/yarder/action_view/log_subscriber.rb
 - lib/yarder/active_record/log_subscriber.rb
 - lib/yarder/active_resource/log_subscriber.rb
 - lib/yarder/core_ext/object/blank.rb
-- lib/yarder/event.rb
-- lib/yarder/logger.rb
 - lib/yarder/rack/logger.rb
-- lib/yarder/railtie.rb
-- lib/yarder/tagged_logging.rb
-- lib/yarder/version.rb
-- lib/yarder.rb
 - MIT-LICENSE
 - Rakefile
 - README.md
+- test/logger_test.rb
+- test/tagged_logging_test.rb
+- test/test_helper.rb
+- test/yarder_test.rb
 - test/action_controller/log_subscriber_test.rb
 - test/action_view/log_subscriber_test.rb
 - test/active_record/log_subscriber_test.rb
 - test/active_resource/log_subscriber_test.rb
 - test/core_ext/blank_test.rb
+- test/dummy/config.ru
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/widgets.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -106,6 +119,7 @@ files:
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -116,30 +130,21 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/migrate/20120927084605_create_widgets.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/migrate/20120927084605_create_widgets.rb
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
-- test/logger_test.rb
 - test/rack/logger_test.rb
 - test/support/fake_models.rb
 - test/support/integration_case.rb
 - test/support/multibyte_test_helpers.rb
-- test/tagged_logging_test.rb
-- test/test_helper.rb
-- test/yarder_test.rb
 homepage: https://github.com/rurounijones/yarder
 licenses: []
-metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,24 +152,39 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
-signing_key: 
-specification_version: 4
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
+specification_version: 3
 summary: JSON format based replacement for Ruby on Rails logging system
 test_files:
+- test/logger_test.rb
+- test/tagged_logging_test.rb
+- test/test_helper.rb
+- test/yarder_test.rb
 - test/action_controller/log_subscriber_test.rb
 - test/action_view/log_subscriber_test.rb
 - test/active_record/log_subscriber_test.rb
 - test/active_resource/log_subscriber_test.rb
 - test/core_ext/blank_test.rb
+- test/dummy/config.ru
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/widgets.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -190,6 +210,7 @@ test_files:
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -200,23 +221,15 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/migrate/20120927084605_create_widgets.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/migrate/20120927084605_create_widgets.rb
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
-- test/logger_test.rb
 - test/rack/logger_test.rb
 - test/support/fake_models.rb
 - test/support/integration_case.rb
 - test/support/multibyte_test_helpers.rb
-- test/tagged_logging_test.rb
-- test/test_helper.rb
-- test/yarder_test.rb