nested_string_parser 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc979b99001df7bd41db9bcd1755e93d4a520b3
-  data.tar.gz: 921e53f32bdcaa6d781eed16804246442263ad55
+  metadata.gz: c03e67f57d3ac7090991e11dcd71f63f58bc46d4
+  data.tar.gz: ca10f72da23bc153ea462000863aa14dad1771a1
 SHA512:
-  metadata.gz: cecb511ad6f63c406884220096aa74e568c78b9d47caaee94666215a7fa60392c7f249039a88da9fdacb3aaf69b73408fae50792aa3949d7c96e5a1b11f9eea0
-  data.tar.gz: 3f37047b78246cc086e71080c8cc5d72ed327d6833e577a24473bd3667113000ee7fb6f201146c44d73f02a618c41f1990a3680a95de0006f3dd62f7ff0768da
+  metadata.gz: b65af052e74f4a0b49f6c2fe1e03f27efe6418babbed1844abc6a1e0864a7820f8df10aac08b4e8893f12423df423a9882af46c1a3dffd8d012c8b15d9d039d1
+  data.tar.gz: 52c1ae8128dd9b177d29c82303cffe6de3141016c52fe6904a14fab941da2cd1c0a8892f254d9f11369110b119af6527f75a04b64aeb977f484e915d3c84371a

data/lib/nested_string_parser.rb

@@ -22,7 +22,18 @@ module NestedStringParser
   # | A | E | G |
   # | B | H | J |
   # | B | H | K |
+  #
   # same as
+  #
+  # | A | B | C |
+  # |   |   | D |
+  # |   | E | F |
+  # |   |   | G |
+  # | B | H | J |
+  # |   |   | K |
+  #
+  # same as
+  #
   # A
   #   B
   #     C
@@ -36,7 +47,19 @@ module NestedStringParser
   #     K
   #
   def self.from_rows rows, root=new_node
-    rows.each { |row| row.inject(root) { |node, name| node.find(name) || node.nest_child(new_node name) } } ; root
+    previous_row = []
+    rows.each { |row|
+      # row.inject(root) { |node, name| node.find(name) || (node.nb?(name) && node.nest_child(new_node name)) || node } }
+      node = root
+      row_has_a_name = false
+      row.length.times { |i|
+        cell_has_a_name = root.nb?(row[i])
+        row_has_a_name ||= cell_has_a_name
+        previous_row[i] = name = cell_has_a_name ? row[i] : (!row_has_a_name && previous_row[i])
+        node = node.find(name) || (node.nb?(name) && node.nest_child(new_node name)) || node
+      }
+    }
+    root
   end
 
   def self.new_node     val=nil ; NestedStringParser::Node.new.tap { |n| n.value = val }        ; end

data/lib/nested_string_parser/version.rb

@@ -1,3 +1,3 @@
 module NestedStringParser
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/from_rows_spec.rb

@@ -24,21 +24,21 @@ RSpec::describe NestedStringParser do
   end
 
   QUARKS_IN_ROWS = [
-                    %w{ quarks G1 up                 },
-                    %w{ quarks G1 down               },
-                    %w{ quarks G2 strange            },
-                    %w{ quarks G2 charmed            },
-                    %w{ quarks G3 top                },
-                    %w{ quarks G3 bottom             },
-                    %w{ leptons G1 electron          },
-                    %w{ leptons G1 electron-neutrino },
-                    %w{ leptons G2 muon              },
-                    %w{ leptons G2 muon-neutrino     },
-                    %w{ leptons G3 tau               },
-                    %w{ leptons G3 tau-neutrino      },
-                   ]
+    %w{ quarks G1 up                 },
+    %w{ quarks G1 down               },
+    %w{ quarks G2 strange            },
+    %w{ quarks G2 charmed            },
+    %w{ quarks G3 top      \         },
+    %w{ quarks G3 bottom             },
+    %w{ leptons G1 electron          },
+    %w{ leptons G1 electron-neutrino },
+    %w{ leptons G2 muon              },
+    %w{ leptons G2 muon-neutrino  \  },
+    %w{ leptons G3 tau               },
+    %w{ leptons G3 tau-neutrino      },
+  ]
 
-  it "parses a single item" do
+  it "parses a whole csv file" do
     node = NestedStringParser.from_rows QUARKS_IN_ROWS
 
     expect(node.value                ).to eq nil
@@ -59,4 +59,96 @@ RSpec::describe NestedStringParser do
     expect(leptons.children.map { |q| q.children.map(&:nesting) }).to eq [[2,2], [2,2], [2,2]]
     expect(leptons.children.map { |q| q.children.map(&:value)   }).to eq [%w{electron electron-neutrino}, %w{muon muon-neutrino}, %w{tau tau-neutrino}]
   end
+
+  QUARKS_IN_SPARSE_ROWS = [
+    %w{ quarks  G1 up                 },
+    %w{ \       \  down               },
+    %w{ \       G2 strange            },
+    %w{ \       \  charmed            },
+    %w{ \       G3 top      \         },
+    %w{ \       \  bottom             },
+    %w{ leptons G1 electron          },
+    %w{ \       \  electron-neutrino },
+    %w{ \       G2 muon              },
+    %w{ \       \  muon-neutrino  \  },
+    %w{ \       G3 tau               },
+    %w{ \       \  tau-neutrino      },
+  ]
+
+  it "parses a whole csv file with parent-items inherited from previous row" do
+    node = NestedStringParser.from_rows QUARKS_IN_SPARSE_ROWS
+
+    expect(node.value                ).to eq nil
+    expect(node.nesting              ).to eq(-1)
+    expect(node.children.map(&:value)).to eq %w{ quarks leptons }
+
+    quarks = node.children[0]
+    expect(quarks.nesting                ).to eq 0
+    expect(quarks.children.map(&:value)  ).to eq %w{ G1 G2 G3 }
+    expect(quarks.children.map(&:nesting)).to eq [1,1,1]
+    expect(quarks.children.map { |q| q.children.map(&:nesting) }).to eq [[2,2], [2,2], [2,2]]
+    expect(quarks.children.map { |q| q.children.map(&:value)   }).to eq [%w{up down}, %w{strange charmed}, %w{top bottom}]
+
+    leptons = node.children[1]
+    expect(leptons.nesting                ).to eq 0
+    expect(leptons.children.map(&:value)  ).to eq %w{ G1 G2 G3 }
+    expect(leptons.children.map(&:nesting)).to eq [1,1,1]
+    expect(leptons.children.map { |q| q.children.map(&:nesting) }).to eq [[2,2], [2,2], [2,2]]
+    expect(leptons.children.map { |q| q.children.map(&:value)   }).to eq [%w{electron electron-neutrino}, %w{muon muon-neutrino}, %w{tau tau-neutrino}]
+  end
+
+  ENGLISH_CURRICULUM = [
+    ["English", "Grammar"   , "Verbs"     , "Past"         ],
+    [""       , ""          , ""          , "Present"      ],
+    [""       , ""          , ""          , "Future"       ],
+    [""       , ""          , ""          , ""             ],
+    [""       , ""          , "Adjectives", ""             ],
+    [""       , ""          , ""          , ""             ],
+    [""       , ""          , "Nouns"     , "Proper"       ],
+    [""       , ""          , ""          , "Pronouns"     ],
+    [""       , ""          , ""          , "Other"        ],
+    [""       , ""          , ""          , ""             ],
+    [""       , ""          , "Sentences" , "Introduction" ],
+    [""       , ""          ,  ""         , "Structure"    ],
+    [""       , ""          ,  ""         , "Clauses"      ],
+    [""       , ""          ,  ""         , "Conjunctions" ],
+    [""       , ""          , ""          , ""             ],
+    [""       , "Literature", "Stories"   , ""             ],
+    [""       , ""          , "Novels"    , ""             ],
+    [""       , ""          , "Drama"     , ""             ],
+    [""       , ""          , "Poetry"    , ""             ],
+    [""       , ""          , "Criticism" , ""             ],
+  ]
+
+  it "parses a whole csv file with parent-items inherited from previous row, ignoring empty rows and empty trailing cells" do
+    node = NestedStringParser.from_rows ENGLISH_CURRICULUM
+
+    expected = <<FORMATTED
+
+  English
+    Grammar
+      Verbs
+        Past
+        Present
+        Future
+      Adjectives
+      Nouns
+        Proper
+        Pronouns
+        Other
+      Sentences
+        Introduction
+        Structure
+        Clauses
+        Conjunctions
+    Literature
+      Stories
+      Novels
+      Drama
+      Poetry
+      Criticism
+FORMATTED
+
+    expect(node.format("")).to eq expected
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_string_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Parse multi-line string with indentation, return a structure where nesting