rip-parser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da07388d321262375ccaa89af4d7bbc22464a05c
-  data.tar.gz: 5565c4dbfcd9702157839b6aa0e6ce9cc7eccfee
+  metadata.gz: b5b0926d469ebb45500d16f544f14c4e4d52363d
+  data.tar.gz: 2b8690bb493360e6fa32fd75f6e6761b12d3a2d3
 SHA512:
-  metadata.gz: 7e37d5077ae71f610effe5840e2f10c715d5460d2c523edde202b7b01acc1ab1b54d36f918928e9f505b936c49febcf7177e5413b339391aad8c8a5b76c5c4d1
-  data.tar.gz: 9446353584fdddf852fb1472e67a2e462510ede2c9645165072a97961de481fe647a62ca7ccffb337a2476d38230f0c51378e129fa6fb4976be6a11cbfc6e078
+  metadata.gz: ef663c6e862950bdcf357402ac070fb3c371fba4f6780518040023f91b4850c6e5fd85e67183a22d3779e4511838927f03d930cca8f87a8ec3705bc57343722a
+  data.tar.gz: fcfa4fd0a5580c5ddd308a53be565a4650b418fda6490c5b7ae71edcbc28ebdc0066512043fa3abc44673b2b460a4bcb6aeb71dc1df655a63afd8b9286846de7

data/source/rip/parser/about.rb

@@ -2,7 +2,7 @@ module Rip
   module Parser
     module About
       def self.version
-        '0.1.0'
+        '0.1.1'
       end
     end
   end

data/source/rip/parser/node.rb

@@ -46,20 +46,35 @@ module Rip::Parser
       self.class.new(extra.merge(other.to_h).merge(location: location, type: other[:type] || type))
     end
 
-    def s_expression
+    def to_h(include_location: true)
       _extra = extra.map do |key, value|
-        [ key, self.class.try_convert_s_expression(value) ]
+        [ key, self.class.try_convert_to_h(value, include_location) ]
       end.to_h
 
-      { type: type }.merge(_extra)
+      if include_location
+        { location: location, type: type }
+      else
+        { type: type }
+      end.merge(_extra)
     end
 
-    def to_h
+    def traverse(&callback)
       _extra = extra.map do |key, value|
-        [ key, self.class.try_convert_to_h(value) ]
+        _value = case value
+        when Array
+          value.map do |v|
+            v.traverse(&callback)
+          end
+        when self.class
+          value.traverse(&callback)
+        else
+          value
+        end
+
+        [ key, _value ]
       end.to_h
 
-      { location: location, type: type }.merge(_extra)
+      callback.call(merge(_extra))
     end
 
     private
@@ -90,23 +105,14 @@ module Rip::Parser
       end
     end
 
-    def self.try_convert_to_h(value)
-      case value
-      when Array
-        value.map(&method(:try_convert_to_h))
-      when self
-        value.to_h
-      else
-        value
-      end
-    end
-
-    def self.try_convert_s_expression(value)
+    def self.try_convert_to_h(value, include_location)
       case value
       when Array
-        value.map(&method(:try_convert_s_expression))
+        value.map do |v|
+          try_convert_to_h(v, include_location)
+        end
       when self
-        value.s_expression
+        value.to_h(include_location: include_location)
       else
         value
       end

data/spec/unit/rip/parser/node_spec.rb

@@ -62,29 +62,6 @@ RSpec.describe Rip::Parser::Node do
     specify { expect(node.merge(other).to_h).to eq(location: location, type: :other_test, answer: 42, foo: :bar) }
   end
 
-  describe '#s_expression' do
-    let(:tree) { Rip::Parser::Node.new(location: location, type: :root, children: [ node ]) }
-
-    let(:expected) do
-      {
-        type: :root,
-        children: [
-          {
-            type: :test,
-            answer: 42
-          }
-        ]
-      }
-    end
-
-    specify { expect(tree.s_expression).to eq(expected) }
-    specify { expect(tree.s_expression).to be_a(Hash) }
-
-    specify { expect(tree.s_expression.keys).to eq([ :type, :children ]) }
-
-    specify { expect(tree.s_expression[:children].first).to be_a(Hash) }
-  end
-
   describe '#to_h' do
     specify { expect(node.to_h.keys).to eq([ :location, :type, :answer ]) }
 
@@ -106,6 +83,52 @@ RSpec.describe Rip::Parser::Node do
       specify { expect(tree.to_h).to eq(expected) }
       specify { expect(tree.to_h[:other]).to be_a(Hash) }
     end
+
+    context 'include_location: false' do
+      let(:tree) { Rip::Parser::Node.new(location: location, type: :root, children: [ node ]) }
+
+      let(:expected) do
+        {
+          type: :root,
+          children: [
+            {
+              type: :test,
+              answer: 42
+            }
+          ]
+        }
+      end
+
+      specify { expect(tree.to_h(include_location: false).keys).to eq([ :type, :children ]) }
+
+      specify { expect(tree.to_h(include_location: false)[:children].first.keys).to eq([ :type, :answer ]) }
+    end
+  end
+
+  describe '#traverse' do
+    let(:node_counts) { Hash.new { |h, k| h[k] = 0 } }
+
+    let(:tree) do
+      Rip::Parser::Node.new(
+        location: location,
+        type: :root,
+        answer: 42,
+        nested: [
+          { location: location, type: :leaf, data: :aaa },
+          { location: location, type: :leaf, data: :bbb },
+          { location: location, type: :leaf, data: :ccc }
+        ],
+        aux: {
+          location: location,
+          type: :auxiliary,
+          whatever: :anything
+        }
+      )
+    end
+
+    before { tree.traverse { |node| node_counts[node.type] += 1 } }
+
+    specify { expect(node_counts).to eq(root: 1, leaf: 3, auxiliary: 1) }
   end
 
   describe '.new' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rip-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Thomas Ingram