firefly 1.3.0 → 1.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firefly (2.0.0.pre1)
+    firefly (1.3.0)
       dm-aggregates (~> 1.0.2)
       dm-core (~> 1.0.2)
       dm-migrations (~> 1.0.2)

data/HISTORY

@@ -1,4 +1,8 @@
-= HEAD
+= 1.3.1 / 2011-02-20
+
+ * 2011-02-20 Fixed issue with escaped characters in URL (ticket #21) [ariejan]
+
+= 1.3.0 / 2011-02-01
 
  * 2011-02-01 Improved GUI [ariejan]
  * 2011-02-01 Improved error handling / reporting [ariejan]

data/lib/firefly/url.rb

@@ -48,7 +48,8 @@ module Firefly
 
       # Normalize the URL
       def self.normalize_url(url)
-        URI.parse(URI.escape(url)).normalize.to_s
+        url = URI.escape(URI.unescape(url))
+        URI.parse(url).normalize.to_s
       end
 
       # Validates the URL to be a valid http or https one. 

data/lib/firefly/version.rb

@@ -1,3 +1,3 @@
 module Firefly
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/firefly/url_spec.rb

@@ -56,6 +56,16 @@ describe "Url" do
       url.url.should eql("http://example.com/?a=%09%0D")
     end
 
+    it "should not unescape invalid URL characters" do
+      url = Firefly::Url.shorten("http://example.com/?a=%09")
+      url.url.should eql("http://example.com/?a=%09")
+    end
+
+    it "should not escape already escaped URLs" do
+      url = Firefly::Url.shorten("http://en.wikipedia.org/wiki/Tarski%27s_circle-squaring_problem")
+      url.url.should eql("http://en.wikipedia.org/wiki/Tarski's_circle-squaring_problem")
+    end
+
     it "should automatically forward code to prevent duplicates" do
       url = Firefly::Url.shorten("http://example.com/")
       the_code = url.code.next

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: firefly
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: FireFly is a simple URL shortner for personal use