paperclip-googledrive 0.1.2 → 0.1.3

data/README.md

@@ -1,5 +1,4 @@
-
-# PaperclipGoogledrive
+# PaperclipGoogledrive [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/evinsou/paperclip-googledrive)
 
 PaperclipGoogledrive is a gem that extends paperclip storage for Google Drive. Works with Rails 3.x.
 
@@ -100,6 +99,3 @@ Useful links
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-=======
-paperclip-googledrive
-=====================

data/lib/paperclip/google_drive/rake.rb

@@ -7,43 +7,44 @@ module Paperclip
       extend self
 
       def authorize
-            puts 'Enter client ID:'
-            client_id = $stdin.gets.chomp
-            puts 'Enter client SECRET:'
-            client_secret = $stdin.gets.chomp.strip
-            puts 'Enter SCOPE:'
-            oauth_scope = $stdin.gets.chomp.strip
-            puts 'Enter redirect URI:'
-            redirect_uri = $stdin.gets.chomp.strip
-
-            # Create a new API client & load the Google Drive API
-            client = Google::APIClient.new
-            drive = client.discovered_api('drive', 'v2')
-
-            client.authorization.client_id = client_id
-            client.authorization.client_secret = client_secret
-            client.authorization.scope = oauth_scope
-            client.authorization.redirect_uri = redirect_uri
-
-            # Request authorization
-            uri = client.authorization.authorization_uri.to_s
-            puts "\nGo to this url:"
-            puts client.authorization.authorization_uri.to_s
-            puts "\n Accept the authorization request from Google in your browser"
-
-            puts "\n\n\n Google will redirect you to localhost, but just copy the code parameter out of the URL they redirect you to, paste it here and hit enter:\n"
-
-            code = $stdin.gets.chomp.strip
-            client.authorization.code = code
-            client.authorization.fetch_access_token!
-
-            puts "\nAuthorization complete!:\n\n"
-            puts "client = Google::APIClient.new"
-            puts "client.authorization.client_id = '#{client_id}'"
-            puts "client.authorization.client_secret = '#{client_secret}'"
-            puts "client.authorization.access_token = '#{client.authorization.access_token}'"
-            puts "client.authorization.refresh_token = '#{client.authorization.refresh_token}'"
-            puts "\n"
+        puts 'Enter client ID:'
+        client_id = $stdin.gets.chomp
+        puts 'Enter client SECRET:'
+        client_secret = $stdin.gets.chomp.strip
+#        puts 'Enter SCOPE:'
+#        oauth_scope = $stdin.gets.chomp.strip
+        oauth_scope = ['https://www.googleapis.com/auth/drive', 'https://www.googleapis.com/auth/userinfo.profile']
+        puts 'Enter redirect URI:'
+        redirect_uri = $stdin.gets.chomp.strip
+
+        # Create a new API client & load the Google Drive API
+        client = Google::APIClient.new(:application_name => 'ppc-gd', :application_version => PaperclipGoogleDrive::VERSION)
+        drive = client.discovered_api('drive', 'v2')
+
+        client.authorization.client_id = client_id
+        client.authorization.client_secret = client_secret
+        client.authorization.scope = oauth_scope
+        client.authorization.redirect_uri = redirect_uri
+
+        # Request authorization
+        uri = client.authorization.authorization_uri.to_s
+        puts "\nGo to this url:"
+        puts client.authorization.authorization_uri.to_s
+        puts "\n Accept the authorization request from Google in your browser"
+
+        puts "\n\n\n Google will redirect you to localhost, but just copy the code parameter out of the URL they redirect you to, paste it here and hit enter:\n"
+
+        code = $stdin.gets.chomp.strip
+        client.authorization.code = code
+        client.authorization.fetch_access_token!
+
+        puts "\nAuthorization completed.\n\n"
+        puts "client = Google::APIClient.new"
+        puts "client.authorization.client_id = '#{client_id}'"
+        puts "client.authorization.client_secret = '#{client_secret}'"
+        puts "client.authorization.access_token = '#{client.authorization.access_token}'"
+        puts "client.authorization.refresh_token = '#{client.authorization.refresh_token}'"
+        puts "\n"
       end
     end
   end

data/lib/paperclip/storage/google_drive.rb

@@ -49,8 +49,10 @@ module Paperclip
             #upload(style, file) #style file
             client = google_api_client
             drive = client.discovered_api('drive', 'v2')
-            oauth2 = client.discovered_api('oauth2', 'v2')
-            result = client.execute!(:api_method => oauth2.userinfo.get)
+            result = client.execute(
+              :api_method => drive.files.get,
+              :parameters => { 'fileId' => @google_drive_options[:public_folder_id],
+                              'fields' => '  id, title' })
             client.authorization.access_token = result.request.authorization.access_token
             client.authorization.refresh_token = result.request.authorization.refresh_token
             title, mime_type = title_for_file(style), "#{content_type}"
@@ -101,7 +103,8 @@ module Paperclip
         @google_api_client ||= begin
           assert_required_keys
         # Initialize the client & Google+ API
-          client = Google::APIClient.new
+          client = Google::APIClient.new(:application_name => 'ppc-gd', :application_version => PaperclipGoogleDrive::VERSION)
+#          client = Google::APIClient.new(:application_name => @google_drive_credentials[:application_name], :application_version => @google_drive_credentials[:application_version])
           client.authorization.client_id = @google_drive_credentials[:client_id]
           client.authorization.client_secret = @google_drive_credentials[:client_secret]
           client.authorization.access_token = @google_drive_credentials[:access_token]
@@ -132,9 +135,7 @@ module Paperclip
 
       def title_for_file(style)
         file_name = instance.instance_exec(style, &file_title)
-
         style_suffix = (style != default_style ? "_#{style}" : "")
-
         if original_extension.present? && file_name =~ /#{original_extension}$/
           file_name.sub(original_extension, "#{style_suffix}#{original_extension}")
         else
@@ -186,7 +187,8 @@ module Paperclip
         end
       end
 
-      def exists?(style)
+      def exists?(style = default_style)
+        return false if not present?
         result_id = search_for_title(path(style))
         if result_id.nil?
           false

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module PaperclipGoogleDrive
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-googledrive
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip