paperclip_upload 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46199ef410968cd3e3f4f1635023ec9f396b3dd
-  data.tar.gz: 4093c1e4f3c47a4acf99da82ecbe38ce8b46917d
+  metadata.gz: 9ab8ed12df64b54b310f81a3e0dc71002872e323
+  data.tar.gz: 83388e8f681debfac5c1687e5d5e0d1d2953b2ca
 SHA512:
-  metadata.gz: 5ad84a18310b22af6d51fbb132f8be8a04ff39f3eab9e4dff15d33e11c2914a1ece16ff3052374dcf678b7b9608f1580dc8539bce79943e2d340470ba3114f4d
-  data.tar.gz: 704cb5f3b50e839cb9713d7b591cf486333306a8d2e37873ef742ee72486ea3295061f877dfd2d9515cb1f33af70265b0adb3fb553933054fade2c3e008694c9
+  metadata.gz: c95d919e913e76b7386a8a0ef36875f27baae052afc2ec48372df82faf2c2f8057081e5527f7f8c22d49b3366353a6b3fd98bcbb22ad9397263d382744a4e9eb
+  data.tar.gz: be4ef5c06bdbfa924ce2055567eb5fd515d6a27e442d9f806aecb9d90e2b56089637968cc163c02842ac4b4a092d33fcb060985c1217cc87c3636972cafeba76

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### v1.2.3
+
+##### Fixed
+* Removed `uploads#download` endpoint. Use always `file.url` instead of `file.path`. `file.path` does not work with S3 config.
+
 ### v1.2.2
 
 ##### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperclip_upload (1.2.2)
+    paperclip_upload (1.2.3)
       active_model_serializers (~> 0.9.3)
       hashids (~> 1.0, >= 1.0.2)
       paperclip (~> 4.2, >= 4.2.0)
@@ -69,7 +69,7 @@ GEM
       railties (>= 3.0.0)
     ffi (1.9.8)
     formatador (0.2.5)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     guard (2.12.5)
       formatador (>= 0.2.4)
@@ -180,9 +180,9 @@ GEM
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     slop (3.6.0)
-    sprockets (3.2.0)
+    sprockets (3.3.4)
       rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -208,3 +208,6 @@ DEPENDENCIES
   rspec-rails (~> 3.2, >= 3.2.1)
   shoulda-matchers (~> 2.8, >= 2.8.0)
   sqlite3 (~> 1.3, >= 1.3.10)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -181,14 +181,9 @@ class Api::UploadsController < Api::BaseController
 
   def create
     new_upload = PaperclipUpload::Upload.create(permitted_params)
-    set_download_url(new_upload)
     respond_with new_upload, status: :created
   end
 
-  def download
-    send_file(upload.file.path, type: upload.file_content_type, disposition: 'inline')
-  end
-
   private
 
   def permitted_params
@@ -198,21 +193,13 @@ class Api::UploadsController < Api::BaseController
   def upload
     @upload ||= PaperclipUpload::Upload.find_by_identifier(params[:identifier])
   end
-
-  private
-
-  def set_download_url(_upload)
-    _upload.singleton_class.send(:attr_accessor, :download_url)
-    _upload.download_url = download_api_upload_url(identifier: _upload.identifier)
-  end
 end
 ```
 
-and the routes...
+and the route...
 
 ```ruby
 post "api/uploads", to: "api/uploads#create", defaults: { format: :json }
-get "api/uploads/:identifier/download", to: "api/uploads#download", defaults: { format: :json }, as: :download_api_upload
 ```
 
 ## Configuration

data/app/controllers/paperclip_upload/uploads_controller.rb

@@ -5,14 +5,9 @@ module PaperclipUpload
 
     def create
       new_upload = PaperclipUpload::Upload.create(permitted_params)
-      set_download_url(new_upload)
       respond_with new_upload, status: :created
     end
 
-    def download
-      send_file(upload.file.path, type: upload.file_content_type, disposition: 'inline')
-    end
-
     private
 
     def permitted_params
@@ -22,12 +17,5 @@ module PaperclipUpload
     def upload
       @upload ||= PaperclipUpload::Upload.find_by_identifier(params[:identifier])
     end
-
-    private
-
-    def set_download_url(_upload)
-      _upload.singleton_class.send(:attr_accessor, :download_url)
-      _upload.download_url = download_url(identifier: _upload.identifier)
-    end
   end
 end

data/app/models/paperclip_upload/upload.rb

@@ -15,24 +15,26 @@ module PaperclipUpload
   class Upload < ActiveRecord::Base
     IDENTIFIER_LENGTH = 8
 
-    has_attached_file :file, path: ':rails_root/tmp/uploads/:id/:filename'
+    has_attached_file :file,
+      path: ':rails_root/public/uploads/:identifier/:filename',
+      url: "/uploads/:identifier/:basename.:extension"
 
     do_not_validate_attachment_file_type :file
     validates_attachment_presence :file
 
     def identifier
-      raise "valid with saved instance only" if self.id.blank?
-      self.class.hashid.encode(self.id)
+      raise "valid with saved instance only" if id.blank?
+      self.class.hashid.encode(id)
     end
 
     def file_extension
-      return unless self.file.exists?
-      File.extname(self.file.original_filename).split('.').last
+      return unless file.exists?
+      File.extname(file.original_filename).split('.').last
     end
 
     def file_name
-      return unless self.file.exists?
-      self.file_file_name.gsub(".#{file_extension}", "")
+      return unless file.exists?
+      file_file_name.gsub(".#{file_extension}", "")
     end
 
     def self.find_by_identifier(_identifier)
@@ -40,14 +42,20 @@ module PaperclipUpload
       PaperclipUpload::Upload.find(decoded_id)
     end
 
-    private
+    def download_url
+      file.url
+    end
 
     def self.hashid
       Hashids.new(PaperclipUpload.hash_salt, IDENTIFIER_LENGTH)
     end
 
     def self.identifier_to_id(_identifier)
-      self.hashid.decode(_identifier).first
+      hashid.decode(_identifier).first
+    end
+
+    Paperclip.interpolates(:identifier) do |attachment, _|
+      attachment.instance.identifier
     end
   end
 end

data/lib/generators/paperclip_upload/upload_controller/templates/controller.rb

@@ -4,14 +4,9 @@ class UploadController < ApplicationController
 
   def create
     new_upload = PaperclipUpload::Upload.create(permitted_params)
-    set_download_url(new_upload)
     respond_with new_upload, status: :created
   end
 
-  def download
-    send_file(upload.file.path, type: upload.file_content_type, disposition: 'inline')
-  end
-
   private
 
   def permitted_params
@@ -21,11 +16,4 @@ class UploadController < ApplicationController
   def upload
     @upload ||= PaperclipUpload::Upload.find_by_identifier(params[:identifier])
   end
-
-  private
-
-  def set_download_url(_upload)
-    _upload.singleton_class.send(:attr_accessor, :download_url)
-    _upload.download_url = "download_link"
-  end
 end

data/lib/generators/paperclip_upload/upload_controller/upload_controller_generator.rb

@@ -1,6 +1,6 @@
 class PaperclipUpload::UploadControllerGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../templates', __FILE__)
-  argument :base_controller, type: :string, :default => "application"
+  argument :base_controller, type: :string, default: "application"
 
   def generate_controller
     generate "controller #{resource_path} --no-helper --no-assets --no-view-specs --no-controller-specs"
@@ -12,14 +12,9 @@ class PaperclipUpload::UploadControllerGenerator < Rails::Generators::NamedBase
 
   def customize_controller
     line = "class UploadController < ApplicationController"
-    gsub_file controller_path, /(#{Regexp.escape(line)})/mi do |match|
+    gsub_file controller_path, /(#{Regexp.escape(line)})/mi do
       "class #{controller_class} < #{base_controller_class}"
     end
-
-    link = "\"download_link\""
-    gsub_file controller_path, /(#{Regexp.escape(link)})/mi do |match|
-      "#{download_route_method}_url(identifier: _upload.identifier)"
-    end
   end
 
   def add_routes
@@ -28,17 +23,12 @@ class PaperclipUpload::UploadControllerGenerator < Rails::Generators::NamedBase
       <<-HERE.gsub(/^ {9}/, '')
          #{match}
            post "#{resource_path}", to: "#{resource_path}#create", defaults: { format: :json }
-           get "#{resource_path}/:identifier/download", to: "#{resource_path}#download", defaults: { format: :json }, as: :#{download_route_method}
          HERE
     end
   end
 
   private
 
-  def download_route_method
-    "download_#{resource_path.singularize.gsub('/','_')}"
-  end
-
   def controller_class
     "#{name.classify.pluralize}Controller"
   end

data/lib/paperclip_upload/version.rb

@@ -1,3 +1,3 @@
 module PaperclipUpload
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_upload
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Leandro Segovia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails