markdillon-restclient 1.0 → 1.1

data/lib/restclient/mixin/response.rb

@@ -0,0 +1,43 @@
+module RestClient
+	module Mixin
+		module Response
+			attr_reader :net_http_res
+
+			# HTTP status code, always 200 since RestClient throws exceptions for
+			# other codes.
+			def code
+				@code ||= @net_http_res.code.to_i
+			end
+
+			# A hash of the headers, beautified with symbols and underscores.
+			# e.g. "Content-type" will become :content_type.
+			def headers
+				@headers ||= self.class.beautify_headers(@net_http_res.to_hash)
+			end
+
+			# Hash of cookies extracted from response headers
+			def cookies
+				@cookies ||= (self.headers[:set_cookie] || "").split('; ').inject({}) do |out, raw_c|
+					key, val = raw_c.split('=')
+					unless %w(expires domain path secure).member?(key)
+						out[key] = val
+					end
+					out
+				end
+			end
+
+			def self.included(receiver)
+				receiver.extend(RestClient::Mixin::Response::ClassMethods)
+			end
+
+			module ClassMethods
+				def beautify_headers(headers)
+					headers.inject({}) do |out, (key, value)|
+						out[key.gsub(/-/, '_').to_sym] = value.first
+					out
+					end
+				end
+			end
+		end
+	end
+end

data/lib/restclient/multipart.rb

@@ -0,0 +1,88 @@
+class Base
+	def initialize(params)
+		build_stream(params)
+	end
+
+	def build_stream(params)
+		@stream = StringIO.new(params)
+		@stream.seek(0)
+	end
+
+	def read(bytes=nil)
+		@stream.read(bytes)
+	end
+	alias :to_s :read
+
+	def escape(v)
+		URI.escape(v.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+	end
+
+	def headers
+		{ 'Content-Length' => size.to_s }
+	end
+
+	def size
+		@stream.size
+	end
+	alias :length :size
+
+	def close
+		@stream.close
+	end
+end
+
+class Multipart < Base
+	EOL = "\r\n"
+
+	def build_stream(params)
+		b = "--#{boundary}"
+
+		@stream = Tempfile.new("RESTClient.Stream.#{rand(1000)}")
+		@stream.write(b)
+		params.each do |k,v|
+		  @stream.write(EOL)
+			if v.respond_to?(:read) && v.respond_to?(:path)
+				create_file_field(@stream, k,v)
+			else
+				create_regular_field(@stream, k,v)
+			end
+			@stream.write(EOL + b)
+		end
+		@stream.write('--')
+		@stream.write(EOL)
+		@stream.seek(0)
+	end
+
+	def create_regular_field(s, k, v)
+		s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"")
+		s.write(EOL)
+		s.write(EOL)
+		s.write(v)
+	end
+
+	def create_file_field(s, k, v, content_type = nil)
+		begin
+		  content_type ||= `file -b --mime #{v.path}`.gsub(/\n/, '')
+			s.write("Content-Disposition: multipart/form-data; name=\"#{k}\"; filename=\"#{v.path}\"#{EOL}")
+			s.write("Content-Type: #{content_type}#{EOL}")
+			s.write(EOL)
+			while data = v.read(8124)
+				s.write(data)
+			end
+		ensure
+			v.close
+		end
+	end
+
+	def boundary
+		@boundary ||= rand(1_000_000).to_s
+	end
+
+	def headers
+		super.merge({:content_type => %Q{multipart/form-data; boundary="#{boundary}"}})
+	end
+
+	def close
+		@stream.close
+	end
+end

data/restclient.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name = "restclient"
-    s.version = "1.0"
+    s.version = "1.1"
     s.summary = "Simple REST client for Ruby, inspired by microframework syntax for specifying actions."
     s.description = "A simple REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
     s.author = "Adam Wiggins"
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
                  lib/restclient.rb
                  lib/restclient/request.rb lib/restclient/response.rb
                  lib/restclient/exceptions.rb lib/restclient/resource.rb
+                 lib/restclient/multipart.rb lib/restclient/mixin/response.rb
                  spec/base.rb spec/request_spec.rb spec/response_spec.rb
                  spec/exceptions_spec.rb spec/resource_spec.rb spec/restclient_spec.rb
                  bin/restclient)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markdillon-restclient
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: "1.1"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -30,6 +30,8 @@ files:
 - lib/restclient/response.rb
 - lib/restclient/exceptions.rb
 - lib/restclient/resource.rb
+- lib/restclient/multipart.rb
+- lib/restclient/mixin/response.rb
 - spec/base.rb
 - spec/request_spec.rb
 - spec/response_spec.rb