playback 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf2e91b3876efbd30efd8318e80d831d5fa14b9a
-  data.tar.gz: c21c5b68e7ea37e1cc0d5145523dd3fa78bbc8a9
+  metadata.gz: 580e0a3e9b1cafc764fe1f62eb6b405078c360c0
+  data.tar.gz: 0420f4a3e89b6b7665b6a5337e332b38989258f6
 SHA512:
-  metadata.gz: bce6c7845b5a9d7c8da1f72154aaad6cd24c134a34e5bf2e741f6cd7bc4cf42f684e12bd16027d1ef7b7f48c783d653335acb76dd0f0665b491db526390615e1
-  data.tar.gz: bb7e8427bd00e2903c9c7992571013277a38854a9b98b50a0528973c4b8b76540fcf9955f0bdb9ba49b23488d2e9b4e330b2c97ce96f58ae6dcba82fb52775a4
+  metadata.gz: 12540808291a231bd988178f6bb463b3605056effd7a98ce896d2e90fb4437856e1f33a84bc32b9a9c108874c3ed9bbc7ccab1151445054ae1bdb099e02035a4
+  data.tar.gz: 84cb9e852812fa93dedf78bdfe039dfcb6b6f08d0d8e0dd3b3ae282aa5067db4c4621b2dd6721d23f477a04092db3683bd5ca8eb72c8d9a0196ccc4978a3fddc

data/README.md

@@ -1,7 +1,6 @@
 # Playback
 [![Build Status](https://travis-ci.org/takady/playback.svg?branch=master)](https://travis-ci.org/takady/playback) [![Code Climate](https://codeclimate.com/github/takady/playback/badges/gpa.svg)](https://codeclimate.com/github/takady/playback)  
-execute http request from access log  
-supported log format: apache(common, combined and customized base on combined)
+Execute http request from apache access log  
 
 ## Installation
 

data/lib/playback/request.rb

@@ -1,4 +1,4 @@
-require "playback/parser"
+require 'apache_log/parser'
 require 'net/http'
 require 'json'
 
@@ -9,7 +9,8 @@ module Playback
 
     def initialize(base_uri)
       @base_uri = base_uri
-      @parser = Playback::Parser
+      @common_parser = ApacheLog::Parser.new('common')
+      @combined_parser = ApacheLog::Parser.new('combined')
     end
 
     def run(line, return_type='')
@@ -27,7 +28,7 @@ module Playback
           path: path,
           status: res.code.to_i,
         }
-        res = JSON.generate result
+        res = JSON.generate(result)
       end
 
       res
@@ -36,12 +37,14 @@ module Playback
       e.message
     end
 
+    private
+
     def parse(line)
       begin
-        @parser.parse(line.chomp, 'combined')
+        @combined_parser.parse(line.chomp)
       rescue
         begin
-          @parser.parse(line.chomp, 'common')
+          @common_parser.parse(line.chomp)
         rescue => e
           raise e
         end
@@ -76,7 +79,5 @@ module Playback
         raise "it is not supported http method: <#{method}>"
       end
     end
-
-    private :parse, :request
   end
 end

data/lib/playback/version.rb

@@ -1,3 +1,3 @@
 module Playback
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/playback.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |spec|
   spec.name          = "playback"
   spec.version       = Playback::VERSION
   spec.authors       = ["Yuichi Takada"]
-  spec.email         = ["takadyy@gmail.com"]
-  spec.summary       = "generate and execute http request from access log"
-  spec.description   = "generate and execute http request from access log"
+  spec.email         = ["takadyuichi@gmail.com"]
+  spec.summary       = "Execute http request from apache access log"
+  spec.description   = spec.summary
   spec.homepage      = "https://github.com/takady/playback"
   spec.license       = "MIT"
 
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_dependency "apache_log-parser", "3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playback
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuichi Takada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,9 +52,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: generate and execute http request from access log
+- !ruby/object:Gem::Dependency
+  name: apache_log-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+description: Execute http request from apache access log
 email:
-- takadyy@gmail.com
+- takadyuichi@gmail.com
 executables:
 - playback
 extensions: []
@@ -69,7 +83,6 @@ files:
 - Rakefile
 - bin/playback
 - lib/playback.rb
-- lib/playback/parser.rb
 - lib/playback/request.rb
 - lib/playback/version.rb
 - playback.gemspec
@@ -98,7 +111,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: generate and execute http request from access log
+summary: Execute http request from apache access log
 test_files:
 - spec/playback/request_spec.rb
 - spec/spec_helper.rb

data/lib/playback/parser.rb

@@ -1,54 +0,0 @@
-module Playback
-  module Parser
-
-    def self.parse(line, format)
-      common_fields   = %w(request)
-      combined_fields = common_fields + %w(referer user_agent)
-
-      common_pattern     = '\S+\s+\S+\s+\S+\s+\[.*\]\s+"(\S+\s\S+\s\S+)"\s+\S+\s+\S+'
-      combined_pattern   = common_pattern + '\s+"([^"]*)"\s+"([^"]*)".*'
-
-      case format
-      when 'common'
-        fields = common_fields
-        pattern = /^#{common_pattern}$/
-      when 'combined'
-        fields = combined_fields
-        pattern = /^#{combined_pattern}$/
-      else
-        raise "no such format: <#{format}>"
-      end
-
-      matched = pattern.match(line)
-      raise "parse error at line: <#{line}>" if matched.nil?
-
-      generate_hash(fields, matched.to_a)
-    end
-
-    def self.generate_hash(keys, values)
-      hash = {}
-
-      keys.each.with_index do |key, idx|
-        key = key.to_sym
-        if (key == :request)
-          hash[key] = parse_request(values[idx+1])
-        else
-          hash[key] = values[idx+1]
-        end
-      end
-
-      hash
-    end
-
-    def self.parse_request(str)
-      method, path, protocol = str.split
-      {
-        method:   method,
-        path:     path,
-        protocol: protocol,
-      }
-    end
-
-    private_class_method :generate_hash, :parse_request
-  end
-end