paperclip-storage-tmp 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 gemfile: Gemfile.ci
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3

data/CHANGELOG.md

@@ -1,16 +1,28 @@
+## Not released yet:
+
+* (no changes)
+
+## 0.0.4 (2012-06-15):
+
+* Ruby 1.8 compatability: use `Tempfile#path` when opening new file
+  instead passing `Tempfile` directly (mikz)
+* Rewind the file queued for write before returning it (exviva)
+* Unlink the file **and** close the file descriptor when clearing
+  the attachments (exviva)
+
 ## 0.0.3 (2012-05-15):
 
 * Depend on Paperclip `>= 2.4.2`, which properly handles
-  `<attachment>_file_name` assignment from `Paperclip::Attachment`
+  `<attachment>_file_name` assignment from `Paperclip::Attachment` (exviva)
 
 ## 0.0.2 (2012-05-12):
 
 * Provide one-line testing helpers for RSpec and Cucumber;
   they require the gem and add after hooks which clear the
-  tmp storage
+  tmp storage (exviva)
 
 ## 0.0.1 (2012-05-11):
 
 * Implement `Paperclip::Storage::Tmp.clear` which clears all
-  attachments from the filesystem (and from the "virtual" filesystem)
-* Provide a `:tmp` storage option for Paperclip attachments
+  attachments from the filesystem (and from the "virtual" filesystem) (exviva)
+* Provide a `:tmp` storage option for Paperclip attachments (exviva)

data/Gemfile.ci

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'paperclip', '2.4.0'
+gem 'paperclip', '2.7.0'

data/README.md

@@ -100,7 +100,8 @@ Here are a couple of specs, which expose the expected behaviour of this gem. The
 
     describe User do
       describe 'avatar' do
-        let(:user) { User.create!(avatar: File.new('spec/fixtures/hey_mom_its_me.png')) }
+        let(:avatar_file) { File.new('spec/fixtures/hey_mom_its_me.png') }
+        let(:user) { User.create!(avatar: avatar_file) }
         subject { user.avatar }
 
         it { should exist }

data/Rakefile

@@ -4,4 +4,4 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task :default => :spec

data/lib/paperclip-storage-tmp/version.rb

@@ -1,7 +1,7 @@
 module Paperclip
   module Storage
     module Tmp
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/lib/paperclip/storage/tmp.rb

@@ -7,7 +7,7 @@ module Paperclip
 
       # Deletes the temporary files and releases references to them
       def self.clear
-        fs.each_value {|f| f.unlink }
+        fs.each_value {|f| f.close! }
         @fs = nil
       end
 
@@ -16,7 +16,12 @@ module Paperclip
       end
 
       def to_file(style_name = default_style)
-        @queued_for_write[style_name] || (File.new(Tmp.fs[path(style_name)], 'rb') if exists?(style_name))
+        if @queued_for_write[style_name]
+          @queued_for_write[style_name].rewind
+          @queued_for_write[style_name]
+        elsif exists?(style_name)
+          File.new(Tmp.fs[path(style_name)].path, 'rb')
+        end
       end
 
       def flush_writes
@@ -31,7 +36,7 @@ module Paperclip
       def flush_deletes
         @queued_for_delete.each do |path|
           if file = Tmp.fs.delete(path)
-            file.unlink
+            file.close!
           end
         end
 

data/spec/fixtures/user.rb

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
-  has_attached_file :avatar, storage: :tmp
+  has_attached_file :avatar, :storage => :tmp
 end

data/spec/lib/paperclip/storage/tmp_spec.rb

@@ -7,7 +7,7 @@ describe Paperclip::Storage::Tmp do
 
   [proc { user.avatar }, proc { user.reload.avatar }].each do |subject_proc|
     describe 'assigning an attachment' do
-      let(:user) { User.create!(avatar: avatar_file) }
+      let(:user) { User.create!(:avatar => avatar_file) }
       subject(&subject_proc)
 
       it { should exist }
@@ -23,7 +23,7 @@ describe Paperclip::Storage::Tmp do
       end
 
       it 'copies the assigned file' do
-        File.read(subject.to_file).should eq(File.read(avatar_file))
+        File.read(subject.to_file.path).should eq(File.read(avatar_file.path))
       end
 
       it 'stores the file in an imagemagick-friendly way' do
@@ -39,17 +39,17 @@ describe Paperclip::Storage::Tmp do
       end
 
       it 'can handle assignment from File' do
-        new_user = User.new(avatar: avatar_file)
+        new_user = User.new(:avatar => avatar_file)
         new_user.avatar_file_name.should eq('hey_mom_its_me.png')
       end
 
       it 'can persist assignment from File' do
-        new_user = User.create!(avatar: avatar_file)
+        new_user = User.create!(:avatar => avatar_file)
         new_user.reload.avatar_file_name.should eq('hey_mom_its_me.png')
       end
 
       it 'can handle assignment from Paperclip::Attachment' do
-        new_user = User.new(avatar: subject)
+        new_user = User.new(:avatar => subject)
         new_user.avatar_file_name.should eq('hey_mom_its_me.png')
       end
     end
@@ -67,7 +67,7 @@ describe Paperclip::Storage::Tmp do
   end
 
   describe 'destroying an attachment' do
-    let(:user) { User.create!(avatar: avatar_file) }
+    let(:user) { User.create!(:avatar => avatar_file) }
     subject do
       @path_before_destroy = user.avatar.to_file.path
       user.destroy
@@ -84,7 +84,7 @@ describe Paperclip::Storage::Tmp do
   end
 
   describe 'clear' do
-    let(:user) { User.create!(avatar: avatar_file) }
+    let(:user) { User.create!(:avatar => avatar_file) }
     subject { Paperclip::Storage::Tmp.clear }
 
     it 'deletes files' do

data/spec/support/active_record.rb

@@ -2,7 +2,7 @@ require 'active_record'
 ActiveRecord::Base.send(:include, Paperclip::Glue)
 require 'fixtures/user'
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 ActiveRecord::Schema.define do
   create_table :users do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-storage-tmp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip