guillotine 1.0.7 → 1.0.8

data/guillotine.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'guillotine'
-  s.version           = '1.0.7'
+  s.version           = '1.0.8'
   s.date              = '2011-11-11'
   s.rubyforge_project = 'guillotine'
 

data/lib/guillotine.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 require 'addressable/uri'
 
 module Guillotine
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"

data/lib/guillotine/adapters/riak_adapter.rb

@@ -112,13 +112,18 @@ module Guillotine
       # Fixes a bug in Guillotine 1.0.2 where the content type on url objects
       # was not being set.  The ruby Riak::Client defaults to JSON, so
       # strings were being saved as "somecode", which is unparseable by JSON.
-      def fix_url_object(obj)
-        if obj.content_type != PLAIN
+      def fix_url_object(obj, data = nil)
+        if data
           obj.content_type = PLAIN
-          obj.data = JSON.parse(%({"data":#{obj.raw_data}}))['data']
+          obj.data = data
           obj.store
+          return obj
+        end
+        case obj.content_type
+          when /json/ then fix_url_object(obj, JSON.parse(%({"data":#{obj.raw_data}}))['data'])
+          when PLAIN  then obj
+          else fix_url_object(obj, obj.data) # old values had the right data but the content type was application/x-www-form-urlencoded
         end
-        obj
       end
 
       def url_key(url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70284745825400 !ruby/object:Gem::Requirement
+  requirement: &70215141118220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70284745825400
+  version_requirements: *70215141118220
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70284745824840 !ruby/object:Gem::Requirement
+  requirement: &70215141117700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70284745824840
+  version_requirements: *70215141117700
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70284745824400 !ruby/object:Gem::Requirement
+  requirement: &70215141117280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284745824400
+  version_requirements: *70215141117280
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []