mage-hand 0.4.0 → 0.4.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.3-p125@mage-hand

data/Gemfile

@@ -11,10 +11,9 @@ gem 'activesupport'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "bundler", "~> 1.1.0"
+  gem "jeweler", "~> 1.8.0"
   gem "mocha", ">=0.9.8"
-  gem "redgreen"
+  # gem "redgreen"
   gem "webmock", ">=1.6.2"
 end

data/Gemfile.lock

@@ -1,25 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
-    addressable (2.2.4)
-    crack (0.1.8)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.7)
+    crack (0.3.1)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
-    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)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
+      rdoc
+    json (1.6.5)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.1.0)
+    oauth (0.4.5)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    webmock (1.8.2)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
 
 PLATFORMS
@@ -27,13 +36,11 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  bundler (~> 1.0.0)
+  bundler (~> 1.1.0)
   i18n
-  jeweler (~> 1.5.1)
+  jeweler (~> 1.8.0)
   json
   mocha (>= 0.9.8)
   oauth (>= 0.4.4)
-  rcov
-  redgreen
   shoulda
   webmock (>= 1.6.2)

data/Rakefile

@@ -34,16 +34,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/mage-hand.rb

@@ -7,6 +7,7 @@ require 'ob_port/user'
 require 'ob_port/campaign'
 require 'ob_port/wiki_page'
 require 'ob_port/errors'
+
 module MageHand
   def self.set_app_keys(app_key, app_secret)
     Client.set_app_keys(app_key, app_secret)
@@ -17,7 +18,10 @@ module MageHand
     Client.get_client(session_request_token, session_access_token_key, session_access_token_secret,
           callback, params)
   end
-  
+end
+
+module MageHandController
+  include MageHand
   protected
   
   def obsidian_portal_login_required
@@ -39,8 +43,20 @@ module MageHand
   end
   
   def store_tokens
+    current_user.save_op_tokens(@mage_client.access_token_key, @mage_client.access_token_secret)
     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/mage-hand.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mage-hand}
-  s.version = "0.4.0"
+  s.name = "mage-hand"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hammond"]
-  s.date = %q{2011-11-06}
-  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.date = "2012-03-15"
+  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 = [
     "LICENSE.txt",
     "README.rdoc",
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -39,33 +40,24 @@ Gem::Specification.new do |s|
     "test/test_campaign.rb",
     "test/test_client.rb"
   ]
-  s.homepage = %q{http://github.com/shammond42/mage-hand}
+  s.homepage = "http://github.com/shammond42/mage-hand"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Ruby wrapper around the Obsidian Portal API}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_base.rb",
-    "test/test_campaign.rb",
-    "test/test_client.rb"
-  ]
+  s.rubygems_version = "1.8.19"
+  s.summary = "Ruby wrapper around the Obsidian Portal API"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      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<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_development_dependency(%q<redgreen>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 1.6.2"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
     else
@@ -74,11 +66,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      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<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
-      s.add_dependency(%q<redgreen>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 1.6.2"])
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
     end
@@ -88,11 +78,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    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<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
-    s.add_dependency(%q<redgreen>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 1.6.2"])
     s.add_dependency(%q<oauth>, [">= 0.4.4"])
   end

data/test/helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'redgreen'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

data/test/test_base.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require 'helper'
 
 class TestBase < Test::Unit::TestCase
   context 'the Base class' do    

data/test/test_campaign.rb

@@ -1,4 +1,4 @@
-require 'test/helper'
+require 'helper'
 
 class TestCampaign < Test::Unit::TestCase
   context 'an instance of the Campaign class' do

metadata

@@ -1,203 +1,188 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mage-hand
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  segments_generated: true
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Steven Hammond
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-06 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2012-03-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: oauth
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 4
-        segments_generated: true
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.4
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  name: json
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: i18n
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        segments_generated: true
-        version: 1.0.0
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        segments_generated: true
-        version: 1.5.1
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :development
-  name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        segments_generated: true
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: redgreen
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+- !ruby/object:Gem::Dependency
   name: webmock
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 2
-        segments_generated: true
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.2
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+- !ruby/object:Gem::Dependency
   name: oauth
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 4
-        segments_generated: true
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.4
-  requirement: *id012
-description: mage-hand is a ghostly hand that reaches across the internet to access the Obsidian Portal API.
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+description: mage-hand is a ghostly hand that reaches across the internet to access
+  the Obsidian Portal API.
 email: shammond@northpub.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 - TODO
-files: 
+files:
 - .document
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -217,40 +202,32 @@ files:
 - test/test_base.rb
 - test/test_campaign.rb
 - test/test_client.rb
-has_rdoc: true
 homepage: http://github.com/shammond42/mage-hand
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: -2130833917453379504
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper around the Obsidian Portal API
-test_files: 
-- test/helper.rb
-- test/test_base.rb
-- test/test_campaign.rb
-- test/test_client.rb
+test_files: []