klarrimore-routengn 0.23 → 0.24

data/lib/http/multipart.rb

@@ -1,80 +1,122 @@
-# Takes a hash of string and file parameters and returns a string of text
-# formatted to be sent as a multipart form post.
-#
-# Author:: Cody Brimhall <mailto:cbrimhall@ucdavis.edu>
-# Created:: 22 Feb 2008
-
-require 'rubygems'
-require 'mime/types'
-require 'cgi'
-
-
-module Multipart
-	VERSION = "1.0.0" unless const_defined?(:VERSION)
-	
-	# Formats a given hash as a multipart form post
-	# If a hash value responds to :string or :read messages, then it is
-	# interpreted as a file and processed accordingly; otherwise, it is assumed
-	# to be a string
-	class Post
-		# We have to pretend like we're a web browser...
-		USERAGENT = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6" unless const_defined?(:USERAGENT)
-		BOUNDARY = "0123456789ABLEWASIEREISAWELBA9876543210" unless const_defined?(:BOUNDARY)
-		CONTENT_TYPE = "multipart/form-data; boundary=#{ BOUNDARY }" unless const_defined?(:CONTENT_TYPE)
-		HEADER = { "Content-Type" => CONTENT_TYPE, "User-Agent" => USERAGENT } unless const_defined?(:HEADER)
-		
-		def self.prepare_query(params)
-			fp = []
-			
-			params.each do |k, v|
-				# Are we trying to make a file parameter?
-				if v.respond_to?(:path) and v.respond_to?(:read) then
-					fp.push(FileParam.new(k, v.path, v.read))
-				# We must be trying to make a regular parameter
-				else
-					fp.push(StringParam.new(k, v))
-				end
-			end
-			
-			# Assemble the request body using the special multipart format
-			query = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("")	+ "--" + BOUNDARY + "--"
-			return query, HEADER
-		end
-	end
-	
-	private
-	
-	# Formats a basic string key/value pair for inclusion with a multipart post
-	class StringParam
-		attr_accessor :k, :v
-		
-		def initialize(k, v)
-			@k = k
-			@v = v
-		end
-		
-		def to_multipart
-			return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"\r\n\r\n#{v}\r\n"
-		end
-	end
-	
-	# Formats the contents of a file or string for inclusion with a multipart
-	# form post
-	class FileParam
-		attr_accessor :k, :filename, :content
-		
-		def initialize(k, filename, content)
-			@k = k
-			@filename = filename
-			@content = content
-		end
-		
-		def to_multipart
-			# If we can tell the possible mime-type from the filename, use the
-			# first in the list; otherwise, use "application/octet-stream"
-			mime_type = MIME::Types.type_for(filename)[0] || MIME::Types["application/octet-stream"][0]
-			return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"; filename=\"#{ filename }\"\r\n" +
-						 "Content-Type: #{ mime_type.simplified }\r\n\r\n#{ content }\r\n"
-		end
-	end
+module RouteNGN
+  module HTTP
+    class Multipart
+
+      def initialize( file_names )
+        @file_names = file_names
+      end
+
+      def post( to_url )
+        boundary = '----RubyMultipartClient' + rand(1000000).to_s + 'ZZZZZ'
+
+        parts = []
+        streams = []
+        @file_names.each do |param_name, filepath|
+          pos = filepath.rindex('/')
+          filename = filepath[pos + 1, filepath.length - pos]
+          parts << StringPart.new ( "--" + boundary + "\r\n" +
+                  "Content-Disposition: form-data; name=\"" + param_name.to_s + "\"; filename=\"" + filename + "\"\r\n" +
+                  "Content-Type: video/x-msvideo\r\n\r\n")
+          stream = File.open(filepath, "rb")
+          streams << stream
+          parts << StreamPart.new (stream, File.size(filepath))
+        end
+        parts << StringPart.new ( "\r\n--" + boundary + "--\r\n" )
+
+        post_stream = MultipartStream.new( parts )
+
+        url = URI.parse( to_url )
+        req = Net::HTTP::Post.new(url.path)
+        req.content_length = post_stream.size
+        req.content_type = 'multipart/form-data; boundary=' + boundary
+        req.body_stream = post_stream
+        res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+
+        streams.each do |stream|
+          stream.close();
+        end
+
+        res
+      end
+
+    end
+
+    class StreamPart
+      def initialize( stream, size )
+        @stream, @size = stream, size
+      end
+
+      def size
+        @size
+      end
+
+      def read ( offset, how_much )
+        @stream.read ( how_much )
+      end
+    end
+
+    class StringPart
+      def initialize ( str )
+        @str = str
+      end
+
+      def size
+        @str.length
+      end
+
+      def read ( offset, how_much )
+        @str[offset, how_much]
+      end
+    end
+
+    class MultipartStream
+      def initialize( parts )
+        @parts = parts
+        @part_no = 0;
+        @part_offset = 0;
+      end
+
+      def size
+        total = 0
+        @parts.each do |part|
+          total += part.size
+        end
+        total
+      end
+
+      def read ( how_much )
+
+        if @part_no >= @parts.size
+          return nil;
+        end
+
+        how_much_current_part = @parts[@part_no].size - @part_offset
+
+        how_much_current_part = if how_much_current_part > how_much
+          how_much
+        else
+          how_much_current_part
+        end
+
+        how_much_next_part = how_much - how_much_current_part
+
+        current_part = @parts[@part_no].read(@part_offset, how_much_current_part )
+
+        if how_much_next_part > 0
+          @part_no += 1
+          @part_offset = 0
+          next_part = read ( how_much_next_part )
+          current_part + if next_part
+            next_part
+          else
+            ''
+          end
+        else
+          @part_offset += how_much_current_part
+          current_part
+        end
+      end
+    end
+  end
 end
+

data/lib/routengn.rb

@@ -62,6 +62,11 @@ module RouteNGN
       end
     end
 
+    define_method :upload do |*args|
+      uri, data, headers = args
+      raw = @connection.access_token.post uri, data, headers
+    end
+
     private
     def check_connection!
       raise ConnectionException.new unless @connection

data/lib/routengn/models/record.rb

@@ -2,6 +2,7 @@ class Record
   include RouteNGN::Mapper
 
   field :dialcode, :primary => true
+  field :account_id
   field :rn
   field :locale_id
   field :sent

data/lib/routengn/uploader.rb

@@ -8,9 +8,11 @@ module RouteNGN
   end
 
   module ClassMethods
-    def upload
-      # STUB
-      puts "data, headers = Multipart::Post.prepare_query(\"title\" => 'title', \"uploaded_data\" => File.new(path))"  
+    def upload(file, params = {})
+      data, headers = Multipart::Post.prepare_query("title" => 'title', "uploaded_data" => File.new(file))
+      puts data.inspect
+      puts headers.inspect
+      RouteNGN.connection.access_token.post("/upload#{base_url}", data, headers)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: klarrimore-routengn
 version: !ruby/object:Gem::Version 
-  version: "0.23"
+  version: "0.24"
 platform: ruby
 authors: 
 - Keith Larrimore