refile 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f335bddd4f808d06e31efe59579f85ddaa635b
-  data.tar.gz: bb5c872f88e17f6756988f2c3cb0bd65ecac9843
+  metadata.gz: b4a6a01330f6055b1ea8d4ff4f2c38bd830b586a
+  data.tar.gz: 63e43f184dd10c69678e2bfaa881a496e86a73ec
 SHA512:
-  metadata.gz: 277ff85d62eb22974311570c0f8245aec981ef1f9bc6e7f9086f8d0ee8890dd4af89154efba369acc52071d20f11641a0b54b2687cfd831b3139f6ef75d95a1a
-  data.tar.gz: 8f22cf639037cb0ed933f5a399abc1f9534dd8c4b6e60e76f9f55452653cb25679bd8e2c5e5655cabbae6d8fd00739526dfd55c9f60afd19b56c88228414bd8c
+  metadata.gz: c233739353d69946b16d3332532bb2394eb0bcb292207e4f51045c9a1209070a19a5447f2cde2e7ea91861d36a3a29c71d4cd931ea342b5832527590d7fada57
+  data.tar.gz: 294c22cbbf9da075a6c6609b9b79c2345ecacd28a071db5b9c00c2ed45121719c5345164eb316070cbdf9910a3dae385459570b37f2c7b6972b847edebbfd339

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 
 rvm:
   - 2.1
-  - 2.1.5
+  - 2.2
   - ruby-head
 
 gemfile:

data/History.md

@@ -1,3 +1,10 @@
+# 0.4.1
+
+Release date: 2014-12-26
+
+- [CHANGED] Improved IO performance
+- [FIXED] Work around a bug in Ruby 2.2
+
 # 0.4.0
 
 Release date: 2014-12-26

data/lib/refile.rb

@@ -16,14 +16,6 @@ module Refile
   ONE_YEAR_IN_SECONDS = 31_557_600
 
   class << self
-    # The number of bytes to read when files are streamed. Refile
-    # uses this in a couple of places where files should be streamed
-    # in a memory efficient way instead of reading the entire file into
-    # memory at once. The default value of this is `3000`.
-    #
-    # @return [Fixnum]
-    attr_accessor :read_chunk_size
-
     # A shortcut to the instance of the Rack application. This should be
     # set when the application is initialized. `refile/rails` sets this
     # value.
@@ -210,10 +202,6 @@ module Refile
 end
 
 Refile.configure do |config|
-  # FIXME: what is a sane default here? This is a little less than a
-  # memory page, which seemed like a good default, is there a better
-  # one?
-  config.read_chunk_size = 3000
   config.direct_upload = ["cache"]
   config.allow_origin = "*"
   config.logger = Logger.new(STDOUT)

data/lib/refile/app.rb

@@ -1,5 +1,6 @@
 require "json"
 require "sinatra/base"
+require "tempfile"
 
 module Refile
   class App < Sinatra::Base
@@ -22,7 +23,7 @@ module Refile
 
     get "/:backend/:id/:filename" do
       set_expires_header
-      stream_file(file)
+      stream_file file
     end
 
     get "/:backend/:processor/:id/:file_basename.:extension" do
@@ -83,11 +84,16 @@ module Refile
     end
 
     def stream_file(file)
-      stream do |out|
-        file.each do |chunk|
-          out << chunk
-        end
+      if file.respond_to?(:path)
+        path = file.path
+      else
+        path = Dir::Tmpname.create(params[:id]) {}
+        IO.copy_stream file, path
       end
+
+      filename = request.path.split("/").last
+
+      send_file path, filename: filename, disposition: "inline"
     end
 
     def backend
@@ -105,7 +111,7 @@ module Refile
         log_error("Could not find attachment by id: #{params[:id]}")
         halt 404
       end
-      file
+      file.download
     end
 
     def processor

data/lib/refile/attachment/active_record.rb

@@ -6,7 +6,7 @@ module Refile
       # Attachment method which hooks into ActiveRecord models
       #
       # @see Refile::Attachment#attachment
-      def attachment(name, raise_errors: false, **)
+      def attachment(name, raise_errors: false, **options)
         super
 
         attacher = "#{name}_attacher"

data/lib/refile/backend/file_system.rb

@@ -15,19 +15,7 @@ module Refile
         Refile.verify_uploadable(uploadable, @max_size)
 
         id = @hasher.hash(uploadable)
-
-        if uploadable.respond_to?(:path) and ::File.exist?(uploadable.path)
-          FileUtils.cp(uploadable.path, path(id))
-        else
-          ::File.open(path(id), "wb") do |file|
-            buffer = "" # reuse the same buffer
-            until uploadable.eof?
-              uploadable.read(Refile.read_chunk_size, buffer)
-              file.write(buffer)
-            end
-            uploadable.close
-          end
-        end
+        IO.copy_stream(uploadable, path(id))
 
         Refile::File.new(self, id)
       end

data/lib/refile/backend/s3.rb

@@ -1,56 +1,10 @@
 require "aws-sdk"
+require "open-uri"
 
 module Refile
   module Backend
     # A refile backend which stores files in Amazon S3
     class S3
-      # Emulates an IO-object like interface on top of S3Object#read. To avoid
-      # memory allocations and unnecessary complexity, this treats the `length`
-      # parameter to read as a boolean flag instead. If given, it will read the
-      # file in chunks of undetermined size, if not given it will read the
-      # entire file.
-      class Reader
-        def initialize(object)
-          @object = object
-          @closed = false
-        end
-
-        def read(length = nil, buffer = nil)
-          result = if length
-            raise "closed" if @closed
-
-            @peek unless eof? # sets @peek
-          else
-            @object.read
-          end
-          buffer.replace(result) if buffer and result
-          result
-        ensure
-          @peek = nil
-        end
-
-        def eof?
-          @peek ||= enumerator.next
-          false
-        rescue StopIteration
-          true
-        end
-
-        def size
-          @object.content_length
-        end
-
-        def close
-          @closed = true
-        end
-
-      private
-
-        def enumerator
-          @enumerator ||= @object.to_enum(:read)
-        end
-      end
-
       attr_reader :access_key_id, :max_size
 
       def initialize(access_key_id:, secret_access_key:, bucket:, max_size: nil, prefix: nil, hasher: Refile::RandomHasher.new, **s3_options)
@@ -88,7 +42,7 @@ module Refile
       end
 
       def open(id)
-        Reader.new(object(id))
+        Kernel.open(object(id).url_for(:read))
       end
 
       def read(id)

data/lib/refile/file.rb

@@ -36,21 +36,10 @@ module Refile
     end
 
     def download
-      tempfile = Tempfile.new(id)
-      tempfile.binmode
-      each do |chunk|
-        tempfile.write(chunk)
-      end
-      close
-      tempfile.close
-      tempfile
-    end
+      return io if io.is_a?(Tempfile)
 
-    def each
-      if block_given?
-        yield(read(Refile.read_chunk_size)) until eof?
-      else
-        to_enum
+      Tempfile.new(id, binmode: true).tap do |tempfile|
+        IO.copy_stream(io, tempfile)
       end
     end
 

data/lib/refile/image_processing.rb

@@ -60,14 +60,11 @@ module Refile
     end
 
     def call(file, *args, format: nil)
-      path = file.download.path
-      img = ::MiniMagick::Image.open(path)
+      img = ::MiniMagick::Image.new(file.path)
       img.format(format.to_s.downcase) if format
       send(@method, img, *args)
 
-      img.write(path)
-
-      ::File.open(path, "rb")
+      ::File.open(img.path, "rb")
     end
   end
 end

data/lib/refile/version.rb

@@ -1,3 +1,3 @@
 module Refile
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/refile/backend/file_system_spec.rb

@@ -2,29 +2,4 @@ RSpec.describe Refile::Backend::FileSystem do
   let(:backend) { Refile::Backend::FileSystem.new(File.expand_path("tmp/store1", Dir.pwd), max_size: 100) }
 
   it_behaves_like :backend
-
-  describe "#upload" do
-    it "efficiently copies a file if it has a path" do
-      path = File.expand_path("tmp/test.txt", Dir.pwd)
-      File.write(path, "hello")
-
-      uploadable = Refile::FileDouble.new("wrong")
-      allow(uploadable).to receive(:path).and_return(path)
-
-      file = backend.upload(uploadable)
-
-      expect(backend.get(file.id).read).to eq("hello")
-    end
-
-    it "ignores path if it doesn't exist" do
-      path = File.expand_path("tmp/doesnotexist.txt", Dir.pwd)
-
-      uploadable = Refile::FileDouble.new("yes")
-      allow(uploadable).to receive(:path).and_return(path)
-
-      file = backend.upload(uploadable)
-
-      expect(backend.get(file.id).read).to eq("yes")
-    end
-  end
 end

data/spec/refile/backend_examples.rb

@@ -179,25 +179,6 @@ RSpec.shared_examples_for :backend do
       end
     end
 
-    describe "#each" do
-      it "can read file contents" do
-        file = backend.upload(uploadable)
-
-        buffer = ""
-        file.each do |chunk|
-          buffer << chunk
-        end
-
-        expect(buffer).to eq("hello")
-      end
-
-      it "returns an enumerator when no block given" do
-        file = backend.upload(uploadable)
-
-        expect(file.each.to_a.join).to eq("hello")
-      end
-    end
-
     describe "#download" do
       it "returns a downloaded tempfile" do
         file = backend.upload(uploadable)

data/spec/refile/spec_helper.rb

@@ -31,9 +31,8 @@ end
 Refile.processor(:upcase, proc { |file| StringIO.new(file.read.upcase) })
 
 Refile.processor(:concat) do |file, *words|
-  content = File.read(file.download.path)
   tempfile = Tempfile.new("concat")
-  tempfile.write(content)
+  tempfile.write(file.read)
   words.each do |word|
     tempfile.write(word)
   end
@@ -86,6 +85,10 @@ RSpec.configure do |config|
   config.include PathHelper
   config.before(:all) do
     Refile.logger = Logger.new(nil)
-    WebMock.disable_net_connect!(allow_localhost: true)
+    if ENV["S3"]
+      WebMock.allow_net_connect!
+    else
+      WebMock.disable_net_connect!(allow_localhost: true)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refile
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple and powerful file upload library