sqliki_generator 0.0.1 → 0.0.2

data/USAGE

@@ -9,38 +9,22 @@ SYNOPSIS
 DESCRIPTION
      This generator creates a rudimentary SQL-based wiki.
 
-     Included:
-      - a User model which uses sha1 encryption for passwords
-      - a Controller with signup, login, welcome and logoff actions
-      - a mixin which lets you easily add advanced authentication 
-        features to your abstract base controller
-      - a user_model.sql with the minimal sql required to get the model to work. 
-      - extensive unit and functional test cases to make sure nothing breaks.
-            
 EXAMPLE
       ./script/generate sqliki Wiki
 
-     This will generate a Wiki controller with the following methods:
-
-           For users:
-              index (=list)
-              rollback
-              wanted
-              orphaned
-              recently_revised
-              find
-              list
-              show
-              new
-              edit
-           For control flow:
-              save
-              raw
-              html
-              inplace_edit
-              inplace_save
-              create
-              update
-              destroy
+     This will generate a Wiki controller which provides users:
+              /wiki/index (==list)    -- list all pages (alphabeticaly)
+              /wiki/wanted            --   ..pages with no content
+              /wiki/orphaned          --   ..pages that aren't linked to
+              /wiki/recently_revised  --   ..pages in reverse order of edits
+              /wiki/show/(page)       -- Show an existing page
+              /wiki/create/(page)     -- Create a new page
+              /wiki/edit/(page)       -- Edit an existing page
+        ...and additional methods for control flow / internal use:
+              /wiki/raw
+              /wiki/html
+              /wiki/inplace_edit
+              /wiki/destroy
+              /wiki/rollback/(draft)
 
      The tables are always called pages, drafts, and links

data/{sqliki_generator-0.0.1.gemspec → sqliki_generator-0.0.2.gemspec}

@@ -2,7 +2,7 @@ require 'rubygems'
 
 SPEC = Gem::Specification.new do |s|
   s.name = %q{sqliki_generator}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.date = %q{2005-08-25}
   s.summary = %q{[Rails] SQL-based wiki generator.}
   s.require_paths = ["."]
@@ -16,21 +16,20 @@ SPEC = Gem::Specification.new do |s|
         templates/README
         templates/model_draft.rb
         templates/view_edit.rhtml
-        templates/view_find.rhtml
         templates/view__form.rhtml
         templates/view_inplace_edit.rhtml
-        templates/view_inplace_save.rhtml
         templates/view_list.rhtml
-        templates/view_new.rhtml
+        templates/view_create.rhtml
         templates/view_rollback.rhtml
         templates/view_show.rhtml
         templates/model_link.rb
         templates/model_page.rb
         templates/controller_sqliki_controller.rb
         sqliki_generator.rb
-        sqliki_generator-0.0.1.gemspec
+        sqliki_generator-0.0.2.gemspec
       }
-  s.add_dependency(%q<rails>, [">= 0.13.1"])
+  s.add_dependency('rails', [">= 0.13.1"])
+  s.add_dependency('redcloth')
 end
 
 if $0 == __FILE__

data/sqliki_generator.rb

@@ -2,10 +2,6 @@ class SqlikiGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       
-      #
-      # For v0.0.1, there's no renaming it
-      file_name = 'sqliki'
-
       # Models.
       %w{page draft link}.each do |x|
         m.template "model_#{x}.rb",File.join("app/models", class_path, "#{x}.rb")
@@ -13,14 +9,11 @@ class SqlikiGenerator < Rails::Generator::NamedBase
 
       # Views. 
       m.directory File.join("app/views", class_path, file_name)
-      %w{edit find _form inplace_edit inplace_save list new rollback show }.each do |x|
+      %w{edit _form inplace_edit list create rollback show }.each do |x|
         m.template "view_#{x}.rhtml",File.join("app/views", class_path, file_name, "#{x}.rhtml")
       end
 
-      # Controller.
-      %w{sqliki}.each do |x|
-        m.template "controller_#{x}_controller.rb",File.join("app/controllers", class_path, "#{x}_controller.rb")
-      end
+      m.template "controller_sqliki_controller.rb",File.join("app/controllers", class_path, "#{file_name}_controller.rb")
 
       # Libs.
       %w{sanitize_html}.each do |x|

data/templates/README

@@ -84,5 +84,12 @@ CREATE TABLE links (
 
 == Changelog
 
-0.0.1 First gem release
-
+0.0.1
+      First gem release
+0.0.2
+      Made the name of the controller changeable
+      Removed the system specific path for RedCloth
+      Implemented Orphaned/Wanted/Recently_revised
+      Cleaned up the controller interface (w. the the
+         trick from Tobias Luetke's Postback Generator)
+         

data/templates/controller_sqliki_controller.rb

@@ -1,9 +1,9 @@
-class SqlikiController < ApplicationController
+class <%= class_name %>Controller < ApplicationController
     model :draft
     include LoginSystem
     before_filter :login_required
     def identify_page
-        @page ||= Page.find_by_title(params[:id]) #|| Page.find_by_id(params[:id])
+        @page ||= Page.find_by_title(params[:id])
         end
     def index
         list
@@ -15,62 +15,61 @@ class SqlikiController < ApplicationController
     def html
         render_text identify_page.current_draft.html
         end
-    def inplace_edit
-        edit
-        end
     def rollback
         identify_page
         #@page.current_draft = ???
         render :action => 'show'
         end
-    def save
-        end
-    def inplace_save
-        save
-        end
     def wanted
+        list :wanted
+        render :action => 'list'
         end
     def orphaned
+        list :orphaned
+        render :action => 'list'
         end
     def recently_revised
-        end
-    def find
+        list :recently_revised
+        render :action => 'list'
         end
     def list(condition=:all)
-        @page_pages, @pages = paginate :page, :per_page => 10
+        @page_pages, @pages = paginate :page, {:per_page => 20}.merge(case condition
+          when :wanted           then {:conditions => 'current_draft_id IS NULL'}
+          when :orphaned         then {
+              :join => 'p LEFT JOIN links l ON l.page_id = p.id left join drafts dx on dx.id = l.draft_id left join pages px on px.current_draft_id = dx.id',
+              :conditions => 'page_id IS NULL'
+              }
+          when :recently_revised then {:order_by => 'updated_on DESC'}
+          else {:order_by => 'title'}
+          end)
         end
     def show
-        identify_page || redirect_to(:action => 'new', :id => @params[:id])
-        end
-    def new
-        @page = Page.new_page(@params[:id])
+        identify_page || redirect_to(:action => 'create', :id => @params[:id])
         end
     def create
-        new
-        @page.save
-        if @page.update_attributes(params[:page])
-            #@page.current_draft.created_by = @session[:user]
-            #@page.save
+        @page = Page.new_page(@params[:id])
+        if @request.post?  and @page.update_attributes(params[:page]) and @page.save
             flash[:notice] = 'Page was successfully created.'
-            redirect_to :action => 'list'
-          else
-            render :action => 'new'
+            redirect_to :action => 'show', :id => @page.title
           end
         end
-    def edit
-        identify_page || redirect_to(:action => 'new', :id => @params[:id])
+    def inplace_edit
+        if not identify_page
+            redirect_to(:action => 'create', :id => @params[:id])
+          elsif @request.post? and @page.update_attributes(params[:page])
+            redirect_to :action => 'html', :id => @page.title
+          end
         end
-    def update
-        identify_page
-        if @page.update_attributes(params[:page])
+    def edit
+        if not identify_page
+            redirect_to(:action => 'create', :id => @params[:id])
+          elsif @request.post? and @page.update_attributes(params[:page])
             flash[:notice] = 'Page was successfully updated.'
             redirect_to :action => 'show', :id => @page.title
-          else
-            render :action => 'edit'
           end
         end
     def destroy
-        identify_page.destroy
+        identify_page.destroy if @request.post?
         redirect_to :action => 'list'
         end
     end

data/templates/model_draft.rb

@@ -1,5 +1,5 @@
 require 'sanitize_html'
-require '/usr/local/lib/ruby/gems/1.8/gems/RedCloth-3.0.3/lib/redcloth'
+require 'redcloth'
 
 class Draft < ActiveRecord::Base
     acts_as_tree :foreign_key => 'based_on_draft_id'
@@ -15,27 +15,15 @@ class Draft < ActiveRecord::Base
         end
     class RopaRojo < RedCloth
         def hard_break(text)
-            make_divs 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(*([:inline_wiki_words]+rules))
-            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
-            text
+            text = super(*([:pre_wiki_words,:pre_make_divs,:post_add_toggle]+rules))
             end
         def htmlesc(str,mode)
             super
@@ -73,7 +61,7 @@ class Draft < ActiveRecord::Base
             /mx
         DIV_RE = /#{ALT_TEXT}#{DIV_BRACKETS}/m
    
-        def make_divs( text )
+        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
@@ -88,6 +76,21 @@ class Draft < ActiveRecord::Base
                 }; 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
@@ -95,33 +98,26 @@ class Draft < ActiveRecord::Base
             ww.gsub(/([a-z0-9])([A-Z])/,'\1 \2');
             end
         def clean_wiki_word(ww)
-            ww.gsub(/ /,'_').gsub(/[^A-Za-z0-9$-_.+!*'(),]/,'')
+            ww.gsub(/[^A-Za-z0-9$-_.+!*'(),]/,'')
             end
         include ActionView::Helpers::TagHelper
         include ActionView::Helpers::UrlHelper
-        #def wiki_link(ww)
-        #    #link_to ww, {:controller => 'sqliki', :action => 'show', :id => clean_wiki_word(ww)}
-        #    link_to ww, "/sqliki/show/#{clean_wiki_word(ww)}"
-        #    end
         def wiki_link(link_text,ww)
-            #link_to link_text, {:controller => 'sqliki', :action => 'show', :id => clean_wiki_word(ww)}
-            #(@callback && @callback.call(:wiki_link,link_text,ww)) || (link_to link_text, "/sqliki/show/#{clean_wiki_word(ww)}")
-            (@callback && @callback.call(:wiki_link,link_text,ww))
-            (link_to link_text, "/sqliki/show/#{clean_wiki_word(ww)}")
+            (@callback && @callback.call(:wiki_link,link_text,ww)) ||
+               (link_to link_text, "/<%= file_name %>/show/#{clean_wiki_word(ww)}")
             end
-        def inline_wiki_words(text)
+        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||'') + wiki_link("<span #{shelve(pba(atts))}>#{link_text||ww}</span>"||ww,ww)
+                    (pre||'') + shelve(wiki_link("<span #{pba(atts)}>#{link_text||ww}</span>",ww))
                     }
                 }
             text
             end
         end
-    #include ActionView::Helpers::TextHelper
     def textilize(body) #html
         if body.blank?
             ""

data/templates/view_edit.rhtml

@@ -1,9 +1,9 @@
 <h1><%%= @page.title %></h1>
 
-<%%= start_form_tag :action => 'update', :id => @page.title %>
+<%%= start_form_tag :action => 'edit', :id => @page.title %>
   <%%= render_partial 'form' %>
-  <%%= submit_tag 'Edit' %>
+  <%%= submit_tag 'Save changes' %>
+  <%%= link_to 'Cancle changes', :action => 'show', :id => @page.title %>
 <%%= end_form_tag %>
 
-<%%= link_to 'Show', :action => 'show', :id => @page.title %> |
-<%%= link_to 'List', :action => 'list' %>
+

data/templates/view_list.rhtml

@@ -6,14 +6,11 @@
   
 <%% for page in @pages %>
   <tr>
-    <td><%%= page.title %></td>
+    <td><%%= link_to page.title, :action => 'show', :id => page.title %></td>
     <td><%%= page.author.login %></td>
     <td><%%= page.created_on %></td>
     <td><%%= page.current_draft.author.login %></td>
     <td><%%= page.current_draft.created_on %></td>
-    <td><%%= link_to 'Show', :action => 'show', :id => page.title %></td>
-    <td><%%= link_to 'Edit', :action => 'edit', :id => page.title %></td>
-    <td><%%= link_to 'Destroy', {:action => 'destroy', :id => page.title}, :confirm => 'Are you sure?' %></td>
   </tr>
 <%% end %>
 </table>
@@ -23,4 +20,4 @@
 
 <br />
 
-<%%= link_to 'New page', :action => 'new' %>
+<%%= link_to 'New page', :action => 'create' %>

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: sqliki_generator
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 date: 2005-08-25
 summary: "[Rails] SQL-based wiki generator."
 require_paths: 
@@ -32,19 +32,17 @@ files:
   - templates/README
   - templates/model_draft.rb
   - templates/view_edit.rhtml
-  - templates/view_find.rhtml
   - templates/view__form.rhtml
   - templates/view_inplace_edit.rhtml
-  - templates/view_inplace_save.rhtml
   - templates/view_list.rhtml
-  - templates/view_new.rhtml
+  - templates/view_create.rhtml
   - templates/view_rollback.rhtml
   - templates/view_show.rhtml
   - templates/model_link.rb
   - templates/model_page.rb
   - templates/controller_sqliki_controller.rb
   - sqliki_generator.rb
-  - sqliki_generator-0.0.1.gemspec
+  - sqliki_generator-0.0.2.gemspec
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []
@@ -61,4 +59,14 @@ dependencies:
           - ">="
           - !ruby/object:Gem::Version 
             version: 0.13.1
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: redcloth
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">"
+          - !ruby/object:Gem::Version 
+            version: 0.0.0
       version: 

data/templates/view_find.rhtml

@@ -1,2 +0,0 @@
-<h1>Page#find</h1>
-<p>Find me in app/views/page/find.rhtml</p>

data/templates/view_inplace_save.rhtml

@@ -1,2 +0,0 @@
-<h1>Page#inplace_save</h1>
-<p>Find me in app/views/page/inplace_save.rhtml</p>