refile 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82ae33f74a7a012f5d04acd5c72ad9675b4e3b7
-  data.tar.gz: 984abf68f34e0725fb18164c0923eeaa2b992b86
+  metadata.gz: 8cbf36645ba19dcbaad5d4b56f88a1aa647515fb
+  data.tar.gz: a422fc72ee72b28c0953251d9109902ad7d4f1ab
 SHA512:
-  metadata.gz: 7393be87fdddfc7fd09b46bfab369dc9364ef30b1f61ebd03de568bc826101206de81474ee6f03215672bd7794d1ce017deadc403b062cba545132d3177aa565
-  data.tar.gz: 53ff261be44222e0fe7afac11e30372ed488884695bcca01569f2a1e58e3f30100765cda72349f4cac54b24a6f8fba660ae6bbf7d2699b739cbb253f69194176
+  metadata.gz: 4bb6048ad95f7b66f847d46c6228ab82c3eb1a59006e7467627eae34d4243eb2ed6851a189eb3828ad8aa4fdcfc88bb0a9712d76d396ed7b40a20393a80f5097
+  data.tar.gz: 1a61ecebcb311bc6b3a7dd6b5d323195f7df557f40741cf70c8ba00dfc7f6f94de28b582e49835aeb98d633ecc59c6d5ded55a305062d6a98d73076ffd3fcba2

data/History.md

@@ -0,0 +1,9 @@
+# 0.2.3
+
+Release date: 2014-12-08
+
+- [ADDED] Support for passing format to processors
+- [FIXED] Support IE10
+- [FIXED] Gracefully degrade on IE9, IE8 and IE7
+- [FIXED] Success event is fired at the appropriate time
+- [FIXED] Works with apps which don't define root_url

data/README.md

@@ -124,6 +124,11 @@ Refile.cache = Refile::Backend::S3.new(prefix: "cache", **aws)
 Refile.store = Refile::Backend::S3.new(prefix: "store", **aws)
 ```
 
+And add to your Gemfile:
+```ruby
+gem "aws-sdk"
+```
+
 Try this in the quick start example above and your files are now uploaded to
 S3.
 
@@ -401,7 +406,9 @@ cross site AJAX requests from posting to buckets. Fixing this is easy though.
 - Open the "Permission" section
 - Click "Add CORS Configuration"
 
-The default configuration only allows "GET", you'll want to allow "POST" as well.
+The default configuration only allows "GET", you'll want to allow "POST" as
+well. You'll also want to permit the "Content-Type" header.
+
 It could look something like this:
 
 ``` xml
@@ -412,6 +419,7 @@ It could look something like this:
         <AllowedMethod>POST</AllowedMethod>
         <MaxAgeSeconds>3000</MaxAgeSeconds>
         <AllowedHeader>Authorization</AllowedHeader>
+        <AllowedHeader>Content-Type</AllowedHeader>
     </CORSRule>
 </CORSConfiguration>
 ```

data/app/assets/javascripts/refile.js

@@ -1,50 +1,61 @@
-"use strict";
-
-document.addEventListener("change", function(e) {
-  if(e.target.tagName === "INPUT" && e.target.type === "file" && e.target.dataset.direct) {
-    var input = e.target;
-    var file = input.files[0];
-    if(file) {
-      var url = e.target.dataset.url;
-      if(e.target.dataset.fields) {
-        var fields = JSON.parse(e.target.dataset.fields);
-      }
+(function() {
+  "use strict";
 
-      var data = new FormData();
+  if(!document.addEventListener) { return }; // IE8
 
-      if(fields) {
-        Object.keys(fields).forEach(function(key) {
-          data.append(key, fields[key]);
-        });
+  document.addEventListener("change", function(e) {
+    if(e.target.tagName === "INPUT" && e.target.type === "file" && e.target.getAttribute("data-direct")) {
+      var input = e.target;
+      if(!input.files) { return; } // IE9, bail out if file API is not supported.
+      var file = input.files[0];
+
+      var dispatchEvent = function(name, detail) {
+        var ev = document.createEvent('CustomEvent');
+        ev.initCustomEvent(name, true, false, detail);
+        input.dispatchEvent(ev);
       }
-      data.append(input.dataset.as, file);
-
-      var xhr = new XMLHttpRequest();
-      xhr.addEventListener("load", function(e) {
-        input.classList.remove("uploading")
-        input.dispatchEvent(new CustomEvent("upload:complete", { detail: xhr.responseText, bubbles: true }));
-        if((xhr.status >= 200 && xhr.status < 300) || xhr.status === 304) {
-          var id = input.dataset.id || JSON.parse(xhr.responseText).id;
-          input.dispatchEvent(new CustomEvent("upload:success", { detail: xhr.responseText, bubbles: true }));
-          input.previousSibling.value = id;
-          input.removeAttribute("name");
-        } else {
-          input.dispatchEvent(new CustomEvent("upload:failure", { detail: xhr.responseText, bubbles: true }));
+
+      if(file) {
+        var url = e.target.getAttribute("data-url");
+        if(e.target.getAttribute("data-fields")) {
+          var fields = JSON.parse(e.target.getAttribute("data-fields"));
         }
-      });
 
-      xhr.addEventListener("progress", function(e) {
-        if (e.lengthComputable) {
-          input.dispatchEvent(new CustomEvent("upload:progress", { detail: e, bubbles: true }));
+        var data = new FormData();
+
+        if(fields) {
+          Object.keys(fields).forEach(function(key) {
+            data.append(key, fields[key]);
+          });
         }
-      });
+        data.append(input.getAttribute("data-as"), file);
+
+        var xhr = new XMLHttpRequest();
+        xhr.addEventListener("load", function(e) {
+          input.classList.remove("uploading")
+          dispatchEvent("upload:complete", xhr.responseText);
+          if((xhr.status >= 200 && xhr.status < 300) || xhr.status === 304) {
+            var id = input.getAttribute("data-id") || JSON.parse(xhr.responseText).id;
+            input.previousSibling.value = id;
+            input.removeAttribute("name");
+            dispatchEvent("upload:success", xhr.responseText);
+          } else {
+            dispatchEvent("upload:failure", xhr.responseText);
+          }
+        });
 
-      xhr.open("POST", url, true);
-      xhr.send(data);
+        xhr.upload.addEventListener("progress", function(e) {
+          if (e.lengthComputable) {
+            dispatchEvent("upload:progress", e);
+          }
+        });
 
-      input.classList.add("uploading")
-      input.dispatchEvent(new CustomEvent("upload:start", { bubbles: true }));
-    }
-  }
-});
+        xhr.open("POST", url, true);
+        xhr.send(data);
 
+        input.classList.add("uploading")
+        dispatchEvent("upload:start");
+      }
+    }
+  });
+})();

data/app/helpers/attachment_helper.rb

@@ -5,9 +5,12 @@ module AttachmentHelper
     filename ||= name.to_s
 
     backend_name = Refile.backends.key(file.backend)
-    host = Refile.host || root_url
+    host = Refile.host || request.base_url
 
-    File.join(host, refile_app_path, backend_name, *args.map(&:to_s), file.id, filename.parameterize("_"))
+    filename = filename.parameterize("_")
+    filename << "." << format.to_s if format
+
+    File.join(host, refile_app_path, backend_name, *args.map(&:to_s), file.id, filename)
   end
 
   def attachment_image_tag(record, name, *args, fallback: nil, format: nil, **options)
@@ -27,7 +30,7 @@ module AttachmentHelper
       cache = options[:object].send(:"#{method}_attachment").cache
 
       if options[:direct]
-        host = Refile.host || root_url
+        host = Refile.host || request.base_url
         backend_name = Refile.backends.key(cache)
 
         options[:data] ||= {}

data/lib/refile/app.rb

@@ -27,50 +27,51 @@ module Refile
 
     def call(env)
       @logger.info { "Refile: #{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}" }
-      if env["REQUEST_METHOD"] == "GET"
-        backend_name, *process_args, id, filename = env["PATH_INFO"].sub(/^\//, "").split("/")
-        backend = Refile.backends[backend_name]
-
-        if backend and id
-          @logger.debug { "Refile: serving #{id.inspect} from #{backend_name} backend which is of type #{backend.class}" }
-
-          file = backend.get(id)
-
-          unless process_args.empty?
-            name = process_args.shift
-            unless Refile.processors[name]
-              @logger.debug { "Refile: no such processor #{name.inspect}" }
-              return not_found
-            end
-            file = Refile.processors[name].call(file, *process_args)
-          end
 
-          peek = begin
-            file.read(Refile.read_chunk_size)
-          rescue => e
-            log_error(e)
+      backend_name, *args = env["PATH_INFO"].sub(/^\//, "").split("/")
+      backend = Refile.backends[backend_name]
+
+      if env["REQUEST_METHOD"] == "GET" and backend and args.length >= 2
+        *process_args, id, filename = args
+        format = ::File.extname(filename)[1..-1]
+
+        @logger.debug { "Refile: serving #{id.inspect} from #{backend_name} backend which is of type #{backend.class}" }
+
+        file = backend.get(id)
+
+        unless process_args.empty?
+          name = process_args.shift
+          processor = Refile.processors[name]
+          unless processor
+            @logger.debug { "Refile: no such processor #{name.inspect}" }
             return not_found
           end
+          file = if format
+            processor.call(file, *process_args, format: format)
+          else
+            processor.call(file, *process_args)
+          end
+        end
 
-          headers = {}
-          headers["Access-Control-Allow-Origin"] = @allow_origin if @allow_origin
-
-          [200, headers, Proxy.new(peek, file)]
-        else
-          @logger.debug { "Refile: must specify backend and id" }
-          not_found
+        peek = begin
+          file.read(Refile.read_chunk_size)
+        rescue => e
+          log_error(e)
+          return not_found
         end
-      elsif env["REQUEST_METHOD"] == "POST"
-        backend_name, *rest = env["PATH_INFO"].sub(/^\//, "").split("/")
-        backend = Refile.backends[backend_name]
 
-        return not_found unless rest.empty?
-        return not_found unless backend and Refile.direct_upload.include?(backend_name)
+        headers = {}
+        headers["Access-Control-Allow-Origin"] = @allow_origin if @allow_origin
+
+        [200, headers, Proxy.new(peek, file)]
+      elsif env["REQUEST_METHOD"] == "POST" and backend and args.empty? and Refile.direct_upload.include?(backend_name)
+        @logger.debug { "Refile: uploading to #{backend_name} backend which is of type #{backend.class}" }
+
+        tempfile = Rack::Request.new(env).params.fetch("file").fetch(:tempfile)
+        file = backend.upload(tempfile)
 
-        file = backend.upload(Rack::Request.new(env).params.fetch("file").fetch(:tempfile))
         [200, { "Content-Type" => "application/json" }, [{ id: file.id }.to_json]]
       else
-        @logger.debug { "Refile: request methods other than GET and POST are not allowed" }
         not_found
       end
     rescue => e

data/lib/refile/rails.rb

@@ -20,17 +20,19 @@ module Refile
   end
 
   class Engine < Rails::Engine
-    initializer "refile", before: :load_environment_config do
+    initializer "refile.setup", before: :load_environment_config do
       Refile.store ||= Refile::Backend::FileSystem.new(Rails.root.join("tmp/uploads/store").to_s)
       Refile.cache ||= Refile::Backend::FileSystem.new(Rails.root.join("tmp/uploads/cache").to_s)
 
-      Refile.app = Refile::App.new(logger: Rails.logger)
-
       ActiveSupport.on_load :active_record do
         require "refile/attachment/active_record"
       end
 
       ActionView::Helpers::FormBuilder.send(:include, AttachmentFieldHelper)
     end
+
+    initializer "refile.app" do
+      Refile.app = Refile::App.new(logger: Rails.logger)
+    end
   end
 end

data/lib/refile/version.rb

@@ -1,3 +1,3 @@
 module Refile
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/refile/app_spec.rb

@@ -1,22 +1,5 @@
 require "rack/test"
 
-Refile.processor(:reverse) do |file|
-  StringIO.new(file.read.reverse)
-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)
-  words.each do |word|
-    tempfile.write(word)
-  end
-  tempfile.close
-  File.open(tempfile.path, "r")
-end
-
 describe Refile::App do
   include Rack::Test::Methods
 
@@ -114,6 +97,15 @@ describe Refile::App do
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq("hellofoobarbaz")
     end
+
+    it "applies processor with format" do
+      file = Refile.store.upload(StringIO.new("hello"))
+
+      get "/store/convert_case/#{file.id}/hello.up"
+
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq("HELLO")
+    end
   end
 
   describe "POST /:backend" do

data/spec/refile/features/normal_upload_spec.rb

@@ -33,4 +33,15 @@ feature "Normal HTTP Post file uploads" do
     click_link("Document")
     expect(page.source.chomp).to eq("hello")
   end
+
+  scenario "Format conversion" do
+    visit "/normal/posts/new"
+    fill_in "Title", with: "A cool post"
+    attach_file "Document", path("hello.txt")
+    click_button "Create"
+
+    expect(page).to have_selector("h1", text: "A cool post")
+    click_link("Convert to Upper")
+    expect(page.source.chomp).to eq("HELLO")
+  end
 end

data/spec/refile/spec_helper.rb

@@ -24,6 +24,32 @@ Refile.backends["limited_cache"] = FakePresignBackend.new(File.expand_path("defa
 
 Refile.direct_upload = ["cache", "limited_cache"]
 
+Refile.processor(:reverse) do |file|
+  StringIO.new(file.read.reverse)
+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)
+  words.each do |word|
+    tempfile.write(word)
+  end
+  tempfile.close
+  File.open(tempfile.path, "r")
+end
+
+Refile.processor(:convert_case) do |file, format:|
+  case format
+    when "up" then StringIO.new(file.read.upcase)
+    when "down" then StringIO.new(file.read.downcase)
+    else file
+  end
+end
+
+
 class Refile::FileDouble
   def initialize(data)
     @io = StringIO.new(data)

data/spec/refile/test_app.rb

@@ -39,6 +39,16 @@ require "capybara/rails"
 require "capybara/rspec"
 require "refile/spec_helper"
 
+if ENV["SAUCE_BROWSER"]
+  Capybara.register_driver :selenium do |app|
+    url = "http://#{ENV["SAUCE_USERNAME"]}:#{ENV["SAUCE_ACCESS_KEY"]}@localhost:4445/wd/hub"
+    capabilities = { browserName: ENV["SAUCE_BROWSER"], version: ENV["SAUCE_VERSION"] }
+    driver = Capybara::Selenium::Driver.new(app, browser: :remote, url: url, desired_capabilities: capabilities)
+    driver.browser.file_detector = lambda { |args| args.first if File.exist?(args.first) }
+    driver
+  end
+end
+
 Capybara.configure do |config|
   config.server_port = 56120
 end

data/spec/refile/test_app/app/assets/javascripts/application.js

@@ -3,38 +3,40 @@
 
 "use strict";
 
-document.addEventListener("DOMContentLoaded", function() {
-  var form = document.querySelector("form#direct");
-
-  if(form) {
-    var input = document.querySelector("#post_document");
-
-    form.addEventListener("upload:start", function() {
-      var p = document.createElement("p");
-      p.textContent = "Upload started";
-      form.appendChild(p);
-    });
-
-    form.addEventListener("upload:complete", function(e) {
-      var p = document.createElement("p");
-      p.textContent = "Upload complete " + e.detail;
-      form.appendChild(p);
-    });
-
-    form.addEventListener("upload:progress", function(e) {
-      var p = document.createElement("p");
-      p.textContent = "Upload progress " + e.detail.loaded + " " + e.detail.total;
-      form.appendChild(p);
-    });
-
-    form.addEventListener("upload:failure", function(e) {
-      var p = document.createElement("p");
-      p.textContent = "Upload failure " + e.detail
-      form.appendChild(p);
-    });
-  }
-});
-
-$(document).on("upload:success", "form#direct", function(e) {
-  $("<p></p>").text("Upload success " + e.originalEvent.detail).appendTo(this);
-});
+if(document.addEventListener) {
+  document.addEventListener("DOMContentLoaded", function() {
+    var form = document.querySelector("form#direct");
+
+    if(form) {
+      var input = document.querySelector("#post_document");
+
+      form.addEventListener("upload:start", function() {
+        var p = document.createElement("p");
+        p.textContent = "Upload started";
+        form.appendChild(p);
+      });
+
+      form.addEventListener("upload:complete", function(e) {
+        var p = document.createElement("p");
+        p.textContent = "Upload complete " + e.detail;
+        form.appendChild(p);
+      });
+
+      form.addEventListener("upload:progress", function(e) {
+        var p = document.createElement("p");
+        p.textContent = "Upload progress " + e.detail.loaded + " " + e.detail.total;
+        form.appendChild(p);
+      });
+
+      form.addEventListener("upload:failure", function(e) {
+        var p = document.createElement("p");
+        p.textContent = "Upload failure " + e.detail
+        form.appendChild(p);
+      });
+    }
+  });
+
+  $(document).on("upload:success", "form#direct", function(e) {
+    $("<p></p>").text("Upload success " + e.originalEvent.detail).appendTo(this);
+  });
+}

data/spec/refile/test_app/app/views/normal_posts/show.html.erb

@@ -7,3 +7,7 @@
 <% if @post.document %>
   <%= link_to "Document", attachment_url(@post, :document) %>
 <% end %>
+
+<% if @post.document %>
+  <%= link_to "Convert to Upper", attachment_url(@post, :document, :convert_case, format: "up") %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refile
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- History.md
 - LICENSE.txt
 - README.md
 - Rakefile