hash_to_csv 0.0.1 → 0.1.0

data/lib/hash_to_csv.rb

@@ -1,9 +1,12 @@
+require 'hash_flattener'
 require_relative 'hash_to_csv/hash_to_csv'
 
 module HashToCsv
 
-  def self.to_csv(hash, options={})
-    HashToCsv.new(hash, options).to_csv
+  def self.to_csv(hashes, options={})
+    hash_flattener = HashFlattener::HashFlattener.new
+    hash_to_csv = HashToCsv.new hash_flattener
+    hash_to_csv.to_csv hashes, options
   end
 
 end

data/lib/hash_to_csv/hash_to_csv.rb

@@ -4,14 +4,16 @@ require 'hash_flattener'
 module HashToCsv
   class HashToCsv
 
-    def initialize(hashes, options={})
-      @hashes = [hashes].flatten.map { |h| HashFlattener.flatten h }
-      @include = options[:include] || []
-      @exclude = options[:exclude] || []
-      @sort = options[:sort] || true
+    def initialize(hash_flattener)
+      @hash_flattener = hash_flattener
     end
 
-    def to_csv
+    def to_csv(hashes, options={})
+      @hashes = [hashes].flatten.map { |h| @hash_flattener.flatten h }
+      @include = options[:include]
+      @exclude = options[:exclude]
+      @sort = options[:sort] == true
+
       CSV.generate do |csv|
         csv << column_names
         rows.each { |row| csv << values_for_row(row) }
@@ -23,8 +25,8 @@ module HashToCsv
     def column_names
       return @column_names if @column_names
       keys = all_keys
-      keys.select! { |key| @include.index { |pattern| column_matches_pattern? key, pattern } }
-      keys.reject! { |key| @exclude.index { |pattern| column_matches_pattern? key, pattern } }
+      keys.select! { |key| @include.index { |pattern| column_matches_pattern? key, pattern } } if @include
+      keys.reject! { |key| @exclude.index { |pattern| column_matches_pattern? key, pattern } } if @exclude
       keys.sort! if @sort
       @column_names = keys
     end
@@ -34,16 +36,17 @@ module HashToCsv
     end
 
     def values_for_row(row)
-      columns.map { |column| row[column] }
+      column_names.map { |column_name| row[column_name] }
     end
 
     def all_keys
       keys = Set.new
       @hashes.each { |h| keys += h.keys }
+      keys.to_a
     end
 
     def column_matches_pattern?(column, pattern)
-      pattern.kind_of?(Regexp) ? column =~ pattern : column == pattern
+      pattern.kind_of?(Regexp) ? column =~ pattern : column == pattern.to_s
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_to_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_flattener
-  requirement: &70290319751300 !ruby/object:Gem::Requirement
+  requirement: &70206923982300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70290319751300
+  version_requirements: *70206923982300
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70206923981500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70206923981500
 description: 
 email: matthew-github@matthewriley.name
 executables: []