More messing around with class auto reloading. Now we reload everything as a module. refs #7683.

Author: Thomas Getgood

init.rb

@@ -1,6 +1,6 @@
 require 'redmine'
 
-require File.dirname(__FILE__) + '/lib/google_spreadsheet_macros.rb'
+require File.dirname(__FILE__) + '/lib/google_apps_macros.rb'
 
 Redmine::Plugin.register :redmine_googlesss do
   name "Google Docs Plugin"
@@ -11,37 +11,37 @@
   Redmine::WikiFormatting::Macros.register do
     desc = "Redmine Google Spreadsheet Macro (gs)"
     macro :gs do |obj, args|
-      out = GoogleSpreadsheetMacros.googless_macro(obj, args)
+      out = GoogleAppsMacros::SpreadsheetMacros.googless_macro(obj, args)
     end
 
     desc = "Redmine Google Spreadsheet Macro (googless)"
     macro :googless do |obj, args|
-      out = GoogleSpreadsheetMacros.googless_macro(obj, args)
+      out = GoogleAppsMacros::SpreadsheetMacros.googless_macro(obj, args)
     end
 
     desc = "Redmine Google Spreadsheet Macro (googlespreadsheet)"
     macro :googlespreadsheet do |obj, args|
-      out = GoogleSpreadsheetMacros.googless_macro(obj, args)
+      out = GoogleAppsMacros::SpreadsheetMacros.googless_macro(obj, args)
     end
 
     desc = "Redmine Google Spreadsheet Macro (googlespread)"
     macro :googlespread do |obj, args|
-      out = GoogleSpreadsheetMacros.googless_macro(obj, args)
+      out = GoogleAppsMacros::SpreadsheetMacros.googless_macro(obj, args)
     end
 
     desc = "Redmine Google Spreadsheet Macro (gi)"
     macro :gi do |obj, args|
-      GoogleSpreadsheetMacros.get_issue(obj, args)
+      GoogleAppsMacros::SpreadsheetMacros.get_issue(obj, args)
     end
 
     desc = "Redmine Google Spreadsheet Macro (googleissue)"
     macro :googleissue do |obj, args|
-      GoogleSpreadsheetMacros.get_issue(obj, args)
+      GoogleAppsMacros::SpreadsheetMacros.get_issue(obj, args)
     end
 
     desc = "Redmine Google Document Macro (googledoc)"
     macro :googledoc do |obj, args|
-      GoogleDocumentMacros.get_doc(obj, args)
+      GoogleAppsMacros::DocumentMacros.get_doc(obj, args)
     end
   end
 end

lib/google_spreadsheet_macros.rb renamed to lib/google_apps_macros.rb

@@ -3,14 +3,15 @@
 require 'yaml'
 include ActionView::Helpers::JavaScriptHelper
 
-class GoogleSpreadsheetMacros
+module GoogleAppsMacros
+  unloadable
+class SpreadsheetMacros
   def self.googless_macro(googless_wiki_content, args, nohead=false)
     raise  "The correct usage is {{ googless(key,query) }}" unless args.length >= 1
 
     # redmine seemingly html-escapes all the wiki arguments, so we un-escape them
     key = escape_javascript(CGI.unescape(args[0]))
 
-
     sheet = "0"
     if args.length > 1
       # check to see if the second argument is a sheet. Otherwise, continue
@@ -164,7 +165,7 @@ def self.clean_key(key)
   end
 end
 
-class GoogleDocumentMacros
+class DocumentMacros
   def self.get_doc(obj, args)
     doc_key = args[0]
     if args.length == 2
@@ -184,3 +185,4 @@ def self.get_doc(obj, args)
     end
   end
 end
+end