firefly 1.2.2 → 1.3.0

data/spec/firefly/base62_spec.rb

@@ -13,7 +13,7 @@ describe "Base62 encoding/decoding" do
     it "should encode #{input} correctly to #{output}" do
       Firefly::Base62.encode(input).should eql(output)
     end
-    
+
     it "should decode correctly" do
       Firefly::Base62.decode(output).should eql(input)
     end

data/spec/firefly/code_factory_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "CodeFactory" do
+
+  describe "next!" do
+    it "should return the next code_count" do
+      current_count = Firefly::CodeFactory.first.count
+      expected_code = Firefly::Base62.encode(current_count + 1)
+      Firefly::CodeFactory.next_code!.should eql(expected_code)
+    end
+  end
+end

data/spec/firefly/server_spec.rb

@@ -6,13 +6,13 @@ describe "Firefly" do
   def app
     @@app
   end
-  
+
   describe "/" do
     it "should respond ok" do
       get '/'
       last_response.should be_ok
     end
-  end    
+  end
 
 
   if defined? Barby
@@ -41,33 +41,33 @@ describe "Firefly" do
   describe "redirecting" do
     it "should redirect to the original URL" do
       fake = Firefly::Url.create(:url => 'http://example.com/123', :code => 'alpha')
-    
+
       get '/alpha'
       follow_redirect!
-    
+
       last_request.url.should eql('http://example.com/123')
     end
-    
+
     it "should increase the visits counter" do
       fake = Firefly::Url.create(:url => 'http://example.com/123', :code => 'alpha')
       Firefly::Url.should_receive(:first).and_return(fake)
-      
+
       lambda {
         get '/alpha'
       }.should change(fake, :clicks).by(1)
     end
-    
+
     it "should redirect with a 301 Permanent redirect" do
       fake = Firefly::Url.create(:url => 'http://example.com/123', :code => 'alpha')
-    
+
       get '/alpha'
-    
+
       last_response.status.should eql(301)
     end
-  
+
     it "should throw a 404 when the code is unknown" do
       get '/some_random_code_that_does_not_exist'
-    
+
       last_response.status.should eql(404)
     end
   end

data/spec/firefly/url_spec.rb

@@ -1,37 +1,37 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Url" do
-  
+
   describe "shortening" do
     it "should generate a code after create" do
       url = Firefly::Url.shorten("http://example.com/")
       Firefly::Url.first(:url => "http://example.com/").code.should_not be_nil
     end
-    
+
     it "should set a clicks count of 0 for newly shortened urls" do
       url = Firefly::Url.shorten("http://example.com/")
       Firefly::Url.first(:url => "http://example.com/").clicks.should eql(0)
     end
-    
+
     it "should create a new Firefly::Url with a new long_url" do
       lambda {
         Firefly::Url.shorten("http://example.com/")
       }.should change(Firefly::Url, :count).by(1)
     end
-    
+
     it "should return an existing Firefly::Url if the long_url exists" do
       Firefly::Url.shorten("http://example.com/")
       lambda {
         Firefly::Url.shorten("http://example.com/")
       }.should_not change(Firefly::Url, :count)
     end
-    
+
     it "should normalize urls correctly" do
       # Note the trailing '/'
       Firefly::Url.shorten("http://example.com/")
       lambda {
         Firefly::Url.shorten("http://example.com")
-      }.should_not change(Firefly::Url, :count)      
+      }.should_not change(Firefly::Url, :count)
     end
 
     it "should shortend urls containing spaces" do
@@ -55,8 +55,18 @@ describe "Url" do
       url = Firefly::Url.shorten("http://example.com/?a=\11\15")
       url.url.should eql("http://example.com/?a=%09%0D")
     end
+
+    it "should automatically forward code to prevent duplicates" do
+      url = Firefly::Url.shorten("http://example.com/")
+      the_code = url.code.next
+      Firefly::Url.create(:url => "http://example.com/blah", :code => the_code)
+
+      url_correct = Firefly::Url.shorten("http://example.com/testit")
+      url_correct.code.should_not eql(the_code)
+      url_correct.code.should eql(the_code.next)
+    end
   end
-  
+
   describe "long url validation" do
     [ "http://ariejan.net", 
       "https://ariejan.net",
@@ -68,18 +78,20 @@ describe "Url" do
         Firefly::Url.shorten(url).should_not be_nil
       end
     end
-    
+
     [ "ftp://ariejan.net", 
       "irc://freenode.org/rails",
       "skype:adevroom",
       "ariejan.net",
     ].each do |url|
       it "should not accept #{url}" do
-        Firefly::Url.shorten(url).should be_nil
+        lambda {
+          Firefly::Url.shorten(url).should be_nil
+        }.should raise_error(Firefly::InvalidUrlError)
       end
-    end    
+    end
   end
-  
+
   describe "clicking" do
     before(:each) do
       Firefly::Url.create(
@@ -89,7 +101,7 @@ describe "Url" do
       )
       @url = Firefly::Url.first(:code => 'alpha')
     end
-    
+
     it "should increase the click count" do
       lambda {
         @url.register_click!

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'firefly.rb')
 
 require 'rubygems'
+require "bundler/setup"
+
 require 'sinatra'
 require 'rack/test'
 require 'spec'
@@ -17,7 +19,7 @@ set :logging, false
 @@app = Firefly::Server.new do
   set :hostname,    "test.host"
   set :api_key,     "test"
-  set :database,    "sqlite3://#{Dir.pwd}/firefly_test.sqlite3"
+  set :database,    "mysql://root@localhost/firefly_test"
 end
 
 Spec::Runner.configure do |config|
@@ -34,6 +36,7 @@ Spec::Runner.configure do |config|
   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

data/views/error.haml

@@ -0,0 +1,11 @@
+%h1 Whoops!
+
+%p
+  There was an error processing your request:
+
+%p
+  %blockquote
+    = @result
+
+%p
+  %a(href='/') Go back

data/views/index.haml

@@ -1,5 +1,4 @@
 - if @authenticated
-  
   .sidebox
     %h2 Bookmarklet
 
@@ -7,9 +6,9 @@
       Drag the following link to your bookmarks. Click it to shorten the URL to the page you're currently viewing.
     %p
       %a{ :href => "javascript:var%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:('%22'+enc(s)+'%22')),key=enc('#{@config[:api_key]}'),f='http://#{@config[:hostname]}/api/add',l=d.location,p='?visual=1&api_key='+key+'&url='+enc(l.href),u=f+p;try{if(!/^(.*\.)?tumblrzzz[^.]*$/.test(l.host))throw(0);tstbklt();}catch(z){a%20=function(){if(!w.open(u))l.href=u;};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();}void(0)" } Shorten with #{@config[:hostname]}
-      
+
   %h1 How about shortening a URL?
-  
+
   .the_form
     %form{ :action => '/api/add', :method => 'post' }
       %input{ :type => "hidden", :name => "visual", :value => "1" }
@@ -19,18 +18,10 @@
         %input.big_url{ :type => 'text', :placeholder => "Optional short code", :name => 'short', :id => 'short', :size => 20, :autocomplete => "off", :spellcheck => 'false' }
       %p
         %input.big_url{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Make it short!" }
-  
-  - if @error
-    %h2 Whoops!
-    
-    %p
-      The URL you posted is invalid. Please post a valid HTTP url, including the protocol (http://) prefix.
 
-    %p= @url
-      
   - if @highlight
     %h2 Your short URL
-    
+
     %table
       %tr
         %td.label Short URL
@@ -60,14 +51,14 @@
     - @urls.each do |url|
       %tr{ :class => is_highlighted?(url) ? 'highlighted' : '' }
         %td.value
-          %input{ :type => "text", :value => short_url(url), :class => 'short_url', :size => 21 }
+          %input{ :type => "text", :value => short_url(url), :class => 'short_url', :size => 31 }
         %td.value.fill <a href="#{url.url}">#{url.url}</a>
         %td.value.center= url.clicks
         %td.value= url.created_at.strftime("%Y-%m-%d %H:%M")
         %td.value
           %a{ :href => "http://twitter.com/home?status=#{tweet(short_url(url))}" }
             %img.twitter{ :src => "/images/twitter.png", :width => "16", :height => "16" }
-          
+
   :javascript
     $(document).ready(function() {
       $('input.short_url').each(function(index) {

data/views/info.haml

@@ -9,7 +9,7 @@
     %td.label Full URL
     %td.label Clicks
     %td.label Shortened at
-  
+
   %tr
     %td.value
       %input{ :type => "text", :value => short_url(@url), :class => 'short_url', :size => 21 }
@@ -21,6 +21,6 @@
   $(document).ready(function() {
     $('input.short_url').each(function(index) {
       $(this).mouseup(function() { $(this).select(); });
-    });  
+    });
   });
-  
+

data/views/layout.haml

@@ -8,13 +8,11 @@
     %script{ :type => "text/javascript", :src => u('jquery-1.4.2.min.js') }
   %body
     .header
-      %ul.nav
-        %li.current
-          %a{ :href => '/' } #{@title}
-          
+      %h1= @title
+
     #main
       = yield
-    
+
     #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> | Export <a href="/api/export.csv">CSV</a>, <a href="/api/export.yml">YAML</a> or <a href="/api/export.xml">XML</a>

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
+  name: dm-mysql-adapter
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -162,16 +162,18 @@ dependencies:
   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.
-email: ariejan@ariejan.net
+email: 
+- ariejan@ariejan.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - HISTORY
 - LICENSE
 - README.md
@@ -179,8 +181,10 @@ files:
 - VERSION
 - config.ru.example
 - firefly.gemspec
+- firefly_test.sqlite3-journal
 - lib/firefly.rb
 - lib/firefly/base62.rb
+- lib/firefly/code_factory.rb
 - lib/firefly/config.rb
 - lib/firefly/server.rb
 - lib/firefly/url.rb
@@ -195,11 +199,13 @@ files:
 - 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/url_spec.rb
 - spec/fixtures/urls.yml
 - spec/spec.opts
 - spec/spec_helper.rb
+- views/error.haml
 - views/index.haml
 - views/info.haml
 - views/layout.haml
@@ -208,8 +214,8 @@ homepage: http://github.com/ariejan/firefly
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -238,8 +244,14 @@ signing_key:
 specification_version: 3
 summary: FireFly is a simple URL shortner for personal use
 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/url_spec.rb
+- spec/fixtures/urls.yml
+- spec/spec.opts
 - spec/spec_helper.rb