datacatalog-importer 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/datacatalog-importer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datacatalog-importer}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]

data/lib/utility.rb

@@ -28,14 +28,16 @@ module DataCatalog
 
     def self.headers
       {
-        "UserAgent" => "National Data Catalog Importer/0.1.4",
+        "UserAgent" => "National Data Catalog Importer/0.1.5",
       }
     end
     
-    def self.parse_csv_from_file(filename, extra_header_rows=0)
+    # { :headers => true } is a common option
+    def self.parse_csv_from_file(filename, options={})
+      extra_header_rows = options.delete(:extra_header_rows) || 0
       File.open(filename) do |f|
         extra_header_rows.times { f.gets } # ignore these rows
-        FasterCSV.parse(f)
+        FasterCSV.parse(f, options)
       end
     end
 
@@ -46,11 +48,12 @@ module DataCatalog
     end
     
     def self.parse_csv_from_file_or_uri(uri, file, options={})
-      if options[:force_fetch] || !File.exist?(file)
+      force_fetch = options.delete(:force_fetch) || false
+      if force_fetch || !File.exist?(file)
         document = fetch(uri)
         File.open(file, "w") { |f| f.write(document) }
       end
-      parse_csv_from_file(file, options[:extra_header_rows] || 0)
+      parse_csv_from_file(file, options)
     end
     
     def self.parse_html_from_file_or_uri(uri, file, options={})
@@ -61,11 +64,11 @@ module DataCatalog
       parse_html_from_file(file) # Why always parse the file? See Note 001, below.
     end
     
-    def self.parse_csv_from_uri(uri)
+    def self.parse_csv_from_uri(uri, options={})
       puts "Fetching #{uri}..."
       data = open(uri, headers)
       puts data.inspect
-      FasterCSV.parse(data)
+      FasterCSV.parse(data, options)
     end
 
     def self.parse_html_from_uri(uri)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datacatalog-importer
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - David James