toml-rb 0.1.0 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGE0NGNmZmVlODdlMTk3YTY3ZmJlZGIxM2JmNTM4MmYxZjU5ODcyYQ==
+    ODJhZWQzOTUxMzkwMDc3ODIxYzM0Zjg4ZTMwODU3YjY2NmM2Y2E4Mg==
   data.tar.gz: !binary |-
-    MjhlMzA4YTJlZTlkOTFiMzI5Zjg3MzMyZGEzZTA1NDE3ODY3YmY3OQ==
+    NGQ4MmM2NDE2MmY3NGNhODM2ZDBiYmE5MmQ4YTk0MzZlYTU4ZjY3Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWQxMTMwN2E2NjVlMzU0MGYwOTAwZjA1NTc0MzFiMjJkNjhjNDU3NzZlNGY5
-    MzkyMDk4OWQ4NGNlYWJjNWVlYTI0ODNmNmNiMDM2NWIzY2E2YmI5NmFlNTkx
-    NjVmZTYzMTFmNDRmZWVhM2JlMjUwZjgxZWE1NWFmMjczZTdkODA=
+    MWNjN2JhYTBhMDQ0ZDgzMDU1ZjVkMWQzY2Y2MDE0MmRjNmZiOGUwZjFkNzA2
+    M2RhMTBhMjgyMjQwMTE5ZmJlMzZjYmI1MzRjZTNiYWU3MzE4NjY4YmQzOWVh
+    ZDkzZTYxNjhhY2EwNzQ5YzQ2NzdmYjYzYTMwYmU0Y2E0OTVjZTg=
   data.tar.gz: !binary |-
-    NmUzNTAwOWE5NmRkNjk2M2Y1NTgxYzBjOTYxOGVkZGMxY2VlNDA2Njc2Zjdm
-    YTM3MTI5ZDcwMTMyNjNkOGZjMzc4ZWI4NmM2MjZkNDc5NDBiNDljNzI1MmZk
-    NWQxYTQ4Mzc2NDBhYTA2N2U1YjdmOWY1YjFjYzJmN2IxYmVmZGU=
+    ZjA1MWEwMWY2YzA5OTNkYWE2MjFjNDNiNWY2ZmYyZGI5ZWM1Y2FhOTA1MGI2
+    M2I5ZjkxZmI1MTRjMzkxOGEyYmEyYzc4MGM0OTI1N2MyMjM2ZjJlYTU4MGQ4
+    OWQxYWJlZDhkNTVmYzBkNWE0OTFjMTAzMjFmYThiNGVhZjY2NzY=

data/init.rb

@@ -0,0 +1,15 @@
+require 'citrus'
+
+ROOT = File.dirname(File.expand_path(__FILE__))
+
+require "#{ROOT}/lib/toml/string"
+require "#{ROOT}/lib/toml/keyvalue"
+require "#{ROOT}/lib/toml/keygroup"
+require "#{ROOT}/lib/toml/parser"
+require "#{ROOT}/lib/toml/dumper"
+
+Citrus.load "#{ROOT}/lib/toml/grammars/helper.citrus"
+Citrus.load "#{ROOT}/lib/toml/grammars/primitive.citrus"
+Citrus.load "#{ROOT}/lib/toml/grammars/array.citrus"
+Citrus.load "#{ROOT}/lib/toml/grammars/document.citrus"
+

data/lib/toml.rb

@@ -53,4 +53,24 @@ module TOML
   def self.load_file(path, options = {})
     TOML.parse(File.read(path), options)
   end
+
+
+  # Public: Returns a *TOML* string from a Ruby Hash.
+  #
+  # hash - Ruby Hash to be dumped into *TOML*
+  #
+  #
+  # Examples
+  #
+  #   TOML.dump({title: "TOML dump"})
+  #   # => TODO:
+  #
+  #   TOML.parse('title = "TOML parser"')
+  #   # => 
+  #
+  #
+  # Returns a TOML string representing the hash.
+  def self.dump(hash)
+    Dumper.new(hash)
+  end
 end

data/lib/toml/dumper.rb

@@ -0,0 +1,43 @@
+module TOML
+  class Dumper
+    attr_reader :toml_str
+
+    def initialize(hash)
+      @toml_str = ""
+
+      visit(hash, '')
+    end
+
+    private
+
+    def visit(hash, prefix)
+      nested_pairs = []
+      simple_pairs = []
+
+      hash.keys.sort.each do |key|
+        val = hash[key]
+        (val.is_a?(Hash) ? nested_pairs : simple_pairs) << [key, val]
+      end
+
+      @toml_str += "[#{prefix}]\n" unless prefix.empty? || simple_pairs.empty?
+
+      # First add simple pairs, under the prefix
+      simple_pairs.each do |pair|
+        @toml_str << "#{pair[0].to_s} = #{to_toml(pair[1])}\n"
+      end
+
+      nested_pairs.each do |pair|
+        visit(pair[1], prefix.empty? ? pair[0].to_s : [prefix, pair[0]].join('.'))
+      end
+    end
+
+    def to_toml(obj)
+      case
+      when obj.is_a?(Time)
+        obj.strftime('%Y-%m-%dT%H:%M:%SZ')
+      else
+        obj.inspect
+      end
+    end
+  end
+end

data/lib/toml/grammars/document.citrus

@@ -3,7 +3,7 @@ grammar Document
   include TomlArray
 
   rule document
-    (comment | keygroup | keyvalue | "\n")*
+    (comment | keygroup | keyvalue | line_break)*
   end
 
   rule keygroup

data/lib/toml/grammars/helper.citrus

@@ -1,6 +1,6 @@
 grammar Helper
   rule comment
-    (space? "#" (~"\n")* "\n"?) { nil }
+    (space? "#" (~line_break)* line_break?) { nil }
   end
 
   rule space
@@ -8,6 +8,10 @@ grammar Helper
   end
 
   rule indent
-    [ \t\n]*
+    [ \t\r\n]*
+  end
+
+  rule line_break
+    "\n" | "\r\n"
   end
 end

data/test/dumper_test.rb

@@ -0,0 +1,58 @@
+require_relative 'helper'
+
+class DumperTest < Test::Unit::TestCase
+
+  def test_dump_empty
+    dumped = TOML.dump({})
+    assert_equal('', dumped.toml_str)
+  end
+
+  def test_dump_types
+    dumped = TOML.dump(string: %q(TOML "dump"))
+    assert_equal("string = \"TOML \\\"dump\\\"\"\n", dumped.toml_str)
+
+    dumped = TOML.dump(float: -13.24)
+    assert_equal("float = -13.24\n", dumped.toml_str)
+
+    dumped = TOML.dump(int: 1234)
+    assert_equal("int = 1234\n", dumped.toml_str)
+
+    dumped = TOML.dump(true: true)
+    assert_equal("true = true\n", dumped.toml_str)
+
+    dumped = TOML.dump(false: false)
+    assert_equal("false = false\n", dumped.toml_str)
+
+    dumped = TOML.dump(array: [1,2,3])
+    assert_equal("array = [1, 2, 3]\n", dumped.toml_str)
+
+    dumped = TOML.dump(array: [[1,2], ["weird", "one"]])
+    assert_equal("array = [[1, 2], [\"weird\", \"one\"]]\n", dumped.toml_str)
+
+    dumped = TOML.dump(datetime: Time.utc(1986,8,28,15,15))
+    assert_equal("datetime = 1986-08-28T15:15:00Z\n", dumped.toml_str)
+  end
+
+  def test_dump_nested_attributes
+    hash = {nested: {hash: { deep: true}}}
+    dumped = TOML.dump(hash)
+    assert_equal("[nested.hash]\ndeep = true\n",
+                 dumped.toml_str)
+
+    hash[:nested].merge!(other: 12)
+    dumped = TOML.dump(hash)
+    assert_equal("[nested]\nother = 12\n[nested.hash]\ndeep = true\n",
+                 dumped.toml_str)
+
+    hash[:nested].merge!(nest: {again: 'it never ends'})
+    dumped = TOML.dump(hash)
+    toml = "[nested]\n" +
+            "other = 12\n" +
+            "[nested.hash]\n" +
+            "deep = true\n" +
+            "[nested.nest]\n" +
+            "again = \"it never ends\"\n"
+
+    assert_equal(toml, dumped.toml_str)
+  end
+end

data/test/example.toml

@@ -25,9 +25,6 @@ enabled = true
   ip = "10.0.0.2"
   dc = "eqdc10"
 
-[servers]
-  amount = 2
-
 [clients]
 data = [ ["gamma", "delta"], [1, 2] ]
 

data/test/toml_test.rb

@@ -23,7 +23,6 @@ class TomlTest < Test::Unit::TestCase
       },
 
       "servers" => {
-        "amount" => 2,
         "alpha" => {
           "ip" => "10.0.0.1",
           "dc" => "eqdc10"
@@ -88,7 +87,6 @@ class TomlTest < Test::Unit::TestCase
       },
 
       servers: {
-        amount: 2,
         alpha: {
           ip: "10.0.0.1",
           dc: "eqdc10"
@@ -107,4 +105,9 @@ class TomlTest < Test::Unit::TestCase
 
     assert_equal(hash, parsed)
   end
+
+  def test_line_break
+    parsed = TOML.parse("hello = 'world'\r\nline_break = true")
+    assert_equal({'hello' => 'world', 'line_break' => true}, parsed)
+  end
 end

data/toml-rb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'toml-rb'
-  s.version     = '0.1.0'
+  s.version     = '0.1.2'
   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. Formerly known as 'toml_parser-ruby'. "
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
     "lib/**/*.rb",
     "lib/**/*.citrus",
     "*.gemspec",
-    "test/*.*"
+    "test/*.*",
+    "init.rb"
   ]
 
   s.add_dependency "citrus"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Emiliano Mancuso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -35,6 +35,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- lib/toml/dumper.rb
 - lib/toml/keygroup.rb
 - lib/toml/keyvalue.rb
 - lib/toml/parser.rb
@@ -46,11 +47,13 @@ files:
 - lib/toml/grammars/primitive.citrus
 - toml-rb.gemspec
 - toml_parser-ruby.gemspec
+- test/dumper_test.rb
 - test/example.toml
 - test/grammar_test.rb
 - test/hard_example.toml
 - test/helper.rb
 - test/toml_test.rb
+- init.rb
 homepage: http://github.com/eMancu/toml-rb
 licenses:
 - MIT