mage-hand 0.4.8 → 0.4.9

data/CHANGELOG

@@ -1,3 +1,5 @@
+ 0.5.1
+   - Renamed User to OPUser to avoid collisions with the user objects in other apps
  0.5.0
     - Renamed MageHand to MageHandController for the controller include
     - Renamed MageHandController::logged_in? to MageHandController::logged_in_op?

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/mage-hand-user.rb

@@ -7,4 +7,9 @@ module MageHandUser
     
     save!
   end
+
+  def obsidian_portal
+    @obsidian_portal ||= MageHand.get_client(nil, access_token_key, 
+      access_token_secret)
+  end
 end

data/lib/mage-hand.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'active_support/core_ext/string'
 require 'ob_port/client'
 require 'ob_port/base'
-require 'ob_port/user'
+require 'ob_port/op_user'
 require 'ob_port/campaign'
 require 'ob_port/wiki_page'
 require 'ob_port/errors'
@@ -40,7 +40,7 @@ module MageHandController
   end
   
   def obsidian_portal
-    @obsidian_portal ||= Client.get_client(session[:request_token], session[:access_token_key], 
+    @obsidian_portal ||= MageHand.get_client(session[:request_token], session[:access_token_key], 
       session[:access_token_secret], request.url, params)
   end
   

data/lib/ob_port/{user.rb → op_user.rb}

@@ -1,5 +1,5 @@
 module MageHand
-  class User < Base
+  class OPUser < Base
     attr_simple :username, :profile_url, :avatar_image_url,
       :created_at, :last_seen_at, :utc_offset, :locale, :is_ascendant
     inflate_if_nil :avatar_image_url, :created_at, :last_seen_at, :utc_offset,

data/mage-hand.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mage-hand"
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hammond"]
-  s.date = "2012-03-23"
+  s.date = "2012-03-31"
   s.description = "mage-hand is a ghostly hand that reaches across the internet to access the Obsidian Portal API."
   s.email = "shammond@northpub.com"
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
     "lib/ob_port/campaign.rb",
     "lib/ob_port/client.rb",
     "lib/ob_port/errors.rb",
-    "lib/ob_port/user.rb",
+    "lib/ob_port/op_user.rb",
     "lib/ob_port/wiki_page.rb",
     "mage-hand.gemspec",
     "test/helper.rb",

data/test/test_mage_hand_user.rb

@@ -11,6 +11,11 @@ class TestMageHandUser < Test::Unit::TestCase
   end
   
   context 'The Mage Hand User Module' do
+    setup do
+      MageHand::Client.set_app_keys('asdfasdf', 'asdfasdfasdfasdfasdf')
+      stub_request(:post, "https://www.obsidianportal.com/oauth/request_token").
+        to_return(:status => 200, :body => "", :headers => {})
+    end
     should 'be able to save op authorization tokens' do
       user = User.new
       assert !user.saved
@@ -19,5 +24,10 @@ class TestMageHandUser < Test::Unit::TestCase
       assert_equal 'abcdefg', user.access_token_key
       assert_equal '1234567', user.access_token_secret
     end
+
+    should 'return an obsidian portal client' do
+      user = User.new
+      assert user.obsidian_portal.instance_of? MageHand::Client
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mage-hand
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -197,7 +197,7 @@ files:
 - lib/ob_port/campaign.rb
 - lib/ob_port/client.rb
 - lib/ob_port/errors.rb
-- lib/ob_port/user.rb
+- lib/ob_port/op_user.rb
 - lib/ob_port/wiki_page.rb
 - mage-hand.gemspec
 - test/helper.rb
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4023440787944590669
+      hash: -4216612953549198741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: