firefly 0.4.1 → 0.4.2

data/.gitignore

@@ -1,3 +1,5 @@
 *.sqlite3
 config.ru
 pkg
+.rvmrc
+*.swp

data/HISTORY

@@ -1,3 +1,7 @@
+= 0.4.2 / 2010-06-06 
+
+ * 2010-06-06 - Added a fix for MySQL users to update the `code` column to use the correct collation. Fixes #9 [ariejan]
+
 = 0.4.1 / 2010-04-30
 
  * 2010-04-30 - Normalize URLs before shortening them. This prevents false duplicates. [ariejan]

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/firefly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{firefly}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ariejan de Vroom"]
-  s.date = %q{2010-04-30}
+  s.date = %q{2010-06-06}
   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 = [
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{firefly}
-  s.rubygems_version = %q{1.3.6}
+  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",
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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>, [">= 0.10.2"])
       s.add_runtime_dependency(%q<dm-aggregates>, [">= 0.10.2"])

data/lib/firefly/server.rb

@@ -163,11 +163,40 @@ module Firefly
       begin
         DataMapper.setup(:default, @config[:database])
         DataMapper.auto_upgrade!
+        check_mysql_collation
       rescue
         puts "Error setting up database connection. Please check the `database` setting in config.ru"
+				puts $!
+				puts "-------"
+				puts $!.backtrace
         exit(1)
       end
     end
+
+		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. 
+			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]
+
+				if collation != "utf8_bin"
+					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) 
+					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
+					end
+				else
+					if !first_try
+					  puts " ~ Successfully fixed your database."
+					end
+				  return true
+				end
+			end
+		end
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firefly
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ariejan de Vroom
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 +02:00
+date: 2010-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -34,9 +37,11 @@ dependencies:
   name: dm-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 10
@@ -48,9 +53,11 @@ dependencies:
   name: dm-aggregates
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 10
@@ -62,9 +69,11 @@ dependencies:
   name: do_sqlite3
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 10
@@ -77,9 +86,11 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 2
         - 2
@@ -91,9 +102,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -105,9 +118,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -163,23 +178,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: firefly
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: FireFly is a simple URL shortner for personal use