From e5e0bd0860758b5292aae7a4bc33d04277b7d359 Mon Sep 17 00:00:00 2001
From: Michael Mangino <mmangino@elevatedrails.com>
Date: Wed, 3 Dec 2008 15:45:19 -0500
Subject: [PATCH] Fix publisher issue

---
 config/environments/development.rb              |  1 -
 config/facebooker.yml                           |  6 +++---
 db/schema.rb                                    | 17 ++++++++++++-----
 .../lib/facebooker/rails/publisher.rb           | 16 ++++++++++++++--
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 09a451f..85c9a60 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -12,7 +12,6 @@
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
\ No newline at end of file
diff --git a/config/facebooker.yml b/config/facebooker.yml
index ec033e7..aa01d39 100644
--- a/config/facebooker.yml
+++ b/config/facebooker.yml
@@ -9,9 +9,9 @@ development:
   callback_url: http://web1.tunnlr.com:10103
   api: new
   tunnel:
-    public_host_username: mmangino
-    public_host: cab.elevatedrails.com
-    public_port: 3002
+    public_host_username: tunnlr7
+    public_host: ssh1.tunnlr.com
+    public_port: 10103
     local_port: 3000
 
 
diff --git a/db/schema.rb b/db/schema.rb
index cade1b6..c11ca25 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,5 @@
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 11) do
+ActiveRecord::Schema.define(:version => 12) do
 
   create_table "attacks", :force => true do |t|
     t.integer  "attacking_user_id"
@@ -20,8 +20,8 @@
     t.boolean  "hit"
   end
 
-  add_index "attacks", ["defending_user_id", "created_at"], :name => "index_attacks_on_defending_user_id_and_created_at"
   add_index "attacks", ["attacking_user_id", "created_at"], :name => "index_attacks_on_attacking_user_id_and_created_at"
+  add_index "attacks", ["defending_user_id", "created_at"], :name => "index_attacks_on_defending_user_id_and_created_at"
 
   create_table "belts", :force => true do |t|
     t.string   "name"
@@ -42,6 +42,13 @@
 
   add_index "comments", ["user_id", "created_at"], :name => "index_comments_on_user_id_and_created_at"
 
+  create_table "facebook_templates", :force => true do |t|
+    t.string   "bundle_id"
+    t.string   "template_name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "moves", :force => true do |t|
     t.string   "name"
     t.string   "image_name"
@@ -57,11 +64,11 @@
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
 
   create_table "users", :force => true do |t|
-    t.integer  "facebook_id", :limit => 8, :null => false
+    t.integer  "facebook_id", :limit => 20, :null => false
     t.string   "session_key"
     t.datetime "created_at"
     t.datetime "updated_at"
diff --git a/vendor/plugins/facebooker/lib/facebooker/rails/publisher.rb b/vendor/plugins/facebooker/lib/facebooker/rails/publisher.rb
index a616eee..f4c0bd0 100644
--- a/vendor/plugins/facebooker/lib/facebooker/rails/publisher.rb
+++ b/vendor/plugins/facebooker/lib/facebooker/rails/publisher.rb
@@ -87,6 +87,9 @@ module Rails
     #
     # Publisher makes many helpers available, including the linking and asset helpers
     class Publisher
+      def initialize
+        @controller = PublisherController.new        
+      end
       class FacebookTemplate < ::ActiveRecord::Base
         
         
@@ -398,8 +401,6 @@ def protect_against_forgery?
       end
       ActionController::Routing::Routes.named_routes.install(self.master_helper_module)
       include self.master_helper_module
-      # Publisher is the controller, it should do the rewriting
-      include ActionController::UrlWriter
       class <<self
         
         def register_all_templates
@@ -470,6 +471,17 @@ def inherited(child)
         end
     
       end
+      # implement the bits of functionality we need out of a controller object
+      class PublisherController
+        include Facebooker::Rails::Publisher.master_helper_module
+        include ActionController::UrlWriter
+        
+        def self.default_url_options(*args)
+          Facebooker::Rails::Publisher.default_url_options(*args)
+        end
+        
+      end
+      
     end
   end
 end