irwi 0.1.11 → 0.2.0

data/README.rdoc

@@ -36,6 +36,14 @@ Also it will add to your <tt>routes.rb</tt> something like:
 
   map.wiki_root '/wiki'
 
+== Wiki syntax (links to other pages)
+
+You can link pages by using
+
+[[Some page title]]
+
+construction in text. If linked page exists, when it will be replaced with link to this page, in other case it will be replaced with link to new page with such path/title.
+
 == Template definition
 
 You may create your own templates for controller actions (<tt>show</tt>, <tt>edit</tt> and <tt>history</tt>), in other case default built-in templates will be used.
@@ -47,9 +55,12 @@ Following helpers are defined by default and you may replace them with you own:
 
 == Configuration
 
-Configuration options are acessed via <tt>Irwi.options</tt> object. Currently supported options:
+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'
-* <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).
+* <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
+  
 * <tt>comparator</tt> - Comparator instance, which builds and renders a set of changes between to texts. By default instance of <tt>Irwi::Comparators::DiffLcs</tt> is used (requires diff-lcs gem).
 
 == Access control

data/Rakefile

@@ -7,9 +7,9 @@ begin
     gem.name = "irwi"
     gem.summary = %Q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application. }
     gem.description = %Q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application. }
-    gem.email = "alexey.noskov@gmail.com"
+    gem.email = "alexey.noskov@gmail.com ravi.bhim@yahoo.com"
     gem.homepage = "http://github.com/alno/irwi"
-    gem.authors = ["Alexey Noskov"]
+    gem.authors = ["Alexey Noskov", "Ravi Bhim"]
     gem.add_dependency "diff-lcs", ">= 1.1.2"
     gem.add_development_dependency "rspec", ">= 1.2.9"
   end

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.2.0

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

@@ -5,10 +5,22 @@
 <% wiki_page_form do |f| %>
   <%= f.hidden_field :previous_version_number, :value => f.object.last_version_number %>
   
-  <p><%=wt 'Path:' %><br/><%= f.text_field :path %></p>
   <p><%=wt 'Title:' %><br /><%= f.text_field :title %></p>
   <p><%=wt 'Content:' %><br /><%= f.text_area :content %></p>
-  <p><%=wt 'Comment:' %><br /><%= f.text_field :comment %></p>
+  <p><%=wt 'Comment on this change (optional):' %><br /><%= f.text_field :comment %></p>
   
   <input type="submit" value="<%=wt 'Save page' %>" class="submit" />
-<% end %>
+<% end %>
+
+
+<%- @page.attachments.each do |attachment| %>
+  <%= image_tag attachment.wiki_page_attachment.url(:thumb) %>
+  <%= "Attachment_#{attachment.id}" %>
+  <%= 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), :html => { :multipart => true } do |form| %>
+  <%= form.file_field :wiki_page_attachment %>
+  <%= form.hidden_field :page_id, :value => @page.id %>
+  <%= form.submit 'Add Attachment' %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<%= wiki_page_style %>
+
+<h1><%=wt 'Creating a new wiki page' %></h1>
+
+<% 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'%>
+
+  <input type="submit" value="<%=wt 'Create page' %>" class="submit" />
+<% end %>

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

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

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

@@ -7,4 +7,5 @@
   
 <div class="wiki_content">
   <%=wiki_content @page.content %>
-</div>
+</div>
+

data/generators/irwi_wiki_updates/irwi_wiki_updates_generator.rb

@@ -0,0 +1,18 @@
+class IrwiWikiUpdatesGenerator < Rails::Generator::Base
+  
+  def manifest
+    record do |m|
+      %w[create_wiki_page_attachments].each do |mig|
+        unless Dir.entries(File.join(Rails.root,'db','migrate')).grep(/#{mig}/).present?
+          puts "Copying migration #{mig}"
+          m.migration_template "migrate/#{mig}.rb", 'db/migrate', :migration_file_name => mig
+          sleep(1) # To avoid migration file version collision.
+        end
+      end
+      
+      # Models
+      m.file 'models/wiki_page_attachment.rb', 'app/models/wiki_page_attachment.rb'
+    end
+  end
+  
+end

data/generators/irwi_wiki_updates/templates/migrate/create_wiki_page_attachments.rb

@@ -0,0 +1,19 @@
+class CreateWikiPageAttachments < ActiveRecord::Migration
+
+  def self.up
+    create_table :wiki_page_attachments do |t|
+      t.integer :page_id, :null => false # Reference to page      
+      t.string   :wiki_page_attachment_file_name
+      t.string   :wiki_page_attachment_content_type
+      t.integer  :wiki_page_attachment_file_size
+          
+      t.timestamps
+    end
+    
+  end
+  
+  def self.down
+    drop_table :wiki_page_attachments
+  end
+  
+end

data/generators/irwi_wiki_updates/templates/models/wiki_page_attachment.rb

@@ -0,0 +1,9 @@
+require 'paperclip'
+
+class WikiPageAttachment < ActiveRecord::Base
+  acts_as_wiki_page_attachment do
+    has_attached_file :wiki_page_attachment, :styles => { :medium => "300x300>", :thumb => "100x100>" }
+    validates_attachment_presence :wiki_page_attachment, :message => " is missing."
+    validates_attachment_content_type :wiki_page_attachment, :content_type => ['image/jpeg','image/jpg','image/png','image/x-png','image/gif','image/pjpeg'], :message => ' must be a JPEG, PNG or GIF.'
+  end
+end

data/irwi.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{irwi}
-  s.version = "0.1.11"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexey Noskov"]
-  s.date = %q{2009-12-05}
+  s.authors = ["Alexey Noskov", "Ravi Bhim"]
+  s.date = %q{2010-06-14}
   s.description = %q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application. }
-  s.email = %q{alexey.noskov@gmail.com}
+  s.email = %q{alexey.noskov@gmail.com ravi.bhim@yahoo.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "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",
@@ -39,6 +40,10 @@ Gem::Specification.new do |s|
      "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_updates/irwi_wiki_updates_generator.rb",
+     "generators/irwi_wiki_updates/templates/migrate/create_wiki_page_attachments.rb",
+     "generators/irwi_wiki_updates/templates/migrate/touched_file.txt",
+     "generators/irwi_wiki_updates/templates/models/wiki_page_attachment.rb",
      "generators/irwi_wiki_views/irwi_wiki_views_generator.rb",
      "irwi.gemspec",
      "lib/irwi.rb",
@@ -47,11 +52,14 @@ Gem::Specification.new do |s|
      "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/extensions/controllers/wiki_pages.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/helpers/wiki_page_attachments_helper.rb",
      "lib/irwi/helpers/wiki_pages_helper.rb",
      "lib/irwi/paginators/none.rb",
      "lib/irwi/paginators/will_paginate.rb",
@@ -62,6 +70,7 @@ Gem::Specification.new do |s|
      "spec/config_spec.rb",
      "spec/extensions/controllers/wiki_pages_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",
@@ -75,19 +84,20 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/alno/irwi}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application.}
   s.test_files = [
-    "spec/comparators/diff_lcs_spec.rb",
+    "spec/support/route_mapper_spec.rb",
      "spec/support/template_finder_spec.rb",
-     "spec/support/route_mapper_spec.rb",
-     "spec/config_spec.rb",
-     "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/comparators/diff_lcs_spec.rb",
+     "spec/extensions/controllers/wiki_pages_spec.rb",
+     "spec/config_spec.rb",
      "spec/paginators/will_paginate_spec.rb",
-     "spec/paginators/none_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"
   ]
 
   if s.respond_to? :specification_version then

data/lib/irwi/config.rb

@@ -6,6 +6,7 @@ class Irwi::Config
   
   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, 'WikiPageAttachment'  
   
   attr_accessor_with_default :page_version_foreign_key, 'page_id'
   
@@ -38,6 +39,10 @@ class Irwi::Config
     page_version_class_name.constantize
   end
   
+  def page_attachment_class
+    page_attachment_class_name.constantize
+  end
+  
   def user_class
     user_class_name.constantize
   end

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

@@ -0,0 +1,21 @@
+module Irwi::Extensions::Controllers::WikiPageAttachments
+
+  def add_attachment
+    attachment = page_attachment_class.new(params[:wiki_page_attachment])
+    attachment.save
+    redirect_to url_for( :action => :edit)
+  end
+
+  def remove_attachment
+    attachment = page_attachment_class.find(params[:attachment_id])
+    attachment.destroy
+    redirect_to url_for(:path => attachment.page.path, :action => :edit)
+  end
+
+  protected
+
+  def page_attachment_class
+    Irwi.config.page_attachment_class
+  end
+
+end

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

@@ -14,6 +14,7 @@ module Irwi::Extensions::Controllers::WikiPages
   
   module InstanceMethods
     
+    include Irwi::Extensions::Controllers::WikiPageAttachments
     include Irwi::Support::TemplateFinder
     
     def show
@@ -52,6 +53,12 @@ module Irwi::Extensions::Controllers::WikiPages
       end
     end
     
+    def new
+      return not_allowed unless show_allowed? && edit_allowed?
+      
+      render_template 'new'
+    end
+    
     def edit
       return not_allowed unless show_allowed? && edit_allowed?
       
@@ -62,6 +69,7 @@ module Irwi::Extensions::Controllers::WikiPages
       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
+      @page.comment = params[:page][:comment]
       
       return not_allowed unless edit_allowed? # Double check: used beacause action may become invalid after attributes update
         
@@ -142,9 +150,9 @@ module Irwi::Extensions::Controllers::WikiPages
     base.send :extend, Irwi::Extensions::Controllers::WikiPages::ClassMethods
     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, :only => [ :show, :history, :compare, :edit, :update, :destroy ] # Setup @page 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
   end
   

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

@@ -23,6 +23,7 @@ module Irwi::Extensions::Models::WikiPage
       
       v = versions.build
       v.attributes = attributes.slice( *v.attribute_names )
+      v.comment = comment
       v.number = n + 1
       v.save!
     end
@@ -39,6 +40,7 @@ module Irwi::Extensions::Models::WikiPage
     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 DESC'
+    base.has_many :attachments, :class_name => Irwi.config.page_attachment_class_name, :foreign_key => Irwi.config.page_version_foreign_key
     
     base.after_save :create_new_version
   end

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

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

data/lib/irwi/helpers/wiki_page_attachments_helper.rb

@@ -0,0 +1,23 @@
+module Irwi::Helpers::WikiPageAttachmentsHelper
+
+  def wiki_add_page_attachment_path(page)
+    page = page.path if page.respond_to? :path
+    url_for(:action => 'add_attachment', :path => page)
+  end
+
+  def wiki_remove_page_attachment_path(attachment_id)
+    url_for(:action => 'remove_attachment', :attachment_id => attachment_id)
+  end
+
+  def wiki_show_attachments(str)
+    str.gsub /Attachment_([\d]+)_([\w]+)/ do |m|
+      begin
+        attachment = Irwi.config.page_attachment_class.find($1)
+        image_tag attachment.wiki_page_attachment.url($2.to_sym), :class => 'wiki_page_attachment'
+      rescue ActiveRecord::RecordNotFound
+        nil
+      end
+    end
+  end
+  
+end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -1,12 +1,17 @@
 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
@@ -30,7 +35,7 @@ module Irwi::Helpers::WikiPagesHelper
   end
   
   def wiki_content( text )
-    sanitize( auto_link( Irwi.config.formatter.format( wiki_linkify( text ) ) ) )
+    sanitize( auto_link( Irwi.config.formatter.format( wiki_linkify( wiki_show_attachments(text) ) ) ) )
   end
   
   def wiki_diff( old_text, new_text )
@@ -104,4 +109,4 @@ 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
     
-end
+end

data/lib/irwi/support/route_mapper.rb

@@ -1,23 +1,30 @@
 module Irwi::Support::RouteMapper
   
   # Defining wiki root mount point
-  def wiki_root( path, config = {} )
+  def wiki_root( root, config = {} )
     opts = {
       :controller => 'wiki_pages',
-      :root => path
+      :root => root
     }.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 }) )
+      connect( "#{root}/#{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
-    connect( "#{path}/history/*path", opts.merge({ :action => 'history' }) ) # Wiki history route
+    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
     
-    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
+    # 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
   end
   
 end

data/rails/init.rb

@@ -7,16 +7,19 @@ end
 
 ActiveRecord::Base.instance_eval do
   
-  # 
   def acts_as_wiki_page( config = {} )
     include Irwi::Extensions::Models::WikiPage
   end
   
-  # 
   def acts_as_wiki_page_version( config = {} )
     include Irwi::Extensions::Models::WikiPageVersion
   end
   
+  def acts_as_wiki_page_attachment
+    include Irwi::Extensions::Models::WikiPageAttachment
+    yield if block_given?
+  end
+  
 end
 
 ActionController::Base.instance_eval do

data/spec/extensions/controllers/wiki_pages_spec.rb

@@ -25,8 +25,8 @@ describe Irwi::Extensions::Controllers::WikiPages do
   
   context "class" do    
     
-    it { @cls.should respond_to :set_page_class }
-    it { @cls.should respond_to :page_class }
+    it { @cls.should respond_to(:set_page_class) }
+    it { @cls.should respond_to(:page_class) }
     
     specify "should have WikiPage as default page_class" do
       @cls.page_class.should == WikiPage
@@ -40,22 +40,23 @@ describe Irwi::Extensions::Controllers::WikiPages do
       @obj = @cls.new
     end
     
-    it { @obj.should respond_to :page_class }
+    it { @obj.should respond_to(:page_class) }
     
     specify "should have WikiPage as default page_class" do
       @obj.send(:page_class).should == WikiPage
     end
 
-    it { @obj.should respond_to :render_template }
-    it { @obj.should respond_to :setup_current_user }
-    it { @obj.should respond_to :setup_page }
+    it { @obj.should respond_to(:render_template) }
+    it { @obj.should respond_to(:setup_current_user) }
+    it { @obj.should respond_to(:setup_page) }
 
-    it { @obj.should respond_to :show }
-    it { @obj.should respond_to :edit }
-    it { @obj.should respond_to :update }
-    it { @obj.should respond_to :history }
-    it { @obj.should respond_to :compare }
-    it { @obj.should respond_to :destroy }
+    it { @obj.should respond_to(:show) }
+    it { @obj.should respond_to(:new) }
+    it { @obj.should respond_to(:edit) }
+    it { @obj.should respond_to(:update) }
+    it { @obj.should respond_to(:history) }
+    it { @obj.should respond_to(:compare) }
+    it { @obj.should respond_to(:destroy) }
     
     specify "should correctly handle current_user" do            
       @obj.send(:setup_current_user)

data/spec/helpers/wiki_page_attachments_helper_spec.rb

@@ -0,0 +1,48 @@
+require "spec/spec_helper"
+
+describe Irwi::Helpers::WikiPageAttachmentsHelper do
+  
+  it { should_not be_nil }
+  
+  context "included in class" do
+    
+    before(:each) do
+      @m = Object.new
+      @m.send :extend, Irwi::Helpers::WikiPagesHelper
+    end
+    
+    describe :wiki_show_attachment do
+      before do
+        class WikiPageAttachment; end
+        module ActiveRecord
+          class RecordNotFound < StandardError
+          end
+        end
+      end
+
+      it 'replaces Attachment_1_thumb with its corresponding image tag' do
+        paperclip_attachment = mock('paperclip attachment')
+        attachment = mock(WikiPageAttachment, :wiki_page_attachment => paperclip_attachment)
+
+        WikiPageAttachment.should_receive(:find).with('1').and_return(attachment)
+        paperclip_attachment.should_receive(:url).with(:thumb).and_return(:thumb_image)
+        @m.should_receive(:image_tag).with(:thumb_image, :class => 'wiki_page_attachment').and_return('thumb_image_markup')
+
+        @m.wiki_show_attachments('Foo Attachment_1_thumb Bar').should == 'Foo thumb_image_markup Bar'
+      end
+
+      it 'does not affect text without attachments' do
+        @m.wiki_show_attachments('Foo Bar').should == 'Foo Bar'
+      end
+
+      it 'ignores absent attachments' do
+        paperclip_attachment = mock('paperclip attachment')
+        attachment = mock(WikiPageAttachment, :wiki_page_attachment => paperclip_attachment)
+        WikiPageAttachment.should_receive(:find).with('10').and_raise(ActiveRecord::RecordNotFound)
+
+        @m.wiki_show_attachments('Foo Attachment_10_thumb Bar').should == 'Foo  Bar'
+      end
+    end  
+    
+  end
+end

data/spec/helpers/wiki_pages_helper_spec.rb

@@ -11,12 +11,12 @@ describe Irwi::Helpers::WikiPagesHelper do
       @m.send :extend, Irwi::Helpers::WikiPagesHelper
     end
     
-    it { @m.should respond_to :wiki_page_form }
+    it { @m.should respond_to(:wiki_page_form) }
     
-    it { @m.should respond_to :wiki_page_edit_path }
-    it { @m.should respond_to :wiki_page_history_path }
-    it { @m.should respond_to :wiki_page_compare_path }
-    it { @m.should respond_to :wiki_page_path }
+    it { @m.should respond_to(:wiki_page_edit_path) }
+    it { @m.should respond_to(:wiki_page_history_path) }
+    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')
@@ -54,19 +54,19 @@ describe Irwi::Helpers::WikiPagesHelper do
       @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 }
+    it { @m.should respond_to(:wiki_content) }
+    it { @m.should respond_to(:wiki_diff) }
+    it { @m.should respond_to(:wiki_user) }
     
-    it { @m.should respond_to :wiki_page_info }
-    it { @m.should respond_to :wiki_page_actions }
-    it { @m.should respond_to :wiki_page_history }    
-    it { @m.should respond_to :wiki_page_style }
+    it { @m.should respond_to(:wiki_page_info) }
+    it { @m.should respond_to(:wiki_page_actions) }
+    it { @m.should respond_to(:wiki_page_history) }    
+    it { @m.should respond_to(:wiki_page_style) }
     
-    it { @m.should respond_to :wiki_link }
-    it { @m.should respond_to :wiki_linkify }
+    it { @m.should respond_to(:wiki_link) }
+    it { @m.should respond_to(:wiki_linkify) }
     
-    it { @m.should respond_to :wt }
+    it { @m.should respond_to(:wt) }
     
     specify "should format and sanitize content with current formatter and #sanitize" do      
       Irwi.config.formatter = mock 'Formatter'
@@ -143,4 +143,4 @@ describe Irwi::Helpers::WikiPagesHelper do
     
   end
   
-end
+end

data/spec/support/route_mapper_spec.rb

@@ -1,4 +1,5 @@
 require "spec/spec_helper"
+require 'action_controller'
 
 describe Irwi::Support::RouteMapper do
   
@@ -12,9 +13,54 @@ describe Irwi::Support::RouteMapper do
     end
     
     specify "should provide wiki_root method" do 
-      @m.should respond_to :wiki_root 
+      @m.should respond_to(:wiki_root) 
     end
     
   end
+
+  describe 'wiki routes' do
+    before do
+      @set = ActionController::Routing::RouteSet.new
+      @mapper = ActionController::Routing::RouteSet::Mapper.new(@set)
+
+      ActionController::Routing::RouteSet::Mapper.instance_eval do
+        include Irwi::Support::RouteMapper
+      end
+      @mapper.wiki_root('/wiki')
+    end
+
+    def check_route path, params = {}
+      @set.generate(params).should == path
+      @set.recognize_path(path).should == params
+    end
+
+    it 'has a route of listing all the wikis' do
+      check_route '/wiki/all', :controller => 'wiki_pages', :action => 'all', :root => '/wiki'
+    end
+
+    %w[compare new edit history].each do |act| 
+      it "has a route for #{act} wiki" do
+        check_route "/wiki/#{act}/wiki_path", :controller => 'wiki_pages', :action => act, :root => '/wiki', :path => ['wiki_path']
+      end
+    end
+
+    # Unable to perform the recognize path test because of conditions. If you can , write it.
+    %w[show update destroy].each do |act|
+      it "has a route for #{act} wiki" do
+        @set.generate({:controller => 'wiki_pages', :action => act, :root => '/wiki', :path => ['wiki_path']}).should == '/wiki/wiki_path'
+      end
+    end
+
+    describe 'attachment routes' do
+      it 'has a route for adding an attachment' do
+        @set.generate({:controller => 'wiki_pages', :action => 'add_attachment', :root => '/wiki', :path => ['wiki_path']}).should == '/wiki/attach/wiki_path'
+      end
+
+      it 'has a route for deleting an attachment' do
+        @set.generate({:controller => 'wiki_pages', :action => 'remove_attachment', :root => '/wiki', :attachment_id => 1}).should == '/wiki/attach/1'
+      end
+    end
+
+  end
   
-end
+end

data/spec/support/template_finder_spec.rb

@@ -13,7 +13,7 @@ describe Irwi::Support::TemplateFinder do
     end
     
     specify "should provide template_dir method" do 
-      @m.should respond_to :template_dir
+      @m.should respond_to(:template_dir)
     end
     
     specify "should select template at controller_path when exists" do 

metadata

@@ -1,39 +1,53 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexey Noskov
+- Ravi Bhim
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 +03:00
+date: 2010-06-14 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "Irwi is Ruby on Rails plugin which adds wiki functionality to your application. "
-email: alexey.noskov@gmail.com
+email: alexey.noskov@gmail.com ravi.bhim@yahoo.com
 executables: []
 
 extensions: []
@@ -55,6 +69,7 @@ files:
 - 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
@@ -64,6 +79,10 @@ files:
 - 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_updates/irwi_wiki_updates_generator.rb
+- generators/irwi_wiki_updates/templates/migrate/create_wiki_page_attachments.rb
+- generators/irwi_wiki_updates/templates/migrate/touched_file.txt
+- generators/irwi_wiki_updates/templates/models/wiki_page_attachment.rb
 - generators/irwi_wiki_views/irwi_wiki_views_generator.rb
 - irwi.gemspec
 - lib/irwi.rb
@@ -72,11 +91,14 @@ files:
 - 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/extensions/controllers/wiki_pages.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/helpers/wiki_page_attachments_helper.rb
 - lib/irwi/helpers/wiki_pages_helper.rb
 - lib/irwi/paginators/none.rb
 - lib/irwi/paginators/will_paginate.rb
@@ -87,6 +109,7 @@ files:
 - spec/config_spec.rb
 - spec/extensions/controllers/wiki_pages_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
@@ -109,29 +132,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.
 test_files: 
-- spec/comparators/diff_lcs_spec.rb
-- spec/support/template_finder_spec.rb
 - spec/support/route_mapper_spec.rb
-- spec/config_spec.rb
-- spec/formatters/red_cloth_spec.rb
-- spec/extensions/controllers/wiki_pages_spec.rb
-- spec/helpers/wiki_pages_helper_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/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