irwi 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/irwi.gemspec

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

@@ -88,7 +88,7 @@ module Irwi::Extensions::Controllers::WikiPages
     
     # Initialize @current_user instance variable
     def setup_current_user
-      @current_user = respond_to?( :current_user ) ? current_user : nil # Find user by current_user method or return nil
+      @current_user = respond_to?( :current_user, true ) ? current_user : nil # Find user by current_user method or return nil
     end
     
     # Initialize @page instance variable

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -24,7 +24,7 @@ module Irwi::Helpers::WikiPagesHelper
   end
   
   def wiki_content( text )
-    sanitize( wiki_linkify( Irwi.config.formatter.format( text ) ) )
+    sanitize( wiki_linkify( auto_link( Irwi.config.formatter.format( text ) ) ) )
   end
   
   def wiki_diff( old_text, new_text )

data/spec/extensions/controllers/wiki_pages_spec.rb

@@ -6,7 +6,15 @@ describe Irwi::Extensions::Controllers::WikiPages do
   
   class WikiPage; end
   class WikiPagesController < ActionController::Base
-    include Irwi::Extensions::Controllers::WikiPages
+    include Irwi::Extensions::Controllers::WikiPages   
+        
+    private
+        
+    def current_user
+      return @current_user if defined?(@current_user)
+      @current_user = 'Some user'
+    end
+    
   end
   
   it { should_not be_nil }
@@ -48,6 +56,12 @@ describe Irwi::Extensions::Controllers::WikiPages do
     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)
+      @obj.send(:current_user).should == 'Some user'
+      @obj.instance_variable_get(:@current_user).should == 'Some user'      
+    end
                 
   end
   

data/spec/helpers/wiki_pages_helper_spec.rb

@@ -36,9 +36,10 @@ describe Irwi::Helpers::WikiPagesHelper do
       Irwi.config.formatter = mock 'Formatter'
       Irwi.config.formatter.should_receive(:format).with('Page content').and_return('Formatted content')
       
-      @m.should_receive(:sanitize).with('Formatted content').and_return('Formatted and sanitized content')
+      @m.should_receive(:auto_link).with('Formatted content').and_return('Formatted content with links')
+      @m.should_receive(:sanitize).with('Formatted content with links').and_return('Formatted and sanitized content with links')
       
-      @m.wiki_content( 'Page content' ).should == 'Formatted and sanitized content'
+      @m.wiki_content( 'Page content' ).should == 'Formatted and sanitized content with links'
     end
     
     specify "should render wiki_page_info partial" do

metadata

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