irwi 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/irwi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{irwi}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Noskov"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
      "spec/comparators/diff_lcs_spec.rb",
      "spec/config_spec.rb",
      "spec/extensions/controllers/wiki_pages_spec.rb",
+     "spec/formatters/red_cloth_spec.rb",
      "spec/helpers/wiki_pages_helper_spec.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
@@ -75,6 +76,7 @@ Gem::Specification.new do |s|
      "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"

data/lib/irwi/config.rb

@@ -1,5 +1,7 @@
 class Irwi::Config
   
+  attr_accessor_with_default :controller_name, 'wiki_pages'
+  
   attr_accessor_with_default :user_class_name, 'User'
   
   attr_accessor_with_default :page_class_name, 'WikiPage'
@@ -15,4 +17,16 @@ class Irwi::Config
     Irwi::Comparators::DiffLcs.new
   end
   
+  def page_class
+    page_class_name.constantize
+  end
+  
+  def page_vrsion_class
+    page_version_class_name.constantize
+  end
+  
+  def user_class
+    user_class_name.constantize
+  end
+  
 end

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

@@ -3,7 +3,7 @@ module Irwi::Extensions::Controllers::WikiPages
   module ClassMethods
     
     def page_class
-      @page_class ||= Irwi.config.page_class_name.constantize
+      @page_class ||= Irwi.config.page_class
     end
     
     def set_page_class(arg)

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

@@ -3,7 +3,7 @@ module Irwi::Extensions::Models::WikiPage
   module ClassMethods
     
     def find_by_path_or_new( path )
-      self.find_by_path( path ) || self.new( :path => path )
+      self.find_by_path( path ) || self.new( :path => path, :title => path )
     end
     
   end

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -24,7 +24,7 @@ module Irwi::Helpers::WikiPagesHelper
   end
   
   def wiki_content( text )
-    sanitize( Irwi.config.formatter.format( text ) )
+    sanitize( wiki_linkify( Irwi.config.formatter.format( text ) ) )
   end
   
   def wiki_diff( old_text, new_text )
@@ -32,11 +32,25 @@ module Irwi::Helpers::WikiPagesHelper
   end
   
   def wiki_user( user )
-    return '<Unknown>' if user.nil?
+    return '<Unknown>' unless user
     
     "User##{user.id}"
   end
   
+  def wiki_linkify( str )
+    str.gsub /\[\[([^\[\]]+)\]\]/ do |m|
+      "<a href=\"#{wiki_link $1}\">#{$1}</a>"
+    end
+  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 )
+    else
+      url_for( :controller => Irwi.config.controller_name, :action => :show, :path => title )
+    end
+  end
+  
   ##
   # Instead of having to translate strings and defining a default value:
   #

data/spec/formatters/red_cloth_spec.rb

@@ -0,0 +1,17 @@
+require "spec/spec_helper"
+
+describe Irwi::Formatters::RedCloth do
+        
+  before(:each) do
+    @f = Irwi::Formatters::RedCloth.new
+  end
+     
+  specify "should proces bold text" do
+    @f.format('*Place* ff').should == '<p><strong>Place</strong> ff</p>'
+  end
+  
+  specify "should proces italic text" do
+    @f.format('_Mom_ ff').should == '<p><em>Mom</em> ff</p>'
+  end
+  
+end

data/spec/helpers/wiki_pages_helper_spec.rb

@@ -27,6 +27,9 @@ describe Irwi::Helpers::WikiPagesHelper do
     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 :wt }
     
     specify "should format and sanitize content with current formatter and #sanitize" do      
@@ -69,6 +72,38 @@ describe Irwi::Helpers::WikiPagesHelper do
       @m.wiki_page_history( page ).should == 'partial_body'
     end
     
+    specify "should linkify string" do
+      
+      @m.should_receive(:wiki_link).with('Some other page').and_return('url')
+      
+      @m.wiki_linkify( '[[Some other page]] - link' ).should == '<a href="url">Some other page</a> - link'
+    end
+    
+    specify "should generate link for non-existent page" do
+      page_class = mock "WikiPageClass"
+      page_class.should_receive(:find_by_title).with('Page title').and_return(nil)
+      
+      Irwi.config.should_receive(:page_class).and_return(page_class)
+      
+      @m.should_receive(:url_for).with( :controller => 'wiki_pages', :action => :show, :path => 'Page title' ).and_return('url')
+      
+      @m.wiki_link( 'Page title' ).should == 'url'
+    end
+    
+    specify "should generate link for existent page" do
+      page = mock "WikiPage"
+      page.should_receive(:path).and_return('page_path')
+      
+      page_class = mock "WikiPageClass"
+      page_class.should_receive(:find_by_title).with('Page title').and_return(page)
+      
+      Irwi.config.should_receive(:page_class).and_return(page_class)
+      
+      @m.should_receive(:url_for).with( :controller => 'wiki_pages', :action => :show, :path => 'page_path' ).and_return('url')
+      
+      @m.wiki_link( 'Page title' ).should == 'url'
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -82,6 +82,7 @@ files:
 - spec/comparators/diff_lcs_spec.rb
 - spec/config_spec.rb
 - spec/extensions/controllers/wiki_pages_spec.rb
+- spec/formatters/red_cloth_spec.rb
 - spec/helpers/wiki_pages_helper_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
@@ -122,6 +123,7 @@ test_files:
 - 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