irwi 0.1.4 → 0.1.5

data/.document

@@ -1,5 +1,4 @@
 README.rdoc
 lib/**/*.rb
 bin/*
-features/**/*.feature
-LICENSE
+MIT-LICENSE

data/.gitignore

@@ -17,5 +17,8 @@ tmtags
 coverage
 rdoc
 pkg
+doc
 
 ## PROJECT::SPECIFIC
+
+.yardoc

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

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

@@ -9,7 +9,7 @@
     <td><%=wt 'Author' %></td>
     <td><%=wt 'Comment' %></td>
   </tr>
-  <% versions.reverse.each do |v| %>
+  <% versions.each do |v| %>
     <tr>
       <td>
         <%=v.number%>

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

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

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

@@ -4,7 +4,9 @@
 
 <%=wt 'Changes list:' %>
 
-<%= wiki_page_history @page, @versions[1..-1] %>
+<% wiki_paginate @versions do%>
+  <%= wiki_page_history @page, @versions %>
+<% end %>
 
 <%=wt 'Changes in content:' %>
 

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

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

data/irwi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{irwi}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Noskov"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-11-01}
   s.description = %q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application. }
   s.email = %q{alexey.noskov@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "app/views/base_wiki_pages/_wiki_page_history.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",
@@ -51,6 +52,8 @@ Gem::Specification.new do |s|
      "lib/irwi/formatters/blue_cloth.rb",
      "lib/irwi/formatters/red_cloth.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",
@@ -59,6 +62,8 @@ Gem::Specification.new do |s|
      "spec/extensions/controllers/wiki_pages_spec.rb",
      "spec/formatters/red_cloth_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",
@@ -79,7 +84,9 @@ Gem::Specification.new do |s|
      "spec/formatters/red_cloth_spec.rb",
      "spec/extensions/controllers/wiki_pages_spec.rb",
      "spec/helpers/wiki_pages_helper_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/paginators/will_paginate_spec.rb",
+     "spec/paginators/none_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/irwi/config.rb

@@ -9,19 +9,26 @@ class Irwi::Config
   
   attr_accessor_with_default :page_version_foreign_key, 'page_id'
   
+  # Object using to format content
   attr_accessor_with_default :formatter do
     Irwi::Formatters::RedCloth.new
   end
   
+  # Object using to compare pages
   attr_accessor_with_default :comparator do
     Irwi::Comparators::DiffLcs.new
   end
   
+  # Object using to paginate collections
+  attr_accessor_with_default :paginator do
+    Irwi::Paginators::None.new
+  end
+  
   def page_class
     page_class_name.constantize
   end
   
-  def page_vrsion_class
+  def page_version_class
     page_version_class_name.constantize
   end
   
@@ -29,4 +36,17 @@ class Irwi::Config
     user_class_name.constantize
   end
   
+  def system_pages
+    @system_pages ||= {
+      'all' => 'all'
+    }
+  end
+  
+  # Add system page
+  # @param action [String,Symbol] controller action
+  # @param path [String] path in routes
+  def add_system_page( action, path )
+    system_pages[ action.to_s ] = path.to_s
+  end
+  
 end

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

@@ -25,6 +25,8 @@ module Irwi::Extensions::Controllers::WikiPages
     def history
       return not_allowed unless history_allowed?
       
+      @versions = Irwi.config.paginator.paginate( @page.versions, :page => params[:page] ) # Paginating them
+      
       render_template( @page.new_record? ? 'no' : 'history' )
     end
     
@@ -34,10 +36,17 @@ module Irwi::Extensions::Controllers::WikiPages
       if @page.new_record?
         render_template 'no'
       else
-        @versions = @page.versions.between( params[:old] || 1, params[:new] || @page.last_version_number ).all # Loading all versions between first and last
+        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
         
-        @new_version = @versions.last # Loading next version
-        @old_version = @versions.first # Loading previous version
+        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
+  
+        @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
@@ -74,6 +83,12 @@ module Irwi::Extensions::Controllers::WikiPages
       redirect_to url_for( :action => :show )
     end
     
+    def all
+      @pages = Irwi.config.paginator.paginate( page_class, :page => params[:page] ) # Loading and paginating all pages
+      
+      render_template 'all'
+    end
+    
     protected
     
     # Retrieves wiki_page_class for this controller
@@ -128,7 +143,7 @@ module Irwi::Extensions::Controllers::WikiPages
     base.send :include, Irwi::Extensions::Controllers::WikiPages::InstanceMethods
     
     base.before_filter :setup_current_user # Setup @current_user instance variable before each action    
-    base.before_filter :setup_page # Setup @page instance variable before each action
+    base.before_filter :setup_page, :only => [ :show, :history, :compare, :edit, :update, :destroy ] # Setup @page instance variable before each action
     
     base.helper_method :show_allowed?, :edit_allowed?, :history_allowed?, :destroy_allowed? # Access control methods are avaliable in views
   end

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

@@ -38,7 +38,7 @@ module Irwi::Extensions::Models::WikiPage
     base.belongs_to :creator, :class_name => Irwi.config.user_class_name
     base.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 ASC'
+    base.has_many :versions, :class_name => Irwi.config.page_version_class_name, :foreign_key => Irwi.config.page_version_foreign_key, :order => 'id DESC'
     
     base.after_save :create_new_version
   end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -7,20 +7,26 @@ module Irwi::Helpers::WikiPagesHelper
     form_for( :page, @page, { :url => url_for( :action => :update ), :html=> { :class => 'wiki_form' } }.merge!( config ), &block )
   end
   
-  def wiki_page_edit_path
-    url_for( :action => :edit )
+  def wiki_page_edit_path( page = nil )
+    wiki_page_path( page, :edit )
   end
     
-  def wiki_page_history_path
-    url_for( :action => :history )
+  def wiki_page_history_path( page = nil )
+    wiki_page_path( page, :history )
   end
   
-  def wiki_page_compare_path
-    url_for( :action => :compare )
+  def wiki_page_compare_path( page = nil )
+    wiki_page_path( page, :compare )
   end
   
-  def wiki_page_path
-    url_for( :action => :show )
+  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 )
@@ -43,6 +49,10 @@ module Irwi::Helpers::WikiPagesHelper
     end
   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 )
@@ -89,7 +99,7 @@ module Irwi::Helpers::WikiPagesHelper
   
   def wiki_page_history(page = nil,versions = nil)
     page ||= @page # By default take page from instance variable
-    versions ||= page.versions
+    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

data/lib/irwi/paginators/none.rb

@@ -0,0 +1,13 @@
+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

data/lib/irwi/paginators/will_paginate.rb

@@ -0,0 +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

data/lib/irwi/support/route_mapper.rb

@@ -6,6 +6,10 @@ module Irwi::Support::RouteMapper
       :controller => 'wiki_pages',
       :root => path
     }.merge(config)
+    
+    Irwi.config.system_pages.each do |page_action, page_path| # Adding routes for system pages
+      connect( "#{path}/#{page_path}", opts.merge({ :action => page_action }) )
+    end
         
     connect( "#{path}/compare/*path", opts.merge({ :action => 'compare' }) ) # Comparing two versions of page
     connect( "#{path}/edit/*path", opts.merge({ :action => 'edit' }) ) # Wiki edit route

data/spec/config_spec.rb

@@ -55,4 +55,14 @@ describe Irwi::Config do
     @o.comparator.should == :diff_lcs_comparator
   end
   
+  specify "should contain 'all' action in system pages" do
+    Irwi.config.system_pages['all'].should == 'all'
+  end
+  
+  specify "should add action in system pages" do
+    Irwi.config.system_pages['custom'].should be_nil
+    Irwi.config.add_system_page :custom, '!custom_page'
+    Irwi.config.system_pages['custom'].should == '!custom_page'
+  end
+  
 end

data/spec/helpers/wiki_pages_helper_spec.rb

@@ -18,6 +18,42 @@ describe Irwi::Helpers::WikiPagesHelper do
     it { @m.should respond_to :wiki_page_compare_path }
     it { @m.should respond_to :wiki_page_path }
     
+    specify "should form url_for by wiki_page_edit_path" do
+      @m.should_receive(:url_for).with(:action => :edit).and_return('epath')
+      
+      @m.wiki_page_edit_path.should == 'epath'
+    end
+    
+    specify "should form url_for by wiki_page_edit_path with path" do
+      @m.should_receive(:url_for).with(:action => :edit, :path => 'qwerty').and_return('epath')
+      
+      @m.wiki_page_edit_path('qwerty').should == 'epath'
+    end
+    
+    specify "should form url_for by wiki_page_history_path" do
+      @m.should_receive(:url_for).with(:action => :history).and_return('hpath')
+      
+      @m.wiki_page_history_path.should == 'hpath'
+    end
+    
+    specify "should form url_for by wiki_page_compare_path" do
+      @m.should_receive(:url_for).with(:action => :compare).and_return('cpath')
+      
+      @m.wiki_page_compare_path.should == 'cpath'
+    end
+    
+    specify "should form url_for by wiki_page_path" do
+      @m.should_receive(:url_for).with(:action => :show).and_return('spath')
+      
+      @m.wiki_page_path.should == 'spath'
+    end
+    
+    specify "should form url_for by wiki_page_path with path" do
+      @m.should_receive(:url_for).with(:action => :show, :path => '123').and_return('spath')
+      
+      @m.wiki_page_path('123').should == 'spath'
+    end
+    
     it { @m.should respond_to :wiki_content }
     it { @m.should respond_to :wiki_diff }
     it { @m.should respond_to :wiki_user }

data/spec/paginators/none_spec.rb

@@ -0,0 +1,24 @@
+require "spec/spec_helper"
+
+describe Irwi::Paginators::None do
+        
+  before(:each) do
+    @p = Irwi::Paginators::None.new
+  end
+     
+  specify "should paginate collection - call find" do
+    coll = mock "Collection"
+    coll.should_receive(:find).with(:all,{}).and_return("full collection")
+    
+    @p.paginate( coll, :page => 10 ).should == "full collection"
+  end
+  
+  specify "should render paginated section" do
+    a = nil
+    @p.paginated_section "view", "collection" do
+      a = true
+    end
+    a.should be_true
+  end
+  
+end

data/spec/paginators/will_paginate_spec.rb

@@ -0,0 +1,28 @@
+require "spec/spec_helper"
+
+describe Irwi::Paginators::WillPaginate do
+  
+  before :all do
+  end
+        
+  before :each do
+    @p = Irwi::Paginators::WillPaginate.new
+  end
+     
+  specify "should paginate collection" do
+    coll = mock "Collection"
+    coll.should_receive(:paginate).with( :page => 15 ).and_return("paginated_collection")
+    
+    @p.paginate( coll, :page => 15 ).should == "paginated_collection"
+  end
+  
+  specify "should render paginated collection" do
+    block = lambda { 11 }
+    coll = []    
+    view = mock "View"
+    view.should_receive(:paginated_section).with( coll, &block ).and_return("result")
+    
+    @p.paginated_section( view, coll, &block ).should == "result"
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 +03:00
+date: 2009-11-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - app/views/base_wiki_pages/_wiki_page_history.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
@@ -76,6 +77,8 @@ files:
 - lib/irwi/formatters/blue_cloth.rb
 - lib/irwi/formatters/red_cloth.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
@@ -84,6 +87,8 @@ files:
 - spec/extensions/controllers/wiki_pages_spec.rb
 - spec/formatters/red_cloth_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
@@ -127,3 +132,5 @@ test_files:
 - spec/extensions/controllers/wiki_pages_spec.rb
 - spec/helpers/wiki_pages_helper_spec.rb
 - spec/spec_helper.rb
+- spec/paginators/will_paginate_spec.rb
+- spec/paginators/none_spec.rb