dragonfly 0.9.2 → 0.9.3

data/History.md

@@ -1,3 +1,11 @@
+0.9.3 (2011-06-03)
+==================
+Fixes
+-----
+- TempObject#to_file sets file permissions 644 - copying wasn't previously guaranteeing this
+- Added TempObject#close and closed?, which Rack uses to clean up tempfiles
+- replaced '/' characters with '~' in base64 encoded urls (they were confusing url recognition)
+
 0.9.2 (2011-05-19)
 ==================
 Features

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2011-05-19}
+  s.date = %q{2011-06-03}
   s.description = %q{Dragonfly is a framework that enables on-the-fly processing for any content type.
   It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation.}
   s.email = %q{mark@new-bamboo.co.uk}

data/lib/dragonfly/serializer.rb

@@ -10,12 +10,12 @@ module Dragonfly
     extend self # So we can do Serializer.b64_encode, etc.
     
     def b64_encode(string)
-      Base64.encode64(string).tr("\n=",'')
+      Base64.encode64(string).tr("\n=",'').tr('/','~')
     end
     
     def b64_decode(string)
       padding_length = string.length % 4
-      Base64.decode64(string + '=' * padding_length)
+      Base64.decode64(string.tr('~','/') + '=' * padding_length)
     end
     
     def marshal_encode(object)

data/lib/dragonfly/server.rb

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

data/lib/dragonfly/temp_object.rb

@@ -32,6 +32,9 @@ module Dragonfly
   #
   class TempObject
 
+    # Exceptions
+    class Closed < RuntimeError; end
+
     # Class configuration
     class << self
 
@@ -69,10 +72,12 @@ module Dragonfly
     attr_reader :original_filename
 
     def data
+      raise Closed, "can't read data as TempObject has been closed" if closed?
       @data ||= file{|f| f.read }
     end
 
     def tempfile
+      raise Closed, "can't read from tempfile as TempObject has been closed" if closed?
       @tempfile ||= begin
         case
         when @data
@@ -117,6 +122,7 @@ module Dragonfly
         File.open(path, 'wb'){|f| f.write(@data) }
       else
         FileUtils.cp(self.path, path)
+        File.chmod(0644, path)
       end
       File.new(path, 'rb')
     end
@@ -125,6 +131,16 @@ module Dragonfly
       @data ? StringIO.open(@data, 'rb', &block) : file(&block)
     end
 
+    def close
+      @tempfile.close! if @tempfile
+      @data = nil
+      @closed = true
+    end
+
+    def closed?
+      !!@closed
+    end
+
     def inspect
       content_string = case
       when @data

data/spec/dragonfly/serializer_spec.rb

@@ -23,6 +23,20 @@ describe Dragonfly::Serializer do
     end
   end
   
+  describe "replacing the '/' character in b64_encode" do
+    before(:each) do
+      @string = (127..255).map{|c| c.chr }.join
+    end
+    it "should replace '/' with '~'" do
+      b64_encode(@string).should_not =~ /\//
+      b64_encode(@string).should =~ /[\w+]+~[\w+]+/
+    end
+    it "should correctly encode and decode to the same string" do
+      str = b64_decode(b64_encode(@string))
+      str.should == @string
+    end
+  end
+  
   [
     :hello,
     nil,

data/spec/dragonfly/server_spec.rb

@@ -59,7 +59,16 @@ describe Dragonfly::Server do
         response.status.should == 200
         response.body.should == 'eggs'
       end
-      
+
+      it "should work ok with ~ symbols" do
+        funny_filename = (127..255).map{|c| c.chr }.join
+        @app.datastore.should_receive(:retrieve).with(funny_filename).and_return "EGGS"
+        # the following is the url for 'fetch(funny_filename)'
+        response = request(@server, '/media/BAhbBlsHOgZmIgGBf4CBgoOEhYaHiImKi4yNjo+QkZKTlJWWl5iZmpucnZ6foKGio6SlpqeoqaqrrK2ur7CxsrO0tba3uLm6u7y9vr~AwcLDxMXGx8jJysvMzc7P0NHS09TV1tfY2drb3N3e3+Dh4uPk5ebn6Onq6+zt7u~w8fLz9PX29~j5+vv8~f7~')
+        response.status.should == 200
+        response.body.should == 'EGGS'
+      end
+
       it "should return a cacheable response" do
         url = "/media/#{@job.serialize}"
         cache = Rack::Cache.new(@server, :entitystore => 'heap:/')

data/spec/dragonfly/temp_object_spec.rb

@@ -135,6 +135,10 @@ describe Dragonfly::TempObject do
           file.should be_a(File)
           file.read.should == 'HELLO'
         end
+        it "should have 644 permissions" do
+          @temp_object.to_file(@filename)
+          File::Stat.new(@filename).mode.to_s(8).should =~ /644$/
+        end
       end
 
     end
@@ -159,6 +163,34 @@ describe Dragonfly::TempObject do
         parts.last.length.should <= 3001
       end
     end
+    
+    describe "closing" do
+      before(:each) do
+        @temp_object = new_temp_object("wassup")
+      end
+      it "should delete its tempfile" do
+        tempfile = @temp_object.tempfile
+        path = tempfile.path
+        path.should_not be_empty
+        @temp_object.close
+        File.exist?(path).should be_false
+      end
+      %w(tempfile file data).each do |method|
+        it "should raise error when calling #{method}" do
+          @temp_object.close
+          expect{
+            @temp_object.send(method)
+          }.to raise_error(Dragonfly::TempObject::Closed)
+        end
+      end
+      it "should not report itself as closed to begin with" do
+        @temp_object.should_not be_closed
+      end
+      it "should report itself as closed after closing" do
+        @temp_object.close
+        @temp_object.should be_closed
+      end
+    end
 
   end
 

metadata

@@ -2,7 +2,7 @@
 name: dragonfly
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Mark Evans
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +01:00
+date: 2011-06-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -401,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3194904429017796395
+      hash: 3515566453882631482
       segments: 
       - 0
       version: "0"