rdparser 0.1.2 → 0.2.0

data/lib/rdparser.rb

@@ -4,11 +4,11 @@ require File.expand_path('../patches/array.rb', __FILE__)
 # A Simple Recursive Descending (LL) Parser for Ruby
 module RDParser
 
-  # raised when Parser cannot get through the entire string.
-  class ParserError < StandardError; end
+  autoload :ParseError, File.expand_path('../rdparser/parse_error.rb', __FILE__)
+  autoload :RDParser,   File.expand_path('../rdparser/rdparser.rb', __FILE__)
+  autoload :Scanner,    File.expand_path('../rdparser/scanner.rb', __FILE__)
 
-  autoload :RDParser, File.expand_path('../rdparser/rdparser.rb', __FILE__)
-  autoload :Scanner,  File.expand_path('../rdparser/scanner.rb', __FILE__)
+  autoload :ParseMatcher, File.expand_path('../rdparser/parse_matcher.rb', __FILE__)
 
   # change to true to get flooded with debug messages during parsing
   DEBUG = false

data/lib/rdparser/parse_error.rb

@@ -0,0 +1,9 @@
+# raised when Parser cannot get through the entire string.
+class RDParser::ParseError < StandardError
+  attr_reader :content, :position
+  def initialize content, position
+    super(%{Cannot parse the entire content! (error was on position ##{position}: "#{content[0...position]}|#{content[position..position]}|#{content[position+1..-1]}")})
+    @content  = content
+    @position = position
+  end
+end

data/lib/rdparser/parse_matcher.rb

@@ -0,0 +1,56 @@
+module RDParser::ParseMatcher
+  class Parse
+    def initialize expression, root
+      @expression = expression
+      @root       = root
+    end
+
+    def matches? parser
+      parser.parse(@root, @expression).kind_of?(Array)
+      return true
+    rescue RDParser::ParseError
+      @error_on_position = $!.position
+      @error_in_content  = $!.content
+      return false
+    end
+
+    def failure_message
+      %{Grammar should parse "#{@expression}" starting with :#{@root} but error was catched on position #{@error_on_position}! "#{@expression[0...@error_on_position]}|#{@expression[@error_on_position..@error_on_position]}|#{@expression[@error_on_position+1..-1]}"}
+    end
+
+    def negative_failure_message
+      %{Grammar should not parse "#{@expression}" starting with :#{@root}} + (@expected_error_on_position && %{ and first error should appear on position #{@expected_error_on_position}} || '') + %{!}
+    end
+
+    def description
+      %{parse "#{@expression}" starting with :#{@root}} + (@expected_error_on_position && %{ and with first error on position #{@expected_error_on_position.to_s}} || '')
+    end
+
+    def with position
+      @expected_error_on_position = position
+      self
+    end
+  end
+
+  def self.included base
+    base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+    base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
+  end
+
+  module ClassMethods
+    def parser &block
+      subject { RDParser::RDParser.new(&block) }
+    end
+  end
+
+  module InstanceMethods
+    def parse expression, root=:expression
+      RDParser::ParseMatcher::Parse.new expression, root
+    end
+
+    def error_on_position position
+      position
+    end
+    alias :first_error_on_position :error_on_position
+  end
+end

data/lib/rdparser/rdparser.rb

@@ -20,7 +20,7 @@ class RDParser::RDParser
     results = parse_section(rule.to_sym)
 
     # Raises ParserError when cannot get parse the entire content and :partial is not set.
-    raise ::RDParser::ParserError, %{Cannot parse the entire content! (error was on position ##{@content.position}: "#{content[0...@content.position]}|#{content[@content.position..@content.position]}|#{content[@content.position+1..-1]}")} unless options[:partial] == true or @content.eos?
+    raise RDParser::ParseError.new(content, @content.position) unless options[:partial] == true or @content.eos?
 
     [results].flatten
   end

data/lib/rdparser/version.rb

@@ -1,3 +1,3 @@
 module RDParser
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/examples/a4_spec.rb

@@ -1,8 +1,6 @@
 require File.expand_path('../../support/spec_helper', __FILE__)
 
 describe 'A4::Authorization::Parser' do
-  include ParserHelper
-
   parser do |p|
     p.expression    'expression_u binary expression | expression_u'
     p.expression_u  'unary expression_u | "(" expression ")" | role'

data/spec/exceptions_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../support/spec_helper.rb', __FILE__)
 
-describe "RDParser::ParserError" do
-  it { expect{ RDParser::ParserError }.should_not raise_error }
+describe "RDParser::ParseError" do
+  it { expect{ RDParser::ParseError }.should_not raise_error }
 end

data/spec/parser_base_spec.rb

@@ -1,15 +1,21 @@
 require File.expand_path('../support/spec_helper.rb', __FILE__)
 
-describe RDParser::RDParser do
+describe RDParser::RDParser, :focused => true do
   context "given a very simple grammar" do
-    include ParserHelper
     parser do |p|
       p.expression  '"a" expression1'
-      p.expression1 /^.*$/
+      p.expression1 '"s" expression2'
+      p.expression2 /^.*$/
     end
 
+    # TODO test failed messages somehow -- cucumber?
+    #it { should_not parse("asdf").with error_on_position(1) }
+    #it { should_not parse("asdf") }
+    #it { should     parse("qwer") }
+
     it { should     parse("asdf") }
     it { should_not parse("qwer") }
+    it { should_not parse("awer").with error_on_position(1) }
   end
 end
 

data/spec/support/spec_helper.rb

@@ -13,5 +13,6 @@ RSpec.configure do |config|
   config.alias_it_should_behave_like_to(:it_should_behave_like, '')
   config.filter_run :focused => true
   config.run_all_when_everything_filtered = true
+  include RDParser::ParseMatcher
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdparser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19621620 !ruby/object:Gem::Requirement
+  requirement: &28082060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19621620
+  version_requirements: *28082060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19621200 !ruby/object:Gem::Requirement
+  requirement: &28081640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19621200
+  version_requirements: *28081640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19620780 !ruby/object:Gem::Requirement
+  requirement: &28081220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19620780
+  version_requirements: *28081220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19620360 !ruby/object:Gem::Requirement
+  requirement: &28080800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19620360
+  version_requirements: *28080800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &19619940 !ruby/object:Gem::Requirement
+  requirement: &28080380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19619940
+  version_requirements: *28080380
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &19619520 !ruby/object:Gem::Requirement
+  requirement: &28079960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19619520
+  version_requirements: *28079960
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &19619100 !ruby/object:Gem::Requirement
+  requirement: &28079540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19619100
+  version_requirements: *28079540
 description: A Simple Recursive Descending (LL) Parser for Ruby
 email:
 - golda@bitandpixel.hu
@@ -102,6 +102,8 @@ files:
 - Rakefile
 - lib/patches/array.rb
 - lib/rdparser.rb
+- lib/rdparser/parse_error.rb
+- lib/rdparser/parse_matcher.rb
 - lib/rdparser/rdparser.rb
 - lib/rdparser/scanner.rb
 - lib/rdparser/version.rb
@@ -109,7 +111,6 @@ files:
 - spec/examples/a4_spec.rb
 - spec/exceptions_spec.rb
 - spec/parser_base_spec.rb
-- spec/support/parser_helper.rb
 - spec/support/spec_helper.rb
 homepage: http://www.rubyinside.com/recursive-descent-parser-for-ruby-300.html
 licenses: []
@@ -126,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 534404727448102245
+      hash: -288882667666033840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,11 +136,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 534404727448102245
+      hash: -288882667666033840
 requirements: []
 rubyforge_project: rdparser
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: rdparser-0.1.2
+summary: rdparser-0.2.0
 test_files: []

data/spec/support/parser_helper.rb

@@ -1,37 +0,0 @@
-module ParserHelper
-  def self.included base
-    base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-    base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
-  end
-
-  module ClassMethods
-    def parser &block
-      subject { RDParser::RDParser.new(&block) }
-    end
-  end
-
-  module InstanceMethods
-    def parse expression, root=:expression
-      class << (o=Object.new)
-        def description
-          %{should parse "#{@_expression}" starting with :#{@_root}}
-        end
-        def failure_message
-          %{Grammar should parse "#{@_expression}"!}
-        end
-        def negative_failure_message
-          %{Grammar should not parse "#{@_expression}"!}
-        end
-        def matches? parser
-          parser.parse(@_root, @_expression).kind_of?(Array)
-          return true
-        rescue RDParser::ParserError
-          return false
-        end
-      end
-      o.instance_variable_set('@_expression', expression)
-      o.instance_variable_set('@_root', root)
-      o
-    end
-  end
-end