Pimki 1.3.092 → 1.4.092

data/libraries/redcloth_for_tex_test.rb

@@ -1,41 +1,41 @@
-require "test/unit"
-require "redcloth_for_tex"
-
-class RedClothForTexTest < Test::Unit::TestCase
-  def test_basics
-    assert_equal '{\bf First Page}', RedClothForTex.new("*First Page*").to_tex
-    assert_equal '{\em First Page}', RedClothForTex.new("_First Page_").to_tex
-    assert_equal "\\begin{itemize}\n\t\\item A\n\t\t\\item B\n\t\t\\item C\n\t\\end{itemize}", RedClothForTex.new("* A\n* B\n* C").to_tex
-  end
-  
-  def test_blocks
-    assert_equal '\section*{hello}', RedClothForTex.new("h1. hello").to_tex
-    assert_equal '\subsection*{hello}', RedClothForTex.new("h2. hello").to_tex
-  end
-  
-  def test_table_of_contents
-    assert_equal(
-      "\n\\section{A}\nAbe\n\n\\subsection{B}\nBabe\n\n\\subsection{C}\n\n\\section{D}\n\n\\subsection{E}\n\n\\subsubsection{F}", 
-      table_of_contents("* [[A]]\n** [[B]]\n** [[C]]\n* D\n** [[E]]\n*** F", { "A" => "Abe", "B" => "Babe" } )
-    )
-  end
-  
-  def test_entities
-    assert_equal "Beck \\& Fowler are 100\\% cool", RedClothForTex.new("Beck & Fowler are 100% cool").to_tex
-  end
-
-  def test_bracket_links
-    assert_equal "such a Horrible Day, but I won't be Made Useless", RedClothForTex.new("such a [[Horrible Day]], but I won't be [[Made Useless]]").to_tex
-  end
-  
-  def test_footnotes_on_abbreviations
-    assert_equal(
-      "such a Horrible Day\\footnote{1}, but I won't be Made Useless", 
-      RedClothForTex.new("such a [[Horrible Day]][1], but I won't be [[Made Useless]]").to_tex
-    )
-  end
-  
-  def test_subsection_depth
-    assert_equal "\\subsubsection*{Hello}", RedClothForTex.new("h4. Hello").to_tex
-  end
+require "test/unit"
+require "redcloth_for_tex"
+
+class RedClothForTexTest < Test::Unit::TestCase
+  def test_basics
+    assert_equal '{\bf First Page}', RedClothForTex.new("*First Page*").to_tex
+    assert_equal '{\em First Page}', RedClothForTex.new("_First Page_").to_tex
+    assert_equal "\\begin{itemize}\n\t\\item A\n\t\t\\item B\n\t\t\\item C\n\t\\end{itemize}", RedClothForTex.new("* A\n* B\n* C").to_tex
+  end
+  
+  def test_blocks
+    assert_equal '\section*{hello}', RedClothForTex.new("h1. hello").to_tex
+    assert_equal '\subsection*{hello}', RedClothForTex.new("h2. hello").to_tex
+  end
+  
+  def test_table_of_contents
+    assert_equal(
+      "\n\\section{A}\nAbe\n\n\\subsection{B}\nBabe\n\n\\subsection{C}\n\n\\section{D}\n\n\\subsection{E}\n\n\\subsubsection{F}", 
+      table_of_contents("* [[A]]\n** [[B]]\n** [[C]]\n* D\n** [[E]]\n*** F", { "A" => "Abe", "B" => "Babe" } )
+    )
+  end
+  
+  def test_entities
+    assert_equal "Beck \\& Fowler are 100\\% cool", RedClothForTex.new("Beck & Fowler are 100% cool").to_tex
+  end
+
+  def test_bracket_links
+    assert_equal "such a Horrible Day, but I won't be Made Useless", RedClothForTex.new("such a [[Horrible Day]], but I won't be [[Made Useless]]").to_tex
+  end
+  
+  def test_footnotes_on_abbreviations
+    assert_equal(
+      "such a Horrible Day\\footnote{1}, but I won't be Made Useless", 
+      RedClothForTex.new("such a [[Horrible Day]][1], but I won't be [[Made Useless]]").to_tex
+    )
+  end
+  
+  def test_subsection_depth
+    assert_equal "\\subsubsection*{Hello}", RedClothForTex.new("h4. Hello").to_tex
+  end
 end

data/libraries/view_helper.rb

@@ -1,33 +1,33 @@
-module ViewHelper
-  # Accepts a container (hash, array, enumerable, your type) and returns a string of option tags. Given a container 
-  # where the elements respond to first and last (such as a two-element array), the "lasts" serve as option values and
-  # the "firsts" as option text. Hashes are turned into this form automatically, so the keys become "firsts" and values
-  # become lasts. If +selected+ is specified, the matching "last" or element will get the selected option-tag.
-  #
-  # Examples (call, result):
-  #   html_options([["Dollar", "$"], ["Kroner", "DKK"]])
-  #     <option value="$">Dollar</option>\n<option value="DKK">Kroner</option>
-  #
-  #   html_options([ "VISA", "Mastercard" ], "Mastercard")
-  #     <option>VISA</option>\n<option selected>Mastercard</option>
-  #
-  #   html_options({ "Basic" => "$20", "Plus" => "$40" }, "$40")
-  #     <option value="$20">Basic</option>\n<option value="$40" selected>Plus</option>
-  def html_options(container, selected = nil)
-    container = container.to_a if Hash === container
-  
-    html_options = container.inject([]) do |options, element| 
-      if element.respond_to?(:first) && element.respond_to?(:last)
-        if element.last != selected
-          options << "<option value=\"#{element.last}\">#{element.first}</option>"
-        else
-          options << "<option value=\"#{element.last}\" selected>#{element.first}</option>"
-        end
-      else
-        options << ((element != selected) ? "<option>#{element}</option>" : "<option selected>#{element}</option>")
-      end
-    end
-    
-    html_options.join("\n")
-  end
+module ViewHelper
+  # Accepts a container (hash, array, enumerable, your type) and returns a string of option tags. Given a container 
+  # where the elements respond to first and last (such as a two-element array), the "lasts" serve as option values and
+  # the "firsts" as option text. Hashes are turned into this form automatically, so the keys become "firsts" and values
+  # become lasts. If +selected+ is specified, the matching "last" or element will get the selected option-tag.
+  #
+  # Examples (call, result):
+  #   html_options([["Dollar", "$"], ["Kroner", "DKK"]])
+  #     <option value="$">Dollar</option>\n<option value="DKK">Kroner</option>
+  #
+  #   html_options([ "VISA", "Mastercard" ], "Mastercard")
+  #     <option>VISA</option>\n<option selected>Mastercard</option>
+  #
+  #   html_options({ "Basic" => "$20", "Plus" => "$40" }, "$40")
+  #     <option value="$20">Basic</option>\n<option value="$40" selected>Plus</option>
+  def html_options(container, selected = nil)
+    container = container.to_a if Hash === container
+  
+    html_options = container.inject([]) do |options, element| 
+      if element.respond_to?(:first) && element.respond_to?(:last)
+        if element.last != selected
+          options << "<option value=\"#{element.last}\">#{element.first}</option>"
+        else
+          options << "<option value=\"#{element.last}\" selected>#{element.first}</option>"
+        end
+      else
+        options << ((element != selected) ? "<option>#{element}</option>" : "<option selected>#{element}</option>")
+      end
+    end
+    
+    html_options.join("\n")
+  end
 end

data/libraries/web_controller_server.rb

@@ -1,95 +1,97 @@
-require 'webrick'
-include WEBrick
-
-# Terminology:
-# * Static controller: Is a controller that has all it's show_* and do_* methods mounted by the server
-# at server start, so the server will handle request rejection of invalid requests
-# * Dynamic controller: Is a controller that's mounted with a responsibility to handle all the request mapping
-# itself. Hence, the server will never reject a request that's below the controller in the path.
-class WebControllerServer
-  STATIC_MOUNTING  = 1
-  DYNAMIC_MOUNTING = 2
-
-  MOUNT_TYPE = DYNAMIC_MOUNTING
-
-  SERVER_TYPE = (RUBY_PLATFORM =~ /mswin/ ? SimpleServer : Daemon)
-  
-  def WebControllerServer.the_active_server
-    @the_active_server
-  end
-  def WebControllerServer.the_active_server= server
-    @the_active_server = server
-  end
-
-  def initialize(port, server_type, controller_path)
-    @server = WEBrick::HTTPServer::new(:Port => port, :ServerType => server_type || SERVER_TYPE)
-    WebControllerServer::the_active_server = @server
-    @server.logger.info "Your WEBrick server is now running on http://localhost:#{port}"
-    @controller_path = controller_path
-    mount_controllers
-    start_server
-  end
-  
-  private
-    # Mounts all the controllers in the controller_path according to the mount type
-    def mount_controllers
-      require_controller_files
-
-      case MOUNT_TYPE
-        when STATIC_MOUNTING  then controller_names.each { |name| mount_static_controller(name)  }
-        when DYNAMIC_MOUNTING then controller_names.each { |name| mount_dynamic_controller(name) }
-      end
-    end
-
-    # Mounts the controller specified by <tt>controller_name</tt> to accept all requests below it's path.
-    # If more than one controller is mounted by this WebControllerServer, the controller is mounted by name,
-    # such that fx WikiController would get the requests of "/wiki/something" and "/wiki/some/thing/else".
-    # If only one controller is mounted, all requests to this WebControllerServer is handled by that controller
-    def mount_dynamic_controller(controller_name)
-      mount_path = mounting_multiple_controllers? ? "/#{controller_name}" : "/"
-      @server.mount(mount_path, controller_class(controller_name))
-    end
-
-    # Mount all public show_* and do_* methods as actions tied to the controller specified by <tt>controller_name</tt>.
-    # If more than one controller is mounted by this WebControllerServer, the actions are mounted below the controller
-    # in the path, such as "/wiki/page" or "/wiki/list". If only one controller is mounted, they're mounted directly on 
-    # the root, such as "/page" or "/list"
-    def mount_static_controller(controller_name)
-      controller_class(controller_name).public_instance_methods(false).each { |method|
-        mount_path = (mounting_multiple_controllers? ? "/#{controller_name}" : "") + "/#{method}"
-        @server.mount(mount_path, controller_class(controller_name))
-      }
-    end
-
-    # Requires all the controller files that are present in the controller_path
-    def require_controller_files
-      controller_names.each { |controller| require @controller_path + controller }
-    end
-
-    # Returns true if more than one controller exists in the controller_path
-    def mounting_multiple_controllers?
-      controller_names.length > 1
-    end
-
-    # Returns a list of controller names in lower-case from the controller path
-    def controller_names
-      Dir.entries(@controller_path).delete_if { |file| file !~ /rb$/ }.collect{ |c| c[0..-4] }
-    end
-
-    # Returns the class of the controller specified by the <tt>controller_name</tt>
-    def controller_class(controller_name)
-      eval(controller_name.capitalize + "Controller")
-    end
-
-  public
-  
-    # Start accepting requests to the defined mount points
-    def start_server
-      @server.start
-    end
-    
-    # Stops accepting requests to the defined mount points
-    def shutdown
-      @server.shutdown
-    end
+require 'webrick'
+include WEBrick
+
+# Terminology:
+# * Static controller: Is a controller that has all it's show_* and do_* methods mounted by the server
+# at server start, so the server will handle request rejection of invalid requests
+# * Dynamic controller: Is a controller that's mounted with a responsibility to handle all the request mapping
+# itself. Hence, the server will never reject a request that's below the controller in the path.
+class WebControllerServer
+  STATIC_MOUNTING  = 1
+  DYNAMIC_MOUNTING = 2
+
+  MOUNT_TYPE = DYNAMIC_MOUNTING
+
+  SERVER_TYPE = (RUBY_PLATFORM =~ /mswin/ ? SimpleServer : Daemon)
+  
+  def WebControllerServer.the_active_server
+    @the_active_server
+  end
+  def WebControllerServer.the_active_server= server
+    @the_active_server = server
+  end
+
+  def initialize(port, server_type, controller_path)
+    @server = WEBrick::HTTPServer::new(:Port => port, :ServerType => server_type || SERVER_TYPE)
+    WebControllerServer::the_active_server = @server
+    @server.logger.info "Your WEBrick server is now running on http://localhost:#{port}"
+    @controller_path = controller_path
+    mount_controllers
+    start_server
+  end
+  
+  private
+    # Mounts all the controllers in the controller_path according to the mount type
+    def mount_controllers
+      require_controller_files
+
+      case MOUNT_TYPE
+        when STATIC_MOUNTING  then controller_names.each { |name| mount_static_controller(name)  }
+        when DYNAMIC_MOUNTING then controller_names.each { |name| mount_dynamic_controller(name) }
+      end
+      
+      @server.mount('/favicon.ico', FavIconHandler)
+    end
+
+    # Mounts the controller specified by <tt>controller_name</tt> to accept all requests below it's path.
+    # If more than one controller is mounted by this WebControllerServer, the controller is mounted by name,
+    # such that fx WikiController would get the requests of "/wiki/something" and "/wiki/some/thing/else".
+    # If only one controller is mounted, all requests to this WebControllerServer is handled by that controller
+    def mount_dynamic_controller(controller_name)
+      mount_path = mounting_multiple_controllers? ? "/#{controller_name}" : "/"
+      @server.mount(mount_path, controller_class(controller_name))
+    end
+
+    # Mount all public show_* and do_* methods as actions tied to the controller specified by <tt>controller_name</tt>.
+    # If more than one controller is mounted by this WebControllerServer, the actions are mounted below the controller
+    # in the path, such as "/wiki/page" or "/wiki/list". If only one controller is mounted, they're mounted directly on 
+    # the root, such as "/page" or "/list"
+    def mount_static_controller(controller_name)
+      controller_class(controller_name).public_instance_methods(false).each { |method|
+        mount_path = (mounting_multiple_controllers? ? "/#{controller_name}" : "") + "/#{method}"
+        @server.mount(mount_path, controller_class(controller_name))
+      }
+    end
+
+    # Requires all the controller files that are present in the controller_path
+    def require_controller_files
+      controller_names.each { |controller| require @controller_path + controller }
+    end
+
+    # Returns true if more than one controller exists in the controller_path
+    def mounting_multiple_controllers?
+      controller_names.length > 1
+    end
+
+    # Returns a list of controller names in lower-case from the controller path
+    def controller_names
+      Dir.entries(@controller_path).delete_if { |file| file !~ /rb$/ }.collect{ |c| c[0..-4] }
+    end
+
+    # Returns the class of the controller specified by the <tt>controller_name</tt>
+    def controller_class(controller_name)
+      eval(controller_name.capitalize + "Controller")
+    end
+
+  public
+  
+    # Start accepting requests to the defined mount points
+    def start_server
+      @server.start
+    end
+    
+    # Stops accepting requests to the defined mount points
+    def shutdown
+      @server.shutdown
+    end
 end

data/pimki.rb

@@ -9,15 +9,18 @@ end
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "libraries")
 begin
   require 'rubygems'
-  require_gem 'madeleine'
-  require_gem 'RedCloth'
+  require 'madeleine'
+  require 'redcloth'
+  require '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:
@@ -26,10 +29,48 @@ RedCloth::GLYPHS.delete_if { |glyph| glyph[1] =~ /class=\"caps\"/ }
 # Fix missing hard_break
 if RedCloth::VERSION == '3.0.0'
   class RedCloth #{{{
-    alias_method :old_clean_white_space, :clean_white_space
-    def clean_white_space text
-      old_clean_white_space text
-      hard_break text
+    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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.3
+rubygems_version: 0.8.4
 specification_version: 1
 name: Pimki
 version: !ruby/object:Gem::Version 
-  version: 1.3.092
-date: 2004-12-26
+  version: 1.4.092
+date: 2005-01-16
 summary: A Personal Information Manager (PIM) based on the Wiki technology of Instiki.
 require_paths: 
   - libraries
@@ -30,6 +30,7 @@ files:
   - pimki.rb
   - README
   - README-PIMKI
+  - favicon.png
   - "./pimki.rb"
   - app/controllers
   - app/models
@@ -99,6 +100,7 @@ files:
   - app/views/wiki/published.rhtml
   - app/views/wiki/recently_revised.rhtml
   - app/views/wiki/revision.rhtml
+  - app/views/wiki/rollback.rhtml
   - app/views/wiki/rss_feed.rhtml
   - app/views/wiki/search.rhtml
   - app/views/wiki/tex.rhtml
@@ -120,6 +122,8 @@ files:
   - libraries/diff/diff_test.rb
   - libraries/madeleine/automatic.rb
   - libraries/madeleine/clock.rb
+  - libraries/madeleine/files.rb
+  - libraries/madeleine/zmarshal.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []
@@ -139,6 +143,16 @@ dependencies:
           - !ruby/object:Gem::Version 
             version: 3.0.0
       version: 
+  - !ruby/object:Gem::Dependency 
+    name: BlueCloth
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+      version: 
   - !ruby/object:Gem::Dependency 
     name: rubyzip
     version_requirement: 
@@ -157,5 +171,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.6.1
+            version: 0.7.1
       version: