Pimki 1.4.092 → 1.5.092

data/pimki.rb

@@ -9,76 +9,17 @@ end
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "libraries")
 begin
   require 'rubygems'
-  require 'madeleine'
-  require 'redcloth'
-  require 'bluecloth'
+  require_gem 'madeleine'
+  require_gem 'BlueCloth'
   require_gem 'rubyzip'
   require 'zip/zip'
 
 rescue LoadError => detail
   # no rubygems, so load from the libraries directory
   p detail
-  require 'redcloth'
   require 'bluecloth'
   require 'zip/zip'
 end
-
-### RedCloth Modifications:
-# Remove the "caps" spanning:
-RedCloth::GLYPHS.delete_if { |glyph| glyph[1] =~ /class=\"caps\"/ }
-# Fix missing hard_break
-if RedCloth::VERSION == '3.0.0'
-  class RedCloth #{{{
-    def to_html( *rules )
-        rules = @rules if rules.empty?
-        # make our working copy
-        text = self.dup
-        
-        @urlrefs = {}
-        @shelf = []
-        textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
-                         :block_textile_prefix, :inline_textile_image, :inline_textile_link,
-                         :inline_textile_code, :inline_textile_span, :inline_textile_glyphs]
-        markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
-                          :block_markdown_bq, :block_markdown_lists, 
-                          :inline_markdown_reflink, :inline_markdown_link]
-        @rules = rules.collect do |rule|
-            case rule
-            when :markdown
-                markdown_rules
-            when :textile
-                textile_rules
-            else
-                rule
-            end
-        end.flatten
-
-        # standard clean up
-        incoming_entities text 
-        clean_white_space text 
-
-        # start processor
-        pre_list = rip_offtags text
-        refs text
-        blocks text
-        inline text
-        smooth_offtags text, pre_list
-
-        retrieve text
-        hard_break text # PIMKI: this is the missing bit!
-
-        text.gsub!( /<\/?notextile>/, '' )
-        text.gsub!( /x%x%/, '&#38;' )
-        text.strip!
-        text
-    end
-  end #}}}
-else
-  # Redcloth v3.0.0 can handle markdown, so BlueCloth is only required if we
-  # have an earlier redcloth version.
-  require 'BlueCloth'
-end
-
 # }}}
 
 # Handle command-line options: {{{
@@ -105,7 +46,8 @@ OPTIONS = {
   :server_type => fork_available ? Daemon : SimpleServer,
   :port        => 2500,
   :storage     => "#{Dir.pwd}/storage",
-  :pdflatex    => pdflatex_available
+  :pdflatex    => pdflatex_available,
+  :redcloth    => '2.0.11'
 }
 
 ARGV.options do |opts|
@@ -116,13 +58,18 @@ ARGV.options do |opts|
 
   opts.on("-p", "--port=port", Integer,
           "Runs Instiki on the specified port.",
-          "Default: 2500") { |OPTIONS[:port]| }
+          "Default: 2500\n") { |OPTIONS[:port]| }
   opts.on("-s", "--simple", "--simple-server",
-          "Forces Instiki not to run as a Daemon if fork is available."
+          "Forces Instiki not to run as a Daemon if fork is available.\n"
           ) { OPTIONS[:server_type] = SimpleServer }
   opts.on("-t", "--storage=storage", String,
           "Makes Instiki use the specified directory for storage.",
-          "Default: [cwd]/storage/[port]") { |OPTIONS[:storage]| }
+          "Default: [cwd]/storage/[port]\n") { |OPTIONS[:storage]| }
+  opts.on("-r", "--redcloth VERSION", Integer,
+          "Makes Instiki use the specified RedCloth version.",
+          "You can specify major version only (2 or 3)",
+          "Default: 2.0.11\n") { |OPTIONS[:redcloth]| }
+          
 
   opts.separator ""
 
@@ -135,6 +82,73 @@ end
 Socket.do_not_reverse_lookup = true
 #}}}
 
+# RedCloth + Modifications: {{{
+begin
+  require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
+
+rescue LoadError => detail
+  if OPTIONS[:redcloth] < '3'
+    require 'redcloth_2.0.11'
+  else
+    require 'redcloth'
+  end
+end
+
+# Remove the "caps" spanning:
+RedCloth::GLYPHS.delete_if { |glyph| glyph[1] =~ /class=\"caps\"/ }
+
+# Fix missing hard_break in RedCloth 3.0.0/1
+if ['3.0.0', '3.0.1'].include? RedCloth::VERSION
+  class RedCloth #{{{
+    # Attempts at fixing the list blocks recognition:
+    #BLOCKS_GROUP_RE = /(^([#*> ])(?:[^\n]|\n+|\n(?!\n|\Z))+)|((?:[^\n]+|\n+ +|\n(?![#*\n]|\Z))+)/m
+
+    def to_html( *rules ) #{{{
+        rules = @rules if rules.empty?
+        # make our working copy
+        text = self.dup
+        
+        @urlrefs = {}
+        @shelf = []
+        textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
+                         :block_textile_prefix, :inline_textile_image, :inline_textile_link,
+                         :inline_textile_code, :inline_textile_span, :inline_textile_glyphs]
+        markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
+                          :block_markdown_bq, :block_markdown_lists, 
+                          :inline_markdown_reflink, :inline_markdown_link]
+        @rules = rules.collect do |rule|
+            case rule
+            when :markdown
+                markdown_rules
+            when :textile
+                textile_rules
+            else
+                rule
+            end
+        end.flatten
+
+        # standard clean up
+        incoming_entities text 
+        clean_white_space text 
+
+        # start processor
+        pre_list = rip_offtags text
+        refs text
+        blocks text
+        inline text
+        smooth_offtags text, pre_list
+
+        retrieve text
+        hard_break text # PIMKI: this is the missing bit!
+
+        text.gsub!( /<\/?notextile>/, '' )
+        text.gsub!( /x%x%/, '&#38;' )
+        text.strip!
+        text
+    end #}}}
+  end #}}}
+end #}}}
+
 # Start the application: {{{
 storage_dir = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s
 require 'fileutils'
@@ -143,12 +157,13 @@ WikiService.storage_path = storage_dir
 
 WikiController.template_root = "#{cdir}/app/views/"
 
-trap "INT" do
-  WebControllerServer::the_active_server.shutdown
-end
-trap "TERM" do
+on_exit = lambda {
   WebControllerServer::the_active_server.shutdown
-end
+  MadeleineService.request_stop
+}
+
+trap "INT", on_exit
+trap "TERM", on_exit
 
 WebControllerServer.new(OPTIONS[:port], OPTIONS[:server_type], "#{cdir}/app/controllers/")
 

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: Pimki
 version: !ruby/object:Gem::Version 
-  version: 1.4.092
-date: 2005-01-16
-summary: A Personal Information Manager (PIM) based on the Wiki technology of Instiki.
+  version: 1.5.092
+date: 2005-02-02
+summary: "A Personal Information Manager (PIM) based on Instiki's Wiki technology."
 require_paths: 
   - libraries
 email: assaph@gmail.com
 homepage: http://pimki.rubyforge.org
 rubyforge_project: pimki
-description: "Pimki in a Personal Information Manager based on the Wiki technology of Instiki. Besides all the rich features and excellent look of Instiki, a few features have been added, such as: a personal blog, todo lists, graphical mapping, quick-links and others."
+description: "Pimki in a Personal Information Manager based on Instiki's Wiki technology. Besides all the rich features and excellent look of Instiki, a few features have been added, such as: a personal blog, todo lists, graphical mapping, quick-links, advanced search and others."
 autorequire: 
 default_executable: pimki.rb
 bindir: "."
@@ -78,6 +78,7 @@ files:
   - app/views/top.rhtml
   - app/views/wiki
   - app/views/wiki_words_help.rhtml
+  - app/views/wiki/adv_search.rhtml
   - app/views/wiki/authors.rhtml
   - app/views/wiki/bliki.rhtml
   - app/views/wiki/bliki_edit.rhtml
@@ -114,6 +115,7 @@ files:
   - libraries/madeleine
   - libraries/madeleine_service.rb
   - libraries/rdocsupport.rb
+  - libraries/redcloth_2.0.11.rb
   - libraries/redcloth_for_tex.rb
   - libraries/redcloth_for_tex_test.rb
   - libraries/view_helper.rb
@@ -141,7 +143,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 3.0.0
+            version: 2.0.11
       version: 
   - !ruby/object:Gem::Dependency 
     name: BlueCloth