instiki 0.10.0 → 0.10.1

data/app/views/wiki/tex.rhtml

@@ -1,23 +1,23 @@
-\documentclass[12pt,titlepage]{article}
-
-\usepackage[danish]{babel}      %danske tekster
-\usepackage[OT1]{fontenc}       %rigtige danske bogstaver...
-\usepackage{a4}
-\usepackage{graphicx}
-\usepackage{ucs}
-\usepackage[utf8x]{inputenc}
-\input epsf 
-
-%-------------------------------------------------------------------
-
-\begin{document}
-
-\sloppy
-
-%-------------------------------------------------------------------
-
-\section*{<%= @page.name %>}
-
-<%= @tex_content %>
-
+\documentclass[12pt,titlepage]{article}
+
+\usepackage[danish]{babel}      %danske tekster
+\usepackage[OT1]{fontenc}       %rigtige danske bogstaver...
+\usepackage{a4}
+\usepackage{graphicx}
+\usepackage{ucs}
+\usepackage[utf8x]{inputenc}
+\input epsf 
+
+%-------------------------------------------------------------------
+
+\begin{document}
+
+\sloppy
+
+%-------------------------------------------------------------------
+
+\section*{<%= @page.name %>}
+
+<%= @tex_content %>
+
 \end{document}

data/app/views/wiki/tex_web.rhtml

@@ -1,35 +1,35 @@
-\documentclass[12pt,titlepage]{article}
-
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-
-\fancyhead[LE,RO]{}
-\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}
-\fancyfoot[C]{\thepage}
-
-\usepackage[danish]{babel}      %danske tekster
-\usepackage{a4}
-\usepackage{graphicx}
-\usepackage{ucs}
-\usepackage[utf8]{inputenc}
-\input epsf 
-
-
-%-------------------------------------------------------------------
-
-\title{<%= @web_name %>}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-\pagebreak
-
-\sloppy
-
-%-------------------------------------------------------------------
-
-<%= @tex_content %>
-
+\documentclass[12pt,titlepage]{article}
+
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+
+\fancyhead[LE,RO]{}
+\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}
+\fancyfoot[C]{\thepage}
+
+\usepackage[danish]{babel}      %danske tekster
+\usepackage{a4}
+\usepackage{graphicx}
+\usepackage{ucs}
+\usepackage[utf8]{inputenc}
+\input epsf 
+
+
+%-------------------------------------------------------------------
+
+\title{<%= @web_name %>}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+\pagebreak
+
+\sloppy
+
+%-------------------------------------------------------------------
+
+<%= @tex_content %>
+
 \end{document}

data/app/views/wiki/web_list.rhtml

@@ -1,18 +1,18 @@
-<% @title = "Wiki webs" %>
-
-<ul>
-<% @webs.each do |web| %>
-  <li>
-    <% if web.published %>
-      <%= link_to_page 'HomePage', web, web.name, :mode => 'publish' %>
-      (read-only) /
-      <%= link_to_page 'HomePage', web, 'editable version', :mode => 'show' %> (requires login)
-    <% else %>
-      <%= link_to_page 'HomePage', web, web.name, :mode => 'show' %>
-    <% end %>
-    <div class="byline" style="margin-bottom: 0px">
-      <%= web.pages.length %> pages by <%= web.authors.length %> authors
-    </div>
-  </li>
-<% end %>
-</ul>
+<% @title = "Wiki webs" %>
+
+<ul>
+<% @webs.each do |web| %>
+  <li>
+    <% if web.published %>
+      <%= link_to_page 'HomePage', web, web.name, :mode => 'publish' %>
+      (read-only) /
+      <%= link_to_page 'HomePage', web, 'editable version', :mode => 'show' %> (requires login)
+    <% else %>
+      <%= link_to_page 'HomePage', web, web.name, :mode => 'show' %>
+    <% end %>
+    <div class="byline" style="margin-bottom: 0px">
+      <%= web.pages.length %> pages by <%= web.authors.length %> authors
+    </div>
+  </li>
+<% end %>
+</ul>

data/app/views/wiki_words_help.rhtml

@@ -1,9 +1,9 @@
-<h3>Wiki words</h3>
-<p style="border-top: 1px dotted #ccc; margin-top: 0px">
-  Two or more uppercase words stuck together (camel case) or any phrase surrounded by double 
-  brackets is a wiki word. A camel-case wiki word can be escaped by putting \ in front of it.
-</p>
-<p>
-  Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
-  Not wiki words: <i>IBM, School</i>
-</p>
+<h3>Wiki words</h3>
+<p style="border-top: 1px dotted #ccc; margin-top: 0px">
+  Two or more uppercase words stuck together (camel case) or any phrase surrounded by double 
+  brackets is a wiki word. A camel-case wiki word can be escaped by putting \ in front of it.
+</p>
+<p>
+  Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
+  Not wiki words: <i>IBM, School</i>
+</p>

data/config/environment.rb

@@ -1,82 +1,82 @@
-if RUBY_VERSION < '1.8.1' 
-  puts 'Instiki requires Ruby 1.8.1+'
-  exit
-end
-
-# Enable UTF-8 support
-$KCODE = 'u'
-require 'jcode'
-
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
-RAILS_ENV  = ENV['RAILS_ENV'] || 'production' unless defined? RAILS_ENV
-
-unless defined? ADDITIONAL_LOAD_PATHS
-  # Mocks first.
-  ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
-
-  # Then model subdirectories.
-  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"]) 
-  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
-
-  # Followed by the standard includes.
-  ADDITIONAL_LOAD_PATHS.concat %w(
-    app 
-    app/models 
-    app/controllers 
-    app/helpers 
-    app/apis 
-    components 
-    config 
-    lib 
-    vendor 
-    vendor/rails/railties
-    vendor/rails/railties/lib
-    vendor/rails/actionpack/lib
-    vendor/rails/activesupport/lib
-    vendor/rails/activerecord/lib
-    vendor/rails/actionmailer/lib
-    vendor/rails/actionwebservice/lib
-    vendor/madeleine-0.7.1/lib
-    vendor/RedCloth-3.0.3/lib
-    vendor/rubyzip-0.5.6
-  ).map { |dir| "#{File.expand_path(File.join(RAILS_ROOT, dir))}"
-  }.delete_if { |dir| not File.exist?(dir) }
-
-  # Prepend to $LOAD_PATH
-  ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
-end
-
-# Require Rails libraries.
-require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
-
-require 'active_support'
-require 'action_controller'
-
-require_dependency 'instiki_errors'
-require_dependency 'active_record_stub'
-
-# Environment specific configuration
-require_dependency "environments/#{RAILS_ENV}"
-
-# Configure defaults if the included environment did not.
-unless defined? RAILS_DEFAULT_LOGGER
-  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
-  ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
-  if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
-    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
-    ActionController::Base.logger.level = Logger::DEBUG
-  else
-    RAILS_DEFAULT_LOGGER.level = Logger::INFO
-    ActionController::Base.logger.level = Logger::INFO
-  end
-end
-
-ActionController::Base.template_root ||= "#{RAILS_ROOT}/app/views/"
-ActionController::Routing::Routes.reload
-Controllers = Dependencies::LoadingModule.root(
-  File.join(RAILS_ROOT, 'app', 'controllers'),
-  File.join(RAILS_ROOT, 'components')
-)
-
-require 'wiki_service'
-Socket.do_not_reverse_lookup = true
+if RUBY_VERSION < '1.8.1' 
+  puts 'Instiki requires Ruby 1.8.1+'
+  exit
+end
+
+# Enable UTF-8 support
+$KCODE = 'u'
+require 'jcode'
+
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
+RAILS_ENV  = ENV['RAILS_ENV'] || 'production' unless defined? RAILS_ENV
+
+unless defined? ADDITIONAL_LOAD_PATHS
+  # Mocks first.
+  ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+
+  # Then model subdirectories.
+  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"]) 
+  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
+
+  # Followed by the standard includes.
+  ADDITIONAL_LOAD_PATHS.concat %w(
+    app 
+    app/models 
+    app/controllers 
+    app/helpers 
+    app/apis 
+    components 
+    config 
+    lib 
+    vendor 
+    vendor/rails/railties
+    vendor/rails/railties/lib
+    vendor/rails/actionpack/lib
+    vendor/rails/activesupport/lib
+    vendor/rails/activerecord/lib
+    vendor/rails/actionmailer/lib
+    vendor/rails/actionwebservice/lib
+    vendor/madeleine-0.7.1/lib
+    vendor/RedCloth-3.0.3/lib
+    vendor/rubyzip-0.5.8/lib
+  ).map { |dir| "#{File.expand_path(File.join(RAILS_ROOT, dir))}"
+  }.delete_if { |dir| not File.exist?(dir) }
+
+  # Prepend to $LOAD_PATH
+  ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+end
+
+# Require Rails libraries.
+require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
+
+require 'active_support'
+require 'action_controller'
+
+require_dependency 'instiki_errors'
+require_dependency 'active_record_stub'
+
+# Environment specific configuration
+require_dependency "environments/#{RAILS_ENV}"
+
+# Configure defaults if the included environment did not.
+unless defined? RAILS_DEFAULT_LOGGER
+  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
+  ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
+  if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
+    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
+    ActionController::Base.logger.level = Logger::DEBUG
+  else
+    RAILS_DEFAULT_LOGGER.level = Logger::INFO
+    ActionController::Base.logger.level = Logger::INFO
+  end
+end
+
+ActionController::Base.template_root ||= "#{RAILS_ROOT}/app/views/"
+ActionController::Routing::Routes.reload
+Controllers = Dependencies::LoadingModule.root(
+  File.join(RAILS_ROOT, 'app', 'controllers'),
+  File.join(RAILS_ROOT, 'components')
+)
+
+require 'wiki_service'
+Socket.do_not_reverse_lookup = true

data/config/environments/development.rb

@@ -1,5 +1,5 @@
-Dependencies.mechanism = :require
-ActionController::Base.consider_all_requests_local = true
-ActionController::Base.perform_caching = false
-BREAKPOINT_SERVER_PORT = 42531
-INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG
+Dependencies.mechanism = :require
+ActionController::Base.consider_all_requests_local = true
+ActionController::Base.perform_caching = false
+BREAKPOINT_SERVER_PORT = 42531
+INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG

data/config/environments/production.rb

@@ -1,4 +1,4 @@
-Dependencies.mechanism = :require
-ActionController::Base.consider_all_requests_local = false
-ActionController::Base.perform_caching = false
-
+Dependencies.mechanism = :require
+ActionController::Base.consider_all_requests_local = false
+ActionController::Base.perform_caching = false
+

data/config/environments/test.rb

@@ -1,17 +1,17 @@
-Dependencies.mechanism = :require
-ActionController::Base.consider_all_requests_local = true
-ActionController::Base.perform_caching = false
-
-require 'fileutils'
-FileUtils.mkdir_p(RAILS_ROOT + "/log")
-
-unless defined? TEST_LOGGER
-  timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-  log_name = RAILS_ROOT + "/log/instiki_test.#{timestamp}.log"
-  $stderr.puts "To see the Rails log:\n    less #{log_name}"
-  
-  TEST_LOGGER = ActionController::Base.logger = Logger.new(log_name)
-  INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG
-  
-  WikiService.storage_path = RAILS_ROOT + '/storage/test/'
-end
+Dependencies.mechanism = :require
+ActionController::Base.consider_all_requests_local = true
+ActionController::Base.perform_caching = false
+
+require 'fileutils'
+FileUtils.mkdir_p(RAILS_ROOT + "/log")
+
+unless defined? TEST_LOGGER
+  timestamp = Time.now.strftime('%Y%m%d%H%M%S')
+  log_name = RAILS_ROOT + "/log/instiki_test.#{timestamp}.log"
+  $stderr.puts "To see the Rails log:\n    less #{log_name}"
+  
+  TEST_LOGGER = ActionController::Base.logger = Logger.new(log_name)
+  INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG
+  
+  WikiService.storage_path = RAILS_ROOT + '/storage/test/'
+end

data/config/routes.rb

@@ -1,18 +1,18 @@
-ActionController::Routing.draw do |map|
-  map.connect 'create_system', :controller => 'admin', :action => 'create_system'
-  map.connect 'create_web', :controller => 'admin', :action => 'create_web'
-  map.connect ':web/edit_web', :controller => 'admin', :action => 'edit_web'
-  map.connect 'remove_orphaned_pages', :controller => 'admin', :action => 'remove_orphaned_pages'
-
-  map.connect ':web/file/:id', :controller => 'file', :action => 'file'
-  map.connect ':web/pic/:id', :controller => 'file', :action => 'pic'
-  map.connect ':web/import/:id', :controller => 'file', :action => 'import'
-
-  map.connect ':web/login', :controller => 'wiki', :action => 'login'
-  map.connect 'web_list', :controller => 'wiki', :action => 'web_list'
-  map.connect ':web/web_list', :controller => 'wiki', :action => 'web_list'
-  map.connect ':web/:action/:id', :controller => 'wiki'
-  map.connect ':web/:action', :controller => 'wiki'
-  map.connect ':web', :controller => 'wiki', :action => 'index'
-  map.connect '', :controller => 'wiki', :action => 'index'
-end
+ActionController::Routing.draw do |map|
+  map.connect 'create_system', :controller => 'admin', :action => 'create_system'
+  map.connect 'create_web', :controller => 'admin', :action => 'create_web'
+  map.connect ':web/edit_web', :controller => 'admin', :action => 'edit_web'
+  map.connect 'remove_orphaned_pages', :controller => 'admin', :action => 'remove_orphaned_pages'
+
+  map.connect ':web/file/:id', :controller => 'file', :action => 'file'
+  map.connect ':web/pic/:id', :controller => 'file', :action => 'pic'
+  map.connect ':web/import/:id', :controller => 'file', :action => 'import'
+
+  map.connect ':web/login', :controller => 'wiki', :action => 'login'
+  map.connect 'web_list', :controller => 'wiki', :action => 'web_list'
+  map.connect ':web/web_list', :controller => 'wiki', :action => 'web_list'
+  map.connect ':web/:action/:id', :controller => 'wiki'
+  map.connect ':web/:action', :controller => 'wiki'
+  map.connect ':web', :controller => 'wiki', :action => 'index'
+  map.connect '', :controller => 'wiki', :action => 'index'
+end

data/lib/active_record_stub.rb

@@ -1,31 +1,31 @@
-# This project uses Railties, which has an external dependency on ActiveRecord
-# Since ActiveRecord may not be present in Instiki runtime environment, this 
-# file provides a stub replacement for it
-
-module ActiveRecord
-  class Base
-    
-      # dependency in railties/lib/dispatcher.rb
-    def self.reset_column_information_and_inheritable_attributes_for_all_subclasses
-       # noop
-    end
-      
-    # dependency in actionpack/lib/action_controller/benchmarking.rb
-    def self.connected?
-      false
-    end
-      
-    # dependency in actionpack/lib/action_controller/benchmarking.rb
-    def self.connection
-      return ConnectionStub
-    end
-      
-  end
-
-  module ConnectionStub
-    def self.reset_runtime
-      0
-    end
-  end
-  
-end
+# This project uses Railties, which has an external dependency on ActiveRecord
+# Since ActiveRecord may not be present in Instiki runtime environment, this 
+# file provides a stub replacement for it
+
+module ActiveRecord
+  class Base
+    
+      # dependency in railties/lib/dispatcher.rb
+    def self.reset_column_information_and_inheritable_attributes_for_all_subclasses
+       # noop
+    end
+      
+    # dependency in actionpack/lib/action_controller/benchmarking.rb
+    def self.connected?
+      false
+    end
+      
+    # dependency in actionpack/lib/action_controller/benchmarking.rb
+    def self.connection
+      return ConnectionStub
+    end
+      
+  end
+
+  module ConnectionStub
+    def self.reset_runtime
+      0
+    end
+  end
+  
+end