dragonfly 0.9.10 → 0.9.11

data/.yardopts

@@ -1,5 +1,7 @@
 --main extra_docs/Index.md
 -e ./yard/setup.rb
+--markup-provider=redcarpet
+--markup=markdown
 -
 README.md
 extra_docs/GeneralUsage.md

data/Gemfile

@@ -10,10 +10,12 @@ group :development, :test, :cucumber do
   gem 'database_cleaner'
   gem 'jeweler', '~> 1.5.2'
   gem 'fog'
+  gem 'github-markup'
   gem 'mongo'
   gem 'couchrest', '~> 1.0'
   gem 'rack-cache'
   gem 'rails', '~>3.1.0', :require => nil
+  gem 'redcarpet', '~>1.0'
   gem 'rspec', '~> 2.5'
   gem 'webmock'
   gem 'yard'
@@ -23,7 +25,7 @@ group :development, :test, :cucumber do
     gem "jruby-openssl"
   else
     gem 'bluecloth'
-    gem 'bson_ext', '~>1.3.1'
+    gem 'bson_ext'
     gem 'sqlite3-ruby'
   end
 end

data/History.md

@@ -1,3 +1,22 @@
+0.9.11 (2012-03-12)
+===================
+Features
+-------
+- Allow the S3 base URL to be customised with `url_host` (or per-request)
+- Added App#name (name as per `Dragonfly[:app_name]`)
+
+Changes
+-------
+- Better inspect for App, Processor, Analyser, Encoder, Generator, Job, TempObject, RoutedEndpoint, JobEndpoint
+
+Fixes
+-----
+- Rescue from Excon::Errors::Conflict which apparently gets raised sometimes (don't know why - see https://github.com/markevans/dragonfly/issues/167)
+- Alias portrait and landscape without question marks, so magic_attributes can be used with them
+- Fixed stack error when using `define_macro_on_include` twice
+- Use fog's `sync_clock` to overcome potential S3 time skew problems
+- Using :name in urls was causing problems when filenames had dashes in them
+
 0.9.10 (2012-01-11)
 ===================
 Fixes

data/README.md

@@ -13,7 +13,7 @@ For the lazy Rails user...
 
 ```ruby
 gem 'rack-cache', :require => 'rack/cache'
-gem 'dragonfly', '~>0.9.10'
+gem 'dragonfly', '~>0.9.11'
 ```
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dragonfly"
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = "2012-01-11"
+  s.date = "2012-03-12"
   s.description = "Dragonfly is a framework that enables on-the-fly processing for any content type.\n  It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation."
   s.email = "mark@new-bamboo.co.uk"
   s.extra_rdoc_files = [
@@ -192,7 +192,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/markevans/dragonfly"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Ideal gem for handling attachments in Rails, Sinatra and Rack applications."
   s.test_files = [
     "spec/dragonfly/active_model_extensions/model_spec.rb",
@@ -253,15 +253,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<fog>, [">= 0"])
+      s.add_development_dependency(%q<github-markup>, [">= 0"])
       s.add_development_dependency(%q<mongo>, [">= 0"])
       s.add_development_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_development_dependency(%q<rack-cache>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<redcarpet>, ["~> 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_development_dependency(%q<bson_ext>, ["~> 1.3.1"])
+      s.add_development_dependency(%q<bson_ext>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
@@ -271,15 +273,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<database_cleaner>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<fog>, [">= 0"])
+      s.add_dependency(%q<github-markup>, [">= 0"])
       s.add_dependency(%q<mongo>, [">= 0"])
       s.add_dependency(%q<couchrest>, ["~> 1.0"])
       s.add_dependency(%q<rack-cache>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.1.0"])
+      s.add_dependency(%q<redcarpet>, ["~> 1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<bson_ext>, ["~> 1.3.1"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
@@ -290,15 +294,17 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<database_cleaner>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<fog>, [">= 0"])
+    s.add_dependency(%q<github-markup>, [">= 0"])
     s.add_dependency(%q<mongo>, [">= 0"])
     s.add_dependency(%q<couchrest>, ["~> 1.0"])
     s.add_dependency(%q<rack-cache>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.1.0"])
+    s.add_dependency(%q<redcarpet>, ["~> 1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, ["~> 1.3.1"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end

data/extra_docs/Configuration.md

@@ -72,7 +72,7 @@ Here is an example of an app with all attributes configured:
       
       # When using ImageMagick only...
       c.convert_command = "/opt/local/bin/convert"          # defaults to "convert"
-      c.identify_command = "/opt/local/bin/convert"         # defaults to "convert"
+      c.identify_command = "/opt/local/bin/identify"        # defaults to "identify"
       c.log_commands = true                                 # defaults to false
     end
 

data/extra_docs/DataStorage.md

@@ -90,6 +90,7 @@ To configure with the {Dragonfly::DataStorage::S3DataStore S3DataStore}:
       c.region = 'eu-west-1'                        # defaults to 'us-east-1'
       c.storage_headers = {'some' => 'thing'}       # defaults to {'x-amz-acl' => 'public-read'}
       c.url_scheme = 'https'                        # defaults to 'http'
+      c.url_host = 'some.custom.host'               # defaults to "<bucket_name>.s3.amazonaws.com"
     end
 
 You can also pass these options to `S3DataStore.new` as an options hash.
@@ -106,6 +107,10 @@ or with an https url:
 
     my_model.attachment.remote_url(:scheme => 'https')   # also configurable for all urls with 'url_scheme'
 
+or with a custom host:
+
+    my_model.attachment.remote_url(:host => 'custom.domain')   # also configurable for all urls with 'url_host'
+
 Extra options you can use on store are `:path` and `:headers`
 
     app.store("SOME CONTENT", :path => 'some/path.txt', :headers => {'x-amz-acl' => 'public-read-write'})

data/extra_docs/ImageMagick.md

@@ -131,6 +131,6 @@ There are some options that can be set, e.g. if the imagemagick convert command
 
     app.configure do |c|
       c.convert_command = "/opt/local/bin/convert"          # defaults to "convert"
-      c.identify_command = "/opt/local/bin/convert"         # defaults to "convert"
+      c.identify_command = "/opt/local/bin/identify"        # defaults to "identify"
       c.log_commands = true                                 # defaults to false
     end

data/extra_docs/Rails3.md

@@ -35,7 +35,7 @@ application.rb:
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.9.10'
+    gem 'dragonfly', '~>0.9.11'
     gem 'rack-cache', :require => 'rack/cache'
 
 Capistrano

data/lib/dragonfly/active_model_extensions/attachment.rb

@@ -158,7 +158,7 @@ module Dragonfly
       end
       
       def inspect
-        "<Dragonfly Attachment uid=#{uid.inspect}, app=#{app.inspect}>"
+        "<Dragonfly Attachment uid=#{uid.inspect}, app=#{app.name.inspect}>"
       end
 
       protected
@@ -182,7 +182,7 @@ module Dragonfly
 
       def destroy_content(uid)
         app.datastore.destroy(uid)
-      rescue DataStorage::DataNotFound => e
+      rescue DataStorage::DataNotFound, DataStorage::DestroyError => e
         app.log.warn("*** WARNING ***: tried to destroy data with uid #{uid}, but got error: #{e}")
       end
 

data/lib/dragonfly/app.rb

@@ -10,7 +10,8 @@ module Dragonfly
       private :new # Hide 'new' - need to use 'instance'
 
       def instance(name)
-        apps[name] ||= new
+        name = name.to_sym
+        apps[name] ||= new(name)
       end
 
       alias [] instance
@@ -23,7 +24,8 @@ module Dragonfly
 
     end
 
-    def initialize
+    def initialize(name)
+      @name = name
       @analyser, @processor, @encoder, @generator = Analyser.new, Processor.new, Encoder.new, Generator.new
       [@analyser, @processor, @encoder, @generator].each do |obj|
         obj.use_same_log_as(self)
@@ -33,6 +35,8 @@ module Dragonfly
       @job_definitions = JobDefinitions.new
     end
 
+    attr_reader :name
+
     include Configurable
 
     extend Forwardable
@@ -135,13 +139,14 @@ module Dragonfly
 
     def define_macro_on_include(mod, macro_name)
       app = self
+      name = self.name
       (class << mod; self; end).class_eval do
-        alias included_without_dragonfly included
-        define_method :included_with_dragonfly do |mod|
-          included_without_dragonfly(mod)
+        alias_method "included_without_dragonfly_#{name}", :included
+        define_method "included_with_dragonfly_#{name}" do |mod|
+          send "included_without_dragonfly_#{name}", mod
           app.define_macro(mod, macro_name)
         end
-        alias included included_with_dragonfly
+        alias_method :included, "included_with_dragonfly_#{name}"
       end
     end
     
@@ -162,6 +167,10 @@ module Dragonfly
       job_definitions.definition_names
     end
     
+    def inspect
+      "<#{self.class.name} name=#{name.inspect} >"
+    end
+    
     # Deprecated methods
     def url_path_prefix=(thing)
       raise NoMethodError, "url_path_prefix is deprecated - please use url_format, e.g. url_format = '/media/:job/:basename.:format' - see docs for more details"

data/lib/dragonfly/data_storage.rb

@@ -5,6 +5,7 @@ module Dragonfly
     class BadUID < RuntimeError; end
     class DataNotFound < RuntimeError; end
     class UnableToStore < RuntimeError; end
+    class DestroyError < RuntimeError; end
 
   end
 end

data/lib/dragonfly/data_storage/s3data_store.rb

@@ -15,6 +15,7 @@ module Dragonfly
       configurable_attr :use_filesystem, true
       configurable_attr :storage_headers, {'x-amz-acl' => 'public-read'}
       configurable_attr :url_scheme, 'http'
+      configurable_attr :url_host
 
       REGIONS = {
         'us-east-1' => 's3.amazonaws.com',  #default
@@ -71,6 +72,8 @@ module Dragonfly
         rescuing_socket_errors{ storage.delete_object(bucket_name, uid) }
       rescue Excon::Errors::NotFound => e
         raise DataNotFound, "#{e} - #{uid}"
+      rescue Excon::Errors::Conflict => e
+        raise DestroyError, "#{e} - #{uid}"
       end
 
       def url_for(uid, opts={})
@@ -82,7 +85,8 @@ module Dragonfly
           end
         else
           scheme = opts[:scheme] || url_scheme
-          "#{scheme}://#{bucket_name}.s3.amazonaws.com/#{uid}"
+          host   = opts[:host]   || url_host || "#{bucket_name}.s3.amazonaws.com"
+          "#{scheme}://#{host}/#{uid}"
         end
       end
 
@@ -91,12 +95,16 @@ module Dragonfly
       end
 
       def storage
-        @storage ||= Fog::Storage.new(
-          :provider => 'AWS',
-          :aws_access_key_id => access_key_id,
-          :aws_secret_access_key => secret_access_key,
-          :region => region
-        )
+        @storage ||= begin
+          storage = Fog::Storage.new(
+            :provider => 'AWS',
+            :aws_access_key_id => access_key_id,
+            :aws_secret_access_key => secret_access_key,
+            :region => region
+          )
+          storage.sync_clock
+          storage
+        end
       end
 
       def bucket_exists?

data/lib/dragonfly/function_manager.rb

@@ -52,7 +52,7 @@ module Dragonfly
     end
 
     def inspect
-      to_s.sub(/>$/, " with functions: #{functions.keys.map{|k| k.to_s }.sort.join(', ')} >")
+      "<#{self.class.name} with functions: #{functions.keys.map{|k| k.to_s }.sort.join(', ')} >"
     end
 
     private

data/lib/dragonfly/image_magick/analyser.rb

@@ -22,11 +22,13 @@ module Dragonfly
         attrs = identify(temp_object)
         attrs[:width] <= attrs[:height]
       end
+      alias portrait portrait?
 
       def landscape?(temp_object)
         attrs = identify(temp_object)
         attrs[:width] >= attrs[:height]
       end
+      alias landscape landscape?
 
       def depth(temp_object)
         identify(temp_object)[:depth]

data/lib/dragonfly/job.rb

@@ -378,7 +378,7 @@ module Dragonfly
     end
 
     def inspect
-      to_s.sub(/>$/, " app=#{app}, steps=#{steps.inspect}, temp_object=#{temp_object.inspect}, steps applied:#{applied_steps.length}/#{steps.length} >")
+      "<Dragonfly::Job app=#{app.name.inspect}, steps=#{steps.inspect}, temp_object=#{temp_object.inspect}, steps applied:#{applied_steps.length}/#{steps.length} >"
     end
     
     def update(content, new_meta)

data/lib/dragonfly/job_endpoint.rb

@@ -11,5 +11,9 @@ module Dragonfly
 
     attr_reader :job
 
+    def inspect
+      "<#{self.class.name} steps=#{job.steps} >"
+    end
+
   end
 end

data/lib/dragonfly/routed_endpoint.rb

@@ -18,6 +18,10 @@ module Dragonfly
       [400, {"Content-Type" => 'text/plain'}, ["The SHA parameter you gave (#{e}) is incorrect"]]
     end
 
+    def inspect
+      "<#{self.class.name} for app #{@app.name.inspect} >"
+    end
+
     private
 
     def routing_params(env)

data/lib/dragonfly/server.rb

@@ -76,6 +76,7 @@ module Dragonfly
       @url_mapper ||= UrlMapper.new(url_format,
         :job => '[\w+~]',
         :basename => '[^\/]',
+        :name => '[^\/]',
         :format => '[^\.]'
       )
     end

data/lib/dragonfly/temp_object.rb

@@ -165,7 +165,7 @@ module Dragonfly
       when @pathname then "pathname=#{@pathname.inspect}"
       when @tempfile then "tempfile=#{@tempfile.inspect}"
       end
-      to_s.sub(/>$/, " #{content_string} >")
+      "<#{self.class.name} #{content_string} >"
     end
 
     def unique_id

data/spec/dragonfly/active_model_extensions/model_spec.rb

@@ -49,18 +49,37 @@ describe Item do
       end
     end
 
-    it "should work for included modules (e.g. Mongoid::Document)" do
-      mongoid_document = Module.new
-      app1.define_macro_on_include(mongoid_document, :dog_accessor)
-      model_class = Class.new do
-        def self.before_save(*args); end
-        def self.before_destroy(*args); end
-        include mongoid_document
-        dog_accessor :doogie
+    describe "included modules (e.g. Mongoid::Document)" do
+      
+      it "should work" do
+        mongoid_document = Module.new
+        app1.define_macro_on_include(mongoid_document, :dog_accessor)
+        model_class = Class.new do
+          def self.before_save(*args); end
+          def self.before_destroy(*args); end
+          include mongoid_document
+          dog_accessor :doogie
+        end
+        klass = model_class.dragonfly_attachment_classes.first
+        klass.app.should == app1
+        klass.attribute.should == :doogie
+      end
+
+      it "should work with two apps" do
+        mongoid_document = Module.new
+        app1.define_macro_on_include(mongoid_document, :image_accessor)
+        app2.define_macro_on_include(mongoid_document, :video_accessor)
+        model_class = Class.new do
+          def self.before_save(*args); end
+          def self.before_destroy(*args); end
+          include mongoid_document
+          image_accessor :doogie
+          video_accessor :boogie
+        end
+        model_class.dragonfly_attachment_classes[0].app.should == app1
+        model_class.dragonfly_attachment_classes[1].app.should == app2
       end
-      klass = model_class.dragonfly_attachment_classes.first
-      klass.app.should == app1
-      klass.attribute.should == :doogie
+
     end
 
   end
@@ -288,12 +307,18 @@ describe Item do
         
       end
 
-      describe "when the data can't be found" do
+      describe "destroy errors" do
         it "should log a warning if the data wasn't found on destroy" do
           @app.datastore.should_receive(:destroy).with('some_uid').and_raise(Dragonfly::DataStorage::DataNotFound)
           @app.log.should_receive(:warn)
           @item.destroy
         end
+
+        it "should log a warning if the data wasn't found on destroy" do
+          @app.datastore.should_receive(:destroy).with('some_uid').and_raise(Dragonfly::DataStorage::DestroyError)
+          @app.log.should_receive(:warn)
+          @item.destroy
+        end
       end
 
     end
@@ -1446,7 +1471,7 @@ describe Item do
       @item.save!
     end
     it "should be awesome" do
-      @item.preview_image.inspect.should =~ %r{^<Dragonfly Attachment uid="[^"]+".*>$}
+      @item.preview_image.inspect.should =~ %r{^<Dragonfly Attachment uid="[^"]+", app=:test[_\w]*>$}
     end
   end
   

data/spec/dragonfly/app_spec.rb

@@ -164,4 +164,10 @@ describe Dragonfly::App do
     end
   end
 
+  describe "inspect" do
+    it "should give a neat output" do
+      Dragonfly[:hello].inspect.should == "<Dragonfly::App name=:hello >"
+    end
+  end
+
 end

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -261,6 +261,16 @@ describe Dragonfly::DataStorage::S3DataStore do
       @data_store.url_scheme = 'https'
       @data_store.url_for(@uid).should == "https://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
     end
+
+    it "should allow for customizing the host" do
+      @data_store.url_for(@uid, :host => 'customised.domain.com/and/path').should == "http://customised.domain.com/and/path/some/path/on/s3"
+    end
+
+    it "should allow the url_host to be customised permanently" do
+      url_host = 'customised.domain.com/and/path'
+      @data_store.url_host = url_host
+      @data_store.url_for(@uid).should == "http://#{url_host}/some/path/on/s3"
+    end
     
   end
 

data/spec/dragonfly/job_endpoint_spec.rb

@@ -226,4 +226,10 @@ describe Dragonfly::JobEndpoint do
     end
   end
 
+  describe "inspect" do
+    it "should be pretty yo" do
+      @job.to_app.inspect.should == %(<Dragonfly::JobEndpoint steps=[fetch("egg")] >)
+    end
+  end
+
 end

data/spec/dragonfly/routed_endpoint_spec.rb

@@ -44,5 +44,9 @@ describe Dragonfly::RoutedEndpoint do
     response = response_for @endpoint.call(env)
     response.body.should == 'wassup'
   end
+  
+   it "should have nice inspect output" do
+     @endpoint.inspect.should =~ /<Dragonfly::RoutedEndpoint for app :test_[_\w]* >/
+   end
 
 end

data/spec/spec_helper.rb

@@ -37,7 +37,8 @@ def mock_app(extra_stubs={})
 end
 
 def test_app
-  app = Dragonfly::App.send(:new)
+  time = Time.now
+  app = Dragonfly::App.send(:new, "test_#{time.sec}_#{time.usec}".to_sym)
   app.log = Logger.new(LOG_FILE)
   app.datastore.root_path = 'tmp/file_data_store_test'
   app

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70223626180020 !ruby/object:Gem::Requirement
+  requirement: &70236021927120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223626180020
+  version_requirements: *70236021927120
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70223626179540 !ruby/object:Gem::Requirement
+  requirement: &70236021942780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626179540
+  version_requirements: *70236021942780
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70223626173660 !ruby/object:Gem::Requirement
+  requirement: &70236021941780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70223626173660
+  version_requirements: *70236021941780
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70223626173180 !ruby/object:Gem::Requirement
+  requirement: &70236021940000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70223626173180
+  version_requirements: *70236021940000
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70223626172700 !ruby/object:Gem::Requirement
+  requirement: &70236021938420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626172700
+  version_requirements: *70236021938420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70223626172220 !ruby/object:Gem::Requirement
+  requirement: &70236021937080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70223626172220
+  version_requirements: *70236021937080
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70223626171740 !ruby/object:Gem::Requirement
+  requirement: &70236021936400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626171740
+  version_requirements: *70236021936400
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: &70236021935700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70236021935700
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70223626170440 !ruby/object:Gem::Requirement
+  requirement: &70236021976980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626170440
+  version_requirements: *70236021976980
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &70223626169900 !ruby/object:Gem::Requirement
+  requirement: &70236021976260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70223626169900
+  version_requirements: *70236021976260
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70223626169420 !ruby/object:Gem::Requirement
+  requirement: &70236021975280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626169420
+  version_requirements: *70236021975280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70223626168940 !ruby/object:Gem::Requirement
+  requirement: &70236021974280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,21 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70223626168940
+  version_requirements: *70236021974280
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &70236021973200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70236021973200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223626168460 !ruby/object:Gem::Requirement
+  requirement: &70236021971360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +164,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70223626168460
+  version_requirements: *70236021971360
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70223626167980 !ruby/object:Gem::Requirement
+  requirement: &70236021970020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626167980
+  version_requirements: *70236021970020
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70223626167500 !ruby/object:Gem::Requirement
+  requirement: &70236021985140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626167500
+  version_requirements: *70236021985140
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70223626167020 !ruby/object:Gem::Requirement
+  requirement: &70236021984320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,21 +197,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626167020
+  version_requirements: *70236021984320
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70223626166540 !ruby/object:Gem::Requirement
+  requirement: &70236021983000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626166540
+  version_requirements: *70236021983000
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70223626166060 !ruby/object:Gem::Requirement
+  requirement: &70236021981600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223626166060
+  version_requirements: *70236021981600
 description: ! "Dragonfly is a framework that enables on-the-fly processing for any
   content type.\n  It is especially suited to image handling. Its uses range from
   image thumbnails to standard attachments to on-demand text generation."
@@ -394,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2886754180935822941
+      hash: -783174098517993028
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -403,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.