Chrononaut-treetop-dcf 0.1.2 → 0.2.0

data/lib/dcf.rb

@@ -1,6 +1,6 @@
 require "rubygems"
 require "treetop"
-require "dcf_grammar"
+require File.join(File.dirname(__FILE__) + "/dcf_grammar")
 
 module Dcf
   # @param [String] input
@@ -17,4 +17,8 @@ module Dcf
       paragraph
     end
   end
+
+  def self.version
+    "0.2.0"
+  end
 end

data/lib/dcf_grammar.treetop

@@ -1,6 +1,6 @@
 grammar Dcf
   rule paragraphs
-    (paragraph eol?)*
+    (paragraph eol?)+
   end
 
   rule paragraph
@@ -8,25 +8,25 @@ grammar Dcf
   end
 
   rule field
-    attribute separator value white*
+    attribute separator value
   end
 
   rule attribute
-    (!eol !":" !" " .)+
+    (!":" !eol .)+
   end
 
   rule value
-    eol? valid_value_symbols (eol white+ valid_value_symbols)*
+    eol? (!eol .)+ (eol white+ (!eol .)+)*
     {
       def text_value
         # I don't really like this, but it works for the files I'm parsing, so..
-        super.strip.gsub(/[\r\n] */, ' ')
+        super.strip.gsub(/\n */, ' ')
       end
     }
   end
 
-  rule valid_value_symbols
-    (!eol .)+
+  rule next_record
+    "\n" [a-zA-Z]
   end
 
   rule separator
@@ -34,7 +34,7 @@ grammar Dcf
   end
 
   rule eol
-    "\r\n" / [\n\r]
+    "\n"
   end
 
   rule white

data/test/test_dcf.rb

@@ -2,9 +2,6 @@
 require File.dirname(__FILE__) + '/helper'
 
 class TestDcfParser < Test::Unit::TestCase
-  should "not accept spaces in keys" do
-    assert_nil Dcf.parse("As df: Value\n")
-  end
 
   should "parse a description file" do
     description = <<EOF
@@ -113,15 +110,19 @@ EOF
 
   should "parse file with UTF-8 data" do
     sample = <<EOF
+Author: Vincent Goulet, Sébastien Auclair, Christophe Dutang, Xavier
+        Milhaud, Tommy Ouellet, Louis-Philippe Pouliot, Mathieu Pigeon
 Encoding: latin1
 Packaged: Tue May 26 10:40:31 2009; Grömping
 Repository: CRAN
 Date/Publication: 2009-05-26 09:23:28
 EOF
-    sample = (RUBY_VERSION =~ /1.9/) ? sample.force_encoding("binary") : sample
-    match = (RUBY_VERSION =~ /1.9/) ? "Grömping".force_encoding("binary") : "Grömping"
+    sample = (RUBY_VERSION =~ /1.9/) ? sample.force_encoding("utf-8") : sample
+    match = (RUBY_VERSION =~ /1.9/) ? "Grömping".force_encoding("utf-8") : "Grömping"
     parse = Dcf.parse(sample).first
     assert_not_nil parse
+    assert_match "Sébastien Auclair", parse["Author"]
     assert_equal "Tue May 26 10:40:31 2009; #{match}", parse["Packaged"]
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Chrononaut-treetop-dcf
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bjorn Arild Maeland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,6 @@ signing_key:
 specification_version: 3
 summary: Easy to use parser for Debian Control Files.
 test_files: 
+- test/test_dcf.rb
 - test/helper.rb
 - test/suite.rb
-- test/test_dcf.rb