paperclip-google-drive 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f945a112a7fc9c7edc1c8b925bb957011f26ba
-  data.tar.gz: 7ff404b4f10d203c306efebe144ca86e5f449a06
+  metadata.gz: c7c2bb6eae67f447365e5f5e0a11a6a751582ba7
+  data.tar.gz: 151052f23e6e53c2b785ec0aa65897ea90903bbe
 SHA512:
-  metadata.gz: c228c2ff00f14992a98974fb94d4da90e230d7b357feb93ab4805f49923ceec9a2aeb09922b0b7fd53107c788673ff46fc261539ce3db6683c2223f3716ed64f
-  data.tar.gz: 68d6878eea81fb2b9fec1607ad32a77f932c1e0199ba0630ac506833b9f88b10aafe7b42b1ad9f1ea1c3380b217c4451bd1af5a8026ee74b32e1f0ca29570f6f
+  metadata.gz: 02a3a5e97b90105dc8ac32789da4edb9e0074df2b863bcba7b6661e5bc469353f723c886a94bf18118bbffa0670e043e6b200492425eab44c9989b7d2e023b24
+  data.tar.gz: 79ccd25892080cb5b41894086524ec6f43575d983b93b6bb9a3ab4586c4447ab522624d3243fa470e0f4b5787f24ea9bdefa85830a77f370ba1fc03dd700c6ba

data/README.md

@@ -2,7 +2,7 @@
 [![GitHub version](https://badge.fury.io/gh/degzcs%2Fpaperclip-googledrive.svg)](https://badge.fury.io/gh/degzcs%2Fpaperclip-googledrive)
 [![Code Climate](https://codeclimate.com/github/degzcs/paperclip-googledrive/badges/gpa.svg)](https://codeclimate.com/github/degzcs/paperclip-googledrive)
 
-PaperclipGoogledrive is a gem that extends paperclip storage for Google Drive (V3). Works with Rails 3.x. and later. 
+PaperclipGoogleDrive is a gem that extends paperclip storage for Google Drive (V3). Works with Rails 3.x. and later.
 IMPORTANT NOTE: This repo was forked and upgraded to use Google Drive V3.
 
 ## Installation
@@ -35,7 +35,7 @@ Google Drive is a free service for file storage files. In order to use this stor
     ```sh
     $ rake google_drive:authorize"[path/to/client_secret.json, 'application_name']"
     ```
-    NOTE: 
+    NOTE:
      - the `path/to/client_secret.json` path is the file downloaded from Google console (it will be overrided with the fresh token).
      - the `application_name` param is the name that you set for the application credentials on Google console.
 
@@ -86,7 +86,7 @@ class Product < ActiveRecord::Base
     :google_drive_client_secret_path => "#{Rails.root}/config/client_secret.json"
     :styles => { :medium => "300x300" },
     :google_drive_options => {
-      :path => proc { |style| "#{style}_#{id}_#{photo.original_filename}" },
+      :path => proc { |style| "#{id}_#{photo.original_filename}_#{style}" },
       :public_folder_id => 'AAAARRRRGGGBBBFFFFadsasdX'
     }
 end
@@ -98,9 +98,16 @@ Public/14_some_photo_medium.jpg
 
 The another file is called some_photo_medium.jpg because style names (other than original) will always be appended to the filenames, for better management.
 
+Also, you can use the resize feature provided by GDrive API, you only have to pass as parameter in the url params the option `:custom` and `width`, as follows:
+
+```ruby
+  some_product.photo.url(:custom, width: 500)
+```
+
 ## Misc
 
-Useful links
+## Useful links
+
 [Google APIs console](https://code.google.com/apis/console/)
 
 [Google Drive scopes](https://developers.google.com/drive/scopes)
@@ -111,7 +118,7 @@ Useful links
 
 ## License
 
-[MIT License](https://github.com/evinsou/paperclip-googledrive/blob/master/LICENSE)
+[MIT License](https://github.com/degzcs/paperclip-googledrive/blob/master/LICENSE)
 
 ## Contributing
 

data/lib/paperclip/storage/google_drive.rb

@@ -52,7 +52,7 @@ module Paperclip
         @queued_for_write.each do |style, file|
           raise FileExists, "file \"#{path(style)}\" already exists in your Google Drive" if exists?(path(style))
 
-          name, mime_type = name_for_file_from(style), "#{ file.content_type }"
+          name, mime_type = filename_from(style), "#{ file.content_type }"
 
           file_metadata = {
             name: name,
@@ -95,28 +95,28 @@ module Paperclip
 
       alias_method :google_drive, :google_api_client
 
-      # This could be used to scale image as Google does. e.i. `<url>=s220`,
-      # where 220 is the width in pixeles OR as Paperclip does.
+      # Retrives the origina file or this also could be used to scale images
+      # as Google does. e.i. `<url>=s220`, where 220 is the width in pixeles
+      # OR as Paperclip does.
       # @params args [ Array ]
       # @return [ String ]
       #  ex.
       #     1. If you want the medium version of your image (Paperclip way)
       #       some_model.avatar.url(:medium)
-      #     2. If you want a custom version of your image/pdf (Google way)
-      #       some_model.avatar.url(:custom, width: 500)
+      #     2. If you want a custom thumbanil of your image/pdf (Google way)
+      #       some_model.avatar.url(:custom_thumb, width: 500)
       def url(*args)
         if present?
           style = args.first.is_a?(Symbol) ? args.first : default_style
           options = args.last.is_a?(Hash) ? args.last : {}
-          if style == :custom
+          if style == :custom_thumb
             custom_width = options[:width] || 220
-            file_name = name_for_file_from(default_style)
+            file_name = filename_from(default_style)
+            public_url_custom_thumbnail_from(file_name, custom_width)
           else
-            custom_width = nil
-            file_name = name_for_file_from(style)
+            file_name = filename_from(style)
+            public_url_for(file_name)
           end
-
-          public_url_for(file_name, custom_width)
         else
           default_image
         end
@@ -125,7 +125,7 @@ module Paperclip
       # Gets full title/name
       # @param style [ String ]
       # @return [ String ]
-      def name_for_file_from(style)
+      def filename_from(style)
         file_name = instance.instance_exec(style, &file_title)
         style_suffix = (style != default_style ? "_#{style}" : "")
         if original_extension.present? && file_name =~ /#{original_extension}$/
@@ -135,35 +135,51 @@ module Paperclip
         end
       end
 
-      alias_method :path, :name_for_file_from
+      alias_method :path, :filename_from
+
+      # Gets the public url for a passed filename
+      # @param title [ String ]
+      # @return [ String ] with url
+      def public_url_for(title)
+        metadata_or_default_img_from(title) do |metadata|
+          # TODO: fix permission issues on the view with this command
+          # effective_url_from(metadata.web_content_link)
+          custom_thumbnail_image_for(metadata.thumbnail_link, 1000)
+        end
+      end
 
       # Gets the public url for a passed filename
       # @param title [ String ]
       # @param custom_width [ Integer ]
       # @return [ String ] with url
-      def public_url_for(title, custom_width)
-        searched_id = search_for_title(title) #return id if any or style
-        if searched_id.nil? # it finds some file
-          default_image
-        else
-          metadata = metadata_by_id(searched_id)
-          custom_image_for(metadata.thumbnail_link, custom_width)
+      def public_url_custom_thumbnail_from(title, custom_width)
+        metadata_or_default_img_from(title) do |metadata|
+          custom_thumbnail_image_for(metadata.thumbnail_link, custom_width)
         end
       end
 
       # Retrieves the specific image with a custom size. It is resized by GDrive API if you
-      # pass the :custom as style option. In other cases it removes the last parameter `=s220`
-      # which is inchaged to do the scaling process.
-      # @param drive_thumbnail_link [ String ]
-      # @param custom_width [ Integer ]
+      # pass the :custom_thumb as style option. In other cases, it removes the last parameter
+      # `=s220` which is inchaged to do the scaling process.
+      # @param drive_thumbnail_link [ String ] with the form: https://<url value>=s220
+      # @param custom_width [ Integer ] ex. 512
       # @return [ String ]
-      def custom_image_for(drive_thumbnail_link, custom_width=nil)
+      def custom_thumbnail_image_for(drive_thumbnail_link, custom_width)
         file_url, current_width = drive_thumbnail_link.split(/=s/)
-        new_file_url = if custom_width.nil?
-                        file_url
-                      else
-                        "#{ file_url }=s#{ custom_width }"
-                      end
+        "#{ file_url }=s#{ custom_width }"
+      end
+
+      # Gets the effective url from the web content link
+      # These are a series of steps to hack the way that GDrive API
+      # handle its urls. It consists in catch a Google::Apis::RedirectError error
+      # and take the correct url where is located the file.
+      # @param driver_web_content_link [ String ]
+      # @return [ String ]
+      def effective_url_from(drive_web_content_link)
+        redirect_url = drive_web_content_link.split(/&export=/)[0]
+        google_drive.http(:get, redirect_url) do |result, err|
+          err.header[:location].split('&continue=')[1]
+        end
       end
 
       # Takes the file title/name and search it in a given folder
@@ -192,7 +208,7 @@ module Paperclip
           client = google_api_client
           metadata = client.get_file(
                     file_id,
-                    fields: 'id, name, thumbnailLink'
+                    fields: 'id, name, thumbnailLink, webContentLink, webViewLink, trashed'
                     )
           validate_metadata(metadata)
           metadata
@@ -206,6 +222,8 @@ module Paperclip
         raise 'the file id was not retrieved' if metadata.id.nil?
         raise 'the file name was not retrieved' if metadata.name.nil?
         raise 'the file thumbnail_link was not retrieved' if metadata.thumbnail_link.nil?
+        raise 'the file web_content_link was not retrieved' if metadata.web_content_link.nil?
+        raise 'the file trashed was not retrieved' if metadata.trashed.nil?
       end
 
       # Checks if the image already exits
@@ -222,12 +240,30 @@ module Paperclip
         end
       end
 
+      # Gets the file metadata if it exists
+      # in other case returns the defaul image
+      # @param title [ String ]
+      # @param block [ Proc ]
+      def metadata_or_default_img_from(title, &block)
+        searched_id = search_for_title(title) #return id if any or style
+        if searched_id.nil? # it finds some file
+          default_image
+        else
+          metadata = metadata_by_id(searched_id)
+          yield metadata
+        end
+      end
+
       def default_image
         if @google_drive_options[:default_url] #if default image is set
           title = @google_drive_options[:default_url]
           searched_id = search_for_title(title) # id
-          metadata = metadata_by_id(searched_id) unless searched_id.nil?
-          custom_image_for(metadata.thumbnail_link)
+          if searched_id.nil?
+            raise 'Default image not found, please double check its name'
+          else
+            metadata = metadata_by_id(searched_id)
+            effective_url_from(metadata.web_content_link)
+          end
         else
           'No picture' # ---- ?
         end

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module PaperclipGoogleDrive
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-google-drive
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Diego Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip