hayesdavis-grackle 0.1.1 → 0.1.2

data/grackle.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grackle}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hayes Davis"]

data/lib/grackle/client.rb

@@ -83,7 +83,6 @@ module Grackle
     
     #Basic OAuth information needed to communicate with Twitter
     TWITTER_OAUTH_SPEC = {
-      :site=>'http://twitter.com',
       :request_token_path=>'/oauth/request_token',
       :access_token_path=>'/oauth/access_token',
       :authorize_path=>'/oauth/authorize'

data/lib/grackle/transport.rb

@@ -59,7 +59,7 @@ module Grackle
           if options[:auth][:type] == :basic
             add_basic_auth(req,options[:auth])
           elsif options[:auth][:type] == :oauth
-            add_oauth(req,options[:auth])
+            add_oauth(http,req,options[:auth])
           end
         end
         dump_request(req) if debug
@@ -151,16 +151,27 @@ module Grackle
         end
       end
       
-      def add_oauth(req,auth)
+      def add_oauth(conn,req,auth)
         options = auth.reject do |key,value|
           [:type,:consumer_key,:consumer_secret,:token,:token_secret].include?(key)
         end
+        unless options.has_key?(:site)
+          options[:site] = oauth_site(conn,req)
+        end
         consumer = OAuth::Consumer.new(auth[:consumer_key],auth[:consumer_secret],options)
         access_token = OAuth::AccessToken.new(consumer,auth[:token],auth[:token_secret])
         consumer.sign!(req,access_token)
       end
 
       private
+        def oauth_site(conn,req)
+          site = "#{(conn.use_ssl? ? "https" : "http")}://#{conn.address}"
+          if (conn.use_ssl? && conn.port != 443) || (!conn.use_ssl? && conn.port != 80) 
+            site << ":#{conn.port}"
+          end
+          site
+        end
+        
         def dump_request(req)
           puts "Sending Request"
           puts"#{req.method} #{req.path}"

data/lib/grackle.rb

@@ -1,7 +1,7 @@
 module Grackle
 
   # :stopdoc:
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hayesdavis-grackle
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Hayes Davis