playback 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 580e0a3e9b1cafc764fe1f62eb6b405078c360c0
-  data.tar.gz: 0420f4a3e89b6b7665b6a5337e332b38989258f6
+  metadata.gz: 047d1f2495190a640bc69a27cac7ccd8c947b410
+  data.tar.gz: 78ce24836ece75f735de0480260204ee7740574b
 SHA512:
-  metadata.gz: 12540808291a231bd988178f6bb463b3605056effd7a98ce896d2e90fb4437856e1f33a84bc32b9a9c108874c3ed9bbc7ccab1151445054ae1bdb099e02035a4
-  data.tar.gz: 84cb9e852812fa93dedf78bdfe039dfcb6b6f08d0d8e0dd3b3ae282aa5067db4c4621b2dd6721d23f477a04092db3683bd5ca8eb72c8d9a0196ccc4978a3fddc
+  metadata.gz: ee385541f2c0c9256f87043c08ac1da99835716d94054191be0d610d698306404492d3a8b208a14d91aeb2eb6ce58545808dba6c9b09274db5684c157f87d97e
+  data.tar.gz: 62b0f255d0cc4933564fcacec00ee53ecb8472fac52450d97852361dd600d04dab010c21650d2ce862192b3155584342192d784bdac1468b19bb732e9d8c8db0

data/README.md

@@ -1,6 +1,5 @@
-# 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 apache access log  
+# 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 apache access log
 
 ## Installation
 
@@ -10,7 +9,7 @@ Execute http request from apache access log
 
 ### as a command line tool
 ```sh
-playback 'http://httpbin.org' /path/to/access.log
+$ playback 'http://httpbin.org' /path/to/access.log
 #=> { "method": "GET", "path": "/get", "status": 200 }
 #=> { "method": "POST", "path": "/post?hoge=1", "status": 404 }
 #=> { "method": "PUT", "path": "/put?foo=bar", "status": 200 }

data/lib/playback.rb

@@ -1,6 +1,2 @@
 require "playback/version"
 require "playback/request"
-
-module Playback
-  # Your code goes here...
-end

data/lib/playback/request.rb

@@ -7,74 +7,53 @@ module Playback
     DEFAULT_CONTENT_TYPE = 'application/text'
     DEFAULT_USER_AGENT = 'From Playback rubygems'
 
+    PARSER = ApacheLog::Parser
+
+    REQUEST_WITHOUT_BODY = %w(GET DELETE HEAD)
+    REQUEST_WITH_BODY = %w(POST PUT PATCH)
+
     def initialize(base_uri)
       @base_uri = base_uri
-      @common_parser = ApacheLog::Parser.new('common')
-      @combined_parser = ApacheLog::Parser.new('combined')
+      @common_parser = PARSER.new('common')
+      @combined_parser = PARSER.new('combined')
     end
 
     def run(line, return_type='')
-      parsed_line = parse(line)
-      method = parsed_line[:request][:method]
-      path   = parsed_line[:request][:path]
-      referer = parsed_line[:referer] ||= ''
-      user_agent = parsed_line[:user_agent] ||= DEFAULT_USER_AGENT
+      parsed_line = parse_log(line)
 
-      res = request(method, path, referer, user_agent)
+      method     = parsed_line[:request][:method]
+      path       = parsed_line[:request][:path]
+      referer    = parsed_line[:referer] ||= ''
+      user_agent = parsed_line[:user_agent] ||= DEFAULT_USER_AGENT
 
-      unless (return_type == 'net-http')
-        result = {
-          method: method,
-          path: path,
-          status: res.code.to_i,
-        }
-        res = JSON.generate(result)
-      end
+      response = request(method, path, referer, user_agent)
 
-      res
+      return response if return_type == 'net-http'
 
+      {method: method, path: path, status: response.code.to_i}.to_json
     rescue => e
       e.message
     end
 
     private
 
-    def parse(line)
+    def parse_log(line)
       begin
         @combined_parser.parse(line.chomp)
       rescue
-        begin
-          @common_parser.parse(line.chomp)
-        rescue => e
-          raise e
-        end
+        @common_parser.parse(line.chomp)
       end
     end
 
     def request(method, path, referer, user_agent)
-      begin
-        uri = URI.parse(@base_uri + path)
-      rescue
-        raise "it can not be recognized as a uri: <#{@base_uri + path}>"
-      end
-
+      uri = URI.parse("#{@base_uri}#{path}")
       http = Net::HTTP.new(uri.host, uri.port)
-      query = uri.query ||= ''
-      data = {'Content-Type' => DEFAULT_CONTENT_TYPE, 'Referer' => referer, 'User-Agent' => user_agent}
+      header = {'Content-Type' => DEFAULT_CONTENT_TYPE, 'Referer' => referer, 'User-Agent' => user_agent}
 
-      case method
-      when 'GET'
-        http.get(path, data)
-      when 'POST'
-        http.post(uri.path, query, data)
-      when 'PUT'
-        http.put(uri.path, query, data)
-      when 'DELETE'
-        http.delete(path, data)
-      when 'PATCH'
-        http.patch(uri.path, query, data)
-      when 'HEAD'
-        http.head(path, data)
+      if REQUEST_WITHOUT_BODY.include?(method)
+        http.send(method.downcase, path, header)
+      elsif REQUEST_WITH_BODY.include?(method)
+        http.send(method.downcase, uri.path, uri.query, header)
       else
         raise "it is not supported http method: <#{method}>"
       end

data/lib/playback/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playback
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yuichi Takada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Execute http request from apache access log