firefly 0.4.5 → 1.0.1

data/HISTORY

@@ -1,4 +1,8 @@
-= HEAD
+= 1.0.0 / 2010-09-19
+
+ * 2010-09-18 - Added better support for URLs with spaces and other special characters. Closes #19
+
+= 0.4.5 / 2010-08-10
 
  * 2010-08-10 - Added sorting of shortened URLs. Closes #12.
  * 2010-08-10 - Added CSV, XML and YAML export of all shortened URLs. Closes #11.

data/Rakefile

@@ -12,15 +12,15 @@ begin
     gemspec.authors = ["Ariejan de Vroom"]
     gemspec.rubyforge_project = 'firefly'
     gemspec.add_dependency('sinatra', '~> 1.0')
-    gemspec.add_dependency('dm-core', '~> 1.0.0')
-    gemspec.add_dependency('dm-migrations', '~> 1.0.0')
-    gemspec.add_dependency('dm-transactions', '~> 1.0.0')
-    gemspec.add_dependency('dm-aggregates', '~> 1.0.0')
-    gemspec.add_dependency('dm-sqlite-adapter', '~> 1.0.0')
-    gemspec.add_dependency('haml', '~> 3.0.9')
+    gemspec.add_dependency('dm-core', '~> 1.0.2')
+    gemspec.add_dependency('dm-migrations', '~> 1.0.2')
+    gemspec.add_dependency('dm-transactions', '~> 1.0.2')
+    gemspec.add_dependency('dm-aggregates', '~> 1.0.2')
+    gemspec.add_dependency('dm-sqlite-adapter', '~> 1.0.2')
+    gemspec.add_dependency('haml', '~> 3.0.18')
     
     gemspec.add_development_dependency('rspec', '~> 1.3.0')
-    gemspec.add_development_dependency('rack-test', '~> 0.5.3')
+    gemspec.add_development_dependency('rack-test', '~> 0.5.4')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.4.5
+1.0.1

data/firefly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firefly}
-  s.version = "0.4.5"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-09-19}
   s.description = %q{FireFly is a simple URL shortner for personal use. It's powered by Sinatra and can be run with any Rack-capable web server.}
   s.email = %q{ariejan@ariejan.net}
   s.extra_rdoc_files = [
@@ -70,35 +70,35 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-transactions>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.0"])
-      s.add_runtime_dependency(%q<haml>, ["~> 3.0.9"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-transactions>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
+      s.add_runtime_dependency(%q<haml>, ["~> 3.0.18"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<rack-test>, ["~> 0.5.3"])
+      s.add_development_dependency(%q<rack-test>, ["~> 0.5.4"])
     else
       s.add_dependency(%q<sinatra>, ["~> 1.0"])
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-transactions>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-aggregates>, ["~> 1.0.0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.0"])
-      s.add_dependency(%q<haml>, ["~> 3.0.9"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-transactions>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-aggregates>, ["~> 1.0.2"])
+      s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
+      s.add_dependency(%q<haml>, ["~> 3.0.18"])
       s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<rack-test>, ["~> 0.5.3"])
+      s.add_dependency(%q<rack-test>, ["~> 0.5.4"])
     end
   else
     s.add_dependency(%q<sinatra>, ["~> 1.0"])
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-transactions>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-aggregates>, ["~> 1.0.0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.0"])
-    s.add_dependency(%q<haml>, ["~> 3.0.9"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-transactions>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-aggregates>, ["~> 1.0.2"])
+    s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.0.2"])
+    s.add_dependency(%q<haml>, ["~> 3.0.18"])
     s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<rack-test>, ["~> 0.5.3"])
+    s.add_dependency(%q<rack-test>, ["~> 0.5.4"])
   end
 end
 

data/lib/firefly/url.rb

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

data/spec/firefly/url_spec.rb

@@ -33,6 +33,28 @@ describe "Url" do
         Firefly::Url.shorten("http://example.com")
       }.should_not change(Firefly::Url, :count)      
     end
+
+    it "should shortend urls containing spaces" do
+      lambda {
+        url = Firefly::Url.shorten("http://example.com/article with spaces.html")
+      }.should change(Firefly::Url, :count).by(1)
+    end
+
+    it "should escape urls with spaces" do
+      url = Firefly::Url.shorten("http://example.com/article with spaces.html")
+      url.url.should eql("http://example.com/article%20with%20spaces.html")
+    end
+
+    it "should shortend urls containing weird characters" do
+      lambda {
+        url = Firefly::Url.shorten("http://example.com/?a=\11\15")
+      }.should change(Firefly::Url, :count).by(1)
+    end
+
+    it "should escape urls with weird characters" do
+      url = Firefly::Url.shorten("http://example.com/?a=\11\15")
+      url.url.should eql("http://example.com/?a=%09%0D")
+    end
   end
   
   describe "long url validation" do
@@ -74,4 +96,4 @@ describe "Url" do
       }.should change(@url, :clicks).by(1)
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 21
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 4
-  - 5
-  version: 0.4.5
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +02:00
+date: 2010-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -73,12 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,12 +105,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -121,12 +121,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 35
         segments: 
         - 3
         - 0
-        - 9
-        version: 3.0.9
+        - 18
+        version: 3.0.18
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -153,12 +153,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   type: :development
   version_requirements: *id009
 description: FireFly is a simple URL shortner for personal use. It's powered by Sinatra and can be run with any Rack-capable web server.