keen-csv 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fe8e0dce221ce5b5e2f0b915e85bd2e8084b36
-  data.tar.gz: 1ab02862ac7b47d6fffb82c8b22633e09dc50fe5
+  metadata.gz: 5cd940708c2ed932bd5f6adcea517643c32cea97
+  data.tar.gz: ae0092aadee0d1121ab59e504ad24f3958d30dc8
 SHA512:
-  metadata.gz: e2df446da5ab8e23eb305d2555487a37cd131dbef5650cff34d1ad1234fa91c501ef3505ea4502f220ca5ece89dde98ccdf561f925b21b9a55c7216bac441c45
-  data.tar.gz: 9b009e1685d3d5f4c99daedef05991d406cbd1e32aaf4ad1c7cb8e22558bde26354c31a645481c6344b032aa963f07c53ca87f67bf944505bd5f4905759bd845
+  metadata.gz: 918c2e00ce3d672459fb96edf8271125e4fce7b4b22c12d0add1afdfa9efa2cacbbcbc07b5037400b68502112049916c3325b591e927dd4d94bda5fc3f258bab
+  data.tar.gz: c33f2cedc4c535f88bd23b0db82ba56c164cadad62cb558453f2dc44fac3071eda7e0216138fe05e1bb663c35a1ac428eb308fc6729dca6ee0065d1c8194fdf0

data/lib/keen-csv.rb

@@ -13,6 +13,28 @@ class Keen::CSV
     @options = options.is_a?(Hash) ? @@defaultOptions.merge(options) : @@defaultOptions
   end
 
+  # ---------------------------------------------------------------------------
+  # csvString
+  # Generates and returns a CSV for this Keen response
+  # ---------------------------------------------------------------------------
+  def csvString
+    resultColumns = self.generateResultColumns
+    headers = resultColumns[:columns].keys
+    # Start off instantiating the csv string with the header values
+    csvString = headers.map{|s| self.filterValue(s)}.join(@options[:delimiter])
+
+    # Now iterate over each row, sticking its value under each header
+    (0..resultColumns[:maxRowIndex]).each do |rowIndex|
+      csvString << "\r\n"
+      csvString << headers.map{ |header|
+        self.filterValue(resultColumns[:columns][header][rowIndex])
+      }.join(@options[:delimiter])
+    end
+    return csvString
+  end
+
+protected
+
   # ---------------------------------------------------------------------------
   # generateResultColumns
   # Transforms the Keen result columnar Map, keyed by header
@@ -84,26 +106,6 @@ class Keen::CSV
            @options[:filteredColumns].include?(header)
   end
 
-  # ---------------------------------------------------------------------------
-  # csvString
-  # Generates and returns a CSV for this Keen response
-  # ---------------------------------------------------------------------------
-  def csvString
-    resultColumns = self.generateResultColumns
-    headers = resultColumns[:columns].keys
-    # Start off instantiating the csv string with the header values
-    csvString = headers.map{|s| self.filterValue(s)}.join(@options[:delimiter])
-
-    # Now iterate over each row, sticking its value under each header
-    (0..resultColumns[:maxRowIndex]).each do |rowIndex|
-      csvString << "\r\n"
-      csvString << headers.map{ |header|
-        self.filterValue(resultColumns[:columns][header][rowIndex])
-      }.join(@options[:delimiter])
-    end
-    return csvString
-  end
-
   # ---------------------------------------------------------------------------
   # filterValue
   # Takes a scalar value, and returns a CSV-compatible one
@@ -121,15 +123,27 @@ class Keen::CSV
   # Converts any nested dictionaries into a flattened/delimited one.
   # ---------------------------------------------------------------------------
   def flatten(object, flattened = {}, prefix = "")
-    object.each do |key, value|
+    handleValue = lambda do |value, newPrefix|
       if value.is_a?(Hash) || value.is_a?(Array)
         # recurse!
-        flatten(value, flattened, prefix + key + @options[:nestedDelimiter])
+        flatten(value, flattened, newPrefix + @options[:nestedDelimiter])
       else
-        flattened[prefix + key] = value
+        flattened[newPrefix] = value
       end
     end
 
+    if object.is_a? Hash
+      object.each do |key, value|
+        handleValue.call(value, prefix + key)
+      end
+    elsif object.is_a? Array
+      object.each_with_index do |value, index|
+        handleValue.call(value, prefix + index.to_s)
+      end
+    else
+      return object
+    end
+
     return flattened
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keen-csv
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jevon Wild