fbo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73410fcfcca5e7d24f72b1647bd476d2524fd749
-  data.tar.gz: 169f5ab226cc08aa4bc9c8f9ab6aff6ba6813775
+  metadata.gz: ef4552a83b8f9ea2c230b313030dcceeaa8cceec
+  data.tar.gz: 4d23253323be1c32ea1b851913614165c89691cc
 SHA512:
-  metadata.gz: 91db543ee60b0fe0ef767ac7d031bf7084e5928f5d3a7fd280ac2006b33e851dbfeeea7dd5b46bd7670a6195566ee12fbc56ee823bb948185eec052a73fe1563
-  data.tar.gz: 59dd1704c86d2a11bdd6205fe5317727a070d99e89240531609bd7fc1c7c2383ad056aa7ac1ceaf4dbc28cf16002db734adaa90349fb4af3f0f7af30a3475e5a
+  metadata.gz: 8cc68dc78677417516f8b51ff388f4dc54f6bbff627b764a3e21272cea3d92e91d03c0ecd920d42212d8d1da20d6fb7cac4be064c9f9abd7b2c06eac32a0534b
+  data.tar.gz: 8dbaca1de6506f7f578b51f237124080714d99dd1e16a1d28f116ff0ed3c435d8c8a0b8c9b23ae1ece543c3fd223a7ab6e9e88b97e4be1bc9a4fb599ff805795

data/lib/fbo.rb

@@ -8,6 +8,7 @@ module FBO
 
 end
 
+require 'fbo/exceptions'
 require 'fbo/file'
 require 'fbo/chunked_file'
 require 'fbo/segmented_file'
@@ -15,4 +16,3 @@ require 'fbo/remote_file'
 require 'fbo/parser'
 require 'fbo/node_extensions'
 require 'fbo/interpreter'
-

data/lib/fbo/exceptions.rb

@@ -0,0 +1,12 @@
+module FBO
+  class ParserError < ::StandardError
+    attr_reader  :data, :parent
+
+    def initialize(msg, data: nil, e: nil)
+      super(msg)
+      @data = data
+      @parent = e
+      set_backtrace(e.backtrace) if e
+    end
+  end
+end

data/lib/fbo/interpreter.rb

@@ -51,7 +51,7 @@ module FBO
     # Parse the text to extract a structure of data for the notice.
     #
     def parse_notice(text)
-      tree = @parser.parse(text)
+      tree = @parser.parse(text) 
       tree.elements.first
     end
   end

data/lib/fbo/node_extensions.rb

@@ -159,7 +159,6 @@ module FBO
     class PasswordNode < SimplePropertyNode; end
     class ProjectIDNode < SimplePropertyNode; end
     class UploadTypeNode < SimplePropertyNode; end
-    class CorrectionNode < SimplePropertyNode; end
 
     # Complex properties may contain other simple properties
     #

data/lib/fbo/parser.rb

@@ -33,7 +33,8 @@ module FBO
         line = parser.failure_line
         column = parser.failure_column
         reason = parser.failure_reason
-        raise Exception, "Parse error at line #{ line }, column #{ column }: #{ reason }"
+        raise FBO::ParserError.new("Could not parse data: line #{ line }, column #{ column }, reason '#{ reason }'",
+                                   data:data)
       end
       clean_tree(tree)
     end

data/lib/fbo/version.rb

@@ -1,3 +1,3 @@
 module FBO
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/fbo/parser_spec.rb

@@ -7,7 +7,7 @@ describe FBO::Parser do
     subject        { FBO::Parser.new(file) }
 
     it 'parses the data all at once' do
-      subject.expects(:parse_string).with(file.contents)      
+      subject.expects(:parse_string).with(file.contents)
       subject.parse
     end
 
@@ -49,4 +49,24 @@ describe FBO::Parser do
                                 'FBO::Dump::PresolicitationNode' ]
     end
   end
+
+  context 'a bad String' do
+    let(:contents) { "<PRESOL>\n</PRESOL>\n<COMBINE>\n<COMBINE>\n</COMBINE>\n<AMDCSS>\n</AMDCSS>\n" }
+    let(:file)     { stub('FBO::File', contents: contents) }
+    subject        { FBO::Parser.new(file) }
+
+    it 'raises a ParserError' do
+      proc { subject.parse }.must_raise FBO::ParserError
+    end
+  end
+
+  context 'a collection of data with a bad String' do
+    let(:contents) { [ '<PRESOL></PRESOL>', '<COMBINE><COMBINE></COMBINE>', '<AMDCSS></AMDCSS>' ] }
+    let(:file)     { stub('FBO::ChunkedFile', contents: contents) }
+    subject        { FBO::Parser.new(file) }
+
+    it 'raises a ParserError' do
+      proc { subject.parse }.must_raise FBO::ParserError
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chris Kottom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -116,6 +116,7 @@ files:
 - lib/fbo.rb
 - lib/fbo/chunked_file.rb
 - lib/fbo/dump.treetop
+- lib/fbo/exceptions.rb
 - lib/fbo/file.rb
 - lib/fbo/interpreter.rb
 - lib/fbo/node_extensions.rb