firefly 1.4.1 → 1.5.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.sqlite3
+*.sqlite3-journal
 sinatra.log
 config.ru
 pkg

data/.rspec

@@ -0,0 +1 @@
+--format progress --colour

data/.travis.yml

@@ -0,0 +1,6 @@
+script: rake spec
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+

data/Gemfile.lock

@@ -1,21 +1,24 @@
 PATH
   remote: .
   specs:
-    firefly (1.4.0)
+    firefly (1.4.1)
       dm-aggregates (~> 1.0.2)
       dm-core (~> 1.0.2)
       dm-migrations (~> 1.0.2)
       dm-mysql-adapter (~> 1.0.2)
       dm-transactions (~> 1.0.2)
+      escape_utils (~> 0.2.3)
       haml (~> 3.0.18)
       sinatra (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.4)
+    addressable (2.2.5)
     data_objects (0.10.3)
       addressable (~> 2.1)
+    database_cleaner (0.6.6)
+    diff-lcs (1.1.2)
     dm-aggregates (1.0.2)
       dm-core (~> 1.0.2)
     dm-core (1.0.2)
@@ -29,25 +32,40 @@ GEM
     dm-mysql-adapter (1.0.2)
       dm-do-adapter (~> 1.0.2)
       do_mysql (~> 0.10.2)
+    dm-sqlite-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_sqlite3 (~> 0.10.2)
     dm-transactions (1.0.2)
       dm-core (~> 1.0.2)
     do_mysql (0.10.3)
       data_objects (= 0.10.3)
+    do_sqlite3 (0.10.3)
+      data_objects (= 0.10.3)
+    escape_utils (0.2.3)
     extlib (0.9.15)
     haml (3.0.25)
-    rack (1.2.1)
+    rack (1.2.2)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rspec (1.3.1)
-    sinatra (1.1.2)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    sinatra (1.2.3)
       rack (~> 1.1)
-      tilt (~> 1.2)
+      tilt (>= 1.2.2, < 2.0)
     tilt (1.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  database_cleaner (~> 0.6.6)
+  dm-sqlite-adapter (~> 1.0.2)
   firefly!
   rack-test (~> 0.5.4)
-  rspec (~> 1.3.0)
+  rspec (~> 2.5.0)

data/HISTORY

@@ -1,3 +1,10 @@
+= 1.5.0 - 2011-04-21
+
+ * 2011-04-21 Firefly is now compatible with ruby 1.8.7, 1.9.2 and ree-1.8 [ariejan]
+ * 2011-04-21 Added support for sharing to hyves [stalkert]
+ * 2011-04-21 Added support for sharing to facebook [stalkert]
+ * 2011-04-21 Removed exports because they add to much overhead [ariejan]
+
 = 1.4.1 - 2011-02-11
 
  * 2011-02-11 Strip leading and trailing whitespace from titles when sharing [ariejan]

data/README.md

@@ -41,13 +41,13 @@ After you have installed the Firefly gem you should create a `config.ru` file th
       # Default: Check this out: %short_url%
       # set :tweet,       "I loved this: %short_url% - Go check it out now!"
 
-      # If you want to enable 'share to twitter'
+      # If you want to enable 'share to sharing targets'
 
-      # A secure key to be used with 'share to twitter'
+      # A secure key to be used with 'share to sharing targets'
       # set :sharing_key,    "set-a-long-secure-key-here"
 
-      # Currently only twitter is supported
-      # set :sharing_targets, [:twitter]
+      # Currently only twitter, hyves and facebook are supported
+      # set :sharing_targets, [:twitter, :hyves, :facebook]
 
       # Set the TLDs (in URLs) that are allowed to be shortened
       # set :sharing_domains, ["example.com", "mydomain.com"]
@@ -79,9 +79,9 @@ All configuration is done in `config.ru`.
  * `:recent_urls` sets the number of URLs to show in the overview. Default: 25.
  * `:tweet` set the template to use for tweets. Default: `"Check this out: %short_url%"`
  * `:sharing_key` set this to something long and secure, used for
-   creating 'share to twitter' links.
- * `:sharing_targets` set to `[:twitter]` if you want to enable sharing
-   to twitter
+   creating 'share to sharing targets' links.
+ * `:sharing_targets` set to `[:twitter, :hyves, :facebook]` if you want to enable sharing 
+   to twitter, hyves or facebook
  * `:sharing_domains` set to an array of TLDs. Only urls shared in those
    domains will be allowed. Set to an empty array (`[]`) if you want to
 accept all domains.
@@ -92,9 +92,7 @@ It's possible to use all kinds of backends with DataMapper. Sqlite3 and MySQL ha
 
 Simply visit `http://:hostname/` and enter your `:api_key`. You can now shorten URLs.
 
-## Advanced usage
-
-### Using the API
+## Using the API
 
 You may also use the API to automate URL shortening. Here's how.
 
@@ -119,9 +117,9 @@ After you restart Terminal.app (or at least reload the `.profile` file) you can
     -- http://ariejan.net => http://aj.gs/1
     Short URL copied to clipboard.
 
-### Using the 'Share to Twitter' features
+## Using the social features (Twitter, Facebook, etc.)
 
-The share to twitter feature allows you to create custom links on your
+The share to sharing targets feature allows you to create custom links on your
 site. When clicked, the specified URL will be shortened and the user
 will be redirect to Twitter to share the new short URL.
 
@@ -131,7 +129,7 @@ will be redirect to Twitter to share the new short URL.
     Parameters:
       url - Long URL to share (required)
       key - The sharing key, specified in `config.ru` (required)
-      target - Target to share to, currently only `twitter` is supported (required)
+      target - Target to share to. E.g. `twitter` or `facebook` (required)
       title - Title of text to use in the tweet (optional)
 
 # Bugs, Feature Requests, etc. 
@@ -161,6 +159,7 @@ Feel free to fork Firefly and create patches for it. Here are some basic instruc
 
  * Ariejan de Vroom - Original author
  * Matthew Boeh - Contributor
+ * Joost Saanen - Contributor
 
 # License
 

data/Rakefile

@@ -1,18 +1,9 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+task :default => :spec
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+desc "Run all specs"
+task "spec" do
+  exec "bundle exec rspec spec"
 end
-
-task :spec
-
-task :default => :spec

data/config.ru.example

@@ -25,7 +25,7 @@ app = Firefly::Server.new do
   set :sharing_key,      ""
 
   # Currently only twitter is supported
-  # set :sharing_targets, [:twitter]
+  # set :sharing_targets, [:twitter, :hyves, :facebook]
   set :sharing_targets, []
 
   # Set the TLDs (in URLs) that are allowed to be shortened

data/firefly.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ariejan de Vroom"]
   s.email       = ["ariejan@ariejan.net"]
-  s.homepage    = "http://github.com/ariejan/firefly"
-  s.summary     = %q{FireFly is a simple URL shortner for personal use}
-  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.homepage    = "http://fireflyrb.com"
+  s.summary     = %q{Firefly is your own personal URL shortener for your own domain.}
+  s.description = %q{Firefly is your own personal URL shortener for your own domain. It's written in Ruby and powered by Sinatra. You can run it with any Rack-capable web server.}
 
   s.rubyforge_project = "firefly"
 
@@ -26,7 +26,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("dm-aggregates",     ["~> 1.0.2"])
   s.add_runtime_dependency("dm-mysql-adapter",  ["~> 1.0.2"])
   s.add_runtime_dependency("haml",              ["~> 3.0.18"])
+  s.add_runtime_dependency("escape_utils",      ["~> 0.2.3"])
 
-  s.add_development_dependency("rspec",         ["~> 1.3.0"])
-  s.add_development_dependency("rack-test",     ["~> 0.5.4"])
+  s.add_development_dependency("rspec",             ["~> 2.5.0"])
+  s.add_development_dependency("rack-test",         ["~> 0.5.4"])
+  s.add_development_dependency("dm-sqlite-adapter", ["~> 1.0.2"])
+  s.add_development_dependency("database_cleaner",  ["~> 0.6.6"])
 end

data/lib/firefly.rb

@@ -7,6 +7,10 @@ require 'dm-core'
 require 'dm-migrations'
 require 'dm-transactions'
 require 'dm-aggregates'
+
+require 'escape_utils'
+require 'escape_utils/url/rack'
+
 begin
   require 'barby'
   require 'barby/outputter/png_outputter'

data/lib/firefly/config.rb

@@ -2,11 +2,13 @@ module Firefly
   class Config < Hash
     
     DEFAULTS = {
-      :hostname    => "localhost:3000",
-      :api_key     => "test",
-      :database    => "sqlite3://#{Dir.pwd}/firefly_#{ENV['RACK_ENV']}.sqlite3",
-      :recent_urls => 25,
-      :tweet       => "Check this out: %short_url%"
+      :hostname         => "localhost:3000",
+      :api_key          => "test",
+      :database         => "sqlite3://#{Dir.pwd}/firefly_#{ENV['RACK_ENV']}.sqlite3",
+      :recent_urls      => 25,
+      :tweet            => "Check this out: %short_url%",
+      :hyves_title      => "Check this out",
+      :hyves_body       => "Check this out: %short_url%"
     }
     
     def initialize obj

data/lib/firefly/server.rb

@@ -71,7 +71,7 @@ module Firefly
       def validate_api_permission
         if !has_valid_api_cookie? && params[:api_key] != config[:api_key]
           status 401
-          return false 
+          return false
         else
           return true
         end
@@ -104,6 +104,8 @@ module Firefly
       end
 
       # Format a tweet
+      #
+      # redirect(URI.escape("http://twitter.com/home?status=#{tweet("http://#{config[:hostname]}/#{@code}", params[:title])}"))
       def tweet(url, message = nil)
         if message.nil? || message == ""
           config[:tweet].gsub('%short_url%', url)
@@ -113,6 +115,20 @@ module Firefly
         end
       end
 
+      # Format a hyves post
+      # {"http://www.hyves.nl/profielbeheer/toevoegen/tips/?name=#{name_of_titel}&text=#{tekst_met_url)}&type=12&rating=5"
+      def hyves_post(url, title = nil, body = nil)
+        if title.nil? || title == ""
+          title = config[:hyves_title]
+        end
+
+        if body.nil? || body == ""
+          body = config[:hyves_body].gsub('%short_url%', url)
+        end
+
+        return "name=#{title.strip}&text=#{body.strip}&type=12&rating=5"
+      end
+
       def store_api_key(key)
         if key == config[:api_key]
           set_api_cookie(config[:api_key])
@@ -175,9 +191,14 @@ module Firefly
       @code, @result = generate_short_url(@url, nil)
       invalid = @code.nil?
 
-      if params[:target].downcase.to_sym == :twitter
-        redirect(URI.escape("http://twitter.com/home?status=#{tweet("http://#{config[:hostname]}/#{@code}", params[:title])}"))
-      end
+      case (params[:target].downcase.to_sym)
+        when :twitter
+          redirect(URI.escape("http://twitter.com/home?status=#{tweet("http://#{config[:hostname]}/#{@code}", params[:title])}"))
+        when :hyves
+          redirect(URI.escape("http://www.hyves.nl/profielbeheer/toevoegen/tips/?#{hyves_post("http://#{config[:hostname]}/#{@code}", params[:title])}"))
+        when :facebook
+          redirect(URI.escape("http://www.facebook.com/share.php?u=http://#{config[:hostname]}/#{@code}"))
+        end
     }
 
     get '/api/share', &api_share
@@ -200,72 +221,6 @@ module Firefly
       end
     end
 
-    # GET /api/export.csv
-    #
-    # Download a CSV file with all shortened URLs
-    get '/api/export.csv' do
-      validate_api_permission or return "Permission denied: Invalid API key"
-
-      @urls = Firefly::Url.all(:order => [ :created_at.asc ])
-
-      output = "\"Code\",\"Short URL\",\"Long URL\",\"Clicks\",\"Created at\"\n"
-      @urls.each do |url|
-        output += "\"#{url.code}\",\"#{short_url(url)}\",\"#{url.url}\",\"#{url.clicks}\",\"#{url.created_at.strftime('%Y-%m-%d %H:%M:%S')}\"\n" 
-      end
-
-      attachment "firefly-export.csv"
-      content_type "text/csv"
-      output
-    end
-
-    # GET /api/export.xml
-    #
-    # Download a XML file with all shortened URLs
-    get '/api/export.xml' do
-      validate_api_permission or return "Permission denied: Invalid API key"
-
-      @urls = Firefly::Url.all(:order => [ :created_at.asc ])
-
-      # I know, manual XML creation is ugly, at least you don't need nokogiri
-      output = "<urls>\n"
-      @urls.each do |url|
-        output += "  <url>\n"
-        output += "    <code>#{url.code}</code>\n"
-        output += "    <short_url>#{short_url(url)}</short_url>\n"
-        output += "    <long_url>#{url.url}</long_url>\n"
-        output += "    <clicks>#{url.clicks}</clicks>\n"
-        output += "    <created_at>#{url.created_at.strftime('%Y-%m-%d %H:%M:%S')}</created_at>\n"
-        output += "  </url>\n"
-      end
-      output += "</urls>\n"
-
-      attachment "firefly-export.xml"
-      content_type "text/xml"
-      output
-    end
-
-    # GET /api/export.yml
-    #
-    # Download a YAML file with all shortened URLs
-    get '/api/export.yml' do
-      validate_api_permission or return "Permission denied: Invalid API key"
-
-      @urls = Firefly::Url.all(:order => [ :created_at.asc ])
-
-      output = {}
-      @urls.each do |url|
-        output[url.code] = { 'code' => url.code, 
-                'short_url' => short_url(url), 
-                'long_url' => url.url, 
-                'clicks' => url.clicks, 
-                'created_at' => url.created_at.strftime('%Y-%m-%d %H:%M:%S') }
-      end
-
-      attachment "firefly-export.yml"
-      content_type "text/yaml"
-      YAML::dump(output)
-    end
-
     if defined? Barby
       # GET /b3d.png
       #
@@ -325,7 +280,7 @@ module Firefly
 
     def check_mysql_collation(first_try = true)
       # Make sure the 'code' column is case-sensitive. This hack is for
-      # MySQL only, other database systems don't have this problem. 
+      # MySQL only, other database systems don't have this problem.
       if DataMapper.repository(:default).adapter =~ "DataMapper::Adapters::MysqlAdapter"
         query     = "SHOW FULL COLUMNS FROM firefly_urls WHERE Field='code';"
         collation = DataMapper.repository(:default).adapter.select(query)[0][:collation]
@@ -334,7 +289,7 @@ module Firefly
           if first_try
             puts " ~ Your MySQL database is not using the 'utf8-bin' collation. Trying to fix..."
             DataMapper.repository(:default).adapter.execute("ALTER TABLE firefly_urls MODIFY `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
-            return check_mysql_collation(false) 
+            return check_mysql_collation(false)
           else
             puts " ~ Failed to set the collation for `code` in `firefly_urls`. Please see http://wiki.github.com/ariejan/firefly/faq for details."
             return false

data/lib/firefly/version.rb

@@ -1,3 +1,3 @@
 module Firefly
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/firefly/api_spec.rb

@@ -149,33 +149,12 @@ describe "API" do
     end
   end
 
-  describe "exports" do
-    before(:each) do
-      load_fixtures 
-    end
-
-    it "should export in CSV" do
-      get '/api/export.csv', :api_key => "test"
-      last_response.body.should eql(spec_file('export.csv'))
-    end
-
-    it "should export in XML" do
-      get '/api/export.xml', :api_key => "test"
-      last_response.body.should eql(spec_file('export.xml'))
-    end
-
-    it "should export in YAML" do
-      get '/api/export.yml', :api_key => "test"
-      last_response.body.should eql(spec_file('export.yml'))
-    end
-  end
-
   describe "api key" do
     def app
       Firefly::Server.new do
         set :hostname,    "test.host"
         set :api_key,     "test#!"
-        set :database,    "mysql://root@localhost/firefly_test"
+        set :database,    "sqlite3://firefly_test_alt.sqlite3"
       end
     end
 

data/spec/firefly/sharing_facebook_spec.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Sharing" do
+  include Rack::Test::Methods
+
+  def app
+    @@app
+  end
+
+  before(:each) do
+    @params = {
+      :url    => 'http://example.com/test',
+      :key    => 'asdfasdf',
+      :target => 'facebook',
+      :title  => 'Test post'
+    }
+  end
+
+  [:post, :get].each do |verb|
+    describe "facebook" do
+      it "should create a shortened URL" do
+        lambda {
+          self.send verb, '/api/share', @params
+        }.should change(Firefly::Url, :count).by(1)
+      end
+
+      it "should redirect to facebook with status" do
+        self.send verb, '/api/share', @params
+        last_response.should be_redirect
+        last_response['Location'].should match(/facebook.com/i)
+      end
+
+      it "should post the short url to facebook" do
+        self.send verb, '/api/share', @params
+        url = Firefly::Url.first(:url => @params[:url])
+
+        last_response['Location'].should include(URI.escape("http://test.host/#{url.code}"))
+      end
+
+      it "should not allow sharing of example.org URL" do
+        self.send verb, '/api/share', @params.merge(:url => 'http://example.org/test123')
+        last_response.status.should eql(401)
+        last_response.body.should match(/cannot share that URL/i)
+      end
+
+      it "should not create a short URL for example.org URL" do
+        lambda {
+          self.send verb, '/api/share', @params.merge(:url => 'http://example.org/test123')
+        }.should_not change(Firefly::Url, :count)
+      end
+
+      it "should not share to unknown target" do
+        self.send verb, '/api/share', @params.merge(:target => 'twitterbook')
+        last_response.status.should eql(401)
+        last_response.body.should match(/cannot share that URL/i)
+      end
+
+      it "should not create a short URL for unknown target" do
+        lambda {
+          self.send verb, '/api/share', @params.merge(:target => 'twitterbook')
+        }.should_not change(Firefly::Url, :count)
+      end
+
+    end
+  end
+end

data/spec/firefly/sharing_hyves_spec.rb

@@ -0,0 +1,100 @@
+# encoding: UTF-8
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Sharing" do
+  include Rack::Test::Methods
+
+  def app
+    @@app
+  end
+
+  before(:each) do
+    @params = {
+      :url    => 'http://example.com/test',
+      :key    => 'asdfasdf',
+      :target => 'hyves',
+      :title  => 'Test post'
+    }
+  end
+
+  [:post, :get].each do |verb|
+    describe "hyves" do
+      it "should create a shortened URL" do
+        lambda {
+          self.send verb, '/api/share', @params
+        }.should change(Firefly::Url, :count).by(1)
+      end
+
+      it "should redirect to hyves with status" do
+        self.send verb, '/api/share', @params
+        last_response.should be_redirect
+        last_response['Location'].should match(/hyves.nl/i)
+      end
+
+      it "should post the title to hyves" do
+        self.send verb, '/api/share', @params
+        url = Firefly::Url.first(:url => @params[:url])
+        last_response['Location'].should include(URI.escape("#{@params[:title]}"))
+      end
+
+      it "should post the title and short url to hyves" do
+        self.send verb, '/api/share', @params
+        url = Firefly::Url.first(:url => @params[:url])
+        last_response['Location'].should include(URI.escape("http://test.host/#{url.code}"))
+      end
+
+      it "should not allow sharing of example.org URL" do
+        self.send verb, '/api/share', @params.merge(:url => 'http://example.org/test123')
+        last_response.status.should eql(401)
+        last_response.body.should match(/cannot share that URL/i)
+      end
+
+      it "should not create a short URL for example.org URL" do
+        lambda {
+          self.send verb, '/api/share', @params.merge(:url => 'http://example.org/test123')
+        }.should_not change(Firefly::Url, :count)
+      end
+
+      it "should not share to unknown target" do
+        self.send verb, '/api/share', @params.merge(:target => 'twitterbook')
+        last_response.status.should eql(401)
+        last_response.body.should match(/cannot share that URL/i)
+      end
+
+      it "should not create a short URL for unknown target" do
+        lambda {
+          self.send verb, '/api/share', @params.merge(:target => 'twitterbook')
+        }.should_not change(Firefly::Url, :count)
+      end
+
+      it "should strip the title to remove any unnecessary white space" do
+        title = "      Test post        "
+        self.send verb, '/api/share', @params.merge(:title => title)
+        url = Firefly::Url.first(:url => @params[:url])
+
+        last_response['Location'].should include(URI.escape("Test post"))
+        last_response['Location'].should_not include(URI.escape(title))
+      end
+
+      it "should strip the body to remove any unnecessary white space" do
+        title = "      This is the test body        "
+        self.send verb, '/api/share', @params.merge(:title => title)
+        url = Firefly::Url.first(:url => @params[:url])
+
+        last_response['Location'].should include(URI.escape("http://test.host/#{url.code}"))
+        last_response['Location'].should_not include(URI.escape(title))
+      end
+
+
+      it "should escape UTF-8 correctly" do
+        title = "Chávez"
+        self.send verb, '/api/share', @params.merge(:title => title)
+        url = Firefly::Url.first(:url => @params[:url])
+
+        last_response['Location'].should include("Ch%C3%A1vez")
+        last_response['Location'].should_not include("Ch%E1vez")
+      end
+    end
+  end
+end

data/spec/firefly/{sharing_spec.rb → sharing_twitter_spec.rb}

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Sharing" do
@@ -49,15 +50,15 @@ describe "Sharing" do
         }.should_not change(Firefly::Url, :count)
       end
 
-      it "should not share to facebook" do
-        self.send verb, '/api/share', @params.merge(:target => 'facebook')
+      it "should not share to unknown target" do
+        self.send verb, '/api/share', @params.merge(:target => 'twitterbook')
         last_response.status.should eql(401)
         last_response.body.should match(/cannot share that URL/i)
       end
 
-      it "should not create a short URL for facebook" do
+      it "should not create a short URL for unknown target" do
         lambda {
-          self.send verb, '/api/share', @params.merge(:target => 'facebook')
+          self.send verb, '/api/share', @params.merge(:target => 'twitterbook')
         }.should_not change(Firefly::Url, :count)
       end
 
@@ -80,6 +81,15 @@ describe "Sharing" do
         last_response['Location'].should include(URI.escape("Test post http://test.host/#{url.code}"))
         last_response['Location'].should_not include(URI.escape(title))
       end
+
+      it "should escape UTF-8 correctly" do
+        title = "Chávez"
+        self.send verb, '/api/share', @params.merge(:title => title)
+        url = Firefly::Url.first(:url => @params[:url])
+
+        last_response['Location'].should include("Ch%C3%A1vez")
+        last_response['Location'].should_not include("Ch%E1vez")
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,10 +5,8 @@ require "bundler/setup"
 
 require 'sinatra'
 require 'rack/test'
-require 'spec'
-require 'spec/autorun'
-require 'spec/interop/test'
 require 'yaml'
+require 'database_cleaner'
 
 # set test environment
 set :environment, :test
@@ -19,31 +17,28 @@ set :logging, false
 @@app = Firefly::Server.new do
   set :hostname,        "test.host"
   set :api_key,         "test"
-  set :database,        "mysql://root@localhost/firefly_test"
+  set :database,        "sqlite3::memory:"
 
   set :sharing_key,     "asdfasdf"
-  set :sharing_targets, [:twitter]
+  set :sharing_targets, [:twitter, :hyves, :facebook]
   set :sharing_domains, ["example.com", "example.net"]
 end
 
-Spec::Runner.configure do |config|
-  config.after(:each) do
-      repository do |r|
-        adapter = r.adapter
-        while adapter.current_transaction
-          adapter.current_transaction.rollback
-          adapter.pop_transaction
-        end
-      end
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with(:truncation)
+    Firefly::CodeFactory.create(:count => 0)
   end
 
-  config.before(:each)  do
-      repository do |r|
-        transaction = DataMapper::Transaction.new(r)
-        Firefly::CodeFactory.first.update(:count => 0)
-        transaction.begin
-        r.adapter.push_transaction(transaction)
-      end
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+    Firefly::CodeFactory.create(:count => 0)
   end
 
   # Loads the urls.yml fixtures.

data/views/layout.haml

@@ -15,4 +15,4 @@
 
     #footer
       %p
-        Powered by <a href="http://github.com/ariejan/firefly">Firefly</a> v#{Firefly::VERSION} | <a href="http://github.com/ariejan/firefly/tree/v#{Firefly::VERSION}">Source</a> | <a href="http://github.com/ariejan/firefly/issues">Issues</a> | Export <a href="/api/export.csv">CSV</a>, <a href="/api/export.yml">YAML</a> or <a href="/api/export.xml">XML</a>
+        Powered by <a href="http://github.com/ariejan/firefly">Firefly</a> v#{Firefly::VERSION} | <a href="http://github.com/ariejan/firefly/tree/v#{Firefly::VERSION}">Source</a> | <a href="http://github.com/ariejan/firefly/issues">Issues</a>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 1
-  version: 1.4.1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +01:00
+date: 2011-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,25 +130,41 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: escape_utils
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 17
         segments: 
-        - 1
+        - 0
+        - 2
         - 3
+        version: 0.2.3
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
         - 0
-        version: 1.3.0
+        version: 2.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,8 +176,40 @@ dependencies:
         - 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.
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: dm-sqlite-adapter
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 6
+        - 6
+        version: 0.6.6
+  type: :development
+  version_requirements: *id012
+description: Firefly is your own personal URL shortener for your own domain. It's written in Ruby and powered by Sinatra. You can run it with any Rack-capable web server.
 email: 
 - ariejan@ariejan.net
 executables: []
@@ -172,16 +220,16 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - HISTORY
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - config.ru.example
 - firefly.gemspec
-- firefly_test.sqlite3-journal
 - lib/firefly.rb
 - lib/firefly/base62.rb
 - lib/firefly/code_factory.rb
@@ -194,14 +242,13 @@ files:
 - public/jquery-1.4.2.min.js
 - public/reset.css
 - public/style.css
-- spec/files/export.csv
-- spec/files/export.xml
-- spec/files/export.yml
 - spec/firefly/api_spec.rb
 - spec/firefly/base62_spec.rb
 - spec/firefly/code_factory_spec.rb
 - spec/firefly/server_spec.rb
-- spec/firefly/sharing_spec.rb
+- spec/firefly/sharing_facebook_spec.rb
+- spec/firefly/sharing_hyves_spec.rb
+- spec/firefly/sharing_twitter_spec.rb
 - spec/firefly/url_spec.rb
 - spec/fixtures/urls.yml
 - spec/spec.opts
@@ -211,7 +258,7 @@ files:
 - views/info.haml
 - views/layout.haml
 has_rdoc: true
-homepage: http://github.com/ariejan/firefly
+homepage: http://fireflyrb.com
 licenses: []
 
 post_install_message: 
@@ -243,16 +290,15 @@ rubyforge_project: firefly
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: FireFly is a simple URL shortner for personal use
+summary: Firefly is your own personal URL shortener for your own domain.
 test_files: 
-- spec/files/export.csv
-- spec/files/export.xml
-- spec/files/export.yml
 - spec/firefly/api_spec.rb
 - spec/firefly/base62_spec.rb
 - spec/firefly/code_factory_spec.rb
 - spec/firefly/server_spec.rb
-- spec/firefly/sharing_spec.rb
+- spec/firefly/sharing_facebook_spec.rb
+- spec/firefly/sharing_hyves_spec.rb
+- spec/firefly/sharing_twitter_spec.rb
 - spec/firefly/url_spec.rb
 - spec/fixtures/urls.yml
 - spec/spec.opts

data/VERSION

@@ -1 +0,0 @@
-1.2.2

data/spec/files/export.csv

@@ -1,3 +0,0 @@
-"Code","Short URL","Long URL","Clicks","Created at"
-"def","http://test.host/def","http://example.org/","456","2010-02-24 14:55:00"
-"abc","http://test.host/abc","http://example.com/","123","2010-04-01 12:00:00"

data/spec/files/export.xml

@@ -1,16 +0,0 @@
-<urls>
-  <url>
-    <code>def</code>
-    <short_url>http://test.host/def</short_url>
-    <long_url>http://example.org/</long_url>
-    <clicks>456</clicks>
-    <created_at>2010-02-24 14:55:00</created_at>
-  </url>
-  <url>
-    <code>abc</code>
-    <short_url>http://test.host/abc</short_url>
-    <long_url>http://example.com/</long_url>
-    <clicks>123</clicks>
-    <created_at>2010-04-01 12:00:00</created_at>
-  </url>
-</urls>

data/spec/files/export.yml

@@ -1,13 +0,0 @@
---- 
-abc: 
-  created_at: 2010-04-01 12:00:00
-  long_url: http://example.com/
-  short_url: http://test.host/abc
-  code: abc
-  clicks: 123
-def: 
-  created_at: 2010-02-24 14:55:00
-  long_url: http://example.org/
-  short_url: http://test.host/def
-  code: def
-  clicks: 456