mojodna-oauth 0.3.4.1 → 0.3.5

data/History.txt

@@ -1,10 +1,12 @@
-== 0.3.5
+== 0.3.5 2009-06-03
 
 * `query` CLI command to access protected resources (Seth)
 * Added -H, -Q CLI options for specifying the authorization scheme (Seth)
 * Added -O CLI option for specifying a file containing options (Seth)
 * Support streamable body contents for large request bodies (Seth Cousins)
 * Support for OAuth 1.0a (Seth)
+* Added proxy support to OAuth::Consumer (Marshall Huss)
+* Added --scope CLI option for Google's 'scope' parameter (Seth)
 
 == 0.3.4 2009-05-06
 

data/lib/oauth/cli.rb

@@ -7,7 +7,8 @@ module OAuth
       "authorize" => "Obtain an access token and secret for a user",
       "debug"     => "Verbosely generate an OAuth signature",
       "query"     => "Query a protected resource",
-      "sign"      => "Generate an OAuth signature"
+      "sign"      => "Generate an OAuth signature",
+      "version"   => "Display the current version of the library"
     }
 
     attr_reader :command
@@ -42,47 +43,54 @@ module OAuth
         case command
         # TODO move command logic elsewhere
         when "authorize"
-          consumer = OAuth::Consumer.new \
-            options[:oauth_consumer_key],
-            options[:oauth_consumer_secret],
-            :access_token_url  => options[:access_token_url],
-            :authorize_url     => options[:authorize_url],
-            :request_token_url => options[:request_token_url],
-            :scheme            => options[:scheme]
-
-          # parameters for OAuth 1.0a
-          oauth_verifier = nil
-
-          # get a request token
-          request_token = consumer.get_request_token(:oauth_callback => options[:oauth_callback])
-
-          if request_token.callback_confirmed?
-            stdout.puts "Server appears to support OAuth 1.0a; enabling support."
-            options[:version] = "1.0a"
-          end
+          begin
+            consumer = OAuth::Consumer.new \
+              options[:oauth_consumer_key],
+              options[:oauth_consumer_secret],
+              :access_token_url  => options[:access_token_url],
+              :authorize_url     => options[:authorize_url],
+              :request_token_url => options[:request_token_url],
+              :scheme            => options[:scheme]
+
+            # parameters for OAuth 1.0a
+            oauth_verifier = nil
+
+            # get a request token
+            request_token = consumer.get_request_token({ :oauth_callback => options[:oauth_callback] }, { :scope => options[:scope] })
+
+            if request_token.callback_confirmed?
+              stdout.puts "Server appears to support OAuth 1.0a; enabling support."
+              options[:version] = "1.0a"
+            end
 
-          stdout.puts "Please visit this url to authorize:"
-          stdout.puts request_token.authorize_url
+            stdout.puts "Please visit this url to authorize:"
+            stdout.puts request_token.authorize_url
 
-          if options[:version] == "1.0a"
-            stdout.puts "Please enter the verification code provided by the SP (oauth_verifier):"
-            oauth_verifier = stdin.gets.chomp
-          else
-            stdout.puts "Press return to continue..."
-            stdin.gets
-          end
+            if options[:version] == "1.0a"
+              stdout.puts "Please enter the verification code provided by the SP (oauth_verifier):"
+              oauth_verifier = stdin.gets.chomp
+            else
+              stdout.puts "Press return to continue..."
+              stdin.gets
+            end
 
-          begin
-            # get an access token
-            access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
+            begin
+              # get an access token
+              access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
 
-            stdout.puts "Response:"
-            access_token.params.each do |k,v|
-              stdout.puts "  #{k}: #{v}" unless k.is_a?(Symbol)
+              stdout.puts "Response:"
+              access_token.params.each do |k,v|
+                stdout.puts "  #{k}: #{v}" unless k.is_a?(Symbol)
+              end
+            rescue OAuth::Unauthorized => e
+              stderr.puts "A problem occurred while attempting to obtain an access token:"
+              stderr.puts e
+              stderr.puts e.request.body
             end
           rescue OAuth::Unauthorized => e
-            stderr.puts "A problem occurred while attempting to obtain an access token:"
+            stderr.puts "A problem occurred while attempting to authorize:"
             stderr.puts e
+            stderr.puts e.request.body
           end
         when "query"
           consumer = OAuth::Consumer.new \
@@ -156,6 +164,8 @@ module OAuth
           else
             stdout.puts request.oauth_signature
           end
+        when "version"
+          puts "OAuth for Ruby #{OAuth::VERSION}"
         end
       else
         usage
@@ -169,7 +179,7 @@ module OAuth
       parse_options(arguments[0..-1])
     end
 
-    def option_parser(arguments)
+    def option_parser(arguments = "")
       # TODO add realm parameter
       # TODO add user-agent parameter
       option_parser = OptionParser.new do |opts|
@@ -208,6 +218,8 @@ module OAuth
 
         ## Options for signing and making requests
 
+        opts.separator("\n  options for signing and querying")
+
         opts.on("--method METHOD", "Specifies the method (e.g. GET) to use when signing.") do |v|
           options[:method] = v
         end
@@ -244,8 +256,12 @@ module OAuth
           options[:uri] = v
         end
 
-        opts.on("--version VERSION", "Specifies the OAuth version to use.") do |v|
-          options[:oauth_version] = v
+        opts.on(:OPTIONAL, "--version VERSION", "Specifies the OAuth version to use.") do |v|
+          if v
+            options[:oauth_version] = v
+          else
+            @command = "version"
+          end
         end
 
         opts.on("--no-version", "Omit oauth_version.") do
@@ -263,6 +279,8 @@ module OAuth
 
         ## Options for authorization
 
+        opts.separator("\n  options for authorization")
+
         opts.on("--access-token-url URL", "Specifies the access token URL.") do |v|
           options[:access_token_url] = v
         end
@@ -278,6 +296,10 @@ module OAuth
         opts.on("--request-token-url URL", "Specifies the request token URL.") do |v|
           options[:request_token_url] = v
         end
+
+        opts.on("--scope SCOPE", "Specifies the scope (Google-specific).") do |v|
+          options[:scope] = v
+        end
       end
     end
 
@@ -316,6 +338,8 @@ module OAuth
         options[:oauth_consumer_key] && options[:oauth_consumer_secret] &&
           options[:access_token_url] && options[:authorize_url] &&
           options[:request_token_url]
+      when "version"
+        true
       else
         options[:oauth_consumer_key] && options[:oauth_consumer_secret] &&
           options[:method] && options[:uri]

data/lib/oauth/consumer.rb

@@ -25,6 +25,7 @@ module OAuth
       :authorize_path     => '/oauth/authorize',
       :access_token_path  => '/oauth/access_token',
 
+      :proxy              => nil,
       # How do we send the oauth values to the server see
       # http://oauth.net/core/1.0/#consumer_req_param for more info
       #
@@ -254,6 +255,10 @@ module OAuth
       @options.has_key?(:access_token_url)
     end
 
+    def proxy
+      @options[:proxy]
+    end
+
   protected
 
     # Instantiates the http object
@@ -264,7 +269,12 @@ module OAuth
         our_uri = URI.parse(_url)
       end
 
-      http_object = Net::HTTP.new(our_uri.host, our_uri.port)
+      if proxy.nil?
+        http_object = Net::HTTP.new(our_uri.host, our_uri.port)
+      else
+        proxy_uri = proxy.is_a?(URI) ? proxy : URI.parse(proxy)
+        http_object = Net::HTTP.new(our_uri.host, our_uri.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+      end
 
       http_object.use_ssl = (our_uri.scheme == 'https')
 
@@ -284,7 +294,7 @@ module OAuth
       http_method = http_method.to_sym
 
       if [:post, :put].include?(http_method)
-        data = arguments.shift
+        data = (arguments.shift || {}).reject { |k,v| v.nil? }
       end
 
       headers = arguments.first.is_a?(Hash) ? arguments.shift : {}

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'action_controller'
 require 'action_controller/request'
 require 'oauth/request_proxy/base'
 require 'uri'

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.4.1'
+  VERSION = '0.3.5'
 end

data/oauth.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.3.4.1"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons", "Matt Sanford"]
-  s.date = %q{2009-05-06}
+  s.date = %q{2009-06-03}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{oauth-ruby@googlegroups.com}

data/test/test_consumer.rb

@@ -13,6 +13,7 @@ class ConsumerTest < Test::Unit::TestCase
         'consumer_key_86cad9', '5888bf0345e5d237',
         {
         :site=>"http://blabla.bla",
+        :proxy=>"http://user:password@proxy.bla:8080",
         :request_token_path=>"/oauth/example/request_token.php",
         :access_token_path=>"/oauth/example/access_token.php",
         :authorize_path=>"/oauth/example/authorize.php",
@@ -31,6 +32,7 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal "consumer_key_86cad9",@consumer.key
     assert_equal "5888bf0345e5d237",@consumer.secret
     assert_equal "http://blabla.bla",@consumer.site
+    assert_equal "http://user:password@proxy.bla:8080",@consumer.proxy
     assert_equal "/oauth/example/request_token.php",@consumer.request_token_path
     assert_equal "/oauth/example/access_token.php",@consumer.access_token_path
     assert_equal "http://blabla.bla/oauth/example/request_token.php",@consumer.request_token_url
@@ -50,6 +52,7 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal "key",@consumer.key
     assert_equal "secret",@consumer.secret
     assert_equal "http://twitter.com",@consumer.site
+    assert_nil    @consumer.proxy
     assert_equal "/oauth/request_token",@consumer.request_token_path
     assert_equal "/oauth/access_token",@consumer.access_token_path
     assert_equal "http://twitter.com/oauth/request_token",@consumer.request_token_url

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Ruby OAuth GEM</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/oauth"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/oauth" class="numbers">0.3.4</a>
+      <a href="http://rubyforge.org/projects/oauth" class="numbers">0.3.5</a>
     </div>
     <h2>What</h2>
 <p>This is a RubyGem for implementing both OAuth clients and servers in Ruby applications.</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.4.1
+  version: 0.3.5
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency