firefly 1.2.2 → 1.3.0

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in firefly.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    firefly (2.0.0.pre1)
+      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)
+      haml (~> 3.0.18)
+      sinatra (~> 1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.4)
+    data_objects (0.10.3)
+      addressable (~> 2.1)
+    dm-aggregates (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
+      extlib (~> 0.9.15)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
+    dm-migrations (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-mysql-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
+      do_mysql (~> 0.10.2)
+    dm-transactions (1.0.2)
+      dm-core (~> 1.0.2)
+    do_mysql (0.10.3)
+      data_objects (= 0.10.3)
+    extlib (0.9.15)
+    haml (3.0.25)
+    rack (1.2.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rspec (1.3.1)
+    sinatra (1.1.2)
+      rack (~> 1.1)
+      tilt (~> 1.2)
+    tilt (1.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  firefly!
+  rack-test (~> 0.5.4)
+  rspec (~> 1.3.0)

data/HISTORY

@@ -1,33 +1,40 @@
+= HEAD
+
+ * 2011-02-01 Improved GUI [ariejan]
+ * 2011-02-01 Improved error handling / reporting [ariejan]
+ * 2011-01-31 Added a CodeFactory to generate unique short codes (and prevent collisions with custom short codes) [ariejan]
+ * 2011-01-30 Use dm-mysql-adapater as default, dm-sqlite-adapter is optional [ariejan]
+
 = 1.2.1/1.2.2 / 2011-01-26
 
  * 2011-01-26 - Added GUI support for custom short codes. [ariejan]
 
 = 1.2.0 / 2011-01-26
 
- * 2010-12-30 - Support for specifying one's own preferred short codes via the API. Also, invalid URL creations return a 422 code, not 200. 
+ * 2010-12-30 - Support for specifying one's own preferred short codes via the API. Also, invalid URL creations return a 422 code, not 200. [ariejan]
  * 2010-12-30 - Make Barby optional to save some gems for those of us who don't need QR code generation. [mboeh]
 
 = 1.1.0 / 2010-10-02
 
- * 2010-10-02 - Generate a QR Code image when accessing http://:host/:code.png
+ * 2010-10-02 - Generate a QR Code image when accessing http://:host/:code.png [ariejan]
 
 = 1.0.0 / 2010-09-19
 
- * 2010-09-18 - Added better support for URLs with spaces and other special characters. Closes #19
+ * 2010-09-18 - Added better support for URLs with spaces and other special characters. Closes #19 [ariejan]
 
 = 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.
- * 2010-08-10 - Updated bookmarklet JavaScript to escape URL-unsafe charachters in the API key. Fixes #17
+ * 2010-08-10 - Added sorting of shortened URLs. Closes #12. [ariejan]
+ * 2010-08-10 - Added CSV, XML and YAML export of all shortened URLs. Closes #11. [ariejan]
+ * 2010-08-10 - Updated bookmarklet JavaScript to escape URL-unsafe charachters in the API key. Fixes #17 [ariejan]
 
 = 0.4.4 / 2010-06-20
 
- * 2010-06-20 - Updated gem dependencies for DataMapper 1.0.0
+ * 2010-06-20 - Updated gem dependencies for DataMapper 1.0.0 [ariejan]
 
 = 0.4.3 / 2010-06-06 
 
- * 2010-06-06 - Handle invalid API keys correctly.
+ * 2010-06-06 - Handle invalid API keys correctly. [ariejan]
 
 = 0.4.2 / 2010-06-06 
 

data/README.md

@@ -14,36 +14,34 @@ After you have installed the Firefly gem you should create a `config.ru` file th
 
     require 'rubygems'
     require 'firefly'
-    
+
     disable :run
-    
+
     app = Firefly::Server.new do
       # The domain you use for shortening.
-      set :hostname,    "localhost:3000"
+      set :hostname,    "localhost:9393"
       # set :hostname,    "aj.gs"
-      
+
       # Used for authenticating you.
-      set :api_key,     "test"
-      
-      # Use Sqlite3 by default
-      set :database,    "sqlite3://#{Dir.pwd}/firefly.sqlite3"
-      
-      # You can use MySQL as well. 
-      # Make sure to install the do_mysql gem:
-      #    sudo gem install do_mysql
-      # set :database,    "mysql://root@localhost/firefly"
-      
+      set :api_key,     "changeme"
+
+      # Default MySQL:
+      set :database,    "mysql://root:password@localhost/firefly"
+
+      # Use Sqlite3: gem install dm-sqlite-adapter
+      # set :database,    "sqlite3://#{Dir.pwd}/firefly.sqlite3"
+
       # Set the number of recent urls to show in the overview.
       # Defaults to 25
       # set :recent_urls, 10
-      
+
       # Set the tweet template.
       # The tag %short_url% will be replaced with the actual url.
       #
       # Default: Check this out: %short_url%
       # set :tweet,       "I loved this: %short_url% - Go check it out now!"
     end
-    
+
     run app
 
 Next you can start your web server. You may try thin:
@@ -90,17 +88,17 @@ If you're on a MacOSX you could add the following function to your  `~/.profile`
       URL=$1
       SHORT_URL=`curl -s -d "url=$URL&api_key=test" http://localhost:3000/api/add`
       echo $SHORT_URL | pbcopy
-      
+
       echo "-- $URL => $SHORT_URL"
       echo "Short URL copied to clipboard."
     }
-    
+
 After you restart Terminal.app (or at least reload the `.profile` file) you can use it like this:
 
     $ shorten http://ariejan.net
     -- http://ariejan.net => http://aj.gs/1
     Short URL copied to clipboard.
-    
+
 # Bugs, Feature Requests, etc. 
 
  * [Source][5]
@@ -110,10 +108,11 @@ Feel free to fork Firefly and create patches for it. Here are some basic instruc
 
  * [Fork][7] Firefly 
  * Create a topic branch - `git checkout -b my_branch`
+ * Write tests and code
  * Push to your branch - `git push origin my_branch`
- * Create an [Issue][8] with a link to your branch
+ * Create a GitHub Pull Request so I can merge your changes
  * That's it!
- 
+
 [1]: http://ariejan.net/2010/07/12/screencast-firefly-url-shortener-in-less-than-25-minutes/
 [2]: http://ariejan.net/2010/06/06/setup-your-own-firefly-url-shortener-in-25-minutes/
 [3]: http://heroku.com
@@ -131,7 +130,7 @@ Feel free to fork Firefly and create patches for it. Here are some basic instruc
 # License
 
     Copyright (c) 2009 Ariejan de Vroom
-    
+
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
@@ -139,10 +138,10 @@ Feel free to fork Firefly and create patches for it. Here are some basic instruc
     distribute, sublicense, and/or sell copies of the Software, and to
     permit persons to whom the Software is furnished to do so, subject to
     the following conditions:
-    
+
     The above copyright notice and this permission notice shall be
     included in all copies or substantial portions of the Software.
-    
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/Rakefile

@@ -1,31 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "firefly"
-    gemspec.summary = "FireFly is a simple URL shortner for personal use"
-    gemspec.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."
-    gemspec.email = "ariejan@ariejan.net"
-    gemspec.homepage = "http://github.com/ariejan/firefly"
-    gemspec.authors = ["Ariejan de Vroom"]
-    gemspec.rubyforge_project = 'firefly'
-    gemspec.add_dependency('sinatra', '~> 1.0')
-    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.4')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
@@ -39,6 +13,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
+task :spec
 
 task :default => :spec

data/config.ru.example

@@ -6,17 +6,17 @@ disable :run
 app = Firefly::Server.new do
   set :hostname,    "localhost:3000"
   set :api_key,     "test"
-  
+
   # Use Sqlite3 by default
   set :database,    "sqlite3://#{Dir.pwd}/firefly.sqlite3"
-  
+
   # Set number of recent urls to show
   set :recent_urls, 10
-  
+
   # You can use MySQL as well. 
   # Make sure to install the do_mysql gem:
   #    sudo gem install do_mysql
   # set :database,    "mysql://root@localhost/firefly"
 end
 
-run app
+run app

data/firefly.gemspec

@@ -1,104 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "firefly/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{firefly}
-  s.version = "1.2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2011-01-28}
+  s.name        = "firefly"
+  s.version     = Firefly::VERSION
+  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.email = %q{ariejan@ariejan.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "HISTORY",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "config.ru.example",
-     "firefly.gemspec",
-     "lib/firefly.rb",
-     "lib/firefly/base62.rb",
-     "lib/firefly/config.rb",
-     "lib/firefly/server.rb",
-     "lib/firefly/url.rb",
-     "lib/firefly/version.rb",
-     "public/favicon.ico",
-     "public/images/twitter.png",
-     "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/server_spec.rb",
-     "spec/firefly/url_spec.rb",
-     "spec/fixtures/urls.yml",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "views/index.haml",
-     "views/info.haml",
-     "views/layout.haml"
-  ]
-  s.homepage = %q{http://github.com/ariejan/firefly}
-  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.rubyforge_project = "firefly"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{firefly}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{FireFly is a simple URL shortner for personal use}
-  s.test_files = [
-    "spec/firefly/api_spec.rb",
-     "spec/firefly/base62_spec.rb",
-     "spec/firefly/server_spec.rb",
-     "spec/firefly/url_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency("sinatra",           ["~> 1.0"])
+  s.add_runtime_dependency("dm-core",           ["~> 1.0.2"])
+  s.add_runtime_dependency("dm-migrations",     ["~> 1.0.2"])
+  s.add_runtime_dependency("dm-transactions",   ["~> 1.0.2"])
+  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"])
 
-    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.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.4"])
-    else
-      s.add_dependency(%q<sinatra>, ["~> 1.0"])
-      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.4"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, ["~> 1.0"])
-    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.4"])
-  end
+  s.add_development_dependency("rspec",         ["~> 1.3.0"])
+  s.add_development_dependency("rack-test",     ["~> 0.5.4"])
 end
-

data/lib/firefly.rb

@@ -11,7 +11,6 @@ begin
   require 'barby'
   require 'barby/outputter/png_outputter'
 rescue LoadError
-   
 end
 
 $:.unshift(File.dirname(__FILE__)) unless
@@ -24,5 +23,7 @@ end
 require 'firefly/config'
 require 'firefly/version'
 require 'firefly/base62'
+require 'firefly/code_factory'
 require 'firefly/url'
 require 'firefly/server'
+

data/lib/firefly/code_factory.rb

@@ -0,0 +1,23 @@
+module Firefly
+  class CodeFactory
+    include DataMapper::Resource
+
+    property :id,    Serial
+    property :count, Integer, :default => 0
+
+    # Returns the next auto increment value and updates
+    # the counter
+    def self.next_code!
+      code = nil
+
+      Firefly::CodeFactory.transaction do
+        c = Firefly::CodeFactory.first
+        code = Firefly::Base62.encode(c.count + 1)
+        c.update(:count => c.count + 1)
+      end
+
+      code
+    end
+
+  end
+end