mediawiki-gateway 0.2.2 → 0.2.3

data/lib/media_wiki.rb

@@ -3,5 +3,5 @@ require File.dirname(__FILE__) + '/media_wiki/utils'
 require File.dirname(__FILE__) + '/media_wiki/gateway'
 
 module MediaWiki
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/media_wiki/gateway.rb

@@ -114,8 +114,12 @@ module MediaWiki
     # Options:
     # * [movesubpages] Move associated subpages
     # * [movetalk] Move associated talkpages
+    # * [noredirect] Do not create a redirect page from old name.  Requires the 'suppressredirect' user right, otherwise MW will silently ignore the option and create the redirect anyway.
+    # * [reason] Reason for move
+    # * [watch] Add page and any redirect to watchlist
+    # * [unwatch] Remove page and any redirect from watchlist
     def move(from, to, options={})
-      valid_options = %w(movesubpages movetalk)
+      valid_options = %w(movesubpages movetalk noredirect reason watch unwatch)
       options.keys.each{|opt| raise ArgumentError.new("Unknown option '#{opt}'") unless valid_options.include?(opt.to_s)}
       
       form_data = options.merge({'action' => 'move', 'from' => from, 'to' => to, 'token' => get_token('move', from)})

data/lib/media_wiki/utils.rb

@@ -24,10 +24,12 @@ module MediaWiki
       title.split('/').last if title
     end
 
-    # Convert URL-ized page name ("getting_there_%26_away") into Wiki display format page name ("getting there & away")
+    # Convert URL-ized page name ("getting_there_%26_away") into Wiki display format page name ("getting there & away").
+    # Also strips out any illegal characters (#<>[]|{}, cf. http://meta.wikimedia.org/wiki/Help:Page_name#Restrictions).
+    #
     # [wiki] Page name string in URL
     def uri_to_wiki(uri)
-      CGI.unescape(uri).tr('_', ' ') if uri
+      CGI.unescape(uri).tr('_', ' ').tr('#<>[]|{}', '') if uri
     end
     
     # Convert a Wiki page name ("getting there & away") to URI-safe format ("getting_there_%26_away"),

data/mediawiki-gateway.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mediawiki-gateway}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jani Patokallio"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2010-12-15}
   s.description = %q{}
   s.email = %q{jpatokal@iki.fi}
   s.extra_rdoc_files = [

data/spec/utils_spec.rb

@@ -68,6 +68,10 @@ describe MediaWiki do
       MediaWiki.uri_to_wiki('Ph%E1%BB%9F').should == 'Phở'
     end
 
+    it "should strip out illegal characters" do
+      MediaWiki.uri_to_wiki('A#B<C>D[E]F|G{H}I').should == 'ABCDEFGHI'
+    end
+    
     it "should pass through nil" do
       MediaWiki.uri_to_wiki(nil).should be_nil
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mediawiki-gateway
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jani Patokallio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +11:00
+date: 2010-12-15 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency