refile 0.4.2 → 0.5.0

data/spec/refile/custom_logger_spec.rb

@@ -0,0 +1,22 @@
+require "active_support/logger"
+require "refile/custom_logger"
+
+describe Refile::CustomLogger do
+  let(:rack_app) do
+    ->(_) { [200, {}, ["Success"]] }
+  end
+  let(:io) { StringIO.new }
+  let(:env) do
+    { "QUERY_STRING" => "",
+      "REQUEST_METHOD" => "POST",
+      "PATH_INFO" => "/" }
+  end
+
+  let(:expected_format) { /^Prefix: \[[^\]]+\] POST "\/" 200 \d+\.\d+ms\n\n$/ }
+
+  it "uses a dynamic logger" do
+    _, _, body = described_class.new(rack_app, "Prefix", -> { ActiveSupport::Logger.new(io) }).call(env)
+    body.close
+    expect(io.tap(&:rewind).read).to match(expected_format)
+  end
+end

data/spec/refile/features/direct_upload_spec.rb

@@ -13,8 +13,10 @@ feature "Direct HTTP post file uploads", :js do
     click_button "Create"
 
     expect(page).to have_selector("h1", text: "A cool post")
-    result = Net::HTTP.get_response(URI(find_link("Document")[:href])).body.chomp
-    expect(result).to eq("hello")
+    expect(page).to have_selector(".content-type", text: "text/plain")
+    expect(page).to have_selector(".size", text: "6")
+    expect(page).to have_selector(".filename", text: "hello.txt")
+    expect(download_link("Document")).to eq("hello")
   end
 
   scenario "Fail to upload a file that is too large" do
@@ -25,4 +27,19 @@ feature "Direct HTTP post file uploads", :js do
     expect(page).to have_content("Upload started")
     expect(page).to have_content("Upload failure error")
   end
+
+  scenario "Fail to upload a file that has wrong format" do
+    visit "/direct/posts/new"
+    fill_in "Title", with: "A cool post"
+    attach_file "Image", path("large.txt")
+
+    expect(page).to have_content("Upload started")
+    expect(page).to have_content("Upload success")
+    expect(page).to have_content("Upload complete")
+
+    click_button "Create"
+
+    expect(page).to have_selector(".field_with_errors")
+    expect(page).to have_content("Image has an invalid file format")
+  end
 end

data/spec/refile/features/normal_upload_spec.rb

@@ -8,8 +8,10 @@ feature "Normal HTTP Post file uploads" do
     click_button "Create"
 
     expect(page).to have_selector("h1", text: "A cool post")
-    click_link("Document")
-    expect(page.source.chomp).to eq("hello")
+    expect(page).to have_selector(".content-type", text: "text/plain")
+    expect(page).to have_selector(".size", text: "6")
+    expect(page).to have_selector(".filename", text: "hello.txt")
+    expect(download_link("Document")).to eq("hello")
   end
 
   scenario "Fail to upload a file that is too large" do
@@ -32,7 +34,22 @@ feature "Normal HTTP Post file uploads" do
     expect(page).to have_content("Image has an invalid file format")
   end
 
-  scenario "Upload a file via form redisplay" do
+  scenario "Fail to upload a file that has the wrong format then submit" do
+    visit "/normal/posts/new"
+    fill_in "Title", with: "A cool post"
+    attach_file "Image", path("hello.txt")
+    click_button "Create"
+
+    expect(page).to have_selector(".field_with_errors")
+    expect(page).to have_content("Image has an invalid file format")
+    click_button "Create"
+    expect(page).to have_selector("h1", text: "A cool post")
+    expect(page).not_to have_link("Document")
+  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
     visit "/normal/posts/new"
     attach_file "Document", path("hello.txt")
     click_button "Create"
@@ -40,8 +57,10 @@ feature "Normal HTTP Post file uploads" do
     click_button "Create"
 
     expect(page).to have_selector("h1", text: "A cool post")
-    click_link("Document")
-    expect(page.source.chomp).to eq("hello")
+    expect(page).to have_selector(".content-type", text: "text/plain")
+    expect(page).to have_selector(".size", text: "6")
+    expect(page).to have_selector(".filename", text: "hello.txt")
+    expect(download_link("Document")).to eq("hello")
   end
 
   scenario "Format conversion" do
@@ -51,8 +70,7 @@ feature "Normal HTTP Post file uploads" do
     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")
+    expect(download_link("Convert to Upper")).to eq("HELLO")
   end
 
   scenario "Successfully remove an uploaded file" do
@@ -68,7 +86,10 @@ feature "Normal HTTP Post file uploads" do
     check "Remove document"
     click_button "Update"
     expect(page).to have_selector("h1", text: "A cool post")
-    expect(page).to_not have_selector(:link, "Document")
+    expect(page).not_to have_selector(:link, "Document")
+    expect(page).not_to have_selector(".content-type", text: "text/plain")
+    expect(page).not_to have_selector(".size", text: "6")
+    expect(page).not_to have_selector(".filename", text: "hello.txt")
   end
 
   scenario "Successfully remove a record with an uploaded file" do
@@ -83,7 +104,14 @@ feature "Normal HTTP Post file uploads" do
   end
 
   scenario "Upload a file from a remote URL" do
-    stub_request(:get, "http://www.example.com/some_file").to_return(status: 200, body: "abc", headers: { "Content-Length" => 3 })
+    stub_request(:get, "http://www.example.com/some_file").to_return(
+      status: 200,
+      body: "abc",
+      headers: {
+        "Content-Length" => 3,
+        "Content-Type" => "image/png"
+      }
+    )
 
     visit "/normal/posts/new"
     fill_in "Title", with: "A cool post"
@@ -91,7 +119,9 @@ feature "Normal HTTP Post file uploads" do
     click_button "Create"
 
     expect(page).to have_selector("h1", text: "A cool post")
-    click_link("Document")
-    expect(page.source.chomp).to eq("abc")
+    expect(download_link("Document")).to eq("abc")
+    expect(page).to have_selector(".content-type", text: "image/png")
+    expect(page).to have_selector(".size", text: "3")
+    expect(page).to have_selector(".filename", text: "some_file")
   end
 end

data/spec/refile/features/presigned_upload_spec.rb

@@ -13,8 +13,7 @@ feature "Direct HTTP post file uploads", :js do
     click_button "Create"
 
     expect(page).to have_selector("h1", text: "A cool post")
-    result = Net::HTTP.get_response(URI(find_link("Document")[:href])).body.chomp
-    expect(result).to eq("hello")
+    expect(download_link("Document")).to eq("hello")
   end
 
   scenario "Fail to upload a file that is too large" do

data/spec/refile/rails/attachment_helper_spec.rb

@@ -3,7 +3,7 @@ require "active_support/inflector"
 require "refile/rails/attachment_helper"
 
 describe Refile::AttachmentHelper do
-  describe "#attachment_url" 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" }

data/spec/refile/test_app.rb

@@ -19,25 +19,12 @@ module Refile
   TestApp.initialize!
 end
 
-class TestMigration < ActiveRecord::Migration
-  def self.up
-    create_table :posts, force: true do |t|
-      t.column :title, :string
-      t.column :image_id, :string
-      t.column :document_id, :string
-    end
-  end
-end
-
-quietly do
-  TestMigration.up
-end
-
 require "rspec"
 require "rspec/rails"
 require "capybara/rails"
 require "capybara/rspec"
 require "refile/spec_helper"
+require "refile/active_record_helper"
 
 if ENV["SAUCE_BROWSER"]
   Capybara.register_driver :selenium do |app|
@@ -56,7 +43,22 @@ end
 Refile.allow_origin = "*"
 Refile.host = "//localhost:56120"
 
+module TestAppHelpers
+  def download_link(text)
+    url = find_link(text)[:href]
+    if Capybara.current_driver == :rack_test
+      using_session :other do
+        visit(url)
+        page.source.chomp
+      end
+    else
+      Net::HTTP.get_response(URI(url)).body.chomp
+    end
+  end
+end
+
 RSpec.configure do |config|
+  config.include TestAppHelpers, type: :feature
   config.before(:all) do
     Refile.logger = Rails.logger
   end

data/spec/refile/test_app/app/controllers/direct_posts_controller.rb

@@ -4,7 +4,7 @@ class DirectPostsController < ApplicationController
   end
 
   def create
-    @post = Post.new(params.require(:post).permit(:title, :document_cache_id))
+    @post = Post.new(params.require(:post).permit(:title, :document, :image))
 
     if @post.save
       redirect_to [:normal, @post]

data/spec/refile/test_app/app/controllers/normal_posts_controller.rb

@@ -43,6 +43,6 @@ class NormalPostsController < ApplicationController
 private
 
   def post_params
-    params.require(:post).permit(:title, :image, :image_cache_id, :document, :document_cache_id, :remove_document, :remote_document_url)
+    params.require(:post).permit(:title, :image, :document, :remove_document, :remote_document_url)
   end
 end

data/spec/refile/test_app/app/controllers/presigned_posts_controller.rb

@@ -4,7 +4,7 @@ class PresignedPostsController < ApplicationController
   end
 
   def create
-    @post = Post.new(params.require(:post).permit(:title, :document_cache_id))
+    @post = Post.new(params.require(:post).permit(:title, :document))
 
     if @post.save
       redirect_to [:normal, @post]

data/spec/refile/test_app/app/views/direct_posts/new.html.erb

@@ -10,6 +10,10 @@
     <%= form.label :document %>
     <%= form.attachment_field :document, direct: true %>
   </p>
+  <p>
+    <%= form.label :image %>
+    <%= form.attachment_field :image, direct: true %>
+  </p>
   <p>
     <%= form.submit "Create" %>
   </p>

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

@@ -1,4 +1,4 @@
-<h1><%= @post.title %></h1<>
+<h1><%= @post.title %></h1>
 
 <% if @post.image %>
   <%= attachment_image_tag(@post, :image) %>
@@ -6,9 +6,11 @@
 
 <% if @post.document %>
   <%= link_to "Document", attachment_url(@post, :document) %>
-<% end %>
 
-<% if @post.document %>
+  <p class="content-type"><%= @post.document_content_type %></p>
+  <p class="size"><%= @post.document_size %></p>
+  <p class="filename"><%= @post.document_filename %></p>
+
   <%= link_to "Convert to Upper", attachment_url(@post, :document, :convert_case, format: "up") %>
 <% end %>
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: refile
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - jonas.nicklas@gmail.com
@@ -273,6 +273,8 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- ".yardopts"
+- CONTRIBUTING.md
 - Gemfile
 - History.md
 - LICENSE.txt
@@ -289,19 +291,24 @@ files:
 - lib/refile/attachment/active_record.rb
 - lib/refile/backend/file_system.rb
 - lib/refile/backend/s3.rb
+- lib/refile/custom_logger.rb
 - lib/refile/file.rb
 - lib/refile/image_processing.rb
 - lib/refile/rails.rb
 - lib/refile/rails/attachment_helper.rb
 - lib/refile/random_hasher.rb
 - lib/refile/signature.rb
+- lib/refile/type.rb
 - lib/refile/version.rb
 - refile.gemspec
+- spec/refile/active_record_helper.rb
 - spec/refile/app_spec.rb
+- spec/refile/attachment/active_record_spec.rb
 - spec/refile/attachment_spec.rb
 - spec/refile/backend/file_system_spec.rb
 - spec/refile/backend/s3_spec.rb
 - spec/refile/backend_examples.rb
+- spec/refile/custom_logger_spec.rb
 - spec/refile/features/direct_upload_spec.rb
 - spec/refile/features/normal_upload_spec.rb
 - spec/refile/features/presigned_upload_spec.rb
@@ -351,16 +358,19 @@ 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
 test_files:
+- spec/refile/active_record_helper.rb
 - spec/refile/app_spec.rb
+- spec/refile/attachment/active_record_spec.rb
 - spec/refile/attachment_spec.rb
 - spec/refile/backend/file_system_spec.rb
 - spec/refile/backend/s3_spec.rb
 - spec/refile/backend_examples.rb
+- spec/refile/custom_logger_spec.rb
 - spec/refile/features/direct_upload_spec.rb
 - spec/refile/features/normal_upload_spec.rb
 - spec/refile/features/presigned_upload_spec.rb