firefly 1.5.2 → 1.5.3

data/.gitignore

@@ -7,3 +7,5 @@ pkg
 *.swp
 _site
 _site/*
+log/
+log/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    firefly (1.5.1)
+    firefly (1.5.2)
       dm-aggregates (~> 1.0.2)
       dm-core (~> 1.0.2)
       dm-migrations (~> 1.0.2)
@@ -9,7 +9,7 @@ PATH
       dm-transactions (~> 1.0.2)
       escape_utils (~> 0.2.3)
       haml (~> 3.0.18)
-      sinatra (~> 1.2.3)
+      sinatra (~> 1.2.6)
 
 GEM
   remote: http://rubygems.org/
@@ -55,25 +55,17 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sinatra (1.2.3)
+    sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
-    tilt (1.2.2)
+    tilt (1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   database_cleaner (~> 0.6.6)
-  dm-aggregates (~> 1.0.2)
-  dm-core (~> 1.0.2)
-  dm-migrations (~> 1.0.2)
-  dm-mysql-adapter (~> 1.0.2)
   dm-sqlite-adapter (~> 1.0.2)
-  dm-transactions (~> 1.0.2)
-  escape_utils (~> 0.2.3)
   firefly!
-  haml (~> 3.0.18)
   rack-test (~> 0.5.4)
   rspec (~> 2.5.0)
-  sinatra (~> 1.2.3)

data/HISTORY

@@ -1,3 +1,7 @@
+- 1.5.3 - 2011-05-05
+
+ * 2011-05-05 Force all instances of Firefly to use the same session_secret so logins work properly with multi-instance setups (issue #30) [ariejan]
+
 = 1.5.2 - 2011-05-02
 
  * 2011-05-02 Fixed issue with sharing a link without a title (issue #26) [ariejan]

data/README.md

@@ -52,6 +52,10 @@ After you have installed the Firefly gem you should create a `config.ru` file th
 
       # Set the TLDs (in URLs) that are allowed to be shortened
       # set :sharing_domains, ["example.com", "mydomain.com"]
+
+      # Set your session secret here.
+      # If you're unsure what to use, open IRB console and run `'%x' % rand(2**255)`
+      set :session_secret, "change-me"
     end
 
     run app

data/config.ru.example

@@ -31,6 +31,10 @@ app = Firefly::Server.new do
   # Set the TLDs (in URLs) that are allowed to be shortened
   # set :sharing_domains, ["example.com", "mydomain.com"]
   set :sharing_domain, []
+
+  # Set your session secret here.
+  # If you're unsure what to use, open IRB console and run `'%x' % rand(2**255)`
+  set :session_secret, "change-me"
 end
 
 run app

data/firefly.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency("sinatra",           ["~> 1.2.3"])
+  s.add_runtime_dependency("sinatra",           ["~> 1.2.6"])
   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"])

data/lib/firefly.rb

@@ -25,6 +25,13 @@ if ENV['RACK_ENV'] == 'development'
   DataMapper::Logger.new($stdout, :debug)
 end
 
+module Firefly
+  # Get the current environment
+  def self.environment
+    ENV['RACK_ENV'] || "development"
+  end
+end
+
 require 'firefly/config'
 require 'firefly/version'
 require 'firefly/base62'

data/lib/firefly/server.rb

@@ -13,12 +13,17 @@ module Firefly
   class Server < Sinatra::Base
     enable :sessions
 
+    if Firefly.environment == "development"
+      enable :logging, :dump_errors, :raise_errors
+    end
+
     dir = File.join(File.dirname(__FILE__), '..', '..')
 
     set :views,   "#{dir}/views"
     set :public,  "#{dir}/public"
     set :haml,    {:format => :html5 }
     set :static,  true
+    set :session_secret, nil
 
     attr_accessor :config
 
@@ -154,6 +159,8 @@ module Firefly
       @config        = config
       @highlight     = nil
       @title         = "Firefly at http://#{@config[:hostname]}"
+
+      set :session_secret, @config[:session_secret]
     end
 
     get '/' do

data/lib/firefly/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Firefly
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
+date: 2011-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
         - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 6
+        version: 1.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: firefly
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Firefly is your own personal URL shortener for your own domain.