rack-simple_logger 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTM2NzNlNDRiYmNiNGZlZjcyM2U3YzEwN2NjMDlkZTM5YzZmZDIxMQ==
-  data.tar.gz: !binary |-
-    ZDM0Mjg4Mjc3NjZmOGEwMTljNWQ4ZjRlZmZjMTQyYTgyNTU4ZDBiYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MTgxYTcyZjEyZGVmOTRiZjZmNDQ5MGU3Nzg3ZWI3OTQ3NmNkZmRjYzU1YzU1
-    NWJkOWU0M2U0MDJiOTBmODIwYjU2YjcxZTI2YmUwMDE4NDM4ZWMzOGYyYjMw
-    MWUxNjBlZmFlMjE5OGY1YTI0NjMxNTg0N2I3NjA0Y2Y2Njg0NGY=
-  data.tar.gz: !binary |-
-    NzEyZTI2OTk2Yjk0NDE3MzFlNzFjNDA0YWVhYjEyYmQxNTI3NDNlMTE0ZTU3
-    ZTk3ZWM0NTkyMjY5ZDkyYjA5N2Y5ZGZjYmQ5ZWI1NTEyYTgzOWM2NmY4Mzdj
-    MmUxODI1YjNkMzZjYTk2ZTIzZGE5N2Y0ODMwNGEzMDBmZGU2MjA=
+SHA1:
+  metadata.gz: 7dd4ec3cff4d4004ac1bdf0a55996a93de4e63cb
+  data.tar.gz: 36e11ad74ff7ef2239eff7eec58db1246338cbbe
+SHA512:
+  metadata.gz: d252d442925f6f794fb6d2d7f61cb93e1761090267b4b4275a551423eeecb2fdb52ab926deb14bdd45f1f6dd342445973a24c1e8f2925a16858078f169dde30c
+  data.tar.gz: 4efbd7eea252240238174866f0d56c8353b70ec2e73a84cf14801e42ac454107838873f7f03faadb89203edcb6988bdb841f0a672c257093c37af538d34f76a4

data/lib/rack/simple_logger.rb

@@ -4,36 +4,27 @@ require "logger"
 
 require "rack/simple_logger/version"
 require "rack/simple_logger/log_proxy"
+require "rack/simple_logger/log_filter"
 
 module Rack
   class SimpleLogger
     def initialize(app, options={})
       options[:log] ||= STDOUT
       @logger = LogProxy.new(options[:log])
+      @filter = options[:filter] || LogFilter.new
       @app = app
     end
 
     def call(env)
       began_at = Time.now
       status, header, body = @app.call(env)
-      log(env, status, header, began_at)
+      log(@filter.pass(env, status, header, began_at))
       [status, header, body]
     end
 
     private
-    def log(env, status, header, began_at)
-      @logger.write(
-        xff: env["HTTP_X_FORWARDED_FOR"] || "-",
-        host: env["REMOTE_ADDR"],
-        time: began_at.strftime("%Y-%m-%d %H:%M:%S"),
-        method: env["REQUEST_METHOD"],
-        path: env["PATH_INFO"],
-        query_strings: env["QUERY_STRING"] || "-",
-        status: status,
-        ua: env["HTTP_USER_AGENT"],
-        res_size: header["Content-Length"],
-        app_time: Time.now - began_at
-      )
+    def log(log_hash)
+      @logger.write(log_hash)
     end
   end
 end

data/lib/rack/simple_logger/log_filter.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+
+module Rack
+  class LogFilter
+    def pass(env, status, header, began_at)
+      {
+        xff: env["HTTP_X_FORWARDED_FOR"] || "-",
+        host: env["REMOTE_ADDR"],
+        time: began_at.strftime("%Y-%m-%d %H:%M:%S"),
+        method: env["REQUEST_METHOD"],
+        path: env["PATH_INFO"],
+        query_strings: env["QUERY_STRING"] || "-",
+        status: status,
+        ua: env["HTTP_USER_AGENT"],
+        res_size: header["Content-Length"],
+        app_time: Time.now - began_at
+      }
+    end
+  end
+end

data/lib/rack/simple_logger/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class SimpleLogger
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/rack/simple_logger/log_filter_spec.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+require "spec_helper"
+
+describe Rack::LogFilter do
+  let(:filter) {Rack::LogFilter.new}
+  let(:status) {200}
+  let(:began_at) {Time.now}
+
+  let(:env) do
+    {
+      "REMOTE_ADDR"=>"127.0.0.1",
+      "REQUEST_METHOD"=>"GET",
+      "PATH_INFO"=>"/login",
+      "QUERY_STRING"=>"",
+     "HTTP_USER_AGENT"=>"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.116 Safari/537.36"
+    }
+  end
+
+  let(:header) do
+    {"Content-Length" => 256}
+  end
+
+  describe "#pass" do
+    it "should return Hash object" do
+      expect(filter.pass(env, status, header, began_at).is_a? Hash).to be_true 
+    end
+
+    it "size should be 10 items" do
+      expect(filter.pass(env, status, header, began_at).size).to eq(10)
+    end
+  end
+end

data/spec/rack/simple_logger_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 describe Rack::SimpleLogger do
   let(:logger) {double("logger mock", class: "Logger").as_null_object}
+  let(:filter) {double("filter mock")}
   let(:app) {Rack::SimpleLogger.new(TestApp.new, log: logger)}
 
   describe "#initialize" do
@@ -15,10 +16,19 @@ describe Rack::SimpleLogger do
       expect(app.instance_eval{@logger}.is_a? Rack::LogProxy).to be_true
     end
 
-    it "@logger is STDOUT if not specified" do
+    it "@logger should be a STDOUT if not specified" do
       Rack::LogProxy.should_receive(:new).with(STDOUT)
       Rack::SimpleLogger.new(TestApp.new)
     end
+
+    it "@filter should be a LogFilter object" do
+      expect(app.instance_eval{@filter}.is_a? Rack::LogFilter).to be_true
+    end
+
+    it "@filter should be a specified filter" do
+      app = Rack::SimpleLogger.new(TestApp.new, log: logger, filter: filter)
+      expect(app.instance_eval{@filter}).to eq(filter)
+    end
   end
 
   describe "#call" do
@@ -31,6 +41,10 @@ describe Rack::SimpleLogger do
   describe "#log" do
     after {get "/"}
 
+    it "should call LogFilter#pass" do
+      Rack::LogFilter.any_instance.should_receive(:pass).and_return({a: 1})
+    end
+
     it "should call LogProxy#write" do
       Rack::LogProxy.any_instance.should_receive(:write)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-simple_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,56 +28,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple logger for rack
@@ -95,9 +95,11 @@ files:
 - README.md
 - Rakefile
 - lib/rack/simple_logger.rb
+- lib/rack/simple_logger/log_filter.rb
 - lib/rack/simple_logger/log_proxy.rb
 - lib/rack/simple_logger/version.rb
 - rack-simple_logger.gemspec
+- spec/rack/simple_logger/log_filter_spec.rb
 - spec/rack/simple_logger/log_proxy_spec.rb
 - spec/rack/simple_logger_spec.rb
 - spec/spec_helper.rb
@@ -112,21 +114,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Simple logger for rack
 test_files:
+- spec/rack/simple_logger/log_filter_spec.rb
 - spec/rack/simple_logger/log_proxy_spec.rb
 - spec/rack/simple_logger_spec.rb
 - spec/spec_helper.rb