mediawiki-gateway 0.3.8 → 0.4.1

data/lib/media_wiki/utils.rb

@@ -1,6 +1,4 @@
 module MediaWiki
-  require 'activesupport'
-
   class << self
 
     # Extract base name.  If there are no subpages, return page name.
@@ -49,7 +47,7 @@ module MediaWiki
     # taking care not to mangle slashes or colons
     # [wiki] Page name string in Wiki format
     def wiki_to_uri(wiki)
-      wiki.to_s.split('/').map {|chunk| CGI.escape(chunk.tr(' ', '_')) }.join('/').gsub('%3A', ':') if wiki
+      wiki.to_s.split('/').map {|chunk| CGI.escape(CGI.unescape(chunk).tr(' ', '_')) }.join('/').gsub('%3A', ':') if wiki
     end
 
     # Return current version of MediaWiki::Gateway

data/mediawiki-gateway.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mediawiki-gateway}
-  s.version = "0.3.8"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jani Patokallio"]
-  s.date = %q{2011-04-14}
+  s.date = %q{2011-05-18}
   s.description = %q{}
   s.email = %q{jpatokal@iki.fi}
   s.extra_rdoc_files = [
@@ -20,11 +20,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "config/hosts.yml",
     "doc/classes/MediaWiki.html",
+    "doc/classes/MediaWiki/APIError.html",
     "doc/classes/MediaWiki/Config.html",
+    "doc/classes/MediaWiki/Exception.html",
     "doc/classes/MediaWiki/Gateway.html",
+    "doc/classes/MediaWiki/Unauthorized.html",
     "doc/created.rid",
     "doc/files/README.html",
     "doc/files/lib/media_wiki/config_rb.html",
+    "doc/files/lib/media_wiki/exception_rb.html",
     "doc/files/lib/media_wiki/gateway_rb.html",
     "doc/files/lib/media_wiki/utils_rb.html",
     "doc/files/script/create_page_rb.html",
@@ -43,6 +47,7 @@ Gem::Specification.new do |s|
     "doc/rdoc-style.css",
     "lib/media_wiki.rb",
     "lib/media_wiki/config.rb",
+    "lib/media_wiki/exception.rb",
     "lib/media_wiki/gateway.rb",
     "lib/media_wiki/utils.rb",
     "mediawiki-gateway.gemspec",

data/spec/gateway_spec.rb

@@ -44,7 +44,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.login('bogususer', 'sekrit')
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::Unauthorized)
       end
   
     end
@@ -54,7 +54,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.login('atlasmw', 'sekrit')
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::Unauthorized)
       end
   
     end
@@ -64,7 +64,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.login('atlasmw', 'wombat', 'bogusdomain')
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::Unauthorized)
       end
   
     end
@@ -93,7 +93,7 @@ describe MediaWiki::Gateway do
         it "should raise an error" do
           lambda do
             @gateway.send(:get_token, 'import', 'Main Page')
-          end.should raise_error(StandardError)
+          end.should raise_error(MediaWiki::Unauthorized)
         end
         
       end
@@ -350,7 +350,7 @@ describe MediaWiki::Gateway do
         it "should raise an error" do
           lambda do
             @gateway.create("Main Page", "Some new content")
-          end.should raise_error(StandardError)
+          end.should raise_error(MediaWiki::APIError)
         end
         
       end
@@ -440,7 +440,7 @@ describe MediaWiki::Gateway do
         it "should raise an error" do
           lambda do
             @gateway.delete("Missing Page")
-          end.should raise_error(StandardError)
+          end.should raise_error(MediaWiki::APIError)
         end
       end
     end
@@ -454,7 +454,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.delete("Deletable Page")
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::Unauthorized)
       end
 
     end
@@ -499,7 +499,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.undelete("Undeletable Page")
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::APIError)
       end
 
     end
@@ -565,7 +565,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.search("")
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::APIError)
       end
    
     end
@@ -644,7 +644,7 @@ describe MediaWiki::Gateway do
       it "should raise an error" do
         lambda do
           @gateway.import(import_file)
-        end.should raise_error(StandardError)
+        end.should raise_error(MediaWiki::Unauthorized)
       end
 
     end
@@ -758,7 +758,7 @@ describe MediaWiki::Gateway do
         it "should raise an error" do
           lambda do
             @gateway.send(:get_userrights_token, 'nosuchuser')
-          end.should raise_error(StandardError)
+          end.should raise_error(MediaWiki::APIError)
         end
       end
       

data/spec/spec_helper.rb

@@ -5,12 +5,10 @@ Spec::Runner.configure do |config|
   config.mock_with RR::Adapters::Rspec
 end
 
-require 'active_support/version'
-if ActiveSupport::VERSION::MAJOR >= 3
-  # :nodoc: Rails 3: #to_xml is defined in ActiveModel::Serializers::Xml
+# :nodoc: Rails 2.3.x: Hash#to_xml is defined in active_support
+# :nodoc: Rails 3: #to_xml is defined in ActiveModel::Serializers::Xml
+require 'active_support'
+unless Hash.method_defined? :to_xml
   require 'active_model'
   Hash.send(:include, ActiveModel::Serializers::Xml)
-else
-  # :nodoc: Rails 2.3.x: Hash#to_xml is defined in active_support
-  require 'active_support'
 end

data/spec/utils_spec.rb

@@ -62,6 +62,10 @@ describe MediaWiki do
       MediaWiki.wiki_to_uri('Zoo:Phở/B&r/B z').should == 'Zoo:Ph%E1%BB%9F/B%26r/B_z'
     end
 
+    it "should preserve any URL-encoded characters" do
+      MediaWiki.wiki_to_uri('Zoo:Ph%E1%BB%9F/B%26r/B_z').should == 'Zoo:Ph%E1%BB%9F/B%26r/B_z'
+    end
+
     it "should pass through nil" do
       MediaWiki.wiki_to_uri(nil).should be_nil
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mediawiki-gateway
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 8
-  version: 0.3.8
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jani Patokallio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +10:00
+date: 2011-05-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,11 +103,15 @@ files:
 - Rakefile
 - config/hosts.yml
 - doc/classes/MediaWiki.html
+- doc/classes/MediaWiki/APIError.html
 - doc/classes/MediaWiki/Config.html
+- doc/classes/MediaWiki/Exception.html
 - doc/classes/MediaWiki/Gateway.html
+- doc/classes/MediaWiki/Unauthorized.html
 - doc/created.rid
 - doc/files/README.html
 - doc/files/lib/media_wiki/config_rb.html
+- doc/files/lib/media_wiki/exception_rb.html
 - doc/files/lib/media_wiki/gateway_rb.html
 - doc/files/lib/media_wiki/utils_rb.html
 - doc/files/script/create_page_rb.html
@@ -126,6 +130,7 @@ files:
 - doc/rdoc-style.css
 - lib/media_wiki.rb
 - lib/media_wiki/config.rb
+- lib/media_wiki/exception.rb
 - lib/media_wiki/gateway.rb
 - lib/media_wiki/utils.rb
 - mediawiki-gateway.gemspec