octoparts 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13fef2aab30cd287c94672a9bdc9ce0ab4b1edd4
-  data.tar.gz: 6c41cb1d2aa6883b9d66dbb48afc3b6440fcd7ab
+  metadata.gz: 158d78c413e947f7fd3f43a8a889e36e7569c2d8
+  data.tar.gz: dad9e133b9fe95ecacc1cb9255a7feb14c6527b1
 SHA512:
-  metadata.gz: 4a55dcf838978766b8a5b048979369fa68671ce94968aaa35403c9bafe2caf586cd811f4a3edd085c68ea67e78713d1e243b1d34c272a9fba420b9baad72c353
-  data.tar.gz: 589fcf6a4364f88b6e7d53093d6aef59d59ef95cd32d5e063de00cb8fb5edde1c3edb7b34d517d5c4203a6b2aac1c8e956c151bf6fb15a3d5a0857ffebfac0ca
+  metadata.gz: ef61d18776ed079e6c6793ee627f30cf76575b90aecfaa6e38365d7bab1329ef05bbba4987ebdddc838ea92e3c160bc45117bc0018ae202edb6f875b7ff8b999
+  data.tar.gz: 6db5751507046998c8599835684eb0ca8521937079b2b4f5a91398e6841c46e273c49a1342209038d0d4ef6b6717fd0cef6ed2825101162e2117bb0c6b56d5cf

data/README.md

@@ -33,18 +33,20 @@ client = Octoparts::Client.new
 
 # invoke aggregate request
 response = client.invoke({
-  "request_meta" => {
-    "id" => "test",
-    "timeout" => 500
+  request_meta: {
+    id: "test",
+    timeout: 500
   },
-  "requests" => [
-    "part_id" => "echo",
-    "params" => [
-      {
-        "key" => "fooValue",
-        "value" => "test"
-      }
-    ]
+  requests: [
+    {
+      part_id: "echo",
+      params: [
+        {
+          key: "fooValue",
+          value: "test"
+        }
+      ]
+    }
   ]
 })
 

data/lib/octoparts/client.rb

@@ -69,7 +69,11 @@ module Octoparts
       @connection ||= Faraday.new(url: @endpoint) do |connection|
         connection.adapter Faraday.default_adapter
       end
-      @connection.send(method, path, params, @headers.merge(headers || {}))
+      response = @connection.send(method, path, params, @headers.merge(headers || {}))
+      if error = Octoparts::Error.from_response(response)
+        raise error
+      end
+      response
     end
   end
 end

data/lib/octoparts/error.rb

@@ -0,0 +1,27 @@
+module Octoparts
+  class Error < StandardError
+    attr_reader :response
+
+    def self.from_response(response)
+      status = response.status.to_i
+
+      klass = case status
+              when 400..499 then Octoparts::ClientError
+              when 500..599 then Octoparts::ServerError
+              end
+      klass.new(response) unless klass.nil?
+    end
+
+    def initialize(response)
+      @response = response
+      super(error_message)
+    end
+
+    def error_message
+      "status: #{@response.status}, body: #{@response.body}"
+    end
+  end
+
+  class ClientError < Error; end
+  class ServerError < Error; end
+end

data/lib/octoparts/version.rb

@@ -1,3 +1,3 @@
 module Octoparts
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/octoparts.rb

@@ -1,6 +1,7 @@
 require "faraday"
 require "octoparts/version"
 require "octoparts/configuration"
+require "octoparts/error"
 require "octoparts/client"
 require "octoparts/model"
 require "octoparts/representer"

data/octoparts.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "test-unit", "~> 3.0"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "vcr"
 end

data/test/fixtures/vcr/invoke_example.yml

@@ -0,0 +1,33 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:9000/octoparts/2
+    body:
+      encoding: UTF-8
+      string: '{"requestMeta":{"id":"test","timeout":500},"requests":[{"partId":"echo","params":[{"key":"fooValue","value":"test"}]}]}'
+    headers:
+      User-Agent:
+      - Octoparts client ruby/0.0.2
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '309'
+    body:
+      encoding: UTF-8
+      string: '{"responseMeta":{"id":"test","processTime":1},"responses":[{"partId":"echo","id":"echo","cookies":[],"statusCode":200,"mimeType":"application/json","charset":"ISO-8859-1","cacheControl":{"noStore":false,"noCache":false},"contents":"{\"foo\":
+        \"test\"}\n","warnings":[],"errors":[],"retrievedFromCache":true}]}'
+    http_version: 
+  recorded_at: Wed, 07 Jan 2015 22:27:38 GMT
+recorded_with: VCR 2.9.3

data/test/fixtures/vcr/invoke_with_2_requests.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:9000/octoparts/2
+    body:
+      encoding: UTF-8
+      string: '{"requestMeta":{"id":"test","timeout":500},"requests":[{"partId":"echo","params":[{"key":"fooValue","value":"test"}]},{"partId":"echo","params":[{"key":"fooValue","value":"hoge"}]}]}'
+    headers:
+      User-Agent:
+      - Octoparts client ruby/0.0.2
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '559'
+    body:
+      encoding: UTF-8
+      string: '{"responseMeta":{"id":"test","processTime":10},"responses":[{"partId":"echo","id":"echo","cookies":[],"statusCode":200,"mimeType":"application/json","charset":"ISO-8859-1","cacheControl":{"noStore":false,"noCache":false},"contents":"{\"foo\":
+        \"test\"}\n","warnings":[],"errors":[],"retrievedFromCache":true},{"partId":"echo","id":"echo","cookies":[],"statusCode":200,"mimeType":"application/json","charset":"ISO-8859-1","cacheControl":{"noStore":false,"noCache":false},"contents":"{\"foo\":
+        \"hoge\"}\n","warnings":[],"errors":[],"retrievedFromCache":true}]}'
+    http_version: 
+  recorded_at: Wed, 07 Jan 2015 22:48:47 GMT
+recorded_with: VCR 2.9.3

data/test/fixtures/vcr/invoke_with_invalid_parameters.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:9000/octoparts/2
+    body:
+      encoding: UTF-8
+      string: '{"requestMeta":{"timeout":500}}'
+    headers:
+      User-Agent:
+      - Octoparts client ruby/0.0.2
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Content-Length:
+      - '27'
+    body:
+      encoding: UTF-8
+      string: Unrecognized request object
+    http_version: 
+  recorded_at: Thu, 08 Jan 2015 05:57:31 GMT
+recorded_with: VCR 2.9.3

data/test/helper.rb

@@ -3,3 +3,11 @@ require 'octoparts'
 
 require 'pry'
 require 'test/unit'
+require 'webmock'
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'test/fixtures/vcr'
+  c.hook_into :webmock
+  c.allow_http_connections_when_no_cassette = true
+end

data/test/test_client.rb

@@ -0,0 +1,87 @@
+require 'helper'
+
+class TestClient < Test::Unit::TestCase
+  def setup
+    @client = Octoparts::Client.new
+  end
+
+  sub_test_case "#invoke" do
+    test "normal invoke" do
+      VCR.use_cassette 'invoke_example' do
+        response = @client.invoke({
+          "request_meta" => {
+            "id" => "test",
+            "timeout" => 500
+          },
+          "requests" => [
+            "part_id" => "echo",
+            "params" => [
+              {
+                "key" => "fooValue",
+                "value" => "test"
+              }
+            ]
+          ]
+        })
+        body = response.body
+        assert { body.class == Octoparts::Model::AggregateResponse }
+        assert { body.response_meta.class == Octoparts::Model::ResponseMeta }
+        assert { body.responses.first.class == Octoparts::Model::PartResponse }
+        assert { body.responses.first.cache_control.class == Octoparts::Model::CacheControl }
+        assert { body.responses.size == 1 }
+        assert { body.responses.first.contents =~ /"test"/ }
+      end
+    end
+
+    test "normal invoke when 2 requests" do
+      VCR.use_cassette 'invoke_with_2_requests' do
+        response = @client.invoke({
+          request_meta: {
+            id: "test",
+            timeout: 500
+          },
+          requests: [
+            {
+              part_id: "echo",
+              params: [
+                {
+                  key: "fooValue",
+                  value: "test"
+                }
+              ]
+            },
+            {
+              part_id: "echo",
+              params: [
+                {
+                  key: "fooValue",
+                  value: "hoge"
+                }
+              ]
+            }
+          ]
+        })
+        body = response.body
+        assert { body.class == Octoparts::Model::AggregateResponse }
+        assert { body.response_meta.class == Octoparts::Model::ResponseMeta }
+        assert { body.responses.first.class == Octoparts::Model::PartResponse }
+        assert { body.responses.first.cache_control.class == Octoparts::Model::CacheControl }
+        assert { body.responses.size == 2 }
+        assert { body.responses.first.contents =~ /"test"/ }
+        assert { body.responses.last.contents =~ /"hoge"/ }
+      end
+    end
+
+    test "invalid parameters" do
+      VCR.use_cassette 'invoke_with_invalid_parameters' do
+        assert_raise Octoparts::ClientError do
+          response = @client.invoke({
+            "request_meta" => {
+              "timeout" => 500
+            }
+          })
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoparts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takayuki Matsubara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: vcr
+  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: " Ruby client library for the Octoparts API "
 email:
 - takayuki.1229@gmail.com
@@ -123,6 +151,7 @@ files:
 - lib/octoparts.rb
 - lib/octoparts/client.rb
 - lib/octoparts/configuration.rb
+- lib/octoparts/error.rb
 - lib/octoparts/model.rb
 - lib/octoparts/model/aggregate_request.rb
 - lib/octoparts/model/aggregate_response.rb
@@ -139,8 +168,12 @@ files:
 - lib/octoparts/response.rb
 - lib/octoparts/version.rb
 - octoparts.gemspec
+- test/fixtures/vcr/invoke_example.yml
+- test/fixtures/vcr/invoke_with_2_requests.yml
+- test/fixtures/vcr/invoke_with_invalid_parameters.yml
 - test/helper.rb
 - test/representer/test_aggregate_request_representer.rb
+- test/test_client.rb
 - test/test_octoparts.rb
 homepage: https://github.com/ma2gedev/octoparts-rb
 licenses:
@@ -167,6 +200,10 @@ signing_key:
 specification_version: 4
 summary: Ruby client for the Octoparts API
 test_files:
+- test/fixtures/vcr/invoke_example.yml
+- test/fixtures/vcr/invoke_with_2_requests.yml
+- test/fixtures/vcr/invoke_with_invalid_parameters.yml
 - test/helper.rb
 - test/representer/test_aggregate_request_representer.rb
+- test/test_client.rb
 - test/test_octoparts.rb