twurl 0.6.2 → 0.6.3

data/CHANGELOG

@@ -0,0 +1,4 @@
+Version: 0.6.3
+--------------
+
+* Add the -A/--header command line option to support adding a header to the request. (Jake Donham)

data/lib/twurl/cli.rb

@@ -39,6 +39,7 @@ module Twurl
         Twurl.options         = Options.new
         Twurl.options.trace   = false
         Twurl.options.data    = {}
+        Twurl.options.headers = {}
 
         option_parser = OptionParser.new do |o|
           o.extend AvailableOptions
@@ -64,11 +65,13 @@ module Twurl
           o.section "Common options:" do
             trace
             data
+            headers
             host
             quiet
             disable_ssl
             request_method
             help
+            version
           end
         end
 
@@ -190,6 +193,13 @@ module Twurl
         end
       end
 
+      def headers
+        on('-A', '--header [header]', 'Adds the specified header to the request to the HTTP server.') do |header|
+          key, value = header.split(': ')
+          options.headers[key] = value
+        end
+      end
+
       def host
         on('-H', '--host [host]', 'Specify host to make requests to (default: api.twitter.com)') do |host|
           options.host = host
@@ -220,6 +230,13 @@ module Twurl
           exit
         end
       end
+
+      def version
+        on_tail("-v", "--version", "Show version") do
+          CLI.puts Version
+          exit
+        end
+      end
     end
   end
 

data/lib/twurl/oauth_client.rb

@@ -64,15 +64,19 @@ module Twurl
 
     [:get, :post, :put, :delete, :options, :head, :copy].each do |request_method|
       class_eval(<<-EVAL, __FILE__, __LINE__)
-        def #{request_method}(url, options = {})
+        def #{request_method}(url, *options)
           # configure_http!
-          access_token.#{request_method}(url, options)
+          access_token.#{request_method}(url, *options)
         end
       EVAL
     end
 
     def perform_request_from_options(options)
-      send(options.request_method, options.path, options.data)
+      if [:post, :put].include?(options.request_method.to_sym)
+        send(options.request_method, options.path, options.data, options.headers)
+      else
+        send(options.request_method, options.path, options.headers)
+      end
     end
 
     def exchange_credentials_for_access_token
@@ -167,4 +171,4 @@ module Twurl
       @access_token ||= OAuth::AccessToken.new(consumer, token, secret)
     end
   end
-end
+end

data/lib/twurl/version.rb

@@ -2,7 +2,7 @@ module Twurl
   module VERSION
     MAJOR  = '0' unless defined? MAJOR
     MINOR  = '6' unless defined? MINOR
-    TINY   = '2' unless defined? TINY
+    TINY   = '3' unless defined? TINY
     BETA   = nil unless defined? BETA # Time.now.to_i.to_s
   end
 

data/test/cli_test.rb

@@ -94,6 +94,22 @@ class Twurl::CLI::OptionParsingTest < Test::Unit::TestCase
   end
   include DataParsingTests
 
+  module HeaderParsingTests
+    def test_extracting_a_single_header
+      options = Twurl::CLI.parse_options(['-A', 'Key: Value'])
+      assert_equal({'Key' => 'Value'}, options.headers)
+
+      options = Twurl::CLI.parse_options(['--header', 'Key: Value'])
+      assert_equal({'Key' => 'Value'}, options.headers)
+    end
+
+    def test_multiple_headers_when_option_is_specified_multiple_times_on_command_line_collects_all
+      options = Twurl::CLI.parse_options(['-A', 'Key: Value', '-A', 'Another: Pair'])
+      assert_equal({'Key' => 'Value', 'Another' => 'Pair'}, options.headers)
+    end
+  end
+  include HeaderParsingTests
+
   module SSLDisablingTests
     def test_ssl_is_on_by_default
       options = Twurl::CLI.parse_options([])
@@ -126,4 +142,4 @@ class Twurl::CLI::OptionParsingTest < Test::Unit::TestCase
     end
   end
   include HostOptionTests
-end
+end

data/test/oauth_client_test.rb

@@ -11,6 +11,7 @@ class Twurl::OAuthClient::AbstractOAuthClientTest < Test::Unit::TestCase
     options.request_method  = 'get'
     options.path            = '/path/does/not/matter.xml'
     options.data            = {}
+    options.headers         = {}
 
     Twurl.options           = options
   end
@@ -159,4 +160,4 @@ class Twurl::OAuthClient::CredentialsForAccessTokenExchangeTest < Twurl::OAuthCl
    client.exchange_credentials_for_access_token
    assert !client.needs_to_authorize?
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twurl
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Marcel Molina
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -07:00
+date: 2011-01-04 00:00:00 -08:00
 default_executable: twurl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ extra_rdoc_files:
 - INSTALL
 files: 
 - .gitignore
+- CHANGELOG
 - COPYING
 - Gemfile
 - Gemfile.lock