toml-rb 0.1.5 → 0.1.6

data/lib/toml/grammars/array.citrus

@@ -2,7 +2,7 @@ grammar TomlArray
   include Primitive
 
   rule array
-    ("[" indent? (elements)* ","? indent? comment? indent? "]" indent?) { eval(self) }
+    ("[" indent? (elements)* ","? indent? comment? indent? "]" indent?) { eval(to_str) }
   end
 
   rule elements

data/lib/toml/grammars/primitive.citrus

@@ -16,6 +16,7 @@ grammar Primitive
   # Full Zulu form
   rule datetime
     (y:/\d\d\d\d/ "-" m:/\d\d/ "-" d:/\d\d/ "T" h:/\d\d/ ":" mi:/\d\d/ ":" s:/\d\d/ "Z") {
+      y,m,d,h,mi,s = [:y,:m,:d,:h,:mi,:s].map{|s| capture(s) }
       Time.utc(*[y,m,d,h,mi,s].map(&:value))
     }
   end
@@ -25,11 +26,11 @@ grammar Primitive
   end
 
   rule float
-    (integer '.' integer) { to_f }
+    (integer '.' integer) { to_str.to_f }
   end
 
   rule integer
-    (sign? [0-9]+) { to_i }
+    (sign? [0-9]+) { to_str.to_i }
   end
 
   rule sign

data/lib/toml/keygroup.rb

@@ -23,6 +23,6 @@ end
 # Used in document.citrus
 module Keygroup
   def value
-    TOML::Keygroup.new(nested_keys.to_s.split('.'))
+    TOML::Keygroup.new(capture(:nested_keys).to_str.split('.'))
   end
 end

data/lib/toml/keyvalue.rb

@@ -21,6 +21,6 @@ end
 # Used in document.citrus
 module Keyvalue
   def value
-    TOML::Keyvalue.new(key.value, v.value)
+    TOML::Keyvalue.new(capture(:key).value, capture(:v).value)
   end
 end

data/toml-rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.1.5'
+  s.version     = '0.1.6'
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = "TOML parser in ruby, for ruby."
   s.description = "A TOML parser using Citrus parsing library. "
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
     "init.rb"
   ]
 
-  s.add_dependency "citrus", "~> 2.4.1"
+  s.add_dependency "citrus", "~> 3.0", "> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -19,7 +19,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '3.0'
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +30,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '3.0'
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: ! 'A TOML parser using Citrus parsing library. '
 email:
 - emiliano.mancuso@gmail.com