irwi 0.2.4 → 0.4.0

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

@@ -1,42 +1,42 @@
 module Irwi::Extensions::Models::WikiPageVersion
-  
+
   module ClassMethods
-        
+
   end
-  
-  module InstanceMethods    
-    
+
+  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 "Cann't modify existent version"
     end
-    
+
   end
-  
+
   def self.included( base )
     base.send :extend, Irwi::Extensions::Models::WikiPageVersion::ClassMethods
     base.send :include, Irwi::Extensions::Models::WikiPageVersion::InstanceMethods
-    
+
     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 | 
-      first = first.to_i 
+
+    base.named_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 ] }
     }
   end
-  
-end
+
+end

data/lib/irwi/formatters/blue_cloth.rb

@@ -1,11 +1,11 @@
 class Irwi::Formatters::BlueCloth
-  
+
   def initialize
     require 'bluecloth'
   end
-  
+
   def format( text )
     BlueCloth.new( text ).to_html
   end
-  
-end
+
+end

data/lib/irwi/formatters/red_cloth.rb

@@ -1,11 +1,11 @@
 class Irwi::Formatters::RedCloth
-  
+
   def initialize
     require 'redcloth'
   end
-    
+
   def format( text )
     ::RedCloth.new( text ).to_html
   end
-  
-end
+
+end

data/lib/irwi/helpers.rb

@@ -0,0 +1,13 @@
+module Irwi::Helpers
+  autoload :WikiPagesHelper, 'irwi/helpers/wiki_pages_helper'
+  autoload :WikiPageAttachmentsHelper, 'irwi/helpers/wiki_page_attachments_helper'
+end
+
+Module.class_eval do
+
+  def acts_as_wiki_pages_helper( config = {} )
+    include Irwi::Helpers::WikiPagesHelper
+    include Irwi::Helpers::WikiPageAttachmentsHelper if Irwi::config.page_attachment_class_name
+  end
+
+end

data/lib/irwi/helpers/wiki_page_attachments_helper.rb

@@ -1,3 +1,5 @@
+require 'active_record/errors'
+
 module Irwi::Helpers::WikiPageAttachmentsHelper
 
   def wiki_add_page_attachment_path(page)
@@ -19,5 +21,5 @@ module Irwi::Helpers::WikiPageAttachmentsHelper
       end
     end
   end
-  
-end
+
+end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -1,53 +1,53 @@
 module Irwi::Helpers::WikiPagesHelper
-  
+
   include Irwi::Support::TemplateFinder
   include Irwi::Helpers::WikiPageAttachmentsHelper
-  
+
   # 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 )
   end
-  
+
   def wiki_page_new_path( page = nil )
     wiki_page_path( page, :new )
   end
-  
+
   def wiki_page_edit_path( page = nil )
     wiki_page_path( page, :edit )
   end
-    
+
   def wiki_page_history_path( page = nil )
     wiki_page_path( page, :history )
   end
-  
+
   def wiki_page_compare_path( page = nil )
     wiki_page_path( page, :compare )
   end
-  
+
   def wiki_page_path( page = nil, action = :show )
     if page
       page = page.path if page.respond_to? :path
-      
+
       url_for( :action => action, :path => page )
     else
       url_for( :action => action )
     end
   end
-  
+
   def wiki_content( text )
     sanitize( auto_link( Irwi.config.formatter.format( wiki_linkify( wiki_show_attachments(text) ) ) ) )
   end
-  
+
   def wiki_diff( old_text, new_text )
-    Irwi.config.comparator.render_changes(h(old_text), h(new_text))
+    Irwi.config.comparator.render_changes(h(old_text), h(new_text)).html_safe
   end
-  
+
   def wiki_user( user )
-    return '<Unknown>' unless user
-    
+    return '<Unknown>'.html_safe unless user
+
     "User##{user.id}"
   end
-  
+
   def wiki_linkify( str )
     str.gsub /\[\[
                 (?:([^\[\]\|]+)\|)?
@@ -57,13 +57,13 @@ module Irwi::Helpers::WikiPagesHelper
       text = "#$2#$3"
       link, anchor = if $1 then $1.split('#', 2) else $2 end
       "<a href=\"#{wiki_link link}#{ '#' + anchor if anchor}\">#{text}</a>"
-    end
+    end.html_safe
   end
-  
+
   def wiki_paginate( collection, &block )
     Irwi.config.paginator.paginated_section( self, collection, &block )
   end
-  
+
   def wiki_link( title )
     if page = Irwi.config.page_class.find_by_title( title )
       url_for( :controller => Irwi.config.controller_name, :action => :show, :path => page.path )
@@ -71,7 +71,7 @@ module Irwi::Helpers::WikiPagesHelper
       url_for( :controller => Irwi.config.controller_name, :action => :show, :path => title )
     end
   end
-  
+
   ##
   # Instead of having to translate strings and defining a default value:
   #
@@ -91,47 +91,47 @@ module Irwi::Helpers::WikiPagesHelper
     config[:scope] = 'wiki'
     I18n.t(msg, config)
   end
-  
-  def wiki_page_style    
+
+  def wiki_page_style
     render :partial => "#{template_dir '_wiki_page_style'}/wiki_page_style"
   end
-  
+
   def wiki_page_info(page = nil)
     page ||= @page # By default take page from instance variable
-    
+
     render :partial => "#{template_dir '_wiki_page_info'}/wiki_page_info", :locals => { :page => page }
   end
-  
+
   def wiki_page_actions(page = nil)
     page ||= @page # By default take page from instance variable
-    
+
     render :partial => "#{template_dir '_wiki_page_actions'}/wiki_page_actions", :locals => { :page => page }
   end
-  
+
   def wiki_page_history(page = nil,versions = nil)
     page ||= @page # By default take page from instance variable
     versions ||= @versions || page.versions
-    
+
     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)
     return unless Irwi::config.page_attachment_class_name
 
-    page.attachments.each do |attachment| 
+    page.attachments.each do |attachment|
       concat image_tag(attachment.wiki_page_attachment.url(:thumb))
-      concat "Attachment_#{attachment.id}" 
+      concat "Attachment_#{attachment.id}"
       concat link_to(wt('Remove'), wiki_remove_page_attachment_path(attachment.id), :method => :delete)
-    end 
+    end
 
-    form_for(:wiki_page_attachment, 
-             Irwi.config.page_attachment_class.new, 
-             :url => wiki_add_page_attachment_path(@page), 
+    form_for(:wiki_page_attachment,
+             Irwi.config.page_attachment_class.new,
+             :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.file_field :wiki_page_attachment
+      concat form.hidden_field :page_id, :value => @page.id
       concat form.submit 'Add Attachment'
     end
   end
-    
+
 end

data/lib/irwi/paginators/none.rb

@@ -1,13 +1,15 @@
+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 )
   end
-  
+
   def paginated_section( view, collection, &block )
     yield
   end
-  
-end
+
+end

data/lib/irwi/paginators/will_paginate.rb

@@ -1,11 +1,11 @@
 class Irwi::Paginators::WillPaginate
-  
+
   def paginate( collection, options = {} )
     collection.paginate( options )
   end
-  
+
   def paginated_section( view, collection, &block )
     view.paginated_section( collection, &block )
   end
-  
-end
+
+end

data/lib/irwi/support/route_mapper.rb

@@ -1,30 +1,34 @@
+require 'action_dispatch'
+
 module Irwi::Support::RouteMapper
-  
+
   # Defining wiki root mount point
   def wiki_root( root, config = {} )
     opts = {
       :controller => 'wiki_pages',
       :root => root
     }.merge(config)
-    
+
     Irwi.config.system_pages.each do |page_action, page_path| # Adding routes for system pages
-      connect( "#{root}/#{page_path}", opts.merge({ :action => page_action }) )
+      get( "#{root}/#{page_path}", opts.merge({ :action => page_action }) )
     end
-        
-    connect( "#{root}/compare/*path", opts.merge({ :action => 'compare' }) ) # Comparing two versions of page
-    connect( "#{root}/new/*path", opts.merge({ :action => 'new' }) ) # Wiki new route
-    connect( "#{root}/edit/*path", opts.merge({ :action => 'edit' }) ) # Wiki edit route
-    connect( "#{root}/history/*path", opts.merge({ :action => 'history' }) ) # Wiki history route
-    
+
+    get( "#{root}/compare/(*path)", opts.merge({ :action => 'compare', :as => 'compare_wiki_page' }) ) # Comparing two versions of page
+    get( "#{root}/new/(*path)", opts.merge({ :action => 'new', :as => 'new_wiki_page' }) ) # Wiki new route
+    get( "#{root}/edit/(*path)", opts.merge({ :action => 'edit', :as => 'edit_wiki_page' }) ) # Wiki edit route
+    get( "#{root}/history/(*path)", opts.merge({ :action => 'history', :as => 'history_wiki_page' }) ) # Wiki history route
+
     # Attachments
-    connect("#{root}/attach/*path", opts.merge({:action => 'add_attachment', :conditions => {:method => :post}}))
-    connect("#{root}/attach/:attachment_id", opts.merge({:action => 'remove_attachment', :conditions => {:method => :delete}}))
-    
-    
-    connect( "#{root}/*path", opts.merge({ :action => 'destroy', :conditions => { :method => :delete } }) ) # Wiki destroy route
-    connect( "#{root}/*path", opts.merge({ :action => 'update', :conditions => { :method => :post } }) ) # Save wiki pages route
-    connect( "#{root}/*path", opts.merge({ :action => 'show', :conditions => { :method => :get } }) ) # Wiki pages route
-    #connect( "#{root}/*path", opts.merge({ :action => 'show', :conditions => { :method => :get } }) ) # Wiki pages route
+    post("#{root}/attach/(*path)", opts.merge({:action => 'add_attachment' }))
+    delete("#{root}/attach/:attachment_id", opts.merge({:action => 'remove_attachment' }))
+
+    delete( "#{root}/(*path)", opts.merge({ :action => 'destroy', :as => 'destroy_wiki_page' }) ) # Wiki destroy route
+    post( "#{root}/(*path)", opts.merge({ :action => 'update', :as => 'update_wiki_page' }) ) # Save wiki pages route
+    get( "#{root}/(*path)", opts.merge({ :action => 'show', :as => 'wiki_page' }) ) # Wiki pages route
   end
-  
+
+end
+
+ActionDispatch::Routing::Mapper.instance_eval do
+  include Irwi::Support::RouteMapper
 end

data/lib/irwi/support/template_finder.rb

@@ -1,11 +1,11 @@
 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
     dir
   end
-  
-end
+
+end

data/lib/irwi/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 2
   - 4
-  version: 0.2.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +04:00
+date: 2011-01-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,101 +36,139 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.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
+  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
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "2.0"
   type: :development
-  version_requirements: *id002
-description: "Irwi is Ruby on Rails plugin which adds wiki functionality to your application. "
-email: alexey.noskov@gmail.com ravi.bhim@yahoo.com
+  version_requirements: *id005
+description: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
+email: 
+- alexey.noskov@gmail.com
+- ravi.bhim@yahoo.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-files: 
-- .document
-- .gitignore
 - MIT-LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- app/views/base_wiki_pages/_wiki_page_actions.html.erb
-- app/views/base_wiki_pages/_wiki_page_history.html.erb
+files: 
+- app/views/base_wiki_pages/no.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/show.html.erb
+- app/views/base_wiki_pages/not_allowed.html.erb
 - app/views/base_wiki_pages/history.html.erb
+- 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/no.html.erb
-- app/views/base_wiki_pages/not_allowed.html.erb
-- app/views/base_wiki_pages/show.html.erb
-- generators/irwi_wiki/irwi_wiki_generator.rb
-- generators/irwi_wiki/templates/controllers/wiki_pages_controller.rb
-- generators/irwi_wiki/templates/helpers/wiki_pages_helper.rb
-- generators/irwi_wiki/templates/migrate/create_wiki_pages.rb
-- generators/irwi_wiki/templates/models/wiki_page.rb
-- generators/irwi_wiki/templates/models/wiki_page_version.rb
-- generators/irwi_wiki_attachments/irwi_wiki_attachments_generator.rb
-- generators/irwi_wiki_attachments/templates/migrate/create_wiki_page_attachments.rb
-- generators/irwi_wiki_attachments/templates/models/wiki_page_attachment.rb
-- generators/irwi_wiki_views/irwi_wiki_views_generator.rb
-- irwi.gemspec
+- app/views/base_wiki_pages/edit.html.erb
+- app/views/base_wiki_pages/_wiki_page_style.html.erb
+- app/views/base_wiki_pages/compare.html.erb
 - lib/irwi.rb
+- lib/irwi/support/template_finder.rb
+- lib/irwi/support/route_mapper.rb
 - lib/irwi/comparators/base.rb
-- lib/irwi/comparators/diff_lcs.rb
-- lib/irwi/comparators/spans/changed_span.rb
 - lib/irwi/comparators/spans/not_changed_span.rb
-- lib/irwi/config.rb
-- lib/irwi/extensions/controllers/wiki_page_attachments.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/extensions/controllers.rb
 - lib/irwi/extensions/models/wiki_page.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_cloth.rb
+- lib/irwi/extensions/models/wiki_page_attachment.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/paginators/none.rb
-- lib/irwi/paginators/will_paginate.rb
-- lib/irwi/support/route_mapper.rb
-- lib/irwi/support/template_finder.rb
-- rails/init.rb
-- spec/comparators/diff_lcs_spec.rb
-- spec/config_spec.rb
-- spec/extensions/controllers/wiki_pages_spec.rb
-- spec/extensions/models/wiki_page_spec.rb
-- spec/formatters/red_cloth_spec.rb
-- spec/helpers/wiki_page_attachments_helper_spec.rb
-- spec/helpers/wiki_pages_helper_spec.rb
-- spec/paginators/none_spec.rb
-- spec/paginators/will_paginate_spec.rb
-- spec/rcov.opts
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/route_mapper_spec.rb
-- spec/support/template_finder_spec.rb
-- tasks/riwiki_tasks.rake
+- lib/irwi/formatters/red_cloth.rb
+- lib/irwi/formatters/blue_cloth.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
 has_rdoc: true
 homepage: http://github.com/alno/irwi
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+- --line-numbers
+- --inline-source
+- --title
+- Rayo CMS
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -147,10 +185,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
@@ -158,16 +198,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
-test_files: 
-- spec/support/route_mapper_spec.rb
-- spec/support/template_finder_spec.rb
-- spec/spec_helper.rb
-- spec/comparators/diff_lcs_spec.rb
-- spec/extensions/controllers/wiki_pages_spec.rb
-- spec/extensions/models/wiki_page_spec.rb
-- spec/config_spec.rb
-- spec/paginators/will_paginate_spec.rb
-- spec/paginators/none_spec.rb
-- spec/helpers/wiki_pages_helper_spec.rb
-- spec/helpers/wiki_page_attachments_helper_spec.rb
-- spec/formatters/red_cloth_spec.rb
+test_files: []
+