refile 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f88d8e0859054884b85f7fc478d6e93ddf05d84
-  data.tar.gz: f48b85dfeb3f29e91dd1b7871c5d74216bc95eda
+  metadata.gz: d93614e14a47419b97ee9062afbbe4d1df8fbdeb
+  data.tar.gz: 352d8c297f223caeddd1bc9b2fe0381ae8f2ce80
 SHA512:
-  metadata.gz: af3a13531db636c5b4c611911a7d03cced2c43c2f8c4edf4a4f300f4de55b90e7b86cf173d6c5f1c69cbc672de59d248014ac593cd1e9b5ea1e14f727035f921
-  data.tar.gz: 73f3e4a8c8503f3445313bb363900ff394edb8ce974267cb0c491bc3552c273d910be64e6d546afcf4162a1bef447d8bdd4759280712dcbe9ab9ecf9bd06e2bc
+  metadata.gz: ecbafbc35dc7a1fac5fbd9d0bd92681362bc09f188dd494e7e76d2a2d5a4fb2c2538c19c64bf167c508f1ed62d853e0ad64f6dfbd5cf99a94b1ca236ca7c6eef
+  data.tar.gz: 7f1e0714723dcabd5d884d3e031664a2153d987d464df0a43547aaba94de10d68fc761de7a87e2075abca911cfce4db5b2d527120ba4323f01bd9a5a0bf72214

data/History.md

@@ -1,3 +1,12 @@
+# 0.5.2
+
+Release date: 2015-01-13
+
+- [ADDED] Can generate URLs without using the Rails helper via `Refile.attachment_url`
+- [FIXED] Regression in `attachment_image_tag`, was not using `Refile.host`.
+- [FIXED] Record without file can be updated when content type and filename are not persisted
+- [FIXED] Remove `id` attribute from hidden field, so it doesn't get confused with the file field
+
 # 0.5.1
 
 Release date: 2015-01-11

data/README.md

@@ -506,9 +506,9 @@ need to do is add columns for these:
 ``` ruby
 class StoreMetadata < ActiveRecord::Migration
   def change
-    add_column :profile_image_filename
-    add_column :profile_image_size
-    add_column :profile_image_content_type
+    add_column :users, :profile_image_filename, :string
+    add_column :users, :profile_image_size, :integer
+    add_column :users, :profile_image_content_type, :string
   end
 end
 ```

data/lib/refile.rb

@@ -217,6 +217,55 @@ module Refile
         end
       end
     end
+
+    # Generate a URL to an attachment. This method receives an instance of a
+    # class which has used the {Refile::Attachment#attachment} macro to
+    # generate an attachment column, and the name of this column, and based on
+    # this generates a URL to a {Refile::App}.
+    #
+    # Optionally the name of a processor and arguments to it can be appended.
+    #
+    # If the filename option is not given, the filename is taken from the
+    # metadata stored in the attachment, or eventually falls back to the
+    # `name`.
+    #
+    # The host defaults to {Refile.host}, which is useful for serving all
+    # attachments from a CDN. You can also override the host via the `host`
+    # option.
+    #
+    # Returns `nil` if there is no file attached.
+    #
+    # @example
+    #   attachment_url(@post, :document)
+    #
+    # @example With processor
+    #   attachment_url(@post, :image, :fill, 300, 300, format: "jpg")
+    #
+    # @param [Refile::Attachment] object   Instance of a class which has an attached file
+    # @param [Symbol] name                 The name of the attachment column
+    # @param [String, nil] filename        The filename to be appended to the URL
+    # @param [String, nil] format          A file extension to be appended to the URL
+    # @param [String, nil] host            Override the host
+    # @param [String, nil] prefix          Adds a prefix to the URL if the application is not mounted at root
+    # @return [String, nil]                The generated URL
+    def attachment_url(object, name, *args, prefix: nil, filename: nil, format: nil, host: nil)
+      attacher = object.send(:"#{name}_attacher")
+      file = attacher.get
+      return unless file
+
+      host ||= Refile.host
+      filename ||= attacher.basename || name.to_s
+      format ||= attacher.extension
+
+      backend_name = Refile.backends.key(file.backend)
+
+      filename = Rack::Utils.escape(filename)
+      filename << "." << format.to_s if format
+
+      uri = URI(host.to_s)
+      uri.path = ::File.join("", *prefix, backend_name, *args.map(&:to_s), file.id.to_s, filename)
+      uri.to_s
+    end
   end
 
   require "refile/version"

data/lib/refile/attacher.rb

@@ -148,7 +148,7 @@ module Refile
     end
 
     def present?
-      id or not @metadata.empty?
+      not @metadata.empty?
     end
 
     def valid?

data/lib/refile/rails/attachment_helper.rb

@@ -14,44 +14,16 @@ module Refile
     # to the {Refile::App} which is assumed to be mounted in the Rails
     # application.
     #
-    # Optionally the name of a processor and a arguments to it can be appended.
+    # @see Refile.attachment_url
     #
-    # If the filename option is not given, the filename falls back to the
-    # `name`.
-    #
-    # The host defaults to {Refile.host}, which is useful for serving all
-    # attachments from a CDN. You can also override the host via the `host`
-    # option.
-    #
-    # Returns `nil` if there is no file attached.
-    #
-    # @example
-    #   attachment_url(@post, :document)
-    #
-    # @example With processor
-    #   attachment_url(@post, :image, :fill, 300, 300, format: "jpg")
-    #
-    # @param [Refile::Attachment] record   Instance of a class which has an attached file
+    # @param [Refile::Attachment] object   Instance of a class which has an attached file
     # @param [Symbol] name                 The name of the attachment column
     # @param [String, nil] filename        The filename to be appended to the URL
     # @param [String, nil] format          A file extension to be appended to the URL
     # @param [String, nil] host            Override the host
     # @return [String, nil]                The generated URL
-    def attachment_url(record, name, *args, filename: nil, format: nil, host: nil)
-      attacher = record.send(:"#{name}_attacher")
-      file = attacher.get
-      return unless file
-
-      filename ||= attacher.basename || name.to_s
-      format ||= attacher.extension
-
-      backend_name = Refile.backends.key(file.backend)
-      host = host || Refile.host || request.base_url
-
-      filename = filename.parameterize("_")
-      filename << "." << format.to_s if format
-
-      ::File.join(host, main_app.refile_app_path, backend_name, *args.map(&:to_s), file.id.to_s, filename)
+    def attachment_url(record, name, *args, **opts)
+      Refile.attachment_url(record, name, *args, prefix: main_app.refile_app_path, **opts)
     end
 
     # Generates an image tag for the given attachment, adding appropriate
@@ -106,7 +78,7 @@ module Refile
         options[:data].merge!(direct: true).merge!(attacher.cache.presign.as_json)
       end
 
-      html = hidden_field(object_name, method, value: attacher.data.to_json, object: object)
+      html = hidden_field(object_name, method, value: attacher.data.to_json, object: object, id: nil)
       html + file_field(object_name, method, options)
     end
   end

data/lib/refile/version.rb

@@ -1,3 +1,3 @@
 module Refile
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/refile/active_record_helper.rb

@@ -13,7 +13,6 @@ class TestMigration < ActiveRecord::Migration
     create_table :posts, force: true do |t|
       t.column :title, :string
       t.column :image_id, :string
-      t.column :image_content_type, :string
       t.column :document_id, :string
       t.column :document_filename, :string
       t.column :document_content_type, :string

data/spec/refile/features/normal_upload_spec.rb

@@ -47,6 +47,21 @@ feature "Normal HTTP Post file uploads" do
     expect(page).not_to have_link("Document")
   end
 
+  scenario "Successfully update a record with an attached file" do
+    visit "/normal/posts/new"
+    fill_in "Title", with: "A cool post"
+    attach_file "Image", path("image.jpg")
+    click_button "Create"
+
+    expect(page).to have_selector("h1", text: "A cool post")
+    click_link("Edit")
+
+    fill_in "Title", with: "A very cool post"
+
+    click_button "Update"
+    expect(page).to have_selector("h1", text: "A very cool post")
+  end
+
   # FIXME: the only reason this is js:true is because the rack_test driver
   # doesn't submit file+metadata correctly.
   scenario "Upload a file via form redisplay", js: true do

data/spec/refile_spec.rb

@@ -71,4 +71,78 @@ RSpec.describe Refile do
       expect(name).to be_nil
     end
   end
+
+  describe ".attachment_url" do
+    let(:klass) do
+      Class.new do
+        extend Refile::Attachment
+        attachment :document
+      end
+    end
+    let(:instance) { klass.new }
+    let(:id) { instance.document_attacher.cache_id }
+
+    before do
+      allow(Refile).to receive(:host).and_return(nil)
+    end
+
+    context "with file" do
+      before do
+        instance.document = Refile::FileDouble.new("hello")
+      end
+
+      it "generates a url from an attachment" do
+        expect(Refile.attachment_url(instance, :document)).to eq("/cache/#{id}/document")
+      end
+
+      it "uses supplied host option" do
+        expect(Refile.attachment_url(instance, :document, host: "http://example.org")).to eq("http://example.org/cache/#{id}/document")
+      end
+
+      it "falls back to Refile.host" do
+        allow(Refile).to receive(:host).and_return("http://elabs.se")
+
+        expect(Refile.attachment_url(instance, :document)).to eq("http://elabs.se/cache/#{id}/document")
+      end
+
+      it "adds a prefix" do
+        expect(Refile.attachment_url(instance, :document, prefix: "moo")).to eq("/moo/cache/#{id}/document")
+      end
+
+      it "adds an escaped filename" do
+        expect(Refile.attachment_url(instance, :document, filename: "test.png")).to eq("/cache/#{id}/test.png")
+        expect(Refile.attachment_url(instance, :document, filename: "tes/t.png")).to eq("/cache/#{id}/tes%2Ft.png")
+      end
+
+      it "adds a format" do
+        expect(Refile.attachment_url(instance, :document, format: "png")).to eq("/cache/#{id}/document.png")
+      end
+    end
+
+    context "with file with content type" do
+      before do
+        instance.document = Refile::FileDouble.new("hello", content_type: "image/png")
+      end
+
+      it "adds format inferred from content type" do
+        expect(Refile.attachment_url(instance, :document)).to eq("/cache/#{id}/document.png")
+      end
+    end
+
+    context "with file with filename" do
+      before do
+        instance.document = Refile::FileDouble.new("hello", "hello.html")
+      end
+
+      it "adds filename" do
+        expect(Refile.attachment_url(instance, :document)).to eq("/cache/#{id}/hello.html")
+      end
+    end
+
+    context "with no file" do
+      it "returns nil" do
+        expect(Refile.attachment_url(instance, :document)).to be_nil
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refile
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -313,8 +313,8 @@ files:
 - spec/refile/features/normal_upload_spec.rb
 - spec/refile/features/presigned_upload_spec.rb
 - spec/refile/fixtures/hello.txt
+- spec/refile/fixtures/image.jpg
 - spec/refile/fixtures/large.txt
-- spec/refile/rails/attachment_helper_spec.rb
 - spec/refile/spec_helper.rb
 - spec/refile/test_app.rb
 - spec/refile/test_app/app/assets/javascripts/application.js
@@ -375,8 +375,8 @@ test_files:
 - spec/refile/features/normal_upload_spec.rb
 - spec/refile/features/presigned_upload_spec.rb
 - spec/refile/fixtures/hello.txt
+- spec/refile/fixtures/image.jpg
 - spec/refile/fixtures/large.txt
-- spec/refile/rails/attachment_helper_spec.rb
 - spec/refile/spec_helper.rb
 - spec/refile/test_app.rb
 - spec/refile/test_app/app/assets/javascripts/application.js

data/spec/refile/rails/attachment_helper_spec.rb

@@ -1,61 +0,0 @@
-require "refile"
-require "active_support/inflector"
-require "refile/rails/attachment_helper"
-
-describe Refile::AttachmentHelper do
-  describe "#attachment_url", pending: "rewrite without mocks" do
-    let(:view) { Struct.new(:main_app, :request).new(main_app, request) }
-    let(:main_app) { double :main_app, refile_app_path: "attachments" }
-    let(:request) { double :request, base_url: "http://www.example.com" }
-    let(:record) { double :record, name: name, image: file }
-    let(:name) { :image }
-    let(:file) { double :file, backend: backend, id: "123abc" }
-    let(:backend) { double :backend }
-    before do
-      view.extend(Refile::AttachmentHelper)
-      Refile.backends["test_backend"] = backend
-    end
-    after do
-      Refile.backends.delete("test_backend")
-    end
-
-    context "with a host passed in" do
-      let(:host) { "//cdn.example.com" }
-
-      it "creates the expected url" do
-        url = view.attachment_url(record, name, "fill", 300, 300, filename: "test", format: "jpg", host: host)
-        expect(url).to eq "//cdn.example.com/attachments/test_backend/fill/300/300/123abc/test.jpg"
-      end
-    end
-
-    context "with no host passed in, but Refile.host set" do
-      before do
-        @original_host = Refile.host
-        Refile.host = "//cdn.example.com"
-      end
-      after do
-        Refile.host = @original_host
-      end
-
-      it "creates the expected url" do
-        url = view.attachment_url(record, name, "fill", 300, 300, filename: "test", format: "jpg")
-        expect(url).to eq "//cdn.example.com/attachments/test_backend/fill/300/300/123abc/test.jpg"
-      end
-    end
-
-    context "with no host passed in, and no Refile.host set" do
-      before do
-        @original_host = Refile.host
-        Refile.host = nil
-      end
-      after do
-        Refile.host = @original_host
-      end
-
-      it "creates the expected url" do
-        url = view.attachment_url(record, name, "fill", 300, 300, filename: "test", format: "jpg")
-        expect(url).to eq "http://www.example.com/attachments/test_backend/fill/300/300/123abc/test.jpg"
-      end
-    end
-  end
-end