middleman-google_drive 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a285921b3f9a1cd1315a39ca4adeb5789ff591
-  data.tar.gz: 95ea9261a02cfcd9c2e719fb92194a2abb880a04
+  metadata.gz: 1afb11c7d973d269a92ed9ca7d3083d26d10be94
+  data.tar.gz: 2a716ee1cf4e9ac1cac6abcdcc0e7f9ebc312805
 SHA512:
-  metadata.gz: 4c674d9893c9f45c9f2ede571ffbe9905989690e50cc7d362ba8387c7953373a36e929c6e64adc2618668f37f2beb3c3c8fe1f981fa45622cbfca546168be94c
-  data.tar.gz: 8e88247849e0f5004e08990ece3bcfd0b5c9e5afdbec9bc355e59cf30e7cfef230725f33631aa59580f7df947c393c3b9aecdccaf0e3bc31d82ed5e24e902d45
+  metadata.gz: ea341f8b96380de5e5e67923ae3014f0a95dd401b4038a614dd5a4264efd3381501ee03250f6fdacd372a12c61f827ac698aace488c55e5358fccab72f2b8e1f
+  data.tar.gz: ee513b57b122fad012b277cef94343e10af928827171e47d6ed78fa2bdff19b5b9ecff2752d9597850991de3df6af9061c4798ee5681874c5bbb91ffbc3c5a34

data/LICENSE.txt

@@ -1,22 +1,27 @@
 Copyright (c) 2014 Vox Media Inc., Ryan Mark, Pablo Mercado
+All rights reserved.
 
-MIT License
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* Neither the name of the {organization} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -43,16 +43,25 @@ explanation](http://tarbell.readthedocs.org/en/latest/install.html#configure-goo
 run middleman, you will be sent to a Google login prompt in order to
 associate Middleman with your Google account. You should make sure that the
 account that you choose has access to the spreadsheets you want to use in
-Middleman. Once you authenticate with Google, a new file
-`~/.google_drive_oauth2.json` will be created containing an key for
-communicating with Google Drive.
+Middleman.
+
+You need to make sure that the `redirect_urls` setting for the client secrets
+is `urn:ietf:wg:oauth:2.0:oob` and not another URL.
+
+Protip: If somebody in your org has used this extension or something like it,
+chances are that person has already created a client secrets file that can be
+shared with you.
+
+Once you authenticate with Google, a new file `~/.google_drive_oauth2.json`
+will be created containing an key for communicating with Google Drive.
 
 You can override the location of the client secrets and oauth2 JSON files with
 the environment variables `GOOGLE_CLIENT_SECRETS` and `GOOGLE_DRIVE_OAUTH`.
 
 If you plan to run Middleman on a server, you can use Google's server to server
 authentication. This will kick in if you define the environment variables
-`GOOGLE_OAUTH_PERSON`, `GOOGLE_OAUTH_ISSUER` and either `GOOGLE_OAUTH_KEYFILE` or  `GOOGLE_OAUTH_PRIVATE_KEY`.
+`GOOGLE_OAUTH_PERSON`, `GOOGLE_OAUTH_ISSUER` and either `GOOGLE_OAUTH_KEYFILE`
+or `GOOGLE_OAUTH_PRIVATE_KEY`.
 
 ## Contributing
 

data/lib/middleman-google_drive/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleDrive
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/middleman-google_drive.rb

@@ -30,8 +30,8 @@ module Middleman
       if key
         puts 'authenticating with key'
         client = Google::APIClient.new(
-          application_name: 'VoxDocs',
-          application_version: '0.0.1',
+          application_name: 'Middleman',
+          application_version: Middleman::GoogleDrive::VERSION,
           authorization: Signet::OAuth2::Client.new(
             token_credential_uri: 'https://accounts.google.com/o/oauth2/token',
             audience: 'https://accounts.google.com/o/oauth2/token',
@@ -50,9 +50,14 @@ module Middleman
       else
         client = Google::APIClient.new(
           application_name: 'Middleman',
-          application_version: '1.0.0'
+          application_version: Middleman::GoogleDrive::VERSION
         )
-        file_storage = Google::APIClient::FileStorage.new(credentials)
+        begin
+          file_storage = Google::APIClient::FileStorage.new(credentials)
+        rescue URI::InvalidURIError
+          File.delete credentials
+          file_storage = Google::APIClient::FileStorage.new(credentials)
+        end
         if file_storage.authorization.nil?
           unless File.exist? client_secrets
             puts 'You need to create a client_secrets.json file and save it to `~/.google_client_secrets.json`. Find instructions here: http://tarbell.readthedocs.org/en/latest/install.html#configure-google-spreadsheet-access-optional'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google_drive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryan Mark
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core