irwi 0.4.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 22090f82507fef1269d7f8ad01a63c5764feb374
+  data.tar.gz: c1b7c604fe635ad3d3f62e3a4cf69d9ec87276a1
+SHA512:
+  metadata.gz: 5928f78b1c8135f0fdf529cb000ef518896f6751927b7caf14367ffdf5111beb6b40f45b4920f25fa3531c12b4a039c8b0a70ee8a110a3674464eff9151d3a6d
+  data.tar.gz: b14e6ac0a0c9352400921a35f841384819a937391dda472188c181594a047db1db17a605d92e1a807e8a6aa54c1b3926729f53aac1fba11041a9b80547391614

data/README.rdoc

@@ -1,31 +1,22 @@
-= Irwi
-
-Irwi is a Ruby on Rails 3 plugin which adds wiki functionality to your application.
-
-== Installation
-
-Setup gemcutter as gem source:
-
-  sudo gem install gemcutter
-  gem tumble
+*WARNING: It's unstable branch for migration to Rails 4*
 
-And install irwi gem (recommended):
+= Irwi
 
-  sudo gem install irwi
+Irwi is a Ruby on Rails 4 plugin which adds wiki functionality to your application.
 
-And add to your environment.rb:
+== Status
 
-  config.gem "irwi", :source => "http://gemcutter.org"
+{<img src="https://secure.travis-ci.org/alno/irwi.png?branch=master" alt="Build Status" />}[http://travis-ci.org/alno/irwi]
 
-Or in your application directory call:
+== Installation
 
-  script/plugin install git://github.com/alno/irwi
+Add to your Gemfile:
 
-== Usage
+  gem 'irwi', :git => 'git://github.com/alno/irwi.git'
 
-In your application directory call:
+Then in your application directory call:
 
-  script/generate irwi_wiki
+  rails g irwi_wiki
 
 It will generate:
 * WikiPageController to serve wiki pages
@@ -34,7 +25,7 @@ It will generate:
 
 Also it will add to your <tt>routes.rb</tt> something like:
 
-  map.wiki_root '/wiki'
+  wiki_root '/wiki'
 
 == Wiki syntax (links to other pages)
 
@@ -57,6 +48,10 @@ Following helpers are defined by default and you may replace them with you own:
 
 Configuration options are acessed via <tt>Irwi.config</tt> object. Currently supported options:
 * <tt>user_class_name</tt> - Name of user model class. By default - 'User'
+
+ Define a method named 'current_user' method on WikiPagesController that returns the object for the current user
+
+
 * <tt>formatter</tt> - Formatter instance, which process wiki content before output. It should have method <tt>format</tt>, which gets a string and returns it formatted. By default instance of <tt>Irwi::Formatters::RedCloth</tt> is used (requires RedCloth gem). Other built-in formatter is <tt>Irwi::Formatters::BlueCloth</tt> (requires BlueCloth gem). Option accepts formatter instance, not class, so correct usage is:
 
   Irwi.config.formatter = Irwi::Formatters::BlueCloth.new

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

@@ -1,4 +1,5 @@
 <ul class="wiki_page_actions">
+  <%= content_tag('li', link_to( wt( 'List pages' ), wiki_all_path)) %>
   <%= 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 can't be restored. Are you sure?" ) )) if destroy_allowed? %>

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

@@ -1,5 +1,5 @@
 <% if with_form %>
-  <form action="<%=wiki_page_compare_path%>" method="get">
+  <form action="<%=wiki_page_compare_path(@page)%>" method="get">
 <% end %>
 
 <table class="wiki_history">

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

@@ -3,9 +3,9 @@
 <h1><%=wt 'All pages' %></h1>
 
 <ul>
-  <% wiki_paginate @pages do -%>
+  <%= wiki_paginate @pages do -%>
     <% @pages.each do |page| -%>
       <li><%= link_to page.title, wiki_page_path( page ) %></li>
     <% end -%>
   <% end -%>
-</ul>
+</ul>

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

@@ -2,6 +2,8 @@
 
 <h1><%=wt '%{page_title} - Comparing versions %{old_version} and %{new_version}', :page_title => h( @page.title ), :old_version => @old_version.number, :new_version => @new_version.number %></h1>
 
+<%= link_to "Back to history", history_wiki_page_path(@page.path) %><br />
+
 <%=wt 'Changes list:' %>
 
 <%= wiki_paginate @versions do%>

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

@@ -11,8 +11,9 @@
 <%= 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>
+
   <%# 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
@@ -21,9 +22,9 @@
       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 "Content: #{link_to('(Textile Markup', 'http://redcloth.org/hobix.com/textile/', target: '_blank')}".html_safe %> allowed)<br /><%= f.text_area(:content) %> </p>
+  <%#<p><%#=wt 'Content:' %><br /><%#= f.text_area(:content, :value => f.object.content.gsub("\n", '&#x000A;').gsub("\r",'')).html_safe %#></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" />
   <input type="submit" name="preview" value="<%=wt 'Preview' %>" class="submit" />
   <input type="submit" name="cancel" value="<%=wt 'Cancel' %>" class="submit" />

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

@@ -6,3 +6,5 @@
 <%= wiki_page_actions %>
 
 <%= wiki_page_history %>
+
+<%= link_to "Back to page", wiki_page_path(@page) %>

data/lib/generators/irwi_wiki/irwi_wiki_generator.rb

@@ -1,9 +1,8 @@
-require 'rails/generators/active_record/migration'
+require 'rails/generators/active_record'
 
 class IrwiWikiGenerator < Rails::Generators::Base
 
   include Rails::Generators::Migration
-  extend ActiveRecord::Generators::Migration
 
   source_root File.expand_path("../templates", __FILE__)
 
@@ -20,10 +19,14 @@ class IrwiWikiGenerator < Rails::Generators::Base
     copy_file 'models/wiki_page_version.rb', 'app/models/wiki_page_version.rb'
 
     # Migrations
-    migration_template 'migrate/create_wiki_pages.rb', 'db/migrate/create_wiki_pages'
+    migration_template 'migrate/create_wiki_pages.rb', 'db/migrate/create_wiki_pages.rb'
 
     # Routes
     route "wiki_root '/wiki'"
   end
 
+  def self.next_migration_number dirname
+    ActiveRecord::Generators::Base.next_migration_number dirname
+  end
+
 end

data/lib/generators/irwi_wiki_attachments/irwi_wiki_attachments_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/active_record/migration'
+require 'rails/generators/active_record'
 
 class IrwiWikiAttachmentsGenerator < Rails::Generators::Base
 
@@ -10,7 +10,7 @@ class IrwiWikiAttachmentsGenerator < Rails::Generators::Base
   def generate_attachments
     %w[create_wiki_page_attachments].each do |mig|
       unless Dir.entries(File.join(Rails.root,'db','migrate')).grep(/#{mig}/).present?
-        migration_template "migrate/#{mig}.rb", "db/migrate/#{mig}"
+        migration_template "migrate/#{mig}.rb", "db/migrate/#{mig}.rb"
         sleep(1) # To avoid migration file version collision.
       end
     end
@@ -19,4 +19,8 @@ class IrwiWikiAttachmentsGenerator < Rails::Generators::Base
     copy_file 'models/wiki_page_attachment.rb', 'app/models/wiki_page_attachment.rb'
   end
 
+  def self.next_migration_number dirname
+    ActiveRecord::Generators::Base.next_migration_number dirname
+  end
+
 end

data/lib/irwi.rb

@@ -7,6 +7,8 @@ module Irwi
     autoload :BlueCloth, 'irwi/formatters/blue_cloth'
     autoload :RedCloth, 'irwi/formatters/red_cloth'
     autoload :SimpleHtml, 'irwi/formatters/simple_html'
+    autoload :WikiCloth, 'irwi/formatters/wiki_cloth'
+    autoload :RedCarpet, 'irwi/formatters/red_carpet'
   end
 
   module Comparators
@@ -23,6 +25,8 @@ module Irwi
   module Paginators
     autoload :None, 'irwi/paginators/none'
     autoload :WillPaginate, 'irwi/paginators/will_paginate'
+    # TODO Implement Kaminari paginator
+    # TODO Autodetect paginator
   end
 
   module Support

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

@@ -1,8 +1,8 @@
 module Irwi::Extensions::Controllers::WikiPageAttachments
 
   def add_attachment
-    attachment = page_attachment_class.new(params[:wiki_page_attachment])
-    attachment.save
+    attachment = page_attachment_class.new(permitted_page_attachment_params)
+    attachment.save!
     redirect_to url_for(:path => attachment.page.path, :action => :edit)
   end
 
@@ -12,10 +12,14 @@ module Irwi::Extensions::Controllers::WikiPageAttachments
     redirect_to url_for(:path => attachment.page.path, :action => :edit)
   end
 
-  protected
+  private
 
   def page_attachment_class
     Irwi.config.page_attachment_class
   end
 
+  def permitted_page_attachment_params
+    params.require(:wiki_page_attachment).permit(:page_id, :wiki_page_attachment)
+  end
+
 end

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

@@ -1,4 +1,5 @@
 module Irwi::Extensions::Controllers::WikiPages
+  extend ActiveSupport::Concern
 
   module ClassMethods
 
@@ -12,148 +13,145 @@ module Irwi::Extensions::Controllers::WikiPages
 
   end
 
-  module InstanceMethods
+  include Irwi::Extensions::Controllers::WikiPageAttachments
+  include Irwi::Support::TemplateFinder
 
-    include Irwi::Extensions::Controllers::WikiPageAttachments
-    include Irwi::Support::TemplateFinder
+  def show
+    return not_allowed unless show_allowed?
 
-    def show
-      return not_allowed unless show_allowed?
-
-      render_template( @page.new_record? ? 'no' : 'show' )
-    end
+    render_template( @page.new_record? ? 'no' : 'show' )
+  end
 
-    def history
-      return not_allowed unless history_allowed?
+  def history
+    return not_allowed unless history_allowed?
 
-      @versions = Irwi.config.paginator.paginate( @page.versions, :page => params[:page] ) # Paginating them
+    @versions = Irwi.config.paginator.paginate( @page.versions, :page => params[:page] ) # Paginating them
 
-      render_template( @page.new_record? ? 'no' : 'history' )
-    end
+    render_template( @page.new_record? ? 'no' : 'history' )
+  end
 
-    def compare
-      return not_allowed unless history_allowed?
+  def compare
+    return not_allowed unless history_allowed?
 
-      if @page.new_record?
-        render_template 'no'
-      else
-        new_num = params[:new].to_i || @page.last_version_number # Last version number
-        old_num = params[:old].to_i || 1 # First version number
+    if @page.new_record?
+      render_template 'no'
+    else
+      new_num = params[:new].to_i || @page.last_version_number # Last version number
+      old_num = params[:old].to_i || 1 # First version number
 
-        old_num, new_num = new_num, old_num if new_num < old_num # Swapping them if last < first
+      old_num, new_num = new_num, old_num if new_num < old_num # Swapping them if last < first
 
-        versions = @page.versions.between( old_num, new_num ) # Loading all versions between first and last
+      versions = @page.versions.between( old_num, new_num ) # Loading all versions between first and last
 
-        @versions = Irwi.config.paginator.paginate( versions, :page => params[:page] ) # Paginating them
+      @versions = Irwi.config.paginator.paginate( versions, :page => params[:page] ) # Paginating them
 
-        @new_version = @versions.first.number == new_num ? @versions.first : versions.first # Loading next version
-        @old_version = @versions.last.number == old_num ? @versions.last : versions.last # Loading previous version
+      @new_version = @versions.first.number == new_num ? @versions.first : versions.first # Loading next version
+      @old_version = @versions.last.number == old_num ? @versions.last : versions.last # Loading previous version
 
-        render_template 'compare'
-      end
+      render_template 'compare'
     end
+  end
 
-    def new
-      return not_allowed unless show_allowed? && edit_allowed?
+  def new
+    return not_allowed unless show_allowed? && edit_allowed?
 
-      render_template 'new'
-    end
+    render_template 'new'
+  end
 
-    def edit
-      return not_allowed unless show_allowed? && edit_allowed?
+  def edit
+    return not_allowed unless show_allowed? && edit_allowed?
 
-      render_template 'edit'
-    end
+    render_template 'edit'
+  end
 
-    def update
-      return not_allowed unless params[:page] && (@page.new_record? || edit_allowed?) # Check for rights (but not for new record, for it we will use second check only)
+  def update
+    return not_allowed unless params[:page] && (@page.new_record? || edit_allowed?) # Check for rights (but not for new record, for it we will use second check only)
 
-      @page.attributes = params[:page] # Assign new attributes
-      @page.comment = params[:page][:comment]
+    @page.attributes = permitted_page_params
 
-      return not_allowed unless edit_allowed? # Double check: used beacause action may become invalid after attributes update
+    return not_allowed unless edit_allowed? # Double check: used beacause action may become invalid after attributes update
 
-      @page.updator = @current_user # Assing user, which updated page
-      @page.creator = @current_user if @page.new_record? # Assign it's creator if it's new page
+    @page.updator = @current_user # Assing user, which updated page
+    @page.creator = @current_user if @page.new_record? # Assign it's creator if it's new page
 
-      if !params[:preview] && (params[:cancel] || @page.save)
-        redirect_to url_for( :action => :show, :path => @page.path.split('/') ) # redirect to new page's path (if it changed)
-      else
-        render_template 'edit'
-      end
+    if !params[:preview] && (params[:cancel] || @page.save)
+      redirect_to url_for( :action => :show, :path => @page.path.split('/') ) # redirect to new page's path (if it changed)
+    else
+      render_template 'edit'
     end
+  end
 
-    def destroy
-      return not_allowed unless destroy_allowed?
+  def destroy
+    return not_allowed unless destroy_allowed?
 
-      @page.destroy
+    @page.destroy
 
-      redirect_to url_for( :action => :show )
-    end
+    redirect_to url_for( :action => :show )
+  end
 
-    def all
-      @pages = Irwi.config.paginator.paginate( page_class, :page => params[:page] ) # Loading and paginating all pages
+  def all
+    @pages = Irwi.config.paginator.paginate( page_class, :page => params[:page] ) # Loading and paginating all pages
 
-      render_template 'all'
-    end
+    render_template 'all'
+  end
 
-    protected
+  private
 
-    # Retrieves wiki_page_class for this controller
-    def page_class
-      self.class.page_class
-    end
+  def permitted_page_params
+    params.require(:page).permit(:title, :content, :comment)
+  end
 
-    # Renders user-specified or default template
-    def render_template( template )
-      render "#{template_dir template}/#{template}", :status => (case template when 'no' then 404 when 'not_allowed' then 403 else 200 end)
-    end
+  # Retrieves wiki_page_class for this controller
+  def page_class
+    self.class.page_class
+  end
 
-    # Initialize @current_user instance variable
-    def setup_current_user
-      @current_user = respond_to?( :current_user, true ) ? current_user : nil # Find user by current_user method or return nil
-    end
+  # Renders user-specified or default template
+  def render_template( template )
+    render "#{template_dir template}/#{template}", :status => (case template when 'no' then 404 when 'not_allowed' then 403 else 200 end)
+  end
 
-    # Initialize @page instance variable
-    def setup_page
-      @page = page_class.find_by_path_or_new( params[:path] || '' ) # Find existing page by path or create new
-    end
+  # Initialize @current_user instance variable
+  def setup_current_user
+    @current_user = respond_to?( :current_user, true ) ? current_user : nil # Find user by current_user method or return nil
+  end
 
-    # Method, which called when user tries to visit
-    def not_allowed
-      render_template 'not_allowed'
-    end
+  # Initialize @page instance variable
+  def setup_page
+    @page = page_class.find_by_path_or_new( params[:path] || '' ) # Find existing page by path or create new
+  end
 
-    # Check is it allowed for current user to see current page. Designed to be redefined by application programmer
-    def show_allowed?
-      true
-    end
+  # Method, which called when user tries to visit
+  def not_allowed
+    render_template 'not_allowed'
+  end
 
-    # Check is it allowed for current user see current page history. Designed to be redefined by application programmer
-    def history_allowed?
-      show_allowed?
-    end
+  # Check is it allowed for current user to see current page. Designed to be redefined by application programmer
+  def show_allowed?
+    true
+  end
 
-    # Check is it allowed for current user edit current page. Designed to be redefined by application programmer
-    def edit_allowed?
-      show_allowed?
-    end
+  # Check is it allowed for current user see current page history. Designed to be redefined by application programmer
+  def history_allowed?
+    show_allowed?
+  end
 
-    # Check is it allowed for current user destroy current page. Designed to be redefined by application programmer
-    def destroy_allowed?
-      edit_allowed?
-    end
+  # Check is it allowed for current user edit current page. Designed to be redefined by application programmer
+  def edit_allowed?
+    show_allowed?
+  end
 
+  # Check is it allowed for current user destroy current page. Designed to be redefined by application programmer
+  def destroy_allowed?
+    edit_allowed?
   end
 
-  def self.included( base )
-    base.send :extend, Irwi::Extensions::Controllers::WikiPages::ClassMethods
-    base.send :include, Irwi::Extensions::Controllers::WikiPages::InstanceMethods
+  included do
+    before_action :setup_current_user # Setup @current_user instance variable before each action
 
-    base.before_filter :setup_current_user # Setup @current_user instance variable before each action
     # Setup @page instance variable before each action
-    base.before_filter :setup_page, :only => [ :show, :history, :compare, :new, :edit, :update, :destroy, :add_attachment ]
-    base.helper_method :show_allowed?, :edit_allowed?, :history_allowed?, :destroy_allowed? # Access control methods are avaliable in views
+    before_action :setup_page, :only => [ :show, :history, :compare, :new, :edit, :update, :destroy, :add_attachment ]
+    helper_method :show_allowed?, :edit_allowed?, :history_allowed?, :destroy_allowed? # Access control methods are avaliable in views
   end
 
 end

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

@@ -1,4 +1,5 @@
 module Irwi::Extensions::Models::WikiPage
+  extend ActiveSupport::Concern
 
   module ClassMethods
 
@@ -8,47 +9,38 @@ module Irwi::Extensions::Models::WikiPage
 
   end
 
-  module InstanceMethods
-
-    # Retrieve number of last version
-    def last_version_number
-      last = versions.first
-      last ? last.number : 0
-    end
+  # Retrieve number of last version
+  def last_version_number
+    last = versions.first
+    last ? last.number : 0
+  end
 
-    protected
+  protected
 
-    def create_new_version
-      n = last_version_number
-
-      v = versions.build
-      v.attributes = attributes.slice( *v.attribute_names )
-      v.comment = comment
-      v.number = n + 1
-      v.save!
-    end
+  def create_new_version
+    n = last_version_number
 
+    v = versions.build
+    v.attributes = attributes.slice( *(v.attribute_names - ['id']) )
+    v.comment = comment
+    v.number = n + 1
+    v.save!
   end
 
-  def self.included( base )
-    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
+  included do
+    attr_accessor :comment, :previous_version_number
 
-    base.belongs_to :creator, :class_name => Irwi.config.user_class_name
-    base.belongs_to :updator, :class_name => Irwi.config.user_class_name
+    belongs_to :creator, class_name: Irwi.config.user_class_name
+    belongs_to :updator, class_name: Irwi.config.user_class_name
 
-    base.has_many :versions, :class_name => Irwi.config.page_version_class_name, :foreign_key => Irwi.config.page_version_foreign_key, :order => 'id DESC'
+    has_many :versions, ->{ order('id DESC') }, class_name: Irwi.config.page_version_class_name, foreign_key: Irwi.config.page_version_foreign_key
 
     if Irwi::config.page_attachment_class_name
-      base.has_many :attachments, :class_name => Irwi.config.page_attachment_class_name, :foreign_key => Irwi.config.page_version_foreign_key
+      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
+    before_save { |record| record.content = '' if record.content.nil? }
+    after_save :create_new_version
   end
 
 end

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

@@ -1,9 +1,10 @@
 module Irwi::Extensions::Models::WikiPageAttachment
+  extend ActiveSupport::Concern
 
   DEFAULT_PAPERCLIP_OPTIONS = {:styles => { :medium => "300x300>", :thumb => "100x100>" }}
 
-  def self.included( base )
-    base.belongs_to :page, :class_name => Irwi.config.page_class_name
+  included do
+    belongs_to :page, class_name: Irwi.config.page_class_name
   end
 
 end

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

@@ -1,43 +1,32 @@
 module Irwi::Extensions::Models::WikiPageVersion
+  extend ActiveSupport::Concern
 
-  module ClassMethods
-
+  def next
+    self.class.first :conditions => ["id > ? AND page_id = ?", id, page_id], :order => 'id ASC'
   end
 
-  module InstanceMethods
-
-    def next
-      self.class.first :conditions => ["id > ? AND page_id = ?", id, page_id], :order => 'id ASC'
-    end
-
-    def previous
-      self.class.first :conditions => ["id < ? AND page_id = ?", id, page_id], :order => 'id DESC'
-    end
-
-    protected
-
-    def raise_on_update
-      raise ActiveRecordError.new "Can't modify existing version"
-    end
-
+  def previous
+    self.class.first :conditions => ["id < ? AND page_id = ?", id, page_id], :order => 'id DESC'
   end
 
-  def self.included( base )
-    base.send :extend, Irwi::Extensions::Models::WikiPageVersion::ClassMethods
-    base.send :include, Irwi::Extensions::Models::WikiPageVersion::InstanceMethods
+  private
 
-    base.attr_protected :id
+  def raise_on_update
+    raise ActiveRecordError.new "Can't modify existing version"
+  end
 
-    base.belongs_to :page, :class_name => Irwi.config.page_class_name
-    base.belongs_to :updator, :class_name => Irwi.config.user_class_name
+  included do
+    belongs_to :page, class_name: Irwi.config.page_class_name
+    belongs_to :updator, class_name: Irwi.config.user_class_name
 
-    base.before_update :raise_on_update
+    before_update :raise_on_update
 
-    base.scope :between, lambda { | first, last |
+    scope :between, lambda { |first, last|
       first = first.to_i
       last = last.to_i
       first, last = last, first if last < first # Reordering if neeeded
-      { :conditions => [ 'number >= ? AND number <= ?', first, last ] }
+
+      where('number >= ? AND number <= ?', first, last)
     }
   end
 

data/lib/irwi/formatters/red_carpet.rb

@@ -0,0 +1,12 @@
+class Irwi::Formatters::RedCarpet
+
+  def initialize
+    require 'redcarpet'
+  end
+
+  def format( text )
+    markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true, :tables => true)
+    markdown.render(text)
+  end
+
+end

data/lib/irwi/formatters/wiki_cloth.rb

@@ -0,0 +1,11 @@
+class Irwi::Formatters::WikiCloth
+
+  def initialize
+    require 'wikicloth'
+  end
+
+  def format( text )
+    WikiCloth::Parser.new({:data => text}).to_html
+  end
+
+end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -39,7 +39,7 @@ module Irwi::Helpers::WikiPagesHelper
   end
 
   def wiki_content( text )
-    sanitize( auto_link( Irwi.config.formatter.format( wiki_linkify( wiki_show_attachments(text) ) ) ) )
+    sanitize( auto_link( Irwi.config.formatter.format( wiki_linkify( wiki_show_attachments(text) ) ).html_safe))
   end
 
   def wiki_diff( old_text, new_text )
@@ -123,7 +123,7 @@ module Irwi::Helpers::WikiPagesHelper
     render :partial => "#{template_dir '_wiki_page_history'}/wiki_page_history", :locals => { :page => page, :versions => versions, :with_form => (versions.size > 1) }
   end
 
-  def wiki_page_attachments(page)
+  def wiki_page_attachments(page = @page)
     return unless Irwi::config.page_attachment_class_name
 
     page.attachments.each do |attachment|
@@ -132,12 +132,12 @@ module Irwi::Helpers::WikiPagesHelper
       concat link_to(wt('Remove'), wiki_remove_page_attachment_path(attachment.id), :method => :delete)
     end
 
-    form_for(:wiki_page_attachment,
-             Irwi.config.page_attachment_class.new,
-             :url => wiki_add_page_attachment_path(@page),
+    form_for(Irwi.config.page_attachment_class.new,
+             :as => :wiki_page_attachment,
+             :url => wiki_add_page_attachment_path(page),
              :html => { :multipart => true }) do |form|
       concat form.file_field :wiki_page_attachment
-      concat form.hidden_field :page_id, :value => @page.id
+      concat form.hidden_field :page_id, :value => page.id
       concat form.submit 'Add Attachment'
     end
   end

data/lib/irwi/paginators/none.rb

@@ -3,9 +3,7 @@ require 'active_support/core_ext/hash'
 class Irwi::Paginators::None
 
   def paginate( collection, options = {} )
-    find_options = options.except :page, :per_page, :total_entries, :finder
-
-    collection.find( :all, find_options )
+    collection.all
   end
 
   def paginated_section( view, collection, &block )

data/lib/irwi/support/route_mapper.rb

@@ -10,7 +10,7 @@ module Irwi::Support::RouteMapper
     }.merge(config)
 
     Irwi.config.system_pages.each do |page_action, page_path| # Adding routes for system pages
-      get( "#{root}/#{page_path}", opts.merge({ :action => page_action }) )
+      get( "#{root}/#{page_path}", opts.merge({ :action => page_action.dup }) )
     end
 
     get( "#{root}/compare/(*path)", opts.merge({ :action => 'compare', :as => 'compare_wiki_page' }) ) # Comparing two versions of page

data/lib/irwi/support/template_finder.rb

@@ -1,7 +1,5 @@
 module Irwi::Support::TemplateFinder
 
-  protected
-
   def template_dir(template)
     dir = respond_to?( :controller_path ) ? controller_path : controller.controller_path
     dir = 'base_wiki_pages' if Dir.glob( "app/views/#{dir}/#{template}.html.*" ).empty? # Select default if there are no template in resource directory

data/lib/irwi/version.rb

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

metadata

@@ -1,231 +1,215 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: irwi
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Alexey Noskov
 - Ravi Bhim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-02-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: diff-lcs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  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"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rails_autolink
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
-email: 
+email:
 - alexey.noskov@gmail.com
 - ravi.bhim@yahoo.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
-files: 
-- app/views/base_wiki_pages/no.html.erb
-- app/views/base_wiki_pages/_wiki_page_info.html.erb
-- app/views/base_wiki_pages/all.html.erb
-- app/views/base_wiki_pages/show.html.erb
-- app/views/base_wiki_pages/not_allowed.html.erb
-- app/views/base_wiki_pages/history.html.erb
+files:
+- MIT-LICENSE
+- README.rdoc
 - app/views/base_wiki_pages/_wiki_page_actions.html.erb
 - app/views/base_wiki_pages/_wiki_page_history.html.erb
-- app/views/base_wiki_pages/new.html.erb
-- app/views/base_wiki_pages/edit.html.erb
+- app/views/base_wiki_pages/_wiki_page_info.html.erb
 - app/views/base_wiki_pages/_wiki_page_style.html.erb
+- app/views/base_wiki_pages/all.html.erb
 - app/views/base_wiki_pages/compare.html.erb
+- app/views/base_wiki_pages/edit.html.erb
+- app/views/base_wiki_pages/history.html.erb
+- app/views/base_wiki_pages/new.html.erb
+- app/views/base_wiki_pages/no.html.erb
+- app/views/base_wiki_pages/not_allowed.html.erb
+- app/views/base_wiki_pages/show.html.erb
+- lib/generators/irwi_wiki/irwi_wiki_generator.rb
+- lib/generators/irwi_wiki/templates/controllers/wiki_pages_controller.rb
+- lib/generators/irwi_wiki/templates/helpers/wiki_pages_helper.rb
+- lib/generators/irwi_wiki/templates/migrate/create_wiki_pages.rb
+- lib/generators/irwi_wiki/templates/models/wiki_page.rb
+- lib/generators/irwi_wiki/templates/models/wiki_page_version.rb
+- lib/generators/irwi_wiki_attachments/irwi_wiki_attachments_generator.rb
+- lib/generators/irwi_wiki_attachments/templates/migrate/create_wiki_page_attachments.rb
+- lib/generators/irwi_wiki_attachments/templates/models/wiki_page_attachment.rb
+- lib/generators/irwi_wiki_views/irwi_wiki_views_generator.rb
 - lib/irwi.rb
-- lib/irwi/support/template_finder.rb
-- lib/irwi/support/route_mapper.rb
 - lib/irwi/comparators/base.rb
-- lib/irwi/comparators/spans/not_changed_span.rb
-- lib/irwi/comparators/spans/changed_span.rb
 - lib/irwi/comparators/diff_lcs.rb
-- lib/irwi/extensions/models.rb
-- lib/irwi/extensions/controllers/wiki_pages.rb
-- lib/irwi/extensions/controllers/wiki_page_attachments.rb
+- lib/irwi/comparators/spans/changed_span.rb
+- lib/irwi/comparators/spans/not_changed_span.rb
+- lib/irwi/config.rb
 - lib/irwi/extensions/controllers.rb
+- lib/irwi/extensions/controllers/wiki_page_attachments.rb
+- lib/irwi/extensions/controllers/wiki_pages.rb
+- lib/irwi/extensions/models.rb
 - lib/irwi/extensions/models/wiki_page.rb
-- lib/irwi/extensions/models/wiki_page_version.rb
 - lib/irwi/extensions/models/wiki_page_attachment.rb
+- lib/irwi/extensions/models/wiki_page_version.rb
+- lib/irwi/formatters/blue_cloth.rb
+- lib/irwi/formatters/red_carpet.rb
+- lib/irwi/formatters/red_cloth.rb
+- lib/irwi/formatters/simple_html.rb
+- lib/irwi/formatters/wiki_cloth.rb
 - lib/irwi/helpers.rb
-- lib/irwi/paginators/will_paginate.rb
-- lib/irwi/paginators/none.rb
 - lib/irwi/helpers/wiki_page_attachments_helper.rb
 - 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/paginators/none.rb
+- lib/irwi/paginators/will_paginate.rb
+- lib/irwi/support/route_mapper.rb
+- lib/irwi/support/template_finder.rb
 - lib/irwi/version.rb
-- lib/irwi/config.rb
-- lib/generators/irwi_wiki/templates/controllers/wiki_pages_controller.rb
-- lib/generators/irwi_wiki/templates/migrate/create_wiki_pages.rb
-- lib/generators/irwi_wiki/templates/helpers/wiki_pages_helper.rb
-- lib/generators/irwi_wiki/templates/models/wiki_page.rb
-- lib/generators/irwi_wiki/templates/models/wiki_page_version.rb
-- lib/generators/irwi_wiki/irwi_wiki_generator.rb
-- lib/generators/irwi_wiki_views/irwi_wiki_views_generator.rb
-- lib/generators/irwi_wiki_attachments/templates/migrate/create_wiki_page_attachments.rb
-- lib/generators/irwi_wiki_attachments/templates/models/wiki_page_attachment.rb
-- lib/generators/irwi_wiki_attachments/irwi_wiki_attachments_generator.rb
-- MIT-LICENSE
-- README.rdoc
 homepage: http://github.com/alno/irwi
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Rayo CMS
-- --main
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--title"
+- Irwi
+- "--main"
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
 test_files: []
-
-has_rdoc: