doctordata 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e47b9d661e4af598baf2fd7c9d3aa5b2814ef431
-  data.tar.gz: 18a2e9bad329273e48f9bacdd662caadde62d1fb
+  metadata.gz: e05423d70ba06c78abea9fa5cbaa603477907e43
+  data.tar.gz: 5b96d9dc76e7e734e94874191aa8de46ab2b472d
 SHA512:
-  metadata.gz: 5791ca876286b3bf956d345df0f9b7797f5701c4fab653fc98e6a12172a8e23fcfd7bd379d1c45b61bbbd6d87b436b0ad00369a6dbc190659d6efcd59f86bed8
-  data.tar.gz: 191671015f072137894294e351a830f64083b6c8a36dd77caf220f3da4fb0cb9bce74fde6be19363a7929fc7cd1050f88b22a3c63d5065ee65cfdde7b96817ab
+  metadata.gz: 37d44d08a1fa4b2795f23fbbf51a552812e713a70c6a6350c5fcb46fdd33a3c87bf2c43a2c346c6c9068b3e3f3daba0f88cfe42b1c83f20fa8d586888b3322af
+  data.tar.gz: 43dddd849ce6bed55e0044531cb8ca80443a89f25129fe3a4394f543559b6bba1bce8acd70f81c9ed7277089f06a6aba93398fdcffdab783651b3613ec8d22d2

data/README.md

@@ -46,6 +46,8 @@ Doctordata::Parser.from_excel(excel_file_or_path)
 
 The result is a Hash. Top level key is sheet name, and value is array as same as csv example.
 
+It skips if the sheet name starts with `#`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/doctordata.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "roo", "~> 2"
-  spec.add_dependency "faraday", "~> 0.12"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/doctordata.rb

@@ -1,22 +1,52 @@
 require "doctordata/version"
 require 'csv'
 require 'roo'
-require 'faraday'
 
 module Doctordata
   class Parser
     class << self
       def from_csv_table(table)
         # there is much room to do performance tuning
-        table.
-          map do |row|
-            row.
-              reject { |k, v| v == nil || v == '' }.
-              reject { |k, v| k == nil || k == '' || k.start_with?('#') }.
-              map { |k, v| "#{k}=#{v}" }.
-              join('&')
-          end.
-          map { |s| Faraday::NestedParamsEncoder.decode(s) }
+        checked_table = table.by_col!.delete_if{ |k, v| k == nil || k == '' || k.start_with?('#') }
+        checked_table.by_row!.map do |row|
+          row.
+            reject { |k, v| v == nil || v == '' }
+        end.
+        map do |s|
+          result = {}
+          s.each do |k,v|
+            context = result
+            subkeys = k.scan(/[^\[\]]+(?:\]?\[\])?/)
+            subkeys.each_with_index do |subkey, i|
+              if i+1 != subkeys.length
+                value_type = Hash
+                if context[subkey] && !context[subkey].is_a?(value_type)
+                  raise TypeError, "expected %s (got %s) for param `%s'" % [
+                      value_type.name,
+                      context[subkey].class.name,
+                      subkey
+                  ]
+                end
+                context = (context[subkey] ||= value_type.new)
+              else
+                context[subkey] = v
+              end
+            end
+          end
+          dehash(result, 0)
+        end
+      end
+
+      def dehash(hash, depth)
+        hash.each do |key, value|
+          hash[key] = dehash(value, depth + 1) if value.kind_of?(Hash)
+        end
+
+        if depth > 0 && !hash.empty? && hash.keys.all? { |k| k =~ /^\d+$/ }
+          hash.keys.sort.inject([]) { |all, key| all << hash[key] }
+        else
+          hash
+        end
       end
 
       def from_csv_path(path)

data/lib/doctordata/version.rb

@@ -1,3 +1,3 @@
 module Doctordata
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doctordata
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - qsona
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement