irwi 0.1.0 → 0.1.1

data/README.rdoc

@@ -4,7 +4,20 @@ Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
 
 == Installation
 
-In your application directory call:
+Setup gemcutter as gem source:
+
+  sudo gem install gemcutter
+  gem tumble
+  
+And install irwi gem (recommended):
+
+  sudo gem install irwi
+  
+And add to your environment.rb:
+ 
+  config.gem "irwi", :source => "http://gemcutter.org"
+
+Or in your application directory call:
 
   script/plugin install git://github.com/alno/irwi
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

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

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

data/irwi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{irwi}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Noskov"]
-  s.date = %q{2009-10-25}
+  s.date = %q{2009-10-26}
   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 = [

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

@@ -23,13 +23,13 @@ module Irwi::Extensions::Controllers::WikiPages
     end
     
     def history
-      return not_allowed unless show_allowed? && history_allowed?
+      return not_allowed unless history_allowed?
       
       render_template( @page.new_record? ? 'no' : 'history' )
     end
     
     def compare
-      return not_allowed unless show_allowed? && history_allowed?
+      return not_allowed unless history_allowed?
       
       if @page.new_record?
         render_template 'no'
@@ -50,11 +50,11 @@ module Irwi::Extensions::Controllers::WikiPages
     end
     
     def update
-      return not_allowed unless @page.new_record? || ( show_allowed? && edit_allowed? ) # Check for rights (but not for new record, for it we will use second check only)
+      return not_allowed unless @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
       
-      return not_allowed unless show_allowed? && 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
@@ -66,6 +66,14 @@ module Irwi::Extensions::Controllers::WikiPages
       end
     end
     
+    def destroy
+      return not_allowed unless destroy_allowed?
+      
+      @page.destroy
+      
+      redirect_to url_for( :action => :show )
+    end
+    
     protected
     
     # Retrieves wiki_page_class for this controller
@@ -100,12 +108,17 @@ module Irwi::Extensions::Controllers::WikiPages
 
     # Check is it allowed for current user see current page history. Designed to be redefined by application programmer
     def history_allowed?
-      true
+      show_allowed?
     end
     
     # Check is it allowed for current user edit current page. Designed to be redefined by application programmer
     def edit_allowed?
-      true
+      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
     
   end
@@ -117,7 +130,7 @@ module Irwi::Extensions::Controllers::WikiPages
     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.helper_method :show_allowed?, :edit_allowed?, :history_allowed? # Access control methods are avaliable in views
+    base.helper_method :show_allowed?, :edit_allowed?, :history_allowed?, :destroy_allowed? # Access control methods are avaliable in views
   end
   
 end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -10,7 +10,7 @@ module Irwi::Helpers::WikiPagesHelper
   def wiki_page_edit_path
     url_for( :action => :edit )
   end
-  
+    
   def wiki_page_history_path
     url_for( :action => :history )
   end

data/lib/irwi/support/route_mapper.rb

@@ -10,6 +10,8 @@ module Irwi::Support::RouteMapper
     connect( "#{path}/compare/*path", opts.merge({ :action => 'compare' }) ) # Comparing two versions of page
     connect( "#{path}/edit/*path", opts.merge({ :action => 'edit' }) ) # Wiki edit route
     connect( "#{path}/history/*path", opts.merge({ :action => 'history' }) ) # Wiki history route
+    
+    connect( "#{path}/*path", opts.merge({ :action => 'destroy', :conditions => { :method => :delete } }) ) # Wiki destroy route
     connect( "#{path}/*path", opts.merge({ :action => 'update', :conditions => { :method => :post } }) ) # Save wiki pages route
     connect( "#{path}/*path", opts.merge({ :action => 'show', :conditions => { :method => :get } }) ) # Wiki pages route
   end

data/spec/extensions/controllers/wiki_pages_spec.rb

@@ -47,6 +47,7 @@ describe Irwi::Extensions::Controllers::WikiPages do
     it { @obj.should respond_to :update }
     it { @obj.should respond_to :history }
     it { @obj.should respond_to :compare }
+    it { @obj.should respond_to :destroy }
                 
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 +04:00
+date: 2009-10-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency