jekyll-gdrive 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f1017a6e52a15259bd35f142d8cbe0efd0547c3
-  data.tar.gz: 1e8ea2c9a0e9809b16ced3a082fa77b4f316673e
+  metadata.gz: 719bbba214913cefb73468b8aa6542ea6b7b4202
+  data.tar.gz: 82de8b6c9547bdc7d6904c1481da2c0eb1e379a8
 SHA512:
-  metadata.gz: 59d34f4e30f694a0db9e92854153accd6b38ddc1eb1a1c880a0e17424b1fa2489a6fe90533a332de2ba7bf52dd0cdeb709e7b24932c4d0d50078d52d7d86eeb5
-  data.tar.gz: 74e32fef80068e5eda3a613683cee6d85133629ff3e264b1f873232420495ed2c0d74ae6c50ef3372b151d4a7d718fc1d54d8e203d1f3abc925b04c34d41a0c7
+  metadata.gz: ea474057a9e558379f6e6ada345ef0d363d58b977e031f49ff44857ec2d08a7cdf1ee6b7a5b6ca6ff7e705bd3299b822e0a284e6cbb56110ee3e3c268666877a
+  data.tar.gz: c94eddbb04990a5b7edb090e7310df7c4f1d82785dc49edefc52317eb7fb833d7298c0a30c7a4f44f055adb505e4e9e3c33c48c69eedb7ad5a16cf3270d2669f

data/README.md

@@ -1,6 +1,6 @@
 # Jekyll Gdrive Plugin
 
-Access data from a Google Drvie Spreadsheet in your Jekyll sites
+Access data from a Google Drive Spreadsheet in your Jekyll sites
 
 ## Installation
 
@@ -18,15 +18,15 @@ And then execute:
 
 ## Usage
 
-Before you can access any data from GDrive you need to get an access token. After installing the plugin, run:
+Before you can access any data from GDrive you need to configure your GDrive API credentials. After installing the plugin, run:
 
     $ bundle exec jekyll gdrive
 
-And follow the instructions to create an application in Google's developer console and generate an access token.
+And follow the instructions to create an application in Google's developer console and generate a refresh token.
 
-Once you have to token, you need to set it up as an environment variable before running `jekyll build`.
+Once you have the token, you need to set it up as an environment variable before running `jekyll build`. The GDrive plugin will give you an export statement you can use to setup your environment:
 
-    $ export GDRIVE_TOKEN=<your ned gdrive token>
+    $ export GDRIVE=<client_id>:<client_secret>:<your gdrive token>
 
 You'll also need to configure the plugin to use the right spreadsheet.
 
@@ -34,7 +34,7 @@ Add this to your `_config.yml`:
 
 ```yaml
 gdrive:
-  sheet: "title of my spreadsheey"
+  sheet: "title of my spreadsheet"
 ```
 
 ## Accessing your Google Sheet data
@@ -46,14 +46,14 @@ Example:
 ```html
 <table>
     <thead>
-      {% for row in site.data.google_sheet limit: 1 %}
+      {% for row in site.data.google_sheet limit:1 %}
         <tr>
           {% for col in row %}<th>{{col}}</th>{% endfor %}
         </tr>
       {% endfor %}
     </thead>
     <tbody>
-      {% for row in site.data.google_sheet offset: 1 %}
+      {% for row in site.data.google_sheet offset:1 %}
         <tr>
           {% for col in row %}<td>{{col}}</td>{% endfor %}
         </tr>

data/lib/jekyll/commands/gdrive.rb

@@ -43,19 +43,12 @@ module Jekyll
           end
           auth.code = ask "Enter he authorization code shown in the page: "
           auth.fetch_access_token!
-          access_token = auth.access_token
 
+          puts "OAuth credentials generated"
+          puts "To access Google Drive data from your Jekyll site"
+          puts "Set a GDRIVE environment variable"
           puts 
-          puts "You now have a Google Drive Access token:"
-          puts
-          puts access_token
-          puts
-          puts "Remember, this token gives access to all the files in your drive"
-          puts "So keep it safe"
-          puts "To use with the Jekyll GDrive plugin:"
-          puts "Set a GDRIVE_TOKEN environment variable"
-          puts 
-          puts "export GDRIVE_TOKEN=#{access_token}"
+          puts "export GDRIVE=#{auth.client_id}:#{auth.client_secret}:#{auth.refresh_token}"
         end
       end
     end

data/lib/jekyll/gdrive/generator.rb

@@ -3,12 +3,22 @@ module Jekyll
     class Generator < Jekyll::Generator
       def generate(site)
         sheet_name = site.config['gdrive'] && site.config['gdrive']['sheet']
-        access_token = ENV['GDRIVE_TOKEN']
+        credentials = ENV['GDRIVE'] && ENV['GDRIVE'].split(":")
 
         raise "No sheet specified for the GDrive Data Plugin\nSet 'gdrive.sheet' in your '_config.yml'" unless sheet_name
-        raise "No access token specified for the GDrive Data Plugin\nSet it in a GRDIVE_TOKEN environment variable\nEg.: export GDRIVE_TOKEN=my-long-token\nRun 'jekyll gdrive' to get an access token" unless access_token
-        
-        session = GoogleDrive.login_with_oauth(access_token)
+        raise "No credentials specified for the GDrive Data Plugin\nSet it in a GRDIVE environment variable\nEg.: export GDRIVE_TOKEN=<client_id>:<client_secret>:<refresh_token>\nRun 'jekyll gdrive' to get an export statement you can cut and past" unless credentials
+
+        client = Google::APIClient.new(
+          :application_name => "Jekyll GDrive Plugin",
+          :application_version => Jekyll::Gdrive::VERSION
+        )
+        auth = client.authorization
+        auth.client_id     = credentials[0]
+        auth.client_secret = credentials[1]
+        auth.refresh_token = credentials[2]
+        auth.fetch_access_token!()
+
+        session = GoogleDrive.login_with_oauth(auth.access_token)
 
         sheet = session.file_by_title(sheet_name).worksheets.first
 

data/lib/jekyll/gdrive/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Gdrive
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gdrive
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mathias Biilmann Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler