libgss 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53665633c09d8a6f5ca84777c9de59b69f26ca0
-  data.tar.gz: 099b87fa95d54caac1aadb658a9aed566073d185
+  metadata.gz: 7dd3ebf42ffbb2444212e81cedbe2612ce5c441d
+  data.tar.gz: 2044b93d9d1f33020093e5e6275687fc97724855
 SHA512:
-  metadata.gz: 48963d4fe7b7a7f02629fa5a0a92cef7030f6c9ebd8651624b0efa7203aba63f798417f91cebe0003cde45a4d7a1537bf73a317593564ec82dfcb1ffda1047cb
-  data.tar.gz: cf7df2a141e586bf514a485cc1a2e135572067e1413ce86b1fcd6a1c1bd5dd32983ae3924cda5bc58fb1db87c7f81e6efac33a45007d9d6ee5b7f9c8d76676d8
+  metadata.gz: d10d914ee9d3658a984be8519b4c5f1cfad52392560a356ffbdf03195380858d7e001284866aa6c285445bc2533b21381e7ed84864135be82f9927e69ccae2be
+  data.tar.gz: 0a5f7be36db3014e69908f70628134afb054c56acab954d69c3310c1bb8d72fa785c926d2b4056715ca65a33c312a1cb8c2e02810fccb970ea32739ff6d63f0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libgss (0.7.3)
+    libgss (0.7.4)
       httpclient
       json
       oauth

data/lib/libgss/action_request.rb

@@ -55,17 +55,26 @@ module Libgss
       res = Libgss.with_retry("action_request") do
         @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
       end
+      r = process_response(res, :async_request)
+      @outputs = Outputs.new(r["outputs"])
+      callback.call(@outputs) if callback
+      @outputs
+    end
+
+    def process_response(res, req_type)
       case res.code.to_i
       when 200..299 then # OK
       else
-        raise Error, "failed to send action request: [#{res.code}] #{res.body}"
+        raise Error, "failed to send #{req_type}: [#{res.code}] #{res.content}"
+      end
+      begin
+        return JSON.parse(res.content)
+      rescue JSON::ParserError => e
+        $stderr.puts("\e[31m[#{e.class}] #{e.message}\e[0m\n#{res.content}")
+        raise e
       end
-      r = JSON.parse(res.body)
-      # puts res.body
-      @outputs = Outputs.new(r["outputs"])
-      callback.call(@outputs) if callback
-      @outputs
     end
+    private :process_response
 
     # 条件に該当するデータを取得
     # @param [String] name 対象となるコレクション名

data/lib/libgss/async_action_request.rb

@@ -22,13 +22,7 @@ module Libgss
     # アクション群を実行するために実際にHTTPリクエストを送信します。
     def send_request(&callback)
       res = @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
-      case res.code.to_i
-      when 200..299 then # OK
-      else
-        raise Error, "failed to send action request: [#{res.code}] #{res.body}"
-      end
-      r = JSON.parse(res.body)
-      # puts res.body
+      r = process_response(res, :async_request)
       @outputs = Outputs.new(r["outputs"])
       callback.call(@outputs) if callback
 
@@ -43,12 +37,7 @@ module Libgss
       raise Error, "failed to get response. please exec send_request before call." unless @ids
 
       res = @httpclient.get(result_url, {input_ids: @ids.join(',')}, req_headers)
-      case res.code.to_i
-      when 200..299 then # OK
-      else
-        raise Error, "failed to send action request: [#{res.code}] #{res.body}"
-      end
-      r = JSON.parse(res.body)
+      r = process_response(res, :aync_status)
     end
   end
 end

data/lib/libgss/network.rb

@@ -236,6 +236,7 @@ module Libgss
         obj = JSON.parse(res.content)
         return yield(obj)
       rescue JSON::ParserError => e
+        $stderr.puts("\e[31m[#{e.class}] #{e.message}\n#{res.content}")
         return false
       end
     end

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/spec/libgss/network_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'spec_helper'
 
 require 'uuid'
@@ -116,9 +117,10 @@ describe Libgss::Network do
 
       context "JSON parse Error" do
         before do
+          $stderr.stub(:puts).with(an_instance_of(String)) # $stderrにメッセージが出力されます
           res = double(:reponse)
           res.stub(:status).and_return(200)
-          res.should_receive(:content).and_return("invalid JSON format string")
+          res.should_receive(:content).twice.and_return("invalid JSON format string")
           HTTPClient.any_instance.should_receive(:post).and_return(res)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - akima
@@ -209,3 +209,4 @@ test_files:
 - spec/protected_assets/Icon.png
 - spec/public_assets/Default.png
 - spec/spec_helper.rb
+has_rdoc: