middleman-google_drive 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c005b79314b36975007d1318e3d641d97447b3b2
-  data.tar.gz: a5c1ba67e4685638dd57f619c06d3aaa7c562c5c
+  metadata.gz: bb9ae8521afbbeae9275df2d64c183a5e0bf21cc
+  data.tar.gz: 28eb1a3c4624f1856b96f8cbd1e1fbd535e12b57
 SHA512:
-  metadata.gz: e4b75a88d830e8ba1f7605367da9427f2e5b2bdc2f754ba7c8b364a48e62774b9c4b1b4704e88bcb548dd5d409f3c54db903db87e44b36c52d0e9f3359f1c831
-  data.tar.gz: 376ab37406c05421ac306b2ea81980ad133101063fb5c43366f0ae61d0c948c43f1d90fdc9e251e3c17eab05ea695b8afcfea65d08ca4985948a6312d0f76ee7
+  metadata.gz: 9e50d4b456bad5d489f9e6e6a008aca3d5f8bea940d6e1c5e8f94030c21bea9ce9c22694072a3ada0da08c6c41bb3031ae63ed1ebb500979d242f00cad437285
+  data.tar.gz: 0b8e2fba1ea328fdf141285b2521de79b80d3e572211b959829c6a9870d369176982a0e8db51306fb50bf2110c37ba1534f946f79085e41a04274a685f0cebf5

data/README.md

@@ -19,7 +19,43 @@ Or install it yourself as:
 
 ## Usage
 
-The extension will get loaded in automatically, you'll just need to activate it.
+The extension will get loaded automatically, you just need to activate it.
+
+```ruby
+activate :google_drive
+```
+
+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...
+
+```ruby
+activate :google_drive, load_sheets: 'mygoogledocumentkey'
+```
+
+------
+
+### WARNING!!!!
+
+You can only reliably load old-style google spreadsheets. These spreadsheets have URLs that look like this: `https://docs.google.com/a/spreadsheet/ccc?key=mygoogledocumentkey#gid=4`. If you create a brand new google spreadsheet, it will load without crashing but the worksheet names and data will be all mixed up.
+
+Click this link to create a new old-style google spreadsheet: [g.co/oldsheets](http://g.co/oldsheets)
+
+------
+
+You can then use the worksheets in your templates (make sure your worksheets
+have names that only contain alpha-numeric characters; no spaces or strange things).
+
+```erb
+<h1>My spreadsheet is called: <%= data.mysheet['title'] %></h1>
+<% data.Sheet1.each do [row] %>
+    Column one header: <%= row['Column one header'] %>
+    Column two header: <%= row['Column two header'] %>
+    My column name: <%= row['My column name'] %>
+<% end %>
+```
+
+If you would like to load multiple documents from google, you can use a hash when
+activating the extension:
 
 ```ruby
 activate :google_drive, load_sheets: {
@@ -28,7 +64,7 @@ activate :google_drive, load_sheets: {
 }
 ```
 
-Then you can use the data in your templates:
+Then you can use the data from any of the loaded documents in your templates:
 
 ```erb
 <h1>My spreadsheet is called: <%= data.mysheet['title'] %></h1>
@@ -37,12 +73,21 @@ Then you can use the data in your templates:
     Column two header: <%= row['Column two header'] %>
     My column name: <%= row['My column name'] %>
 <% end %>
+<% data.moresheet['Sheet1'].each do [row] %>
+    Column one header: <%= row['Column one header'] %>
+    Column two header: <%= row['Column two header'] %>
+    My column name: <%= row['My column name'] %>
+<% end %>
 ```
 
 You can also use a simplified Google Drive interface from inside your project, via the `drive`
-variable.
+variable. In order to use this functionality, you only have to activate the extension; you do
+not have to provide a google docs key:
 
 ```ruby
+# Activate the extension
+activate :google_drive
+
 # get metadata for a document
 doc_info = drive.find('google_document_key')
 

data/lib/middleman-google_drive/extension.rb

@@ -14,13 +14,13 @@ module Middleman
 
         app = klass.inst
         app.set :drive, @drive # so you can access the drive api directly
-        if options.load_sheets.is_a? String
-          load_doc(options.load_sheets).each do |name, sheet|
-            app.data.store(name, sheet)
+        if options.load_sheets.is_a? Hash
+          options.load_sheets.each do |name, key|
+            app.data.store(name, load_doc(key.to_s))
           end
         else
-          options.load_sheets.each do |name, key|
-            app.data.store(name, load_doc(key))
+          load_doc(options.load_sheets.to_s).each do |name, sheet|
+            app.data.store(name, sheet)
           end
         end
       end

data/lib/middleman-google_drive/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleDrive
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/middleman-google_drive.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'middleman-core', '>= 3.0.0'
-  spec.add_runtime_dependency 'google-api-client', '>= 0.7.1'
+  spec.add_runtime_dependency 'google-api-client', '< 0.8'
   spec.add_runtime_dependency 'roo', '~> 1.13.2'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google_drive
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ryan Mark
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -29,16 +29,16 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement