rip-parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b0926d469ebb45500d16f544f14c4e4d52363d
-  data.tar.gz: 2b8690bb493360e6fa32fd75f6e6761b12d3a2d3
+  metadata.gz: aafa69ef5c9c30357b11e2ac9860ba212e97cde9
+  data.tar.gz: 9819d13beb2ba122291d5832b7f1a4f4d355f9dd
 SHA512:
-  metadata.gz: ef663c6e862950bdcf357402ac070fb3c371fba4f6780518040023f91b4850c6e5fd85e67183a22d3779e4511838927f03d930cca8f87a8ec3705bc57343722a
-  data.tar.gz: fcfa4fd0a5580c5ddd308a53be565a4650b418fda6490c5b7ae71edcbc28ebdc0066512043fa3abc44673b2b460a4bcb6aeb71dc1df655a63afd8b9286846de7
+  metadata.gz: 8e9f90dd03e880efce9d5379991fd3ce392448203d38db6f11cc49a052a00a03ee70455224d9e0d6577032badbc9fe721eba4cdce704239a2aa03cb74af99e35
+  data.tar.gz: 66eecd03bfe5b04f926cba4645b59d10a8be60d8132c500c6b0dfd3e9069d37ba844b96638c01b7876f29b13b86fbd980e8ceb527d459e88a1a60932376e9711

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/source/rip/parser/about.rb

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

data/source/rip/parser/node.rb

@@ -1,16 +1,16 @@
 module Rip::Parser
   class Node
-    include Enumerable
-
     attr_reader :location
+    attr_reader :parent
     attr_reader :type
     attr_reader :extra
 
-    def initialize(location:, type:, **extra)
+    def initialize(location:, parent: nil, type:, **extra)
       @location = location
+      @parent = parent
       @type = type
       @extra = extra.inject({}) do |memo, (key, value)|
-        memo.merge(key => self.class.try_convert(value))
+        memo.merge(key => self.class.try_convert(value, self))
       end
     end
 
@@ -26,10 +26,6 @@ module Rip::Parser
       end
     end
 
-    def each(&block)
-      to_h.each(&block)
-    end
-
     def key?(key)
       extra.key?(key.to_sym)
     end
@@ -38,6 +34,10 @@ module Rip::Parser
       extra.keys
     end
 
+    def values
+      extra.values
+    end
+
     def length
       location.length
     end
@@ -74,7 +74,7 @@ module Rip::Parser
         [ key, _value ]
       end.to_h
 
-      callback.call(merge(_extra))
+      callback.call(merge(_extra.merge(parent: parent)))
     end
 
     private
@@ -94,12 +94,16 @@ module Rip::Parser
       key?(name) || name.to_s.end_with?('?')
     end
 
-    def self.try_convert(value)
+    def self.try_convert(value, parent)
       case value
       when Array
-        value.map(&method(:try_convert))
+        value.map do |v|
+          try_convert(v, parent)
+        end
       when Hash
-        new(value)
+        new(value.merge(parent: parent))
+      when self
+        new(value.to_h.merge(parent: parent))
       else
         value
       end

data/source/rip/parser/rules/expression.rb

@@ -87,6 +87,8 @@ module Rip::Parser::Rules
 
         # exception_block_sequence |
 
+        # query |
+
         date_time |
         date |
         time |

data/source/rip/parser/utilities/normalizer.rb

@@ -8,45 +8,20 @@ module Rip::Parser::Utilities
 
     def self.apply(origin, raw_tree)
       new.apply(raw_tree, origin: origin).tap do |tree|
-        validate_branches(tree, origin)
-        validate_leaves(tree, origin)
-      end
-    end
-
-    def self.validate_branches(tree, origin)
-      case tree
-      when Array
-        tree.each do |branch|
-          validate_branches(branch, origin)
-        end
-      when Hash, Rip::Parser::Node
-        tree.each do |_, branch|
-          validate_branches(branch, origin)
-        end
-
-        if tree.key?(:expression_chain)
-          shape = tree[:expression_chain].map do |key, value|
-            [ key, value.class ]
-          end.to_h
-          warn shape
-          raise Rip::Parser::NormalizeError.new('Unhandled expression_chain node', origin, tree)
-        end
-      end
-    end
-
-    def self.validate_leaves(tree, origin)
-      case tree
-      when Array
-        tree.each do |branch|
-          validate_leaves(branch, origin)
-        end
-      when Rip::Parser::Node
-        tree.each do |_, branch|
-          validate_leaves(branch, origin)
+        tree.traverse do |node|
+          case
+          when node.values.any? { |leaf| leaf.is_a?(Parslet::Slice) }
+            raise Rip::Parser::NormalizeError.new('Unconverted parslet slice', origin, node)
+          when node.key?(:expression_chain)
+            shape = node.expression_chain.map do |key, value|
+              [ key, value.class ]
+            end.to_h
+            warn shape
+            raise Rip::Parser::NormalizeError.new('Unhandled expression_chain node', origin, node)
+          else
+            node
+          end
         end
-      when Parslet::Slice
-        warn tree
-        raise Rip::Parser::NormalizeError.new('Unconverted parslet slice', origin, tree)
       end
     end
 

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

@@ -27,14 +27,6 @@ RSpec.describe Rip::Parser::Node do
     end
   end
 
-  describe '#each' do
-    specify do
-      expect do |x|
-        node.each(&x)
-      end.to yield_successive_args([ :location, location ], [ :type, :test ], [ :answer, 42 ])
-    end
-  end
-
   describe '#key?' do
     specify { expect(node.key?(:answer)).to be(true) }
     specify { expect(node.key?(:foo)).to be(false) }
@@ -46,6 +38,10 @@ RSpec.describe Rip::Parser::Node do
     specify { expect(node.keys).to match_array([ :answer ]) }
   end
 
+  describe '#values' do
+    specify { expect(node.values).to match_array([ 42 ]) }
+  end
+
   describe '#length' do
     specify { expect(node.length).to eq(node.location.length) }
   end
@@ -148,6 +144,7 @@ RSpec.describe Rip::Parser::Node do
 
   context 'nesting' do
     let(:root) { Rip::Parser::Node.new(location: location, type: :root, other: node) }
+    let(:root_with_hash) { Rip::Parser::Node.new(location: location, type: :root, other: node.to_h) }
 
     specify { expect(root.other).to eq(node) }
     specify { expect(root.other.answer).to eq(42) }
@@ -158,6 +155,11 @@ RSpec.describe Rip::Parser::Node do
     specify { expect(root).to respond_to(:root?) }
     specify { expect(root).to respond_to(:test?) }
 
+    specify { expect(root.parent).to be_nil }
+    specify { expect(root.other.parent).to eq(root) }
+
+    specify { expect(root_with_hash.other.parent).to eq(root) }
+
     context 'nested collection' do
       let(:nodes) do
         [
@@ -175,6 +177,8 @@ RSpec.describe Rip::Parser::Node do
 
       specify { expect(filtered.count).to eq(1) }
       specify { expect(filtered.first.type).to eq(:special) }
+
+      specify { expect(root.others.sample.parent).to eq(root) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rip-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Thomas Ingram
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-28 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -95,6 +95,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - legacy/normalizer.rb
 - legacy/parser_spec.rb