middleman-google_drive 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc8b914f8ecfa175eeebbbf9f523994f377bea2
-  data.tar.gz: a7cf3b8776134a09304e05e96d38a76c11435d49
+  metadata.gz: 2e770a8092ef9c7f93c2bfa87cc5761f734de84a
+  data.tar.gz: 70a53a4a60479ca86ab745eeadf419b6e276a366
 SHA512:
-  metadata.gz: ebf0e3d4784bdd27b29ad834e4fb188d6f25165c88b36eaf31b6bfbc7d085bbb570e5224110ea4b8d8086b0b1fb85ab371938e2cd3438c262ef912566032d4e1
-  data.tar.gz: 127a4748dc58952a4edf74862593eaf49b127aae41ac03f399684cd2e22871bb17601ecc96945cb910daefac83e248e8177733706f116b37afc3a3a8c1dcfa75
+  metadata.gz: d481a955ea7beb27b5fabb80616e01d54d0c8b7efd25d123c62523b222d98a30de747930d38a1e317eeec4d87201bf4ed5e54635c19c08ff0807d546121b326f
+  data.tar.gz: 94273972b78ebc5a254c0f5eeb18e573a73efb03dbaef85f6f4462e60cc1aa18de8516df0f656a248f641365da62a6ca4a488943c1e24e5df63088f648e306a6

data/README.md

@@ -1,6 +1,6 @@
 # Middleman::GoogleDrive
 
-This is an extension for Middleman that allows you to load data from a google 
+This is an extension for Middleman that allows you to load data from a google
 spreadsheet into your template data.
 
 ## Installation
@@ -25,6 +25,8 @@ The extension will get loaded automatically, you just need to activate it.
 activate :google_drive
 ```
 
+### Spreadsheet
+
 There are two ways to load and use spreadsheets. Most the time you just need a
 single document with multiple worksheets. If you only need a single document...
 
@@ -80,65 +82,32 @@ Then you can use the data from any of the loaded documents in your templates:
 <% end %>
 ```
 
-You can also use a simplified Google Drive interface from inside your project, via the `drive`
-variable. In order to use this functionality, you only have to activate the extension; you do
-not have to provide a google docs key:
+### Documents
 
-```ruby
-# Activate the extension
-activate :google_drive
+You can load documents similarly to spreadsheets. With documents, you have a couple
+options: plain text or HTML.
 
-# get metadata for a document
-doc_info = drive.find('google_document_key')
+To load a single document as text:
 
-# get the same spreadsheet data without using the load_sheets param above
-mysheet = drive.prepared_spreadsheet('google_document_key')
-
-# get a fancy spreadsheet object
-spreadsheet = drive.spreadsheet('google_document_key')
+```ruby
+activate :google_drive, load_docs: 'mygoogledocumentkey'
 ```
 
-The fancy spreadsheet object comes from the [roo gem](https://github.com/Empact/roo). Unfortunately documentation is slim. Here is an example from the `roo` readme:
+You can now access the text in `data.doc`. To change the name of the variable name
+or to load multiple documents, use a hash:
 
 ```ruby
-spreadsheet.sheet('Info').row(1)
-spreadsheet.sheet(0).row(1)
-
-# use this to find the sheet with the most data to parse
-
-spreadsheet.longest_sheet
-
-# this file has multiple worksheets, let's iterate through each of them and process
-
-spreadsheet.each_with_pagename do |name, sheet|
-  p sheet.row(1)
-end
-
-# pull out a hash of exclusive column data (get rid of useless columns and save memory)
-
-spreadsheet.each(:id => 'UPC',:qty => 'ATS') {|hash| arr << hash}
-#=> hash will appear like {:upc=>727880013358, :qty => 12}
-
-# NOTE: .parse does the same as .each, except it returns an array (similar to each vs. map)
-
-# not sure exactly what a column will be named? try a wildcard search with the character *
-# regex characters are allowed ('^price\s')
-# case insensitive
-
-spreadsheet.parse(:id => 'UPC*SKU',:qty => 'ATS*\sATP\s*QTY$')
-
-# if you need to locate the header row and assign the header names themselves,
-# use the :header_search option
-
-spreadsheet.parse(:header_search => ['UPC*SKU','ATS*\sATP\s*QTY$'])
-#=> each element will appear in this fashion:
-#=> {"UPC" => 123456789012, "STYLE" => "987B0", "COLOR" => "blue", "QTY" => 78}
-
-# want to strip out annoying unicode characters and surrounding white space?
-
-spreadsheet.parse(:clean => true)
+activate :google_drive, load_docs: {
+    first_article: 'googledockeyone',
+    second_article: 'googledockeytwo'
+}
 ```
 
+In order to load the google doc as HTML, use `load_docs_html` instead of `load_docs`.
+The HTML version of a Google doc will be a complete HTML document that includes
+`<html>`, `<head>` and `<body>` tags. You'll probably wanna use the sanitize gem
+to clean things up.
+
 ## Setup
 
 The first time you use this extension, you will have to configure the authentication

data/lib/middleman-google_drive/extension.rb

@@ -6,6 +6,8 @@ module Middleman
     # Middle man extension that loads the google doc data
     class Extension < Middleman::Extension
       option :load_sheets, {}, 'Key for a google spreadsheet or a hash of google spreadsheets to load. Hash value is the id or slug of the spreadsheet to load, hash key is the data attribute to load the sheet data into.'
+      option :load_docs, {}, 'Key for a google doc or a hash of google docs to load as text. Hash value is the Google key of the spreadsheet to load, hash key is the data attribute to load the sheet data into.'
+      option :load_docs_html, {}, 'Key for a google doc or a hash of google docs to load as HTML. Hash value is the Google key of the spreadsheet to load, hash key is the data attribute to load the sheet data into.'
 
       def initialize(klass, options_hash = {}, &block)
         super
@@ -13,19 +15,45 @@ module Middleman
         @drive = ::GoogleDrive.new
 
         app = klass.inst
+
         if options.load_sheets.is_a? Hash
           options.load_sheets.each do |name, key|
-            app.data.store(name, load_doc(key.to_s))
+            app.data.store(name, load_doc(key.to_s, 'spreadsheet'))
           end
         else
-          load_doc(options.load_sheets.to_s).each do |name, sheet|
+          load_doc(options.load_sheets.to_s, 'spreadsheet').each do |name, sheet|
             app.data.store(name, sheet)
           end
         end
+
+        if options.load_docs.is_a? Hash
+          options.load_docs.each do |name, key|
+            app.data.store(name, load_doc(key.to_s, 'text'))
+          end
+        else
+          app.data.store(
+            'doc', load_doc(options.load_docs.to_s, 'text'))
+        end
+
+        if options.load_docs_html.is_a? Hash
+          options.load_docs_html.each do |name, key|
+            app.data.store(name, load_doc(key.to_s, 'html'))
+          end
+        else
+          app.data.store(
+            'doc', load_doc(options.load_docs_html.to_s, 'html'))
+        end
       end
 
-      def load_doc(key)
-        data = @drive.prepared_spreadsheet(key)
+      def load_doc(key, type)
+        case type.to_s
+        when 'spreadsheet'
+          data = @drive.prepared_spreadsheet(key)
+        when 'html'
+          data = @drive.doc(key, 'html')
+        else
+          data = @drive.doc(key, 'text')
+        end
         doc = @drive.find(key)
         puts <<-MSG
 == Loaded data from Google Doc "#{doc['title']}"

data/lib/middleman-google_drive/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleDrive
-    VERSION = '0.2.7'
+    VERSION = '0.2.8'
   end
 end

data/middleman-google_drive.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'middleman-core', '~> 3'
   spec.add_runtime_dependency 'retriable', '~> 1.4'
   spec.add_runtime_dependency 'google-api-client', '< 0.8'
-  spec.add_runtime_dependency 'spreadsheet'
+  spec.add_runtime_dependency 'roo'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google_drive
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ryan Mark
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="