mage-hand 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mage-hand.rb

@@ -5,10 +5,10 @@ module MageHand
   protected
   
   def obsidian_portal_login_required
-    @mage_client = MageHand::Client.new(session[:request_token], session[:access_token],
-      request.url, params)
+    @mage_client = MageHand::Client.new(session[:request_token], session[:access_token_key], 
+      session[:access_token_secret], request.url, params)
     store_tokens
-    return true if logged_in?
+    return true unless @mage_client.access_token.nil?
 
     redirect_to @mage_client.request_token.authorize_url
     false
@@ -24,6 +24,7 @@ module MageHand
   
   def store_tokens
     session[:request_token] = @mage_client.request_token
-    session[:access_token] = @mage_client.access_token
+    session[:access_token_key] = @mage_client.access_token_key
+    session[:access_token_secret] = @mage_client.access_token_secret
   end
 end

data/lib/ob_port/client.rb

@@ -1,32 +1,42 @@
 module MageHand
-  LOGIN_URL = 'https://www.obsidianportal.com/'
+  LOGIN_URL = 'http://www.obsidianportal.com/'
   API_URL = 'http://api.obsidianportal.com/v1/users/me.json'
   
   class Client
     cattr_accessor :key, :secret
-    attr_accessor :consumer, :request_token, :access_token
+    attr_accessor :consumer, :request_token, :access_token,:access_token_key, :access_token_secret
     
     def self.configure(key, secret)
       self.key = key
       self.secret = secret
     end
     
-    def initialize(request_token=nil, access_token=nil, callback=nil, params=nil)
+    def initialize(session_request_token=nil, session_access_token_key=nil, session_access_token_secret=nil,
+        callback=nil, params=nil)
+      @request_token = session_request_token
+      @access_token_key = session_access_token_key
+      @access_token_secret = session_access_token_secret
+            
       @consumer = OAuth::Consumer.new( Client.key,Client.secret, {
-        :request_token_path => 'https://www.obsidianportal.com/oauth/request_token',
-        :authorize_path=> 'https://www.obsidianportal.com/oauth/authorize',
-        :access_token_path => 'https://www.obsidianportal.com/oauth/access_token'})
-      if request_token
-        @request_token = request_token
-        @access_token = access_token || @request_token.get_access_token(
-          :oauth_verifier => params[:oauth_verifier])
+        :site => 'http://api.obsidianportal.com',
+        :request_token_url => 'https://www.obsidianportal.com/oauth/request_token',
+        :authorize_url => 'https://www.obsidianportal.com/oauth/authorize',
+        :access_token_url => 'https://www.obsidianportal.com/oauth/access_token'})
+        
+      if logged_in?
+        @access_token = OAuth::AccessToken.new(@consumer, access_token_key, access_token_secret)
+      elsif params[:oauth_verifier]
+        temp_token = @request_token.get_access_token(:oauth_verifier => params[:oauth_verifier])
+        @access_token_key = temp_token.token
+        @access_token_secret = temp_token.secret
+        @access_token = OAuth::AccessToken.new(@consumer, @access_token_key, @access_token_secret)          
       else
         @request_token = @consumer.get_request_token(:oauth_callback => callback)
       end
     end
     
     def logged_in?
-      !!@access_token
+      !!access_token_secret
     end
   end
 end

data/mage-hand.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mage-hand}
-  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 = ["Steven Hammond"]
-  s.date = %q{2010-11-21}
+  s.date = %q{2010-11-24}
   s.description = %q{mage-hand is a ghostly hand that reaches across the internet to access the Obsidian Portal API.}
   s.email = %q{shammond@northpub.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mage-hand
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Steven Hammond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -05:00
+date: 2010-11-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency