rreplay 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa09716c0210241ba3b0d38a5e8dd75167753ccdb5b4912ad77ec80d78678d1
-  data.tar.gz: '05909b0693720f9b62c3494e7d1de4ba71e908fea26f6aed85a5a052087ebce0'
+  metadata.gz: 14173bb308c83ce39166a267e8f1477616aa6f51b24fc68e2df4e9f9accfa292
+  data.tar.gz: d472b8bbe77689121115f7d40758ff2a9c928a22057771f3237a3b181fc396ef
 SHA512:
-  metadata.gz: b23043a99ee9f017ceb21ffcd37e9e16269504bdd5ef8e0ac740d0802f5728f19fd124a6d9b1308b336f51c7768fc5ab51578deca922eea770140f2658464f44
-  data.tar.gz: 43bcd20ae323b1c9f627daf9fca8d0b365712f5b30ca182252f9a221086e25449ecf7a6322ed6e228f79294657fefd8627fa1dd3ee51ab3068134030637bb87e
+  metadata.gz: 4ac669fe52af177b7f7133e9d842315137e361eb5c7875ff673f8e12f83a83b440a5523f61dc82c32e5ddc80ad7427c35511ae9109ce91ba9071bf8a6e5b24a5
+  data.tar.gz: e2dcf2b4772208628c4d8b63ffa194b1c93f10424f92bb7c2d3840b13ec0fb646273da8d48f09b486d38c7f3d5d96fd58ecfe58ab8c37aafe99770ab2a1733de

data/lib/rreplay/debugger.rb

@@ -8,7 +8,15 @@ module Rreplay
     def out(&block)
       return unless @debug
 
-      @logger.write("#{Time.now.iso8601} - #{block.call}\n")
+      msg = block.call.then do |msg|
+        case msg
+        when Hash
+          msg.merge({ time: Time.now.iso8601 }).to_json
+        else
+          "#{Time.now.iso8601} - #{block.call}"
+        end
+      end
+      @logger.write("#{msg}\n")
     end
   end
 end

data/lib/rreplay/replay_runner.rb

@@ -9,47 +9,27 @@ require_relative './format'
 module Rreplay
   class ReplayRunner
     def initialize(endpoint, target, format: :msgpack, debug: false)
-      @endpoint = endpoint
+      @http = Http.new(endpoint)
       @format = Rreplay::Format.of(format)
       @target = target
       @debugger = Debugger.new($stderr, debug)
     end
 
     def run
+      output = OutputBuilder.new(style: :json)
+
       file_names.each do |file_name|
         ::File.open(file_name) do |file|
-          @debugger.out { "Open file: #{file_name}" }
+          @debugger.out { { message: "Open file: #{file_name}" } }
 
           file.each_line do |line|
             next if line.start_with?('#') # LogDevice's header
             line.chomp!
+            record = deserialize(line)
 
-            begin
-              record = @format.deserializer.call(line)
-            rescue => e
-              raise "Failed to deserialize. err = #{e.inspect}, line = #{line}", e
-            end
-            request = record["request"]
-            result, response_time = http_call(request)
+            result = @http.call(record['request'])
             @debugger.out {
-              response_json = {
-                status: result.code,
-                headers: record['response']['headers'].reduce({}) do |acc, (key, _)|
-                  acc.merge({key => result[key]})
-                end,
-                body: Array(result.body),
-              }
-              <<~EOF
-              #{record['uuid']}:
-              * request:
-                #{request}
-              * response(actual):
-                #{response_time} sec
-                #{response_json}
-              * response(recorded):
-                #{record['response_time']} sec
-                #{record['response']}
-              EOF
+              output.call(record, result)
             }
           end
         end
@@ -67,8 +47,83 @@ module Rreplay
         end
       end
 
+      def deserialize(line)
+        @format.deserializer.call(line)
+      rescue => e
+        raise "Failed to deserialize. err = #{e.inspect}, line = #{line}", e
+      end
+
+  end
+
+  private
+
+    class OutputBuilder
+      # @param style [Symbol] :json or :string
+      def initialize(style: :json)
+        @builder = case style
+                   when :json
+                     method(:build_json)
+                   else
+                     method(:build_string)
+                   end
+      end
+
+      # @param record [Hash]
+      # @param result [Http::Result]
+      def call(record, result)
+        response_json = {
+          status: result.response.code,
+          headers: record['response']['headers'].reduce({}) do |acc, (key, _)|
+            acc.merge({key => result.response[key]})
+          end,
+          body: Array(result.response.body),
+        }
+
+        @builder.call(record, result.response_time, response_json)
+      end
+
+      private
+
+        def build_json(record, response_time, actual_response)
+          {
+            uuid: record['uuid'],
+            response: {
+              actual: {
+                response_time: response_time,
+                response: actual_response,
+              },
+              recorded: {
+                response_time: record['response_time'],
+                record: record['response'],
+              }
+            }
+          }
+        end
+
+        def build_string(record, response_time, actual_response)
+
+          <<~EOF
+            #{record['uuid']}:
+            * request:
+              #{record['request']}
+            * response(actual):
+              #{response_time} sec
+              #{actual_response}
+            * response(recorded):
+              #{record['response_time']} sec
+              #{record['response']}
+          EOF
+        end
+    end
+
+    class Http
+      Result = Struct.new(:response, :response_time)
 
-      def http_call(orig_request)
+      def initialize(endpoint)
+        @endpoint = endpoint
+      end
+
+      def call(orig_request)
         uri = URI(::File.join(@endpoint, orig_request['path'], orig_request['query_strings']))
         body = orig_request['body']
         headers = orig_request['headers']
@@ -95,13 +150,10 @@ module Rreplay
 
         start_time = Time.now
         response = Net::HTTP.start(uri.hostname, uri.port,
-                        :use_ssl => uri.scheme == 'https') { |http|
+                                   :use_ssl => uri.scheme == 'https') { |http|
           http.request(request)
         }
-        [response, Time.now - start_time]
+        Result.new(response, Time.now - start_time)
       end
-  end
-
-  private
-
+    end
 end

data/rreplay.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rreplay"
-  spec.version       = "0.1.2"
+  spec.version       = "0.2.0"
   spec.authors       = ["petitviolet"]
   spec.email         = ["violethero0820@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rreplay
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - petitviolet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack