middleman-google_drive 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046c0207e7aeb1e5536b1838144a08ce0c46440a
-  data.tar.gz: b16aca8e31aeb09d297a0d139662184aac4ba5f9
+  metadata.gz: 16c1bd804f853f95a62015f235fa40dac151a003
+  data.tar.gz: af02439107587b497cfe943fd0499798c6908b3e
 SHA512:
-  metadata.gz: c2344bc5ce55c5e0c28a422ee86355568afeda34019564a34d6dbd9361e11ad619c37c67c9491252383de4a0e16dcc096dbed3ff5e720e27b94feddde0ae06ff
-  data.tar.gz: 9102b25373ca55a560115d7246226d0f5c33dccfc74310cf80d94219cd5c771f9fa73de47b5b6fc4af02dd233c2da126b746777b2f87cb5f7e89f9c6b326dad2
+  metadata.gz: 1a3ab2878383a99299331cf70bb715e55b4552f5bdc8a58ae9f47fab38035ed36b724da8c69cee9d59a40bd7954d70037c14bc78853bd9385ba5b09f1f0aa4db
+  data.tar.gz: 087b46c200f6556ba3a72e86da8e57f0ad22d75b6641e65b28ec2ef8efc8b82622f85472f33f6f7d563e989239c85c15fc7820fb7e0c17a38cbe25355320c79d

data/README.md

@@ -35,6 +35,8 @@ Then you can use the data in your templates:
         My column name: <%= row['My column name'] %>
     <% end %>
 
+## Setup
+
 The first time you use this extension, you will have to configure the authentication
 with Google docs. There are two parts to this. First you will have to register
 a client application with Google and get API keys. Tarbell has a [great

data/lib/middleman-google_drive/extension.rb

@@ -1,4 +1,4 @@
-require 'google_drive'
+require 'roo'
 
 module Middleman
   module GoogleDrive
@@ -10,10 +10,9 @@ module Middleman
         super
 
         @client = Middleman::GoogleDrive.connect
-        @session = ::GoogleDrive.login_with_oauth(
-          @client.authorization.access_token)
+        @drive = @client.discovered_api('drive', 'v2')
 
-        app = klass.inst
+        app = klass.inst # this is obviously where you would store the app instance
         options.load_sheets.each do |k, v|
           app.data.store(k, get_sheet(v))
         end
@@ -21,11 +20,58 @@ module Middleman
 
       def get_sheet(key)
         data = {}
-        s = @session.spreadsheet_by_key(key)
-        data[:title] = s.title
-        s.worksheets.each do |sheet|
-          data[sheet.title] = sheet.list.to_hash_array
+        # we're gonna request the spreadsheet in excel format
+        format = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+        # get the file metadata
+        list_resp = @client.execute(
+          api_method: @drive.files.get,
+          parameters: { fileId: key })
+
+        # die if there's an error
+        fail list_resp.error_message if list_resp.error?
+
+        # grab the export url
+        uri = list_resp.data['exportLinks'][format]
+
+        # get the export
+        get_resp = @client.execute(uri: uri)
+
+        # die if there's an error
+        fail get_resp.error_message if get_resp.error?
+
+        # get a temporary file. we can't just write to it because ruby's
+        # tempfile tries to be clever and open the file for you, except we
+        # need to open the file in binary mode, so thanks ruby.
+        fp = Tempfile.new(['gdoc', '.xlsx'])
+        filename = fp.path
+        fp.close
+
+        # since the export is binary, reopen the tempfile in write binary mode
+        open(filename, 'wb') do |f|
+          # write the digits
+          f.write get_resp.body
+        end
+
+        # now open the file a third time with Roo. (Roo can't handle an IO
+        # object, it will only take filenames or urls, coulda done this all
+        # in memory, but alas...)
+        xls = Roo::Spreadsheet.open(filename)
+        xls.each_with_pagename do |title, sheet|
+          # if the sheet is called microcopy or copy, we assume the first
+          # column contains keys and the second contains values. Ala tarbell.
+          if %w(microcopy copy).include? title.downcase
+            data[title] = {}
+            sheet.each do |row|
+              data[title][row[0]] = row[1]
+            end
+          else
+            # otherwise parse the sheet into a dict, incorrectly, of course
+            sheet.header_line = 2 # this is stupid. theres a bug in Roo.
+            data[title] = sheet.parse(headers: true)
+          end
         end
+        fp.unlink # delete our tempfile
         data
       end
     end

data/lib/middleman-google_drive/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleDrive
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

data/lib/middleman-google_drive.rb

@@ -39,10 +39,7 @@ module Middleman
             issuer: issuer,
             signing_key: key,
             scope: [
-              'https://www.googleapis.com/auth/drive',
-              'https://spreadsheets.google.com/feeds',
-              'https://docs.google.com/feeds/',
-              'https://docs.googleusercontent.com/'
+              'https://www.googleapis.com/auth/drive'
             ]
           )
         )
@@ -63,16 +60,14 @@ module Middleman
             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'
             exit
           end
+          puts 'Please login via your web browser'
           client_secrets = Google::APIClient::ClientSecrets.load(
             client_secrets)
           flow = Google::APIClient::InstalledAppFlow.new(
             client_id: client_secrets.client_id,
             client_secret: client_secrets.client_secret,
             scope: [
-              'https://www.googleapis.com/auth/drive',
-              'https://spreadsheets.google.com/feeds',
-              'https://docs.google.com/feeds/',
-              'https://docs.googleusercontent.com/'
+              'https://www.googleapis.com/auth/drive'
             ]
           )
           client.authorization = flow.authorize(file_storage)

data/middleman-google_drive.gemspec

@@ -6,12 +6,13 @@ require 'middleman-google_drive/version'
 Gem::Specification.new do |spec|
   spec.name          = 'middleman-google_drive'
   spec.version       = Middleman::GoogleDrive::VERSION
+  spec.platform      = Gem::Platform::RUBY
   spec.authors       = ['Ryan Mark', 'Pablo Mercado']
   spec.email         = ['ryan@mrk.cc', 'pablo@voxmedia.com']
   spec.summary       = 'Pull content from a google spreadsheet to use in your middleman site.'
   #spec.description   = %q(TODO: Write a longer description. Optional.)
   spec.homepage      = 'https://github.com/voxmedia/middleman-google_drive'
-  spec.license       = 'MIT'
+  spec.license       = 'BSD'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'middleman-core', '>= 3.0.0'
   spec.add_runtime_dependency 'google-api-client', '>= 0.7.1'
-  spec.add_runtime_dependency 'google_drive', '>= 0.3.9'
+  spec.add_runtime_dependency 'roo', '~> 1.13.2'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '>= 10.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google_drive
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Mark
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -40,19 +40,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: google_drive
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 1.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 1.13.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ files:
 - middleman-google_drive.gemspec
 homepage: https://github.com/voxmedia/middleman-google_drive
 licenses:
-- MIT
+- BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []