json_client 0.2.2 → 1.0.0

data/lib/json_client/request_with_body.rb

@@ -0,0 +1,30 @@
+require 'json_client/request'
+
+module JsonClient
+  class RequestWithBody < Request
+    attr_reader :params
+
+    def md5
+      @md5 ||= ::JsonClient.md5_base64_digest(params)
+    end
+
+    def execute!(request)
+      if methods.include? request.method
+        request.body = params
+        super(request)
+      else
+        fail "#{request.method} must be in #{methods}"
+      end
+    end
+
+    protected
+
+    def methods
+      %w(POST PUT)
+    end
+
+    def headers
+      super.merge('Content-MD5' => md5)
+    end
+  end
+end

data/lib/json_client/request_without_body.rb

@@ -0,0 +1,17 @@
+module JsonClient
+  class RequestWithoutBody < Request
+    def fetch(request)
+      if methods.include? request.method
+        execute!(request)
+      else
+        fail "#{request.method} must be in #{methods}"
+      end
+    end
+
+    protected
+
+    def methods
+      %w(GET DELETE POST PUT)
+    end
+  end
+end

data/lib/json_client/requests.rb

@@ -1,29 +1,71 @@
-require_relative 'base_requests/index'
-require_relative 'base_requests/show'
-require_relative 'base_requests/create'
-require_relative 'base_requests/update'
-require_relative 'base_requests/destroy'
+require 'json_client/request_with_body'
+require 'json_client/request_without_body'
 
 module JsonClient
-  class Requests
-    def index
-      BaseRequests::Index
+  module Requests
+    class Create < ::JsonClient::RequestWithBody
+      def fetch
+        execute!(request)
+      end
+
+      def request
+        client::Post.new(
+          uri,
+          headers
+        )
+      end
     end
 
-    def show
-      BaseRequests::Show
+    class Update < ::JsonClient::RequestWithBody
+      def fetch
+        execute!(request)
+      end
+
+      def request
+        client::Put.new(
+          uri,
+          headers
+        )
+      end
     end
 
-    def create
-      BaseRequests::Create
+    class Index < ::JsonClient::RequestWithoutBody
+      def fetch
+        execute!(request)
+      end
+
+      def request
+        client::Get.new(
+          uri,
+          headers
+        )
+      end
     end
 
-    def update
-      BaseRequests::Update
+    class Show < ::JsonClient::RequestWithoutBody
+      def fetch
+        execute!(request)
+      end
+
+      def request
+        client::Get.new(
+          uri,
+          headers
+        )
+      end
     end
 
-    def destroy
-      BaseRequests::Destroy
+    class Destroy < ::JsonClient::RequestWithoutBody
+      def fetch
+        execute!(request)
+      end
+
+      def request
+        client::Delete.new(
+          uri,
+          headers
+        )
+      end
     end
   end
 end

data/lib/json_client/response.rb

@@ -0,0 +1,23 @@
+module JsonClient
+  class Response
+    attr_reader :raw_response
+
+    def initialize(raw_response)
+      @raw_response = raw_response
+    end
+
+    def method_missing(name, *args)
+      raw_response.public_send(name, *args)
+    end
+
+    def json
+      parse_json
+    end
+
+    protected
+
+    def parse_json
+      @parse_json ||= JSON.parse(body)
+    end
+  end
+end

data/lib/json_client/show.rb

@@ -0,0 +1,9 @@
+module JsonClient
+  module Show
+    class Request < ::JsonClient::Request
+      def fetch
+        client.get url, params: auth_params
+      end
+    end
+  end
+end

data/lib/json_client/update.rb

@@ -0,0 +1,15 @@
+module JsonClient
+  module Update
+    class Request < ::JsonClient::RequestWithBody
+      def fetch
+        body = auth_params.merge(params).to_json
+
+        client.put(
+          url,
+          body,
+          'content-md5' => md5(body)
+        )
+      end
+    end
+  end
+end

data/lib/json_client/uri_builder.rb

@@ -0,0 +1,34 @@
+module JsonClient
+  class UriBuilder
+    attr_reader :host, :ext, :name, :port, :ssl
+
+    def initialize(host, ext, name, port = '80', ssl = false)
+      @host = host
+      @ext = ext
+      @name = name
+      @port = port
+      @ssl = ssl
+    end
+
+    def path(id = nil)
+      base = "#{host}:#{port}"
+      if id.nil?
+        base + "/#{ext}/#{name}"
+      else
+        base + "/#{ext}/#{name}/#{id}"
+      end
+    end
+
+    def uri(id = nil)
+      p = path(id)
+
+      if ssl
+        p = "https://#{p}"
+      else
+        p = "http://#{p}"
+      end
+
+      URI(p)
+    end
+  end
+end

data/lib/json_client/version.rb

@@ -1,3 +1,3 @@
 module JsonClient
-  VERSION = "0.2.2"
+  VERSION = '1.0.0'
 end

data/spec/fixtures/vcr_cassettes/all_success.yml

@@ -2,28 +2,30 @@
 http_interactions:
 - request:
     method: get
-    uri: http://account-authenticator.herokuapp.com/api/v1/accounts?api_key=124ecd49-07fd-4553-a5cd-0178b7fa8b3f&api_password=IIoclO7kmQqJ1wixWrAuOA
+    uri: http://127.0.0.1:3000/api/v2/accounts
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Content-Type:
+      - application/json
       Accept:
-      - "*/*; q=0.5, application/xml"
+      - application/json
       Accept-Encoding:
-      - gzip, deflate
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
       - Ruby
+      Host:
+      - 127.0.0.1:3000
+      Date:
+      - Tue, 11 Aug 2015 05:46:26 GMT
+      Authorization:
+      - APIAuth 1:if37PuD7O2xnNl2F79KfWRC1IsE=
   response:
     status:
       code: 200
       message: OK
     headers:
-      Server:
-      - Cowboy
-      Date:
-      - Sun, 04 Jan 2015 20:36:27 GMT
-      Connection:
-      - keep-alive
       X-Frame-Options:
       - SAMEORIGIN
       X-Xss-Protection:
@@ -33,20 +35,18 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Etag:
-      - '"d750f6d7ca4471b89f25e4d5c7fa8d78"'
+      - W/"d750f6d7ca4471b89f25e4d5c7fa8d78"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 0c59d284-8ebb-4bbc-9077-a4485d9a5762
+      - 9f23d55a-b913-460a-b680-18cc77295693
       X-Runtime:
-      - '0.102701'
+      - '0.397713'
       Transfer-Encoding:
       - chunked
-      Via:
-      - 1.1 vegur
     body:
       encoding: UTF-8
       string: '{"accounts":[]}'
     http_version: 
-  recorded_at: Sun, 04 Jan 2015 20:36:28 GMT
+  recorded_at: Tue, 11 Aug 2015 05:46:27 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/create_success.yml

@@ -2,32 +2,32 @@
 http_interactions:
 - request:
     method: post
-    uri: http://account-authenticator.herokuapp.com/api/v1/accounts
+    uri: http://127.0.0.1:3000/api/v2/accounts
     body:
       encoding: UTF-8
-      string: '{"api_key":"124ecd49-07fd-4553-a5cd-0178b7fa8b3f","api_password":"IIoclO7kmQqJ1wixWrAuOA","account":{"username":"new_username","password":"new_password"}}'
+      string: '{"account":{"username":"new_username","password":"new_password"}}'
     headers:
+      Content-Type:
+      - application/json
       Accept:
       - application/json
+      Content-Md5:
+      - fHr1ZStB7WO1pvI2sBlMug==
       Accept-Encoding:
-      - gzip, deflate
-      Content-Type:
-      - application/json
-      Content-Length:
-      - '154'
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
       - Ruby
+      Host:
+      - 127.0.0.1:3000
+      Date:
+      - Tue, 11 Aug 2015 05:52:21 GMT
+      Authorization:
+      - APIAuth 1:6s5PqLo32dc6TO9MqxQH8RzAX1Y=
   response:
     status:
       code: 200
       message: OK
     headers:
-      Server:
-      - Cowboy
-      Date:
-      - Sun, 04 Jan 2015 20:36:27 GMT
-      Connection:
-      - keep-alive
       X-Frame-Options:
       - SAMEORIGIN
       X-Xss-Protection:
@@ -37,22 +37,21 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Etag:
-      - '"f26adbb79ceaf5aaa609ed1819b600b6"'
+      - W/"8db1fcb20c4c44c6c0c7d4685444c86c"
       Cache-Control:
       - max-age=0, private, must-revalidate
       Set-Cookie:
       - request_method=POST; path=/
       X-Request-Id:
-      - b554584e-ac2f-45ee-859e-d89f414c7aed
+      - 7ddcde23-0da6-4da6-9344-66281ce62191
       X-Runtime:
-      - '0.201978'
+      - '0.549678'
       Transfer-Encoding:
       - chunked
-      Via:
-      - 1.1 vegur
     body:
       encoding: UTF-8
-      string: '{"id":6,"username":"new_username","created_at":"2015-01-04T20:36:28.339Z","updated_at":"2015-01-04T20:36:28.339Z"}'
+      string: '{"id":1,"username":"new_username","created_at":"2015-08-11 05:52:22
+        +0000","updated_at":"2015-08-11 05:52:22 +0000"}'
     http_version: 
-  recorded_at: Sun, 04 Jan 2015 20:36:28 GMT
+  recorded_at: Tue, 11 Aug 2015 05:52:22 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/destroy_success.yml

@@ -2,32 +2,32 @@
 http_interactions:
 - request:
     method: post
-    uri: http://account-authenticator.herokuapp.com/api/v1/accounts
+    uri: http://127.0.0.1:3000/api/v2/accounts
     body:
       encoding: UTF-8
-      string: '{"api_key":"124ecd49-07fd-4553-a5cd-0178b7fa8b3f","api_password":"IIoclO7kmQqJ1wixWrAuOA","account":{"username":"new_username_2","password":"new_password_2"}}'
+      string: '{"account":{"username":"new_username_2","password":"new_password_2"}}'
     headers:
+      Content-Type:
+      - application/json
       Accept:
       - application/json
+      Content-Md5:
+      - dfp9/6hUVEGb+qoSkIjHGQ==
       Accept-Encoding:
-      - gzip, deflate
-      Content-Type:
-      - application/json
-      Content-Length:
-      - '158'
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
       - Ruby
+      Host:
+      - 127.0.0.1:3000
+      Date:
+      - Tue, 11 Aug 2015 05:46:28 GMT
+      Authorization:
+      - APIAuth 1:jqoBak/4rQGzOkE68wZkFbnkX7s=
   response:
     status:
       code: 200
       message: OK
     headers:
-      Server:
-      - Cowboy
-      Date:
-      - Sun, 04 Jan 2015 20:48:55 GMT
-      Connection:
-      - keep-alive
       X-Frame-Options:
       - SAMEORIGIN
       X-Xss-Protection:
@@ -37,48 +37,49 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Etag:
-      - '"03258793b9ebad43ea73e9565d861f80"'
+      - W/"5cafc7592864a07d28e51c815e120ba4"
       Cache-Control:
       - max-age=0, private, must-revalidate
       Set-Cookie:
       - request_method=POST; path=/
       X-Request-Id:
-      - a764b58c-eda2-4770-9ef3-87fb2bf7854c
+      - b8b99031-607c-4b56-9eda-62fda108b1f6
       X-Runtime:
-      - '0.201380'
+      - '0.177914'
       Transfer-Encoding:
       - chunked
-      Via:
-      - 1.1 vegur
     body:
       encoding: UTF-8
-      string: '{"id":10,"username":"new_username_2","created_at":"2015-01-04T20:48:55.695Z","updated_at":"2015-01-04T20:48:55.695Z"}'
+      string: '{"id":3,"created_at":"2015-08-11 05:46:28 +0000","updated_at":"2015-08-11
+        05:46:28 +0000"}'
     http_version: 
-  recorded_at: Sun, 04 Jan 2015 20:48:55 GMT
+  recorded_at: Tue, 11 Aug 2015 05:46:28 GMT
 - request:
     method: delete
-    uri: http://account-authenticator.herokuapp.com/api/v1/accounts/10?api_key=124ecd49-07fd-4553-a5cd-0178b7fa8b3f&api_password=IIoclO7kmQqJ1wixWrAuOA
+    uri: http://127.0.0.1:3000/api/v2/accounts/3
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      Content-Type:
+      - application/json
       Accept:
-      - "*/*; q=0.5, application/xml"
+      - application/json
       Accept-Encoding:
-      - gzip, deflate
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
       - Ruby
+      Host:
+      - 127.0.0.1:3000
+      Date:
+      - Tue, 11 Aug 2015 05:46:28 GMT
+      Authorization:
+      - APIAuth 1:6zJzQcNflZ70uzfDeCHjJz/fEeA=
   response:
     status:
       code: 200
       message: OK
     headers:
-      Server:
-      - Cowboy
-      Date:
-      - Sun, 04 Jan 2015 20:48:55 GMT
-      Connection:
-      - keep-alive
       X-Frame-Options:
       - SAMEORIGIN
       X-Xss-Protection:
@@ -88,22 +89,20 @@ http_interactions:
       Content-Type:
       - application/json; charset=utf-8
       Etag:
-      - '"db2883d5f032d326e56b7f4d896e51e9"'
+      - W/"a7f153d21e6c7effbc234f3242315d32"
       Cache-Control:
       - max-age=0, private, must-revalidate
       Set-Cookie:
       - request_method=DELETE; path=/
       X-Request-Id:
-      - a4863ea3-30e9-48b1-91c9-628a1b10a858
+      - 2a02029f-4bf1-4e84-b571-504423727fe5
       X-Runtime:
-      - '0.119341'
+      - '0.024727'
       Transfer-Encoding:
       - chunked
-      Via:
-      - 1.1 vegur
     body:
       encoding: UTF-8
-      string: '{"id":10}'
+      string: '{"id":3}'
     http_version: 
-  recorded_at: Sun, 04 Jan 2015 20:48:55 GMT
+  recorded_at: Tue, 11 Aug 2015 05:46:28 GMT
 recorded_with: VCR 2.9.3