dragonfly 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13de1169904aec53779af0935d6a07ecd59fe6a5
-  data.tar.gz: c5f99e7f5de7a1a7b93cbd93246e9737651f2c45
+  metadata.gz: 685e6116346b2a5b8853e643a5441cbcc7bce93d
+  data.tar.gz: 92c44ab44a26bab0e3423d6a3e5cade8b040d4d9
 SHA512:
-  metadata.gz: 4852dbed8e8ef2cf0fbfab4c6eb93f9036315ce8e83d581cd00c12fefefdf7fc4b7b0e87107391e8c2b8ddad26503b64ecd63d1267a0eacc3d50033abde29859
-  data.tar.gz: e4f00871e4aca9c56e424dec1ef41d77183b0d305eaae765ba199cd39ec04516b084ce421171c1aa91f546c59dbd1c5549d02456d6246925afc39fea537c8d12
+  metadata.gz: ce6ef849c48cbacf4468019988dc99fd10781f52b5689d5550ec55a21c7c6fdc2f560024cf0908eefbcc529b5d194f411a812e48522c3ec7e6a81e8dfb26ac07
+  data.tar.gz: 256a355a616ad042a832d00e8e99407953f4afe1b2f769071aa9cc1e8b7582d465fa1e53f60bf538ce21b30b6643d540878f786a66316ebdc85b38877d0edc9b

data/History.md

@@ -1,3 +1,9 @@
+1.0.11 (2015-09-04)
+===================
+Fixes
+-----
+- Make sure tempfiles are created with paths matching the meta name
+
 1.0.10 (2015-05-14)
 ===================
 Features

data/README.md

@@ -44,7 +44,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.0.10'
+gem 'dragonfly', '~> 1.0.11'
 ```
 
 Require with

data/lib/dragonfly/content.rb

@@ -66,7 +66,7 @@ module Dragonfly
     # @example "beach.jpg"
     # @return [String]
     def name
-      meta["name"] || temp_object.original_filename
+      meta["name"]
     end
 
     # @example
@@ -112,12 +112,12 @@ module Dragonfly
     # @param meta [Hash] - should be json-like, i.e. contain no types other than String, Number, Boolean
     # @return [Content] self
     def update(obj, meta=nil)
-      self.temp_object = TempObject.new(obj)
-      original_filename = temp_object.original_filename
-      self.meta['name'] ||= original_filename if original_filename
+      meta ||= {}
+      self.temp_object = TempObject.new(obj, meta['name'])
+      self.meta['name'] ||= temp_object.name if temp_object.name
       clear_analyser_cache
       add_meta(obj.meta) if obj.respond_to?(:meta)
-      add_meta(meta) if meta
+      add_meta(meta)
       self
     end
 

data/lib/dragonfly/temp_object.rb

@@ -39,7 +39,7 @@ module Dragonfly
 
     # Instance Methods
 
-    def initialize(obj)
+    def initialize(obj, name=nil)
       if obj.is_a? TempObject
         @data = obj.get_data
         @tempfile = obj.get_tempfile
@@ -62,19 +62,22 @@ module Dragonfly
 
       @tempfile.close if @tempfile
 
-      # Original filename
-      @original_filename = if obj.respond_to?(:original_filename)
+      # Name
+      @name = if name
+        name
+      elsif obj.respond_to?(:original_filename)
         obj.original_filename
       elsif @pathname
         @pathname.basename.to_s
       end
     end
 
-    attr_reader :original_filename
+    attr_reader :name
 
     def ext
-      name = original_filename
-      name.split('.').last if name
+      if n = name
+        n.split('.').last
+      end
     end
 
     def data

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

data/spec/dragonfly/content_spec.rb

@@ -205,6 +205,13 @@ describe Dragonfly::Content do
       str.should == "asdf"
     end
 
+    describe "tempfile" do
+      it "uses the name for the file extension" do
+        content.update("ASDF", 'name' => 'asdf.txt')
+        expect(content.tempfile.path).to match(/\.txt$/)
+      end
+    end
+
   end
 
   describe "shell commands" do

data/spec/dragonfly/temp_object_spec.rb

@@ -368,33 +368,37 @@ describe Dragonfly::TempObject do
     it_should_behave_like "common behaviour"
   end
 
-  describe "original_filename" do
+  describe "name" do
 
     before(:each) do
       @obj = new_tempfile
     end
 
-    it "should set the original_filename if the initial object responds to 'original filename'" do
+    it "should set the name from the arg passed in" do
+      Dragonfly::TempObject.new(@obj, 'goof.ball').name.should == 'goof.ball'
+    end
+
+    it "should set the name if the initial object responds to 'original filename'" do
       def @obj.original_filename
         'jimmy.page'
       end
-      Dragonfly::TempObject.new(@obj).original_filename.should == 'jimmy.page'
+      Dragonfly::TempObject.new(@obj).name.should == 'jimmy.page'
     end
 
     it "should not set the name if the initial object doesn't respond to 'original filename'" do
-      Dragonfly::TempObject.new(@obj).original_filename.should be_nil
+      Dragonfly::TempObject.new(@obj).name.should be_nil
     end
 
     it "should set the name if the initial object is a file object" do
       file = File.new(SAMPLES_DIR.join('round.gif'))
       temp_object = Dragonfly::TempObject.new(file)
-      temp_object.original_filename.should == 'round.gif'
+      temp_object.name.should == 'round.gif'
     end
 
     it "should set the name if the initial object is a pathname" do
       pathname = Pathname.new(SAMPLES_DIR + '/round.gif')
       temp_object = Dragonfly::TempObject.new(pathname)
-      temp_object.original_filename.should == 'round.gif'
+      temp_object.name.should == 'round.gif'
     end
 
   end
@@ -407,8 +411,8 @@ describe Dragonfly::TempObject do
       temp_object.ext.should be_nil
     end
 
-    it "uses original_filename if present" do
-      temp_object.should_receive(:original_filename).and_return('some.thing.yo')
+    it "uses name if present" do
+      temp_object.should_receive(:name).and_return('some.thing.yo')
       temp_object.ext.should == 'yo'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack