async-rest 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980a446f72bdda0d1c784191fcb21212584d96bd7ea7f677559789d2dc982668
-  data.tar.gz: edfd0ce4873aea371c007a40ab982aa677f891f199ddf14f9fe0a75f8853668b
+  metadata.gz: ce0c7cbe77ef56cba58f5cd57ad1486a9cf9040d70fea765c6300f51e5590ddb
+  data.tar.gz: 167cf326a9f2195cc0482bd7223cfa62a0ea9bdabce42a20076801bbc72ff9ef
 SHA512:
-  metadata.gz: 3c34905a2dc51ddf5068adb1107b04c7c7e43c4530d6fac4469c888610303921677346eeccfe5d772d3647343c7b04494fa698ef5cff4ddb460bf0c7c9b97f50
-  data.tar.gz: 3647e473eb28edc8f229b5be613e0a068496ac704e617159afd34103405015214df2687a93752f62ef4bfde9b7f970f3fbf57b92d5ca21756220f4f6e500d383
+  metadata.gz: 6cc434bcd3df1f0c4659e189e2d710650bad4a4a954f483173228d6678fda02d97f95391f1c29bcd3b5610ac318464213570d3febb0a0eb560a58028a9ed0b3a
+  data.tar.gz: e231949363b899e5cc5d7739c8a7dcab667e46fd2a4bea91f766cb7c1683d9c27379049e565b4f7016fa5b0149aa92250f96bcf25b792e976e7a2af2ab6dcc50

data/lib/async/rest.rb

@@ -1,4 +1,4 @@
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/async/rest/json_body.rb

@@ -0,0 +1,49 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'json'
+
+module Async
+	module REST
+		class JSONBody
+			def initialize(body)
+				@body = body
+			end
+			
+			def close
+				@body = @body.close
+				
+				return self
+			end
+			
+			def join
+				JSON.parse(@body.join, symbolize_names: true)
+			end
+			
+			def self.dump(payload)
+				JSON.dump(payload)
+			end
+			
+			def finished?
+				@body.finished?
+			end
+		end
+	end
+end

data/lib/async/rest/reference.rb

@@ -1,4 +1,4 @@
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -52,10 +52,10 @@ module Async
 			def append(buffer)
 				if @query_string
 					buffer << escape_path(@path) << '?' << query_string
-					buffer << '&' << query_parameters if @parameters
+					buffer << '&' << encode(@parameters) if @parameters
 				else
 					buffer << escape_path(@path)
-					buffer << '?' << query_parameters if @parameters
+					buffer << '?' << encode(@parameters) if @parameters
 				end
 				
 				if @fragment
@@ -97,16 +97,6 @@ module Async
 			
 			private
 			
-			# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
-			NON_PCHAR = /([^a-zA-Z0-9_\-\.~!$&'()*+,;=:@\/]+)/.freeze
-			
-			def escape_path(path)
-				encoding = path.encoding
-				path.b.gsub(NON_PCHAR) do |m|
-					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
-				end.force_encoding(encoding)
-			end
-			
 			# Escapes a generic string, using percent encoding.
 			def escape(string)
 				encoding = string.encoding
@@ -115,19 +105,27 @@ module Async
 				end.force_encoding(encoding)
 			end
 			
-			def query_parameters
-				build_nested_query(@parameters)
+			# According to https://tools.ietf.org/html/rfc3986#section-3.3, we escape non-pchar.
+			NON_PCHAR = /([^a-zA-Z0-9_\-\.~!$&'()*+,;=:@\/]+)/.freeze
+			
+			# Escapes a path
+			def escape_path(path)
+				encoding = path.encoding
+				path.b.gsub(NON_PCHAR) do |m|
+					'%' + m.unpack('H2' * m.bytesize).join('%').upcase
+				end.force_encoding(encoding)
 			end
 			
-			def build_nested_query(value, prefix = nil)
+			# Encodes a hash or array into a query string
+			def encode(value, prefix = nil)
 				case value
 				when Array
 					value.map { |v|
-						build_nested_query(v, "#{prefix}[]")
+						encode(v, "#{prefix}[]")
 					}.join("&")
 				when Hash
 					value.map { |k, v|
-						build_nested_query(v, prefix ? "#{prefix}[#{escape(k.to_s)}]" : escape(k.to_s))
+						encode(v, prefix ? "#{prefix}[#{escape(k.to_s)}]" : escape(k.to_s))
 					}.reject(&:empty?).join('&')
 				when nil
 					prefix

data/lib/async/rest/resource.rb

@@ -1,4 +1,4 @@
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,45 +19,52 @@
 # THE SOFTWARE.
 
 require_relative 'reference'
+require_relative 'json_body'
 
 require 'async/http/client'
-require 'json'
+require 'async/http/url_endpoint'
 
 module Async
 	module REST
-		class JSONBody
-			def initialize(body)
-				@body = body
-			end
+		class Resource
+			DEFAULT_HEADERS = {
+				'accept-encoding' => 'gzip',
+				'accept' => 'application/json;q=0.9, */*;q=0.8'
+			}
 			
-			def close
-				@body = @body.close
+			def initialize(client, reference = Reference.parse, headers = DEFAULT_HEADERS, max_redirects: 10)
+				@client = client
+				@reference = reference
+				@headers = headers
 				
-				return self
-			end
-			
-			def join
-				JSON.parse(@body.join, symbolize_names: true)
+				@max_redirects = max_redirects
 			end
 			
-			def self.dump(payload)
-				JSON.dump(payload)
+			def close
+				@client.close
 			end
 			
-			def finished?
-				@body.finished?
-			end
-		end
-		
-		class Resource
-			def initialize(client, reference = Reference.parse, headers = {}, max_redirects: 10)
-				@client = client
-				@reference = reference
-				@headers = headers
+			def self.for(url, headers = {}, **options)
+				endpoint = HTTP::URLEndpoint.parse(url)
+				client = HTTP::Client.new(endpoint)
 				
-				@max_redirects = max_redirects
+				resource = self.new(client, Reference.parse(endpoint.url.request_uri), headers)
+				
+				return resource unless block_given?
+				
+				begin
+					yield resource
+				ensure
+					resource.close
+				end
 			end
 			
+			attr :client
+			attr :reference
+			attr :headers
+			
+			attr :max_redirects
+			
 			def [] path
 				self.class.new(@client, @reference.nest(path), @headers, max_redirects: @max_redirects)
 			end
@@ -85,6 +92,8 @@ module Async
 			end
 			
 			def process_response(response)
+				response.body = HTTP::InflateBody.for_response(response)
+				
 				content_type = response.headers['content-type']
 				
 				if wrapper = wrapper_for(content_type)
@@ -98,7 +107,11 @@ module Async
 				define_method(verb.downcase) do |payload = nil, **parameters, &block|
 					reference = @reference.dup(nil, parameters)
 					
-					response = self.request(verb, reference.to_str, @headers, prepare_body(payload)) do |response|
+					if body = prepare_body(payload)
+						body = HTTP::DeflateBody.for_request(@headers, body)
+					end
+					
+					response = self.request(verb, reference.to_str, @headers, body) do |response|
 						process_response(response)
 					end
 					

data/lib/async/rest/version.rb

@@ -1,4 +1,4 @@
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,6 @@
 
 module Async
 	module REST
-		VERSION = "0.1.0"
+		VERSION = "0.2.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-rest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - async-rest.gemspec
 - lib/async/rest.rb
+- lib/async/rest/json_body.rb
 - lib/async/rest/reference.rb
 - lib/async/rest/resource.rb
 - lib/async/rest/version.rb