dragonfly 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/dragonfly-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly-rails}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]

data/dragonfly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]

data/lib/dragonfly/active_record_extensions/attachment.rb

@@ -97,7 +97,7 @@ module Dragonfly
       def magic_attributes
         parent_model.class.column_names.select { |name|
           name =~ /^#{attribute_name}_(.+)$/ &&
-            (analyser.has_analysis_method?($1) || %w(size ext).include?($1))
+            (analyser.has_analysis_method?($1) || %w(size name ext).include?($1))
         }
       end
       

data/lib/dragonfly/app.rb

@@ -100,7 +100,7 @@ module Dragonfly
     include Configurable
     
     configurable_attr :datastore do DataStorage::FileDataStore.new end
-    configurable_attr :encoder do Encoding::Base.new end
+    configurable_attr :encoder do Encoding::TransparentEncoder.new end
     configurable_attr :log do Logger.new('/var/tmp/dragonfly.log') end
     configurable_attr :cache_duration, 3600*24*365 # Defaults to 1 year
     configurable_attr :fallback_mime_type, 'application/octet-stream'

data/lib/dragonfly/data_storage/file_data_store.rb

@@ -30,8 +30,9 @@ module Dragonfly
       end
 
       def retrieve(uid)
-        entries = Dir[absolute_storage_path(uid) + '*']
-        raise DataNotFound if entries.empty?
+        pattern = "#{absolute_storage_path(uid)}*"
+        entries = Dir[pattern]
+        raise DataNotFound, "Couldn't find any files matching #{pattern}" if entries.empty?
         File.new(entries.first)
       rescue Errno::ENOENT => e
         raise DataNotFound, e.message

data/lib/dragonfly/url_handler.rb

@@ -35,6 +35,7 @@ module Dragonfly
     end
 
     def url_to_parameters(path, query_string)
+      path = unescape(path)
       validate_format!(path)
       path = remove_path_prefix(path)
       query = parse_nested_query(query_string)

data/spec/dragonfly/active_record_extensions/migration.rb

@@ -6,6 +6,7 @@ class MigrationForTest < ActiveRecord::Migration
       t.string  :preview_image_uid
       t.string  :preview_image_some_analyser_method
       t.integer :preview_image_size
+      t.string  :preview_image_name
       t.string  :preview_image_ext
       t.string  :preview_image_blah_blah
       t.string  :other_image_uid

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -401,6 +401,13 @@ describe Item do
       @item.preview_image = data
       @item.preview_image_ext.should == 'png'
     end
+
+    it "should store the original file name if it exists" do
+      data = 'jasdlkf sadjl'
+      data.stub!(:original_filename).and_return('hello.png')
+      @item.preview_image = data
+      @item.preview_image_name.should == 'hello.png'
+    end
     
   end
 

data/spec/dragonfly/url_handler_spec.rb

@@ -91,6 +91,12 @@ describe Dragonfly::UrlHandler do
       parameters.format.should == 'bean'
     end
     
+    it "should unescape any url-escaped characters" do
+      parameters = @url_handler.url_to_parameters('hello%20bean.jpg', 'm=whats%20up')
+      parameters.uid.should == 'hello bean'
+      parameters.processing_method.should == 'whats up'
+    end
+    
   end
   
   describe "forming a url from parameters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Mark Evans