firefly 1.0.1 → 1.1.0

data/HISTORY

@@ -1,3 +1,7 @@
+= 1.1.0 / 2010-10-02
+
+ * 2010-10-02 - Generate a QR Code image when accessing http://:host/:code.png
+
 = 1.0.0 / 2010-09-19
 
  * 2010-09-18 - Added better support for URLs with spaces and other special characters. Closes #19

data/Rakefile

@@ -18,6 +18,8 @@ begin
     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_dependency('barby', '~> 0.4.0')
+    gemspec.add_dependency('png', '1.1.0')
     
     gemspec.add_development_dependency('rspec', '~> 1.3.0')
     gemspec.add_development_dependency('rack-test', '~> 0.5.4')

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/firefly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firefly}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2010-09-19}
+  s.date = %q{2010-10-02}
   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 = [
@@ -76,6 +76,8 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<barby>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<png>, ["= 1.1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
       s.add_development_dependency(%q<rack-test>, ["~> 0.5.4"])
     else
@@ -86,6 +88,8 @@ Gem::Specification.new do |s|
       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<barby>, ["~> 0.4.0"])
+      s.add_dependency(%q<png>, ["= 1.1.0"])
       s.add_dependency(%q<rspec>, ["~> 1.3.0"])
       s.add_dependency(%q<rack-test>, ["~> 0.5.4"])
     end
@@ -97,6 +101,8 @@ Gem::Specification.new do |s|
     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<barby>, ["~> 0.4.0"])
+    s.add_dependency(%q<png>, ["= 1.1.0"])
     s.add_dependency(%q<rspec>, ["~> 1.3.0"])
     s.add_dependency(%q<rack-test>, ["~> 0.5.4"])
   end

data/lib/firefly.rb

@@ -7,6 +7,8 @@ require 'dm-core'
 require 'dm-migrations'
 require 'dm-transactions'
 require 'dm-aggregates'
+require 'barby'
+require 'barby/outputter/png_outputter'
 
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))

data/lib/firefly/server.rb

@@ -214,6 +214,23 @@ module Firefly
       YAML::dump(output)
     end
 
+    # GET /b3d.png
+    #
+    # Return a QR code image
+    get '/:code.png' do
+      @url = Firefly::Url.first(:code => params[:code])
+
+      if @url.nil?
+        status 404
+        "Sorry, that code is unknown."
+      else
+        qr = Barby::QrCode.new(short_url(@url))
+        content_type('image/png')
+        cache_control :public, :max_age => 2592000 # One month
+        body(qr.to_png(:xdim => 15, :margin => 30))
+      end
+    end
+
     # GET /b3d
     #
     # Redirect to the shortened URL

data/spec/firefly/server_spec.rb

@@ -14,6 +14,27 @@ describe "Firefly" do
     end
   end    
 
+  describe "QR Codes" do
+    before(:each) do
+      @url = Firefly::Url.create(:url => 'http://example.com/123', :code => 'alpha')
+    end
+
+    it "should return a 200 status" do
+      get '/alpha.png'
+      last_response.should be_ok
+    end
+
+    it "should return a PNG image" do
+      get '/alpha.png'
+      last_response.headers['Content-Type'].should eql('image/png')
+    end
+
+    it "should cache-control to 1 month" do
+      get '/alpha.png'
+      last_response.headers['Cache-Control'].should eql('public, max-age=2592000')
+    end
+  end
+
   describe "redirecting" do
     it "should redirect to the original URL" do
       fake = Firefly::Url.create(:url => 'http://example.com/123', :code => 'alpha')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 +02:00
+date: 2010-10-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,9 +130,41 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: barby
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: png
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,11 +176,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,7 +192,7 @@ dependencies:
         - 4
         version: 0.5.4
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 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.
 email: ariejan@ariejan.net
 executables: []