sqliki 0.0.3 → 0.0.4

data/USAGE

@@ -28,3 +28,4 @@ EXAMPLE
               /wiki/rollback/(draft)
 
      The tables are always called pages, drafts, and links
+     

data/{sqliki_generator-0.0.3.gemspec → sqliki_generator-0.0.4.gemspec}

@@ -2,17 +2,18 @@ require 'rubygems'
 
 SPEC = Gem::Specification.new do |s|
   s.name = %q{sqliki}
-  s.version = "0.0.3"
-  s.date = %q{2005-08-25}
+  s.version = "0.0.4"
+  s.date = %q{2005-09-03}
   s.summary = %q{[Rails] SQL-based wiki generator.}
   s.require_paths = ["."]
   s.email = %q{Markus@reality.com}
-  s.homepage = %q{http://www.rubyonrails.org/show/Generators}
+  s.homepage = %q{http://rubyforge.org/projects/sqliki/}
   s.description = %q{Generates code for (primative) a SQL-based wiki within your Rails app.}
   s.authors = ["Markus J. Q. Roberts"]
   s.files = %w{
         USAGE
         templates/lib_sanitize_html.rb
+        templates/lib_roparojo.rb
         templates/README
         templates/model_draft.rb
         templates/view_edit.rhtml
@@ -26,7 +27,7 @@ SPEC = Gem::Specification.new do |s|
         templates/model_page.rb
         templates/controller_sqliki_controller.rb
         sqliki_generator.rb
-        sqliki_generator-0.0.3.gemspec
+        sqliki_generator-0.0.4.gemspec
       }
   s.add_dependency('rails', [">= 0.13.1"])
   s.add_dependency('RedCloth')

data/sqliki_generator.rb

@@ -16,7 +16,7 @@ class SqlikiGenerator < Rails::Generator::NamedBase
       m.template "controller_sqliki_controller.rb",File.join("app/controllers", class_path, "#{file_name}_controller.rb")
 
       # Libs.
-      %w{sanitize_html}.each do |x|
+      %w{sanitize_html roparojo}.each do |x|
         m.template "lib_#{x}.rb",File.join("lib", class_path, "#{x}.rb")
       end
 

data/templates/README

@@ -92,4 +92,10 @@ CREATE TABLE links (
       Implemented Orphaned/Wanted/Recently_revised
       Cleaned up the controller interface (w. the the
          trick from Tobias Luetke's Postback Generator)
+0.0.3
+      Fixed two typos in the gemspec that were making
+         it hard for some people to install
+0.0.4
+      Added ".id" to the Uses of "User.current_user" to
+         fix a bug which misattributed pages
          

data/templates/controller_sqliki_controller.rb

@@ -3,7 +3,7 @@ class <%= class_name %>Controller < ApplicationController
     include LoginSystem
     before_filter :login_required
     def identify_page
-        @page ||= Page.find_by_title(params[:id])
+        @page ||= Page.find(Page.key_from_URL(params[:id]))
         end
     def index
         list

data/templates/lib_roparojo.rb

@@ -0,0 +1,95 @@
+require 'redcloth'
+
+class RopaRojo < RedCloth
+    def hard_break(text)
+        @rules.each do |rule_name|
+            method( rule_name ).call( text ) if rule_name.to_s.match /^pre_/
+            end
+        super
+        end
+    def to_html(*rules,&callback)
+        @callback = callback
+        rules = DEFAULT_RULES if rules.empty?
+        text = super(*([:pre_wiki_words,:pre_make_divs,:post_add_toggle]+rules))
+        end
+    def htmlesc(str,mode)
+        super
+        str
+        end
+    # Bracket free text consists of either
+    #      characters that are not "{" or "}",
+    #      one or two "{"s, not followed by a third "{",
+    #      one or two "}"s, not followed by a third "}",
+    #
+    BRACKET_FREE_TEXT = "((:?[^{}]|[{]{1,2}(?![{])|[}]{1,2}(?![}]))*?)"
+    DIV_BRACKETS = /\{\{\{#{BRACKET_FREE_TEXT}\}\}\}/m
+    ALT_TEXT = /
+            (
+            ([\s\[{(]|[#{PUNCT}])?     # $pre
+            "                          # start
+            (#{C})                     # $atts
+            ([^"]+?)                   # $text
+            \s?
+            (?:\(([^)]+?)\)(?="))?     # $title
+            ":
+            )?
+            /mx
+    XDIV_RE = /
+            (
+            ([\s\[{(]|[#{PUNCT}])?     # $pre
+            "                          # start
+            (#{C})                     # $atts
+            ([^"]+?)                   # $text
+            \s?
+            (?:\(([^)]+?)\)(?="))?     # $title
+            ":
+            )?
+            #{DIV_BRACKETS}            # $div_block
+        /mx
+    DIV_RE = /#{ALT_TEXT}#{DIV_BRACKETS}/m
+
+    def pre_make_divs( text )
+        ## break the text into <div> blocks based on {{{ ... }}}
+        while text.gsub!( DIV_RE ) { |m|
+            has_link,pre,atts,link_text,title,div_block = $~.captures
+            if has_link
+                @need_toggle_function = true
+                id   = "div_#{rand(100000)}"
+                atts = shelve(" onclick=\"toggle('#{id}'); return false;\" #{ pba(atts) } title=\"#{ title||'more...' }\"")
+                "#{ pre }<a#{ atts }>#{ link_text }</a><div id=\"#{id}\" style=\"display:none\">#{div_block}</div>"
+              else
+                "<div #{shelve(attrs) }>#{div_block}</div>"
+              end
+            }; end
+        text
+        end
+    def post_add_toggle(text)
+        text << %q{
+            <script type="text/javascript" language="JavaScript">
+            <!--
+                 function toggle(name) {
+                     q=document.getElementById(name);
+                     if (q.style.display == 'none')
+                         {q.style.display  = 'block';}
+                       else
+                         {q.style.display  = 'none';};
+                     }
+            //-->
+            </script>
+            } if @need_toggle_function
+        end
+    NOT_WIKI_WORD = /\\(([A-Z]+[a-z0-9]+){2,})/
+    WIKI_WORD = /#{ALT_TEXT}(([A-Z]+['a-z1-9]+){2,})/
+    WIKI_PHRASE = /#{ALT_TEXT}\[\[(.*?)\]\]/m
+    def pre_wiki_words(text)
+        text.gsub!(NOT_WIKI_WORD) { |m| shelve $1 }
+        [WIKI_PHRASE,WIKI_WORD].each {|pattern|
+            text.gsub!(pattern) { |m|
+                has_link,pre,atts,link_text,title,ww = $~.captures
+                (pre||'') + shelve(@callback.call(:wiki_link,pattern,atts,link_text,ww))
+                }
+            }
+        text
+        end
+    end
+        

data/templates/model_draft.rb

@@ -1,5 +1,5 @@
 require 'sanitize_html'
-require 'redcloth'
+require 'roparojo'
 
 class Draft < ActiveRecord::Base
     acts_as_tree :foreign_key => 'based_on_draft_id'
@@ -13,129 +13,29 @@ class Draft < ActiveRecord::Base
     def raw
         body
         end
-    class RopaRojo < RedCloth
-        def hard_break(text)
-            @rules.each do |rule_name|
-                method( rule_name ).call( text ) if rule_name.to_s.match /^pre_/
-                end
-            super
-            end
-        def to_html(*rules,&callback)
-            @callback = callback
-            rules = DEFAULT_RULES if rules.empty?
-            text = super(*([:pre_wiki_words,:pre_make_divs,:post_add_toggle]+rules))
-            end
-        def htmlesc(str,mode)
-            super
-            str
-            end
-        # Bracket free text consists of either
-        #      characters that are not "{" or "}",
-        #      one or two "{"s, not followed by a third "{",
-        #      one or two "}"s, not followed by a third "}",
-        #
-        BRACKET_FREE_TEXT = "((:?[^{}]|[{]{1,2}(?![{])|[}]{1,2}(?![}]))*?)"
-        DIV_BRACKETS = /\{\{\{#{BRACKET_FREE_TEXT}\}\}\}/m
-        ALT_TEXT = /
-                (
-                ([\s\[{(]|[#{PUNCT}])?     # $pre
-                "                          # start
-                (#{C})                     # $atts
-                ([^"]+?)                   # $text
-                \s?
-                (?:\(([^)]+?)\)(?="))?     # $title
-                ":
-                )?
-                /mx
-        XDIV_RE = /
-                (
-                ([\s\[{(]|[#{PUNCT}])?     # $pre
-                "                          # start
-                (#{C})                     # $atts
-                ([^"]+?)                   # $text
-                \s?
-                (?:\(([^)]+?)\)(?="))?     # $title
-                ":
-                )?
-                #{DIV_BRACKETS}            # $div_block
-            /mx
-        DIV_RE = /#{ALT_TEXT}#{DIV_BRACKETS}/m
-   
-        def pre_make_divs( text )
-            ## break the text into <div> blocks based on {{{ ... }}}
-            while text.gsub!( DIV_RE ) { |m|
-                has_link,pre,atts,link_text,title,div_block = $~.captures
-                if has_link
-                    @need_toggle_function = true
-                    id   = "div_#{rand(100000)}"
-                    atts = shelve(" onclick=\"toggle('#{id}'); return false;\" #{ pba(atts) } title=\"#{ title||'more...' }\"")
-                    "#{ pre }<a#{ atts }>#{ link_text }</a><div id=\"#{id}\" style=\"display:none\">#{div_block}</div>"
-                  else
-                    "<div #{shelve(attrs) }>#{div_block}</div>"
-                  end
-                }; end
-            text
-            end
-        def post_add_toggle(text)
-            text << %q{
-                <script type="text/javascript" language="JavaScript">
-                <!--
-                     function toggle(name) {
-                         q=document.getElementById(name);
-                         if (q.style.display == 'none')
-                             {q.style.display  = 'block';}
-                           else
-                             {q.style.display  = 'none';};
-                         }
-                //-->
-                </script>
-                } if @need_toggle_function
-            end
-        NOT_WIKI_WORD = /\\(([A-Z]+[a-z0-9]+){2,})/
-        WIKI_WORD = /#{ALT_TEXT}(([A-Z]+[a-z1-9]+){2,})/
-        WIKI_PHRASE = /#{ALT_TEXT}\[\[(.*?)\]\]/m
-        def split_wiki_word(ww)
-            ww.gsub(/([a-z0-9])([A-Z])/,'\1 \2');
-            end
-        def clean_wiki_word(ww)
-            ww.gsub(/[^A-Za-z0-9$-_.+!*'(),]/,'')
-            end
-        include ActionView::Helpers::TagHelper
-        include ActionView::Helpers::UrlHelper
-        def wiki_link(link_text,ww)
-            (@callback && @callback.call(:wiki_link,link_text,ww)) ||
-               (link_to link_text, "/<%= file_name %>/show/#{clean_wiki_word(ww)}")
-            end
-        def pre_wiki_words(text)
-            text.gsub!(NOT_WIKI_WORD) { |m| shelve $1 }
-            [WIKI_PHRASE,WIKI_WORD].each {|pattern|
-                text.gsub!(pattern) { |m|
-                    has_link,pre,atts,link_text,title,ww = $~.captures
-                    ww = split_wiki_word(ww) if pattern == WIKI_WORD
-                    (pre||'') + shelve(wiki_link("<span #{pba(atts)}>#{link_text||ww}</span>",ww))
-                    }
-                }
-            text
-            end
-        end
-    def textilize(body) #html
-        if body.blank?
-            ""
-          else
-            RopaRojo.new(body, [:hard_breaks ]).to_html { |event,*details|
-                case event
-                  when :wiki_link
-                    link_text,ww = *details
-                    page = (Page.find_by_title(ww) || Page.new_page(ww))
-                    links << page unless links.include? page
-                    nil
-                  else
-                    nil
-                  end
-                }
-            end
-        end
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::UrlHelper
     def html
-        sanitize_html(textilize(body))
+        sanitize_html(
+            #if body.blank?
+            #    ""
+            #  else
+                RopaRojo.new(body, [:hard_breaks ]).to_html { |event,*details|
+                    case event
+                      when :wiki_link
+                        pattern,atts,link_text,ww = *details
+                        ww = Page.key_from_CamelCase(ww) if pattern == RopaRojo::WIKI_WORD
+                        page = (Page.find(ww) || Page.new_page(ww))
+                        ww = page.title
+                        links << page unless links.include? page
+                        link_text = "<span #{pba(atts)}>#{link_text||ww}</span>"
+                        link_to link_text, "/<%= file_name %>/show/#{Page.find_or_make(ww).for_URL}"
+                      else
+                        nil
+                      end
+                    }
+            #    end
+            )
         end
     end
+    

data/templates/model_page.rb

@@ -7,7 +7,7 @@ class Page < ActiveRecord::Base
     validates_length_of :title, :within => 1..80
     validates_presence_of :title
     def self.new_page(title)
-        p = Page.new :created_by => User.current_user, :title => title
+        p = Page.new :created_by => User.current_user.id, :title => title
         p.raw = ''
         p
         end
@@ -18,7 +18,7 @@ class Page < ActiveRecord::Base
         d = Draft.new(
             :body => new_text || '',
             :based_on_draft_id => self.current_draft && self.current_draft.id,
-            :created_by => User.current_user
+            :created_by => User.current_user.id
             );
         d.save;
         self.current_draft = d
@@ -28,4 +28,24 @@ class Page < ActiveRecord::Base
     def html
         current_draft.html
         end
+    def self.key_from_CamelCase(s)
+        s.gsub(/([a-z])([A-Z][a-z])/,'\1 \2')
+        end
+    def self.key_from_URL(s)
+        s.html_decode.gsub(/\+/,' ').gsub(/''/,'"')
+        end
+    def self.find(s*)
+        return super(s*) unless s.length == 1 and s.first.is_a? String
+        s = s.first
+        find_by_title(s) || ((s =~ /[a-z][A-Z][a-z]) && find_by_title(key_from_CamelCase(s)))
+        end
+    def for_URL
+        title.gsub(/ /,'+').gsub(/"/,"''").html_encode
+        end
+    def split_wiki_word(ww)
+        ww.gsub(/([a-z0-9])([A-Z])/,'\1 \2');
+        end
+    def clean_wiki_word(ww)
+        ww.gsub(/[^-A-Za-z0-9$_.+!*'(),]/,'')
+        end
     end

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: sqliki
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2005-08-25
+  version: 0.0.4
+date: 2005-09-03
 summary: "[Rails] SQL-based wiki generator."
 require_paths: 
   - "."
 email: Markus@reality.com
-homepage: http://www.rubyonrails.org/show/Generators
+homepage: http://rubyforge.org/projects/sqliki/
 rubyforge_project: 
 description: Generates code for (primative) a SQL-based wiki within your Rails app.
 autorequire: 
@@ -29,6 +29,7 @@ authors:
 files: 
   - USAGE
   - templates/lib_sanitize_html.rb
+  - templates/lib_roparojo.rb
   - templates/README
   - templates/model_draft.rb
   - templates/view_edit.rhtml
@@ -42,7 +43,7 @@ files:
   - templates/model_page.rb
   - templates/controller_sqliki_controller.rb
   - sqliki_generator.rb
-  - sqliki_generator-0.0.3.gemspec
+  - sqliki_generator-0.0.4.gemspec
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []