dragonfly 0.9.9 → 0.9.10

data/History.md

@@ -1,3 +1,9 @@
+0.9.10 (2012-01-11)
+===================
+Fixes
+-----
+- FileDataStore was causing errors when the storage path was flat (not in a directory structure)
+
 0.9.9 (2011-12-30)
 ==================
 Features

data/README.md

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

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dragonfly"
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = "2011-12-30"
+  s.date = "2012-01-11"
   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 = [

data/extra_docs/Heroku.md

@@ -40,7 +40,7 @@ The datastore remains as the {Dragonfly::DataStorage::FileDataStore FileDataStor
 
 application.rb if using with Rails:
 
-    config.middleware.insert 0, 'Dragonfly::Middleware', :images
+    config.middleware.insert 1, 'Dragonfly::Middleware', :images
 
 We don't store the S3 access key and secret in the repository, rather we use Heroku's
 {http://docs.heroku.com/config-vars config variables} using the command line (we only have to do this once).

data/extra_docs/ImageMagick.md

@@ -122,7 +122,7 @@ Note that the text generation options are meant to resemble css as much as possi
 
 You can use `padding-top`, `padding-left`, etc., as well as the standard css shortcuts for `padding` (it assumes unit is px).
 
-An alternative for `:font_family` is `:font` (see {http://www.imagemagick.org/script/command-line-options.php#font}), which could be a complete filename.
+An alternative for `:font_family` is `:font` (see {http://www.imagemagick.org/script/command-line-options.php#font the imagemagick docs}), which could be a complete filename.
 Available fonts are those available on your system.
 
 Configuration

data/extra_docs/Rails3.md

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

data/extra_docs/ServingRemotely.md

@@ -10,8 +10,8 @@ For most cases, this is the way to go - you have control over it and you can {fi
 However, if for whatever reason you must serve content from the datastore directly, e.g. for lightening the load on your server, Dragonfly
 provides a number of ways of doing this.
 
-Serving Original Content
-------------------------
+Original Content
+----------------
 The {file:DataStorage#File\_datastore FileDataStore}, {file:DataStorage#S3\_datastore S3DataStore} and
 {file:DataStorage#Couch\_datastore CouchDataStore} allow for serving data directly, so given a Dragonfly app
 
@@ -27,10 +27,30 @@ we can get the remote url using
 
 or from a model attachment:
 
-    my_model.attachment.remote_url     # http://my-bucket.s....
+    my_model.attachment.remote_url     # http://my-bucket.s3.amazonaws.com/2011...
 
-Serving Processed Content
--------------------------
+Processed Content
+-----------------
+If using models, the quick and easy way to serve e.g. image thumbnails remotely is to process them _on upload_
+like most other attachment ruby gems (see {file:Models#Up-front_thumbnailing}),
+e.g. for my avatar model,
+
+    class Avatar
+      image_accessor :image do
+        copy_to(:small_image){|a| a.thumb('200x200#') }
+      end
+      image_accessor :small_image
+    end
+
+Then we can use `remote_url` for for each accessor.
+
+    avatar.image.remote_url            # http://my-bucket.s3.amazonaws.com/some/path.jpg
+    avatar.small_image.remote_url      # http://my-bucket.s3.amazonaws.com/some/other/path.jpg
+
+However, this has all the limitations that come with up-front processing, such as having to regenerate the thumbnail when the size requirement changes.
+
+Serving Processed Content *on-the-fly*
+--------------------------------------
 Serving processed versions of content such as thumbnails remotely is a bit more tricky as we need to upload the thumbnail
 to the datastore in the on-the-fly manner.
 
@@ -38,34 +58,35 @@ Dragonfly provides a way of doing this using `define_url` and `before_serve` met
 
 The details of keeping track of/expiring these thumbnails is up to you.
 
-Below is an example using an ActiveRecord 'Thumb' table to keep track of image thumbnails.
+We need to keep track of which thumbnails have been already created, by storing a uid for each one.
+Below is an example using an ActiveRecord 'Thumb' table to keep track of already created thumbnail uids.
 It has two string columns; 'job' and 'uid'.
 
     app.configure do |c|
   
-      c.server.before_serve do |job, env|
-        # Before serving, the first time it is requested...
-        # store the thumbnail in the datastore
-        uid = job.store
-        
-        # Keep track of its uid
-        Thumb.create!(
-          :uid => uid,
-          :job => job.serialize     # 'BAhbBls...' - holds all the job info
-        )                           # e.g. fetch 'some_uid' then resize to '40x40'
-      end
-  
       # Override the .url method...
       c.define_url do |app, job, opts|
         thumb = Thumb.find_by_job(job.serialize)
-        # If (fetch 'some_uid' then resize to '40x40') has been stored already..
+        # If (fetch 'some_uid' then resize to '40x40') has been stored already, give the datastore's remote url ...
         if thumb
           app.datastore.url_for(thumb.uid)
-        # ...otherwise serve from the Dragonfly server as per usual
+        # ...otherwise give the local Dragonfly server url
         else
           app.server.url_for(job)
         end
       end
+
+      # Before serving from the local Dragonfly server...
+      c.server.before_serve do |job, env|
+        # ...store the thumbnail in the datastore...
+        uid = job.store
+        
+        # ...keep track of its uid so next time we can serve directly from the datastore
+        Thumb.create!(
+          :uid => uid,
+          :job => job.serialize     # 'BAhbBls...' - holds all the job info
+        )                           # e.g. fetch 'some_uid' then resize to '40x40'
+      end
   
     end
 

data/lib/dragonfly/data_storage/file_data_store.rb

@@ -81,7 +81,7 @@ module Dragonfly
       private
 
       def absolute(relative_path)
-        File.join(root_path, relative_path)
+        relative_path.to_s == '.' ? root_path : File.join(root_path, relative_path)
       end
 
       def relative(absolute_path)
@@ -91,6 +91,10 @@ module Dragonfly
       def directory_empty?(path)
         Dir.entries(path) == ['.','..']
       end
+      
+      def root_path?(dir)
+        root_path == dir
+      end
 
       def meta_data_path(data_path)
         "#{data_path}.meta"
@@ -126,7 +130,7 @@ module Dragonfly
         containing_directory = Pathname.new(path).dirname
         containing_directory.ascend do |relative_dir|
           dir = absolute(relative_dir)
-          FileUtils.rmdir dir if directory_empty?(dir)
+          FileUtils.rmdir dir if directory_empty?(dir) && !root_path?(dir)
         end
       end
 

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -174,6 +174,12 @@ describe Dragonfly::DataStorage::FileDataStore do
       @data_store.destroy(uid)
       @data_store.root_path.should be_an_empty_directory
     end
+    
+    it "should not prune root_path directory when destroying file without directory prefix in path" do
+      uid = @data_store.store(@temp_object, :path => 'mate.png')
+      @data_store.destroy(uid)
+      @data_store.root_path.should be_an_empty_directory
+    end
 
     it "should raise an error if the data doesn't exist on destroy" do
       uid = @data_store.store(@temp_object)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2166406820 !ruby/object:Gem::Requirement
+  requirement: &70223626180020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166406820
+  version_requirements: *70223626180020
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2166405800 !ruby/object:Gem::Requirement
+  requirement: &70223626179540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166405800
+  version_requirements: *70223626179540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2166404860 !ruby/object:Gem::Requirement
+  requirement: &70223626173660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2166404860
+  version_requirements: *70223626173660
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2166404060 !ruby/object:Gem::Requirement
+  requirement: &70223626173180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *2166404060
+  version_requirements: *70223626173180
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2166403120 !ruby/object:Gem::Requirement
+  requirement: &70223626172700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166403120
+  version_requirements: *70223626172700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2166402100 !ruby/object:Gem::Requirement
+  requirement: &70223626172220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2166402100
+  version_requirements: *70223626172220
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2166401160 !ruby/object:Gem::Requirement
+  requirement: &70223626171740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166401160
+  version_requirements: *70223626171740
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2166400320 !ruby/object:Gem::Requirement
+  requirement: &70223626170440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166400320
+  version_requirements: *70223626170440
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &2166399340 !ruby/object:Gem::Requirement
+  requirement: &70223626169900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2166399340
+  version_requirements: *70223626169900
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2166398460 !ruby/object:Gem::Requirement
+  requirement: &70223626169420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166398460
+  version_requirements: *70223626169420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2166397520 !ruby/object:Gem::Requirement
+  requirement: &70223626168940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2166397520
+  version_requirements: *70223626168940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166396660 !ruby/object:Gem::Requirement
+  requirement: &70223626168460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2166396660
+  version_requirements: *70223626168460
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2166395620 !ruby/object:Gem::Requirement
+  requirement: &70223626167980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166395620
+  version_requirements: *70223626167980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2166394640 !ruby/object:Gem::Requirement
+  requirement: &70223626167500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166394640
+  version_requirements: *70223626167500
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2166393680 !ruby/object:Gem::Requirement
+  requirement: &70223626167020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166393680
+  version_requirements: *70223626167020
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2166392920 !ruby/object:Gem::Requirement
+  requirement: &70223626166540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2166392920
+  version_requirements: *70223626166540
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2166392240 !ruby/object:Gem::Requirement
+  requirement: &70223626166060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166392240
+  version_requirements: *70223626166060
 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 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3133110676781217122
+      hash: 2886754180935822941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: