mage-hand 0.4.1 → 0.4.2

data/CHANGELOG

@@ -0,0 +1,7 @@
+ 0.5.0
+    - Renamed MageHand to MageHandController for the controller include
+    - Renamed MageHandController::logged_in? to MageHandController::logged_in_op?
+    - Error classes
+    - Added MageHandUser to provide common user functionality
+    - Updated documentation
+    - MOAR Tests

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/mage-hand-user.rb

@@ -0,0 +1,10 @@
+module MageHandUser
+  include MageHand
+  
+  def save_op_tokens(access_token_key, access_token_secret)
+    self.access_token_key = access_token_key
+    self.access_token_secret = access_token_secret
+    
+    save!
+  end
+end

data/lib/mage-hand.rb

@@ -8,6 +8,8 @@ require 'ob_port/campaign'
 require 'ob_port/wiki_page'
 require 'ob_port/errors'
 
+require 'mage-hand-user'
+
 module MageHand
   def self.set_app_keys(app_key, app_secret)
     Client.set_app_keys(app_key, app_secret)
@@ -25,8 +27,7 @@ module MageHandController
   protected
   
   def obsidian_portal_login_required
-    @mage_client = Client.get_client(session[:request_token], session[:access_token_key], 
-      session[:access_token_secret], request.url, params)
+    obsidian_portal
     store_tokens
     return true if logged_in?
 
@@ -34,29 +35,19 @@ module MageHandController
     false
   end
   
-  def logged_in?
-    @mage_client.logged_in?
+  def logged_in_op?
+    !!@obsidian_portal && @obsidian_portal.logged_in?
   end
   
   def obsidian_portal
-    @mage_client
+    @obsidian_portal ||= Client.get_client(session[:request_token], session[:access_token_key], 
+      session[:access_token_secret], request.url, params)
   end
   
   def store_tokens
-    current_user.save_op_tokens(@mage_client.access_token_key, @mage_client.access_token_secret)
+    current_user.save_op_tokens(@mage_client.access_token_key, @mage_client.access_token_secret) if current_user
     session[:request_token] = @mage_client.request_token
     session[:access_token_key] = @mage_client.access_token_key
     session[:access_token_secret] = @mage_client.access_token_secret
   end
 end
-
-module MageHandUser
-  include MageHand
-  
-  def save_op_tokens(access_token_key, access_token_secret)
-    self.access_token_key = access_token_key
-    self.access_token_secret = access_token_secret
-    
-    save!
-  end
-end

data/lib/ob_port/errors.rb

@@ -1,2 +1,4 @@
-class OAuthConfigurationError < StandardError
+module MageHand
+  class MageHandNotInitialized < StandardError; end
+  class OAuthConfigurationError < StandardError; end
 end

data/mage-hand.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mage-hand"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hammond"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rvmrc",
+    "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO",
     "VERSION",
+    "lib/mage-hand-user.rb",
     "lib/mage-hand.rb",
     "lib/ob_port/base.rb",
     "lib/ob_port/campaign.rb",
@@ -38,7 +40,9 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_base.rb",
     "test/test_campaign.rb",
-    "test/test_client.rb"
+    "test/test_client.rb",
+    "test/test_mage_hand_controller.rb",
+    "test/test_mage_hand_user.rb"
   ]
   s.homepage = "http://github.com/shammond42/mage-hand"
   s.licenses = ["MIT"]

data/test/test_client.rb

@@ -6,7 +6,7 @@ class TestClient < Test::Unit::TestCase
       assert_nothing_raised {MageHand::Client.set_app_keys('asdfasdf','asdfasdfasdfasdfasdf')} 
     end
     should "raise an exception when the app keys are not set" do
-      assert_raise(OAuthConfigurationError) do
+      assert_raise(MageHand::OAuthConfigurationError) do
         # @request_token = stub('request token')
         MageHand::Client.send(:reset_client)
         MageHand::get_client

data/test/test_mage_hand_controller.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+class TestMageHandUser < Test::Unit::TestCase
+  include MageHandController
+  
+  context 'The Mage Hand Controller Module' do
+    setup do
+      
+    end
+    
+    should 'be know if the user is logged into obsidian portal' do
+    end
+  end
+end

data/test/test_mage_hand_user.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+class TestMageHandUser < Test::Unit::TestCase
+  class User
+    include MageHandUser
+    attr_accessor :access_token_key, :access_token_secret, :saved
+    @saved = false
+    def save!
+      @saved = true
+    end
+  end
+  
+  context 'The Mage Hand User Module' do
+    should 'be able to save op authorization tokens' do
+      user = User.new
+      assert !user.saved
+      user.save_op_tokens('abcdefg', '1234567')
+      assert user.saved
+      assert_equal 'abcdefg', user.access_token_key
+      assert_equal '1234567', user.access_token_secret
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mage-hand
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -183,6 +183,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rvmrc
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -190,6 +191,7 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- lib/mage-hand-user.rb
 - lib/mage-hand.rb
 - lib/ob_port/base.rb
 - lib/ob_port/campaign.rb
@@ -202,6 +204,8 @@ files:
 - test/test_base.rb
 - test/test_campaign.rb
 - test/test_client.rb
+- test/test_mage_hand_controller.rb
+- test/test_mage_hand_user.rb
 homepage: http://github.com/shammond42/mage-hand
 licenses:
 - MIT
@@ -217,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2130833917453379504
+      hash: 4609764136026977758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: