twurl 0.8.3 → 0.9.0

data/lib/twurl/cli.rb

@@ -47,6 +47,8 @@ module Twurl
         Twurl.options.trace   = false
         Twurl.options.data    = {}
         Twurl.options.headers = {}
+        Twurl.options.upload  = {}
+        Twurl.options.upload['file'] = []
 
         option_parser = OptionParser.new do |o|
           o.extend AvailableOptions
@@ -82,6 +84,9 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
             help
             version
             proxy
+            file
+            filefield
+            base64
           end
         end
 
@@ -286,9 +291,34 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
           options.proxy = proxy
         end
       end
+
+      def file
+        on('-f', '--file [path_to_file]', 'Specify the path to the file to upload') do |file|
+          if File.file?(file)
+            options.upload['file'] << file
+          else 
+            CLI.puts "ERROR: File not found"
+            exit
+          end
+        end
+      end
+      
+      def filefield 
+        on('-F', '--file-field [field_name]', 'Specify the file field for the upload to be included within (default: media)') do |filefield|
+          options.upload['filefield'] = filefield
+          options.upload['filefield'] = 'media[]' if options.upload['filefield'].empty? 
+        end
+      end
+      
+      def base64 
+        on('-b', '--base64', 'Encode the uploaded file as base64 (default: false)') do |base64|
+          options.upload['base64'] = base64
+        end
+      end
     end
   end
 
+    
   class Options < OpenStruct
     DEFAULT_REQUEST_METHOD = 'get'
     DEFAULT_HOST           = 'api.twitter.com'

data/lib/twurl/oauth_client.rb

@@ -75,7 +75,42 @@ module Twurl
     def perform_request_from_options(options, &block)
       request_class = METHODS.fetch(options.request_method.to_sym)
       request = request_class.new(options.path, options.headers)
-      request.set_form_data(options.data) if options.data
+
+      if options.upload && options.upload['file'].count > 0
+        boundary = "00Twurl" + rand(1000000000000000000).to_s + "lruwT99"
+        multipart_body = []
+
+        options.data.each {|key, value|
+          multipart_body << "--#{boundary}\r\n"
+          multipart_body << "Content-Disposition: form-data; name=\"#{key}\"\r\n"
+          multipart_body << "\r\n"
+          multipart_body << value
+          multipart_body << "\r\n"
+        }
+
+        options.upload['file'].each {|filename|
+          multipart_body << "--#{boundary}\r\n"
+          multipart_body << "Content-Disposition: form-data; name=\"#{options.upload['filefield']}\"; filename=\"#{File.basename(filename)}\"\r\n"
+          multipart_body << "Content-Type: application/octet-stream\r\n"
+          multipart_body << "Content-Transfer-Encoding: base64\r\n" if options.upload['base64']
+          multipart_body << "\r\n"
+
+          if options.upload['base64']
+            enc = Base64.encode64(File.read(filename))
+            multipart_body << enc
+          else 
+            multipart_body << File.read(filename)
+          end
+        }
+
+        multipart_body << "\r\n--#{boundary}--\r\n"
+        
+        request.body = multipart_body.join
+        request['Content-Type'] = "multipart/form-data, boundary=\"#{boundary}\""
+      elsif options.data
+        request.set_form_data(options.data)
+      end
+
       request.oauth!(consumer.http, consumer, access_token)
       consumer.http.request(request, &block)
     end

data/lib/twurl/version.rb

@@ -1,8 +1,8 @@
 module Twurl
   class Version
     MAJOR = 0 unless defined? Twurl::Version::MAJOR
-    MINOR = 8 unless defined? Twurl::Version::MINOR
-    PATCH = 3 unless defined? Twurl::Version::PATCH
+    MINOR = 9 unless defined? Twurl::Version::MINOR
+    PATCH = 0 unless defined? Twurl::Version::PATCH
     BETA = nil unless defined? Twurl::Version::BETA # Time.now.to_i.to_s
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twurl
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth