irwi 0.4.1 → 0.4.2

data/README.rdoc

@@ -1,6 +1,6 @@
 = Irwi
 
-Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
+Irwi is a Ruby on Rails 3 plugin which adds wiki functionality to your application.
 
 == Installation
 
@@ -78,30 +78,15 @@ Irwi allows easy attachment integration in your wiki. There area several simple
 * Append to initializer (or create a new one) something like <tt>Irwi.config.page_attachment_class_name = 'WikiPageAttachment'</tt>.
 * Run <tt>rake db:migrate</tt> and start using attachments in your wiki!
 
-== Localization
-
-== Rails prior to 2.3
-
-If you have Rails prior to 2.3 when you should also call:
-
-  script/generate irwi_wiki_views
-
-To generate default wiki views.
-
-== I18n Issues
-
-If you get some weird errors like
-
-  missing interpolation argument in "%{count} %B %Y, %H:%M"
-
-Please check your Rails and I18n versions, because of incompatibility issue between Rails prior to 2.3.6 and I18n 0.4.x (http://github.com/svenfuchs/i18n/issues/issue/20). If it's your case, consider upgrade of Rails or downgrade of I18n. Big thanks to Tomasz Stachewicz for information ;)
-
 == Contributors
 
 * Alexey Noskov (http://github.com/alno)
 * Ravi Bhim (http://github.com/ravibhim)
 * Pavel Valodzka (http://github.com/valodzka)
 * Xavier Defrang (http://github.com/xavier)
+* Tomáš Pospíšek (http://github.com/tpo)
+* Evan Arnold (http://github.com/earnold)
+* https://github.com/alno/irwi/contributors
 
 Feel free to add yourself when you add new features.
 

data/app/views/base_wiki_pages/_wiki_page_actions.html.erb

@@ -1,5 +1,5 @@
 <ul class="wiki_page_actions">
   <%= content_tag('li', link_to( wt( 'History' ), wiki_page_history_path(@page) )) if history_allowed? %>
   <%= content_tag('li', link_to( wt( 'Edit' ), wiki_page_edit_path(@page) )) if edit_allowed? %>
-  <%= content_tag('li', link_to( wt( 'Destroy' ), wiki_page_path(@page), :method => :delete, :confirm => wt( "Destroyed page cann't be restored. Are you ready for it?" ) )) if destroy_allowed? %>
+  <%= content_tag('li', link_to( wt( 'Destroy' ), wiki_page_path(@page), :method => :delete, :confirm => wt( "Destroyed page can't be restored. Are you sure?" ) )) if destroy_allowed? %>
 </ul>

data/app/views/base_wiki_pages/compare.html.erb

@@ -4,7 +4,7 @@
 
 <%=wt 'Changes list:' %>
 
-<% wiki_paginate @versions do%>
+<%= wiki_paginate @versions do%>
   <%= wiki_page_history @page, @versions %>
 <% end %>
 

data/app/views/base_wiki_pages/edit.html.erb

@@ -8,11 +8,20 @@
 </div>
 <% end %>
 
-<% wiki_page_form do |f| %>
+<%= wiki_page_form do |f| %>
   <%= f.hidden_field :previous_version_number, :value => f.object.last_version_number %>
+  <%= hidden_field_tag :path, @page.path %>
   
   <p><%=wt 'Title:' %><br /><%= f.text_field :title %></p>
-  <p><%=wt 'Content:' %><br /><%= f.text_area :content %></p>
+  <%# If our 'content' contains newlines, Erubis will indent them (to make the
+      produced HTML look nicer). However those indenting spaces *will* appear
+      in the textarea in the user's browser and will get POSTed by the browser
+      when submitting the form and thus would get written to the wiki content
+      into the database.  The gsub's below replace the linebreaks ('\r\n')
+      with UTF8 linefeeds (same way HAML solves this problem), which are
+      ignored by Erubis and should be correctly displayed as linebreaks by
+      modern browsers. %>
+  <p><%=wt 'Content:' %><br /><%= f.text_area(:content).gsub("\n", '&#x000A;').gsub("\r",'') %></p>
   <p><%=wt 'Comment on this change (optional):' %><br /><%= f.text_field :comment %></p>
   
   <input type="submit" name="save" value="<%=wt 'Save page' %>" class="submit" />

data/app/views/base_wiki_pages/history.html.erb

@@ -5,6 +5,4 @@
 <%= wiki_page_info %>
 <%= wiki_page_actions %>
 
-<% wiki_paginate @versions do%>
-  <%= wiki_page_history %>
-<% end %>
+<%= wiki_page_history %>

data/app/views/base_wiki_pages/new.html.erb

@@ -2,12 +2,13 @@
 
 <h1><%=wt 'Creating a new wiki page' %></h1>
 
-<% wiki_page_form do |f| %>
+<%= wiki_page_form do |f| %>
   <%= f.hidden_field :previous_version_number, :value => f.object.last_version_number %>
   
   <p><%=wt 'Title:' %><br /><%= f.text_field :title %></p>
   <p><%=wt 'Content:' %><br /><%= f.text_area :content %></p>
   <%= f.hidden_field :comment, :value => 'First Revision'%>
+  <%= hidden_field_tag :path, @page.path %>
 
   <input type="submit" value="<%=wt 'Create page' %>" class="submit" />
-<% end %>
+<% end %>

data/app/views/base_wiki_pages/no.html.erb

@@ -1 +1 @@
-<%=(wt 'There are no such page. Do you want to <a href="%{new_url}">create it</a>?', :new_url => wiki_page_new_path ).html_safe %>  
+<%=(wt 'There is no such page', :default => 'There is no such page. Do you want to <a href="%{new_url}">create it</a>?', :new_url => wiki_page_new_path ).html_safe %>  

data/app/views/base_wiki_pages/not_allowed.html.erb

@@ -1 +1 @@
-<%=wt 'You are not allowed to be here, please go out.' %>  
+<%=wt 'You are not allowed to be here; please go back.' %>  

data/lib/generators/irwi_wiki_views/irwi_wiki_views_generator.rb

@@ -5,7 +5,7 @@ class IrwiWikiViewsGenerator < Rails::Generators::Base
   def views
     empty_directory 'app/views/base_wiki_pages'
 
-    Dir.foreach source_root do |file| # Searching for files in app/views
+    Dir.foreach File.expand_path("../../../../app/views/base_wiki_pages", __FILE__) do |file| # Searching for files in app/views
       copy_file( file, 'app/views/base_wiki_pages/' + file ) if file != '.' && file != '..'
     end
   end

data/lib/irwi.rb

@@ -1,10 +1,12 @@
 require 'active_support/dependencies'
+require 'rails_autolink' if defined?(Rails)
 
 module Irwi
 
   module Formatters
     autoload :BlueCloth, 'irwi/formatters/blue_cloth'
     autoload :RedCloth, 'irwi/formatters/red_cloth'
+    autoload :SimpleHtml, 'irwi/formatters/simple_html'
   end
 
   module Comparators

data/lib/irwi/config.rb

@@ -2,40 +2,55 @@ require 'active_support'
 
 class Irwi::Config
 
-  attr_accessor_with_default :controller_name, 'wiki_pages'
-
-  attr_accessor_with_default :user_class_name, 'User'
-
-  attr_accessor_with_default :page_class_name, 'WikiPage'
-  attr_accessor_with_default :page_version_class_name, 'WikiPageVersion'
-  attr_accessor_with_default :page_attachment_class_name do
-    # Can be for example 'WikiPageAttachment'
-    nil
-  end
-
-  attr_accessor_with_default :page_version_foreign_key, 'page_id'
+  attr_accessor :controller_name
+  attr_accessor :user_class_name
+  attr_accessor :page_class_name
+  attr_accessor :page_version_class_name
+  attr_accessor :page_attachment_class_name
+  attr_accessor :page_version_foreign_key
 
   # Object using to format content
-  attr_accessor_with_default :formatter do
-    require 'irwi/formatters/red_cloth'
-
-    Irwi::Formatters::RedCloth.new
+  attr_writer :formatter
+
+  def formatter
+    @formatter ||= begin
+                     require 'irwi/formatters/red_cloth'
+                     
+                     self.formatter = Irwi::Formatters::RedCloth.new
+                   end	
   end
 
   # Object using to compare pages
-  attr_accessor_with_default :comparator do
-    require 'irwi/comparators/diff_lcs'
-
-    Irwi::Comparators::DiffLcs.new
+  attr_writer :comparator
+  
+  def comparator
+    @comparator ||= begin
+                      require 'irwi/comparators/diff_lcs'
+                      
+                      self.comparator = Irwi::Comparators::DiffLcs.new
+                    end	
   end
 
   # Object using to paginate collections
-  attr_accessor_with_default :paginator do
-    require 'irwi/paginators/none'
-
-    Irwi::Paginators::None.new
+  attr_writer :paginator
+    
+  def paginator
+    @paginator ||= begin
+                     require 'irwi/paginators/none'
+                     
+                     self.paginator = Irwi::Paginators::None.new
+                   end	
   end
 
+  def initialize
+    @controller_name = 'wiki_pages'
+    @user_class_name = 'User'
+    @page_class_name = 'WikiPage'
+    @page_version_class_name = 'WikiPageVersion'
+    @page_attachment_class_name = nil
+    @page_version_foreign_key = 'page_id'
+  end   
+
   def page_class
     page_class_name.constantize
   end

data/lib/irwi/extensions/controllers/wiki_pages.rb

@@ -106,7 +106,7 @@ module Irwi::Extensions::Controllers::WikiPages
 
     # Renders user-specified or default template
     def render_template( template )
-      render "#{template_dir template}/#{template}"
+      render "#{template_dir template}/#{template}", :status => (case template when 'no' then 404 when 'not_allowed' then 403 else 200 end)
     end
 
     # Initialize @current_user instance variable

data/lib/irwi/extensions/models/wiki_page.rb

@@ -3,7 +3,7 @@ module Irwi::Extensions::Models::WikiPage
   module ClassMethods
 
     def find_by_path_or_new( path )
-      self.find_by_path( path ) || self.new( :path => path, :title => path )
+      self.find_by_path( path ) || self.new( :path => path, :title => CGI::unescape(path) )
     end
 
   end
@@ -34,6 +34,8 @@ module Irwi::Extensions::Models::WikiPage
     base.send :extend, Irwi::Extensions::Models::WikiPage::ClassMethods
     base.send :include, Irwi::Extensions::Models::WikiPage::InstanceMethods
 
+    base.attr_protected :id
+
     base.send :attr_accessor, :comment, :previous_version_number
 
     base.belongs_to :creator, :class_name => Irwi.config.user_class_name
@@ -45,6 +47,7 @@ module Irwi::Extensions::Models::WikiPage
       base.has_many :attachments, :class_name => Irwi.config.page_attachment_class_name, :foreign_key => Irwi.config.page_version_foreign_key
     end
 
+    base.before_save {|record| record.content = '' if record.content.nil? }
     base.after_save :create_new_version
   end
 

data/lib/irwi/extensions/models/wiki_page_version.rb

@@ -17,7 +17,7 @@ module Irwi::Extensions::Models::WikiPageVersion
     protected
 
     def raise_on_update
-      raise ActiveRecordError.new "Cann't modify existent version"
+      raise ActiveRecordError.new "Can't modify existing version"
     end
 
   end
@@ -26,12 +26,14 @@ module Irwi::Extensions::Models::WikiPageVersion
     base.send :extend, Irwi::Extensions::Models::WikiPageVersion::ClassMethods
     base.send :include, Irwi::Extensions::Models::WikiPageVersion::InstanceMethods
 
+    base.attr_protected :id
+
     base.belongs_to :page, :class_name => Irwi.config.page_class_name
     base.belongs_to :updator, :class_name => Irwi.config.user_class_name
 
     base.before_update :raise_on_update
 
-    base.named_scope :between, lambda { | first, last |
+    base.scope :between, lambda { | first, last |
       first = first.to_i
       last = last.to_i
       first, last = last, first if last < first # Reordering if neeeded

data/lib/irwi/formatters/simple_html.rb

@@ -0,0 +1,10 @@
+class Irwi::Formatters::SimpleHtml
+
+  def initialize
+  end
+
+  def format( text )
+    text.html_safe
+  end
+
+end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -5,10 +5,13 @@ module Irwi::Helpers::WikiPagesHelper
 
   # Edit form for wiki page model
   def wiki_page_form( config = {}, &block )
-    form_for( :page, @page, { :url => url_for( :action => :update ), :html=> { :class => 'wiki_form' } }.merge!( config ), &block )
+    form_for( @page, { :as => :page, :url => url_for( :action => :update ), :html=> { :class => 'wiki_form', :method => :post } }.merge!( config ), &block )
   end
 
-  def wiki_page_new_path( page = nil )
+  def wiki_page_new_path
+    if params && params[:path].present?
+      page = CGI::escape(params[:path])
+    end
     wiki_page_path( page, :new )
   end
 
@@ -27,6 +30,7 @@ module Irwi::Helpers::WikiPagesHelper
   def wiki_page_path( page = nil, action = :show )
     if page
       page = page.path if page.respond_to? :path
+      page = nil if page.empty?
 
       url_for( :action => action, :path => page )
     else
@@ -43,9 +47,13 @@ module Irwi::Helpers::WikiPagesHelper
   end
 
   def wiki_user( user )
-    return '<Unknown>'.html_safe unless user
+    return ("<" + wt("Unknown") + ">").html_safe unless user
 
-    "User##{user.id}"
+    if user.respond_to?(:name)
+      user.name
+    else
+      "User##{user.id}"
+    end
   end
 
   def wiki_linkify( str )
@@ -68,7 +76,7 @@ module Irwi::Helpers::WikiPagesHelper
     if page = Irwi.config.page_class.find_by_title( title )
       url_for( :controller => Irwi.config.controller_name, :action => :show, :path => page.path )
     else
-      url_for( :controller => Irwi.config.controller_name, :action => :show, :path => title )
+      url_for( :controller => Irwi.config.controller_name, :action => :show, :path => CGI::escape(title) )
     end
   end
 
@@ -87,7 +95,7 @@ module Irwi::Helpers::WikiPagesHelper
   #
   def wt(msg, *args)
     config = args.extract_options!
-    config[:default] = msg
+    config[:default] = msg if config[:default].blank?
     config[:scope] = 'wiki'
     I18n.t(msg, config)
   end

data/lib/irwi/paginators/none.rb

@@ -10,6 +10,7 @@ class Irwi::Paginators::None
 
   def paginated_section( view, collection, &block )
     yield
+    return
   end
 
 end

data/lib/irwi/version.rb

@@ -2,7 +2,7 @@ module Irwi
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 1 
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +03:00
-default_executable: 
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
@@ -84,9 +83,24 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rails_autolink
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +111,21 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
 email: 
 - alexey.noskov@gmail.com
@@ -143,6 +171,7 @@ files:
 - lib/irwi/helpers/wiki_pages_helper.rb
 - lib/irwi/formatters/red_cloth.rb
 - lib/irwi/formatters/blue_cloth.rb
+- lib/irwi/formatters/simple_html.rb
 - lib/irwi/version.rb
 - lib/irwi/config.rb
 - lib/generators/irwi_wiki/templates/controllers/wiki_pages_controller.rb
@@ -157,7 +186,6 @@ files:
 - lib/generators/irwi_wiki_attachments/irwi_wiki_attachments_generator.rb
 - MIT-LICENSE
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/alno/irwi
 licenses: []
 
@@ -194,9 +222,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
 test_files: []
 
+has_rdoc: