mage-hand 0.1.2 → 0.2.0

data/Gemfile

@@ -11,4 +11,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
+  gem "mocha", ">=0.9.8"
+  gem "redgreen"
 end

data/Gemfile.lock

@@ -6,9 +6,12 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mocha (0.9.8)
+      rake
     oauth (0.4.4)
     rake (0.8.7)
     rcov (0.9.9)
+    redgreen (1.2.2)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -17,6 +20,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
+  mocha (>= 0.9.8)
   oauth (>= 0.4.4)
   rcov
+  redgreen
   shoulda

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/mage-hand.rb

@@ -1,4 +1,7 @@
 require 'ob_port/client'
+require 'ob_port/base'
+require 'ob_port/user'
+require 'ob_port/campaign'
 
 module MageHand
   
@@ -8,7 +11,7 @@ module MageHand
     @mage_client = MageHand::Client.new(session[:request_token], session[:access_token_key], 
       session[:access_token_secret], request.url, params)
     store_tokens
-    return true unless @mage_client.access_token.nil?
+    return true if logged_in?
 
     redirect_to @mage_client.request_token.authorize_url
     false
@@ -19,7 +22,7 @@ module MageHand
   end
   
   def obsidian_portal
-    @mage_client.access_token
+    @mage_client
   end
   
   def store_tokens

data/lib/ob_port/base.rb

@@ -0,0 +1,17 @@
+module MageHand
+  class Base
+    attr_accessor :id
+    
+    def initialize(attributes)
+      attributes ||= {}
+      attributes.each do |key, value|
+        setter = "#{key}="
+        self.send setter, value if self.respond_to?(setter)
+      end
+    end
+    
+    def self.model_name
+      @_model_name ||= ActiveModel::Name.new(self)
+    end
+  end
+end

data/lib/ob_port/campaign.rb

@@ -0,0 +1,5 @@
+module MageHand
+  class Campaign < Base
+   attr_accessor :name, :campaign_url, :role, :visibility 
+  end
+end

data/lib/ob_port/client.rb

@@ -1,42 +1,46 @@
 module MageHand
-  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,:access_token_key, :access_token_secret
+    attr_accessor :request_token, :access_token_key, :access_token_secret
     
     def self.configure(key, secret)
-      self.key = key
-      self.secret = secret
+      @@key = key
+      @@secret = secret
     end
-    
+        
     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, {
-        :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]
+      if !logged_in? && params && 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)
+        @access_token_secret = temp_token.secret          
+      elsif !logged_in?
+        @request_token = consumer.get_request_token(:oauth_callback => callback)
       end
     end
     
     def logged_in?
-      !!access_token_secret
+      !!access_token_secret && !!access_token_key
+    end
+    
+    def consumer
+      @consumer ||= OAuth::Consumer.new( @@key, @@secret, {
+        :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'})
+    end
+    
+    def access_token
+      return nil unless logged_in?
+      @access_token ||= OAuth::AccessToken.new(consumer, access_token_key, access_token_secret)          
+    end
+    
+    def current_user
+      MageHand::User.new(JSON.parse(access_token.get('/v1/users/me.json').body))
     end
   end
 end

data/lib/ob_port/user.rb

@@ -0,0 +1,19 @@
+module MageHand
+  class User < Base
+    attr_accessor :username, :profile_url, :avatar_image_url,
+      :created_at, :last_seen_at, :utc_offset, :locale, :is_ascendant
+
+    alias :is_ascendant? :is_ascendant
+    
+    def campaigns
+      @campaigns
+    end
+    
+    def campaigns=(new_campaigns)
+      @campaigns = []
+      new_campaigns.each do |campaign|
+        @campaigns << Campaign.new(campaign)
+      end
+    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.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hammond"]
-  s.date = %q{2010-11-24}
+  s.date = %q{2010-11-30}
   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 = [
@@ -25,9 +25,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/mage-hand.rb",
+    "lib/ob_port/base.rb",
+    "lib/ob_port/campaign.rb",
     "lib/ob_port/client.rb",
+    "lib/ob_port/user.rb",
     "mage-hand.gemspec",
     "test/helper.rb",
+    "test/test_client.rb",
     "test/test_mage-hand.rb"
   ]
   s.homepage = %q{http://github.com/shammond42/mage-hand}
@@ -37,6 +41,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby wrapper around the Obsidian Portal API}
   s.test_files = [
     "test/helper.rb",
+    "test/test_client.rb",
     "test/test_mage-hand.rb"
   ]
 
@@ -50,6 +55,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<redgreen>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
     else
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
@@ -57,6 +64,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<redgreen>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
     end
   else
@@ -65,6 +74,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<redgreen>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0.4.4"])
   end
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'redgreen'
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
@@ -9,10 +10,12 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mage-hand'
+require 'oauth'
 
 class Test::Unit::TestCase
 end

data/test/test_client.rb

@@ -0,0 +1,51 @@
+require 'helper'
+
+class TestClient < Test::Unit::TestCase
+  context "The Obsidian Portal client" do
+    should "configure correctly with a key and secret" do
+      assert_nothing_raised {MageHand::Client.configure('asdfasdf','asdfasdfasdfasdfasdf')} 
+    end
+  end
+  
+  context "An instance of the client" do
+    setup do
+      response = Net::HTTPResponse.new("1.1", 200, "")
+      @request_token = stub('request token')
+      @access_token = stub_everything('access token')
+      @access_token.stubs(:token).returns('access_token')
+      @access_token.stubs(:secret).returns('access_secret')
+      Net::HTTPResponse.any_instance.stubs(:body).returns "{'hello' : 'world'}"
+      @request_token.stubs(:get_access_token).returns(@access_token)
+      OAuth::AccessToken.any_instance.stubs(:post).returns(response)
+      OAuth::Consumer.any_instance.stubs(:get_request_token).returns(@request_token)
+      
+      MageHand::Client.configure('asdfasdf', 'asdfasdfasdfasdfasdf')  
+    end
+    should "be configured to use different urls for authentication and api access" do
+      @client = MageHand::Client.new(nil, nil, nil)
+      assert @client.consumer.site =~ /api\.obsidianportal\.com/
+      assert @client.consumer.request_token_url =~ /https:\/\/www\.obsidianportal\.com/
+      assert @client.consumer.authorize_url =~ /https:\/\/www\.obsidianportal\.com/
+      assert @client.consumer.access_token_url =~ /https:\/\/www\.obsidianportal\.com/
+    end
+    should "have a request_token, and not an access token, when authorizing" do
+      @client = MageHand::Client.new(nil, nil, nil)
+      assert_not_nil @client
+      assert_equal @client.request_token, @request_token
+      assert_nil @client.access_token
+    end
+    should "create an access_token when an oauth_verifier and request_token is passed in" do
+      @client = MageHand::Client.new(@request_token, nil, nil, nil, {:oauth_verifier => 'asdfasdf'})
+      assert_not_nil @client
+      assert_not_nil @client.access_token
+      assert @client.logged_in?
+    end
+    should "be logged in if initialized with an access_key and access_secret" do
+      @client = MageHand::Client.new(nil, 'asdf', 'asdfasdfasdfasdf')
+      assert_not_nil @client
+      assert @client.logged_in?
+      assert_equal @client.access_token.token, 'asdf'
+      assert_equal @client.access_token.secret, 'asdfasdfasdfasdf'
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mage-hand
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steven Hammond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -05:00
+date: 2010-11-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,36 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  name: mocha
+  requirement: *id006
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: redgreen
+  requirement: *id007
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,7 +138,7 @@ dependencies:
         - 4
         version: 0.4.4
   name: oauth
-  requirement: *id006
+  requirement: *id008
   type: :runtime
 description: mage-hand is a ghostly hand that reaches across the internet to access the Obsidian Portal API.
 email: shammond@northpub.com
@@ -128,9 +158,13 @@ files:
 - Rakefile
 - VERSION
 - lib/mage-hand.rb
+- lib/ob_port/base.rb
+- lib/ob_port/campaign.rb
 - lib/ob_port/client.rb
+- lib/ob_port/user.rb
 - mage-hand.gemspec
 - test/helper.rb
+- test/test_client.rb
 - test/test_mage-hand.rb
 has_rdoc: true
 homepage: http://github.com/shammond42/mage-hand
@@ -168,4 +202,5 @@ specification_version: 3
 summary: Ruby wrapper around the Obsidian Portal API
 test_files: 
 - test/helper.rb
+- test/test_client.rb
 - test/test_mage-hand.rb