middleman-google_drive 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df94f7285904bfdc980f5c9b41f462419510d229
-  data.tar.gz: d21820a19625117878fac1a193f31886405cc2b1
+  metadata.gz: b55941adf06f492ae066a183856e98b563a03b42
+  data.tar.gz: 20e2056fbdc0114d14c391de431d583fc9d1a88d
 SHA512:
-  metadata.gz: f0491070a92dac3f1b78bcf9c344505ff85d00e06ced6c3f8483fd549fd0d4793f30198ff327073e8fb7590a06f4a9506fb502f26b707b6e3889f36f1ce425f2
-  data.tar.gz: 335652541d98d74f3ac22138bbdc2c618c0f11977f22e93fbfd83d33b3f32843cba2aff811ea8c496bb8e137e1cfd9ab5d988ec66d17eaa6a43d07662f622a75
+  metadata.gz: 310b40a38b5fb3c452b0e261476552b261ea7aa4a11349bb9f0e6716254323ef6fe92385a41205ec51c32b1642d6cd579fb65fd8e7696e065887616452b2acc3
+  data.tar.gz: 2ed85c7be3f9e6c9fb97bc28ea7bb406d4d4f3eeabf625b1c811e1908d6a41bb6634ec5c5f22838b8036429b2f26dc77a3e39ea6634d3fb913534f6589a408ae

data/lib/google_drive.rb

@@ -89,27 +89,49 @@ class GoogleDrive
       # Like tarbell.
       if %w(microcopy copy).include?(title.downcase) ||
           title.downcase =~ /[ -_]copy$/
-        data[title] = {}
-        sheet.extract_data.each do |row|
-          # if the key name is reused, create an array with all the entries
-          if data[title].keys.include? row[0]
-            if data[title][row[0]].is_a? Array
-              data[title][row[0]] << row[1]
-            else
-              data[title][row[0]] = [data[title][row[0]], row[1]]
-            end
-          else
-            data[title][row[0]] = row[1]
-          end
-        end
+        data[title] = load_microcopy(sheet.extract_data)
       else
         # otherwise parse the sheet into a hash
-        data[title] = sheet.get_table[:table]
+        data[title] = load_table(sheet.extract_data)
+      end
+    end
+    data
+  end
+
+  # Take a two-dimensional array from a spreadsheet and create a hash. The first
+  # column is used as the key, and the second column is the value. If the key
+  # occurs more than once, the value becomes an array to hold all the values
+  # associated with the key.
+  def load_microcopy(table)
+    data = {}
+    table.each_with_index do |row, i|
+      next if i == 0 # skip the header row
+      # Did we already create this key?
+      if data.keys.include? row[0]
+        # if the key name is reused, create an array with all the entries
+        if data[row[0]].is_a? Array
+          data[row[0]] << row[1]
+        else
+          data[row[0]] = [data[row[0]], row[1]]
+        end
+      else
+        # add this row's key and value to the hash
+        data[row[0]] = row[1]
       end
     end
     data
   end
 
+  # Take a two-dimensional array from a spreadsheet and create an array of hashes.
+  def load_table(table)
+    return [] if table.length < 2
+    header = table.shift # Get the header row
+    table.map do |row|
+      # zip headers with current row, convert it to a hash
+      header.zip(row).to_h unless row.nil?
+    end
+  end
+
   def doc(key, format = 'html')
     doc = find(key)
 

data/lib/middleman-google_drive/extension.rb

@@ -36,7 +36,7 @@ module Middleman
         else
           store_data('doc', load_doc(option.to_s, type))
         end
-      rescue Faraday::ConnectionFailed => exc
+      rescue ::Faraday::ConnectionFailed => exc
         if @drive.server?
           puts "== FAILED to load Google Doc \"#{exc.message}\""
         else
@@ -44,7 +44,7 @@ module Middleman
 == Could not connect to Google Drive. Local data will be used.
 MSG
         end
-      rescue GoogleDrive::GoogleDriveError => exc
+      rescue ::GoogleDrive::GoogleDriveError => exc
         if @drive.server?
           puts "== FAILED to load Google Doc \"#{exc.message}\""
         else

data/lib/middleman-google_drive/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleDrive
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google_drive
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ryan Mark