mage-hand 0.4.4 → 0.4.5

data/Gemfile

@@ -2,10 +2,13 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "oauth", ">= 0.4.4"
+gem "oauth", "= 0.4.4"
 gem "json"
 gem 'i18n'
-gem 'activesupport'
+gem 'rails', ">= 3.0.0"
+
+# gem 'actioncontroller'
+# gem 'activesupport'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,24 +1,81 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.7)
+    arel (3.0.2)
+    builder (3.0.0)
     crack (0.3.1)
+    erubis (2.7.0)
     git (1.2.5)
+    hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.3)
     json (1.6.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     metaclass (0.0.1)
+    mime-types (1.17.2)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.1.0)
-    oauth (0.4.5)
+    oauth (0.4.4)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
+      bundler (~> 1.0)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -27,6 +84,16 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.32)
     webmock (1.8.2)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
@@ -35,12 +102,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   bundler (~> 1.1.0)
   i18n
   jeweler (~> 1.8.0)
   json
   mocha (>= 0.9.8)
-  oauth (>= 0.4.4)
+  oauth (= 0.4.4)
+  rails (>= 3.0.0)
   shoulda
   webmock (>= 1.6.2)

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/ob_port/base.rb

@@ -1,5 +1,6 @@
 module MageHand
   class Base
+    attr_accessor :client
     @@simple_attributes = {}
     @@instance_attributes = {}
     
@@ -13,7 +14,8 @@ module MageHand
     
     attr_simple :id
     
-    def initialize(attributes=nil)
+    def initialize(client, attributes=nil)
+      self.client = client
       update_attributes!(attributes)
     end
      
@@ -29,7 +31,7 @@ module MageHand
       #if we don't have an id, the opject has not been created on the server yet
       return unless self.id
       
-      hash = JSON.parse( MageHand::get_client.access_token.get(individual_url).body)
+      hash = JSON.parse(client.access_token.get(individual_url).body)
       update_attributes!(hash)
     end
     
@@ -82,7 +84,7 @@ module MageHand
           end
 
           def #{name}=(new_#{name})
-            @#{name} = #{class_name}.new(new_#{name.singularize})
+            @#{name} = #{class_name}.new(client, new_#{name.singularize})
           end
         CODE
         puts code if ENV['DEBUG']
@@ -105,7 +107,7 @@ module MageHand
           def #{name}=(new_#{name})
             @#{name} = []
             new_#{name}.each do |#{name.singularize}|
-              @#{name} << #{class_name}.new(#{name.singularize})
+              @#{name} << #{class_name}.new(client, #{name.singularize})
             end
           end
         CODE

data/lib/ob_port/campaign.rb

@@ -21,12 +21,12 @@ module MageHand
     inflate_if_nil :players
 
     def self.find_by_slug(slug)
-      hash = JSON.parse( MageHand::get_client.access_token.get("/v1/campaigns/#{slug}.json?use_slug=true").body)
+      hash = JSON.parse(client.access_token.get("/v1/campaigns/#{slug}.json?use_slug=true").body)
       Campaign.new(hash)
     end
 
     def self.find(id)
-      hash = JSON.parse( MageHand::get_client.access_token.get("/v1/campaigns/#{id}.json").body)
+      hash = JSON.parse(client.access_token.get("/v1/campaigns/#{id}.json").body)
       Campaign.new(hash)
     end
     

data/lib/ob_port/client.rb

@@ -1,7 +1,6 @@
 module MageHand
   class Client
     attr_accessor :request_token, :access_token_key, :access_token_secret
-    @@client = nil
     
     def self.set_app_keys(key, secret)
       @@key = key
@@ -10,12 +9,8 @@ module MageHand
     
     def self.get_client(session_request_token=nil, session_access_token_key=nil, session_access_token_secret=nil,
         callback=nil, params=nil)
-      # If we don't have a client, or we are changing a token, initialize a new client
-      if !@@client || session_request_token || session_access_token_key || session_access_token_secret
-        @@client = Client.new(session_request_token, session_access_token_key,
-          session_access_token_secret, callback, params)
-      end
-      @@client
+        Client.new(session_request_token, session_access_token_key, session_access_token_secret,
+          callback, params)
     end
     
     def initialize(session_request_token=nil, session_access_token_key=nil, session_access_token_secret=nil,
@@ -53,12 +48,16 @@ module MageHand
     end
     
     def current_user
-      @current_user ||= MageHand::User.new(JSON.parse(access_token.get('/v1/users/me.json').body))
+      @current_user ||= MageHand::User.new(self, JSON.parse(access_token.get('/v1/users/me.json').body))
     end
     alias :me :current_user
     
     def campaign(id)
-      MageHand::Campaign.new(JSON.parse(access_token.get("/v1/campaigns/#{id}.json").body))
+      MageHand::Campaign.new(self, JSON.parse(access_token.get("/v1/campaigns/#{id}.json").body))
+    end
+    
+    def create_wiki_page(options)
+      MageHand::WikiPage.new(self, options)
     end
     
     protected
@@ -66,7 +65,6 @@ module MageHand
     def self.reset_client
       @@key = nil
       @@secret = nil
-      @@client = nil
     end
   end
 end

data/lib/ob_port/wiki_page.rb

@@ -20,13 +20,12 @@ module MageHand
     inflate_if_nil :campaign
     
     def self.load_wiki_pages(campaign_id)
-      wiki_hashes = JSON.parse(
-        MageHand::get_client.access_token.get(collection_url(campaign_id)).body)
+      wiki_hashes = JSON.parse(client.access_token.get(collection_url(campaign_id)).body)
       wiki_hashes.map {|hash| WikiPage.new(hash)}
     end
     
     def campaign=(campaign_hash)
-      @campaign ||= Campaign.new(campaign_hash)
+      @campaign = Campaign.new(client, campaign_hash)
     end
     
     def is_post?
@@ -50,9 +49,18 @@ module MageHand
       if id # save existing wiki pae
         
       else # create new wiki page
+        puts '#########'
+        puts client.logged_in?
+        puts self.campaign.inspect
+        puts self.class.collection_url(self.campaign.id)
+        puts client.access_token.inspect
+        puts client.campaign(self.campaign.id).name
+        
         json_body = {'wiki_page' => self.to_hash}.to_json
-        @response = MageHand.get_client.access_token.post(self.class.collection_url(self.campaign.id),
+        puts json_body
+        @response = client.access_token.post(self.class.collection_url(self.campaign.id),
           json_body,  {'content-type' => 'application/x-www-form-urlencoded'})
+        puts @response.inspect
         self.update_attributes!(JSON.parse(@response.body))
       end
     end

data/mage-hand.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mage-hand"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hammond"]
-  s.date = "2012-03-16"
+  s.date = "2012-03-20"
   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 = [
@@ -54,10 +54,10 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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<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_runtime_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
@@ -65,10 +65,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webmock>, [">= 1.6.2"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
     else
-      s.add_dependency(%q<oauth>, [">= 0.4.4"])
+      s.add_dependency(%q<oauth>, ["= 0.4.4"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
@@ -77,10 +77,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
     end
   else
-    s.add_dependency(%q<oauth>, [">= 0.4.4"])
+    s.add_dependency(%q<oauth>, ["= 0.4.4"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.0"])

data/test/helper.rb

@@ -19,4 +19,5 @@ require 'mage-hand'
 require 'oauth'
 
 class Test::Unit::TestCase
+
 end

data/test/test_base.rb

@@ -4,7 +4,7 @@ class TestBase < Test::Unit::TestCase
   context 'the Base class' do    
     should 'use the attr_simple method to add an attribute' do
       MageHand::Base.attr_simple :test_attribute, :second_attribute
-      @instance = MageHand::Base.new
+      @instance = MageHand::Base.new(nil)
       @instance.test_attribute = 'Hello'
       @instance.second_attribute = 'World'
       assert_equal 'Hello', @instance.test_attribute
@@ -13,7 +13,7 @@ class TestBase < Test::Unit::TestCase
     
     should 'be able to get a list of simple attributes' do
       MageHand::Base.attr_simple :test_attribute, :second_attribute
-      @instance = MageHand::Base.new
+      @instance = MageHand::Base.new(nil)
       
       assert MageHand::Base.simple_attributes.include?(:test_attribute)
       assert @instance.simple_attributes.include?(:test_attribute)
@@ -23,15 +23,16 @@ class TestBase < Test::Unit::TestCase
     end
     
     should 'be able to add an instance of another class as an attribute' do
+      # MageHand::Client.set_app_keys('asdfasdf', 'asdfasdfasdfasdfasdf') 
       MageHand::Base.attr_instance :test_campaign, :class_name => 'Campaign'
-      @instance = MageHand::Base.new
+      @instance = MageHand::Base.new(nil)
       @instance.test_campaign = {:name => "A Great Time"}
       assert_equal "A Great Time", @instance.test_campaign.name
     end
     
     should 'be able to get a list of instance attributes' do
       MageHand::Base.attr_instance :test_campaign, :class_name => 'Campaign'
-      @instance = MageHand::Base.new
+      @instance = MageHand::Base.new(nil)
       
       assert MageHand::Base.instance_attributes.include?(:test_campaign)
       assert @instance.instance_attributes.include?(:test_campaign)
@@ -40,7 +41,7 @@ class TestBase < Test::Unit::TestCase
     should 'be able to get a list of all declared attributes' do
       MageHand::Base.attr_instance :test_campaign, :class_name => 'Campaign'
       MageHand::Base.attr_simple :test_attribute
-      @instance = MageHand::Base.new
+      @instance = MageHand::Base.new(nil)
       
       assert MageHand::Base.attributes.include?(:test_campaign)
       assert @instance.attributes.include?(:test_campaign)

data/test/test_campaign.rb

@@ -4,7 +4,7 @@ class TestCampaign < Test::Unit::TestCase
   context 'an instance of the Campaign class' do
     should 'know its url' do
       id_string = 'asdf12341asdf1234'
-      campaign = MageHand::Campaign.new(:id => id_string)
+      campaign = MageHand::Campaign.new(nil, :id => id_string)
       assert_equal "/v1/campaigns/#{id_string}.json", campaign.send(:individual_url)
     end
   end
@@ -26,7 +26,7 @@ class TestCampaign < Test::Unit::TestCase
     end
     
     should 'be able to initialize from a mini object' do
-      campaign = MageHand::Campaign.new(@mini_fields)
+      campaign = MageHand::Campaign.new(nil, @mini_fields)
       assert_not_nil campaign
       @mini_fields.each do |key, value|
         assert_equal campaign.send(key), value
@@ -34,7 +34,7 @@ class TestCampaign < Test::Unit::TestCase
     end
     
     should 'be able to initialize from a complete object' do
-      campaign = MageHand::Campaign.new(@full_fields)
+      campaign = MageHand::Campaign.new(nil, @full_fields)
       assert_not_nil campaign
       @full_fields.each do |key, value|
         assert_equal campaign.send(key), value

data/test/test_client.rb

@@ -26,9 +26,9 @@ class TestClient < Test::Unit::TestCase
       OAuth::AccessToken.any_instance.stubs(:post).returns(response)
       OAuth::Consumer.any_instance.stubs(:get_request_token).returns(@request_token)
       
-      MageHand::Client.send(:reset_client)
       MageHand::Client.set_app_keys('asdfasdf', 'asdfasdfasdfasdfasdf')  
     end
+    
     should "be configured to use different urls for authentication and api access" do
       @client = MageHand::get_client(nil, nil, nil)
       assert @client.consumer.site =~ /api\.obsidianportal\.com/
@@ -36,18 +36,21 @@ class TestClient < Test::Unit::TestCase
       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::get_client(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::get_client(@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::get_client(nil, 'asdf', 'asdfasdfasdfasdf')
       assert_not_nil @client
@@ -55,5 +58,13 @@ class TestClient < Test::Unit::TestCase
       assert_equal @client.access_token.token, 'asdf'
       assert_equal @client.access_token.secret, 'asdfasdfasdfasdf'
     end
+    
+    should 'be act as a factory for wiki page objects' do
+      @client = MageHand::get_client(nil, 'asdf', 'asdfasdfasdfasdf')
+      @page = @client.create_wiki_page(slug: 'test_page')
+      assert_not_nil @page
+      assert_equal @client, @page.client
+      assert_equal 'test_page', @page.slug
+    end
   end
 end

data/test/test_mage_hand_controller.rb

@@ -1,14 +1,42 @@
 require 'helper'
+require 'active_support'
+require 'active_support/test_case'
+require 'action_controller'
+require 'action_controller/test_case'
 
-class TestMageHandUser < Test::Unit::TestCase
+class UnderTestController < ActionController::Base
   include MageHandController
+  def current_user
+    
+  end
+end
+
+class TestMageHandController < ActionController::TestCase
+  tests UnderTestController
   
   context 'The Mage Hand Controller 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 'return an obsidian portal client' do
+      assert @controller.send(:obsidian_portal).instance_of? MageHand::Client
+    end
+    
+    should 'know if an op user is logged in' do
+      assert !@controller.send(:logged_in_op?)
       
+      @controller.send(:obsidian_portal).access_token_key = 'asdfasdf'
+      @controller.send(:obsidian_portal).access_token_secret = 'adsfasdfasdfasdf'
+      assert @controller.send(:logged_in_op?)
     end
     
-    should 'be know if the user is logged into obsidian portal' do
+    should 'be able to store tokens on the user and the session' do
+      @controller.send(:obsidian_portal).access_token_key = 'asdfasdf'
+      @controller.send(:obsidian_portal).access_token_secret = 'adsfasdfasdfasdf'
+      assert @controller.send(:logged_in_op?)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mage-hand
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.4
 - !ruby/object:Gem::Dependency
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3200575853277087957
+      hash: 4602273356508008928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: