irwi 0.2.3 → 0.2.4

data/README.rdoc

@@ -88,11 +88,20 @@ If you have Rails prior to 2.3 when you should also call:
   
 To generate default wiki views.
 
+== I18n Issues
+
+If you get some weird errors like 
+
+  missing interpolation argument in "%{count} %B %Y, %H:%M"
+
+Please check your Rails and I18n versions, because of incompatibility issue between Rails prior to 2.3.6 and I18n 0.4.x (http://github.com/svenfuchs/i18n/issues/issue/20). If it's your case, consider upgrade of Rails or downgrade of I18n. Big thanks to Tomasz Stachewicz for information ;)
+
 == Contributors
 
 * Alexey Noskov (http://github.com/alno)
 * Ravi Bhim (http://github.com/ravibhim)
-* http://github.com/valodzka
+* Pavel Valodzka (http://github.com/valodzka)
+* Xavier Defrang (http://github.com/xavier)
 
 Feel free to add yourself when you add new features.
 

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/irwi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{irwi}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Noskov", "Ravi Bhim"]
-  s.date = %q{2010-06-24}
+  s.date = %q{2010-09-09}
   s.description = %q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application. }
   s.email = %q{alexey.noskov@gmail.com ravi.bhim@yahoo.com}
   s.extra_rdoc_files = [
@@ -84,7 +84,7 @@ 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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Irwi is Ruby on Rails plugin which adds wiki functionality to your application.}
   s.test_files = [
     "spec/support/route_mapper_spec.rb",
@@ -105,7 +105,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else

data/lib/irwi/helpers/wiki_pages_helper.rb

@@ -39,7 +39,7 @@ module Irwi::Helpers::WikiPagesHelper
   end
   
   def wiki_diff( old_text, new_text )
-    Irwi.config.comparator.render_changes( old_text, new_text )
+    Irwi.config.comparator.render_changes(h(old_text), h(new_text))
   end
   
   def wiki_user( user )
@@ -55,8 +55,8 @@ module Irwi::Helpers::WikiPagesHelper
                \]\]
                (\w+)?/xu do |m|
       text = "#$2#$3"
-      link = $1 || $2
-      "<a href=\"#{wiki_link link}\">#{text}</a>"
+      link, anchor = if $1 then $1.split('#', 2) else $2 end
+      "<a href=\"#{wiki_link link}#{ '#' + anchor if anchor}\">#{text}</a>"
     end
   end
   

data/spec/helpers/wiki_pages_helper_spec.rb

@@ -116,6 +116,12 @@ describe Irwi::Helpers::WikiPagesHelper do
       @m.wiki_linkify( '[[Some other page|Go other page]] - link' ).should == '<a href="url">Go other page</a> - link'
       @m.wiki_linkify( '[[Some other page]]s are there' ).should == '<a href="url">Some other pages</a> are there'
     end
+
+    specify "should linkify with anchors" do
+      @m.should_receive(:wiki_link).once.with('Some other page').and_return('url')
+      
+      @m.wiki_linkify( 'And [[Some other page#other|other page]]' ).should == 'And <a href="url#other">other page</a>'
+    end
     
     specify "should generate link for non-existent page" do
       page_class = mock "WikiPageClass"
@@ -142,6 +148,11 @@ describe Irwi::Helpers::WikiPagesHelper do
       @m.wiki_link( 'Page title' ).should == 'url'
     end
     
+    specify "not be vulnerable to XSS when showing a diff" do
+      xss = '<script>alert("exploit")</script>'  
+      @m.wiki_diff('foo bar', "foo #{xss} bar").should_not include(xss)
+    end
+    
   end
   
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irwi
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 +04:00
+date: 2010-09-09 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
@@ -36,9 +39,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -129,23 +134,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Irwi is Ruby on Rails plugin which adds wiki functionality to your application.