davetron5000-gliffy 0.9.4 → 0.9.5

data/lib/gliffy/handle.rb

@@ -330,11 +330,12 @@ module Gliffy
     # [+parse+] if true, request is parsed; set to false to get the raw result back
     # [+link_only+] don't make a request just send the full link (useful for <img> tags)
     def make_request(method,url,params=nil,parse=true,link_only=false)
+      url = SignedURL::encodeParts(url)
       update_token
       if link_only
         @request.link_for(method,url,params)
       else
-        @logger.debug("Requesting #{url} with {#params.inspect}")
+        @logger.debug("Requesting #{url} with #{params.inspect}")
         response = @request.send(method,url,params)
         @logger.debug("Got back #{response.body}")
         if parse

data/lib/gliffy/url.rb

@@ -16,10 +16,23 @@ module Gliffy
       'oauth_timestamp' => true,
     }
 
-    # Ruby's SignedURL::encode doesn't encode spaces correctly
+    # Encodes each part of this url, accounting for some
+    # of the weirdness we are dealing with
+    def self.encodeParts(url)
+      parts = url.split(/\//).map do |part|
+        if part =~ /^\$/
+          part
+        else
+          encode(part)
+        end
+      end
+      parts.join('/')
+    end
+
+    # Ruby's CGI::encode doesn't encode spaces correctly
     def self.encode(string)
       string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
-      '%' + $1.unpack('H2' * $1.size).join('%').upcase
+        '%' + $1.unpack('H2' * $1.size).join('%').upcase
       end.gsub(' ', '%20')
     end
 

data/lib/gliffy/version.rb

@@ -1,4 +1,4 @@
 # Generated by rake update_version
 module Gliffy
-  GLIFFY_VERSION = '0.9.4'
+  GLIFFY_VERSION = '0.9.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davetron5000-gliffy
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - David Copeland