mojodna-oauth 0.3.1.3 → 0.3.1.4

data/lib/oauth/cli.rb

@@ -53,14 +53,34 @@ module OAuth
 
           if verbose?
             stdout.puts "Method: #{request.method}"
-            stdout.puts "Base URI: #{request.uri}"
-            stdout.puts "Normalized params: #{request.normalized_parameters}"
+            stdout.puts "URI: #{request.uri}"
+            stdout.puts "Normalized params: #{request.normalized_parameters}" unless options[:xmpp]
             stdout.puts "Signature base string: #{request.signature_base_string}"
-            stdout.puts "OAuth Request URI: #{request.signed_uri}"
-            stdout.puts "URI: #{request.signed_uri(false)}"
-            stdout.puts "Authorization header: #{request.oauth_header(:realm => options[:realm])}"
-            stdout.puts "Signature:         #{request.signature}"
-            stdout.puts "Escaped signature: #{OAuth::Helper.escape(request.signature)}"
+
+            if options[:xmpp]
+              stdout.puts
+              stdout.puts "XMPP Stanza:"
+              stdout.puts <<-EOS
+  <oauth xmlns='urn:xmpp:tmp:oauth'>
+    <oauth_consumer_key>#{request.oauth_consumer_key}</oauth_consumer_key>
+    <oauth_token>#{request.oauth_token}</oauth_token>
+    <oauth_signature_method>#{request.oauth_signature_method}</oauth_signature_method>
+    <oauth_signature>#{request.oauth_signature}</oauth_signature>
+    <oauth_timestamp>#{request.oauth_timestamp}</oauth_timestamp>
+    <oauth_nonce>#{request.oauth_nonce}</oauth_nonce>
+    <oauth_version>#{request.oauth_version}</oauth_version>
+  </oauth>
+              EOS
+              stdout.puts
+              stdout.puts "Note: You may want to use bare JIDs in your URI."
+              stdout.puts
+            else
+              stdout.puts "OAuth Request URI: #{request.signed_uri}"
+              stdout.puts "Request URI: #{request.signed_uri(false)}"
+              stdout.puts "Authorization header: #{request.oauth_header(:realm => options[:realm])}"
+            end
+            stdout.puts "Signature:         #{request.oauth_signature}"
+            stdout.puts "Escaped signature: #{OAuth::Helper.escape(request.oauth_signature)}"
           else
             stdout.puts signature
           end
@@ -140,6 +160,11 @@ module OAuth
           options[:oauth_version] = nil
         end
 
+        opts.on("--xmpp", "Generate XMPP stanzas.") do
+          options[:xmpp] = true
+          options[:method] ||= "iq"
+        end
+
         opts.on("-v", "--verbose", "Be verbose.") do
           options[:verbose] = true
         end

data/lib/oauth/helper.rb

@@ -14,6 +14,8 @@ module OAuth
       Base64.encode64(OpenSSL::Random.random_bytes(size)).gsub(/\W/, '')
     end
 
+    alias_method :generate_nonce, :generate_key
+
     def generate_timestamp
       Time.now.to_i.to_s
     end

data/lib/oauth/request_proxy/base.rb

@@ -16,14 +16,52 @@ module OAuth::RequestProxy
       @options = options
     end
 
-    def token
+    ## OAuth parameters
+
+    def oauth_consumer_key
+      parameters['oauth_consumer_key']
+    end
+
+    def oauth_nonce
+      parameters['oauth_nonce']
+    end
+
+    def oauth_signature
+      # TODO can this be nil?
+      parameters['oauth_signature'] || ""
+    end
+
+    def oauth_signature_method
+      case parameters['oauth_signature_method']
+      when Array
+        parameters['oauth_signature_method'].first
+      else
+        parameters['oauth_signature_method']
+      end
+    end
+
+    def oauth_timestamp
+      parameters['oauth_timestamp']
+    end
+
+    def oauth_token
       parameters['oauth_token']
     end
 
-    def consumer_key
-      parameters['oauth_consumer_key']
+    def oauth_version
+      parameters["oauth_version"]
     end
 
+    # TODO deprecate these
+    alias_method :consumer_key,     :oauth_consumer_key
+    alias_method :token,            :oauth_token
+    alias_method :nonce,            :oauth_nonce
+    alias_method :timestamp,        :oauth_timestamp
+    alias_method :signature,        :oauth_signature
+    alias_method :signature_method, :oauth_signature_method
+
+    ## Parameter accessors
+
     def parameters
       raise NotImplementedError, "Must be implemented by subclasses"
     end
@@ -40,27 +78,6 @@ module OAuth::RequestProxy
       parameters.reject { |k,v| OAuth::PARAMETERS.include?(k) }
     end
 
-    def nonce
-      parameters['oauth_nonce']
-    end
-
-    def timestamp
-      parameters['oauth_timestamp']
-    end
-
-    def signature_method
-      case parameters['oauth_signature_method']
-      when Array
-        parameters['oauth_signature_method'].first
-      else
-        parameters['oauth_signature_method']
-      end
-    end
-
-    def signature
-      parameters['oauth_signature'] || ""
-    end
-
     # See 9.1.2 in specs
     def normalized_uri
       u = URI.parse(uri)

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.1.3'
+  VERSION = '0.3.1.4'
 end

data/oauth.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.3.1.3"
+  s.version = "0.3.1.4"
 
   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"]
-  s.date = %q{2009-02-04}
+  s.date = %q{2009-02-05}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{pelleb@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.3
+  version: 0.3.1.4
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -08:00
+date: 2009-02-05 00:00:00 -08:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency