jsony 0.0.1 → 0.0.2

data/.gemspec

@@ -2,7 +2,7 @@
 
 GemSpec = Gem::Specification.new do |gem|
   gem.name = 'jsony'
-  gem.version = '0.0.1'
+  gem.version = '0.0.2'
   gem.license = 'MIT'
   gem.required_ruby_version = '>= 1.9.1'
 
@@ -18,6 +18,6 @@ JSONY lets you omit a lot of the syntax that makes JSON a pain to write.
 
   gem.files = `git ls-files`.lines.map{|l|l.chomp}
 
-  gem.add_dependency 'pegex', '>= 0.0.2'
-  gem.add_development_dependency 'testml-lite', '>= 0.0.1'
+  gem.add_dependency 'pegex', '>= 0.0.3'
+  gem.add_development_dependency 'testml', '>= 0.0.2'
 end

data/CHANGELOG.yaml

@@ -1,3 +1,6 @@
+- version: 0.0.2
+  date:    Sat Apr 20 07:08:34 CST 2013
+  changes: Integrate latest pegex and testml
 - version: 0.0.1
   date:    Wed Dec 19 22:35:56 PST 2012
   changes: First release

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2012 Ingy döt Net
+Copyright © 2013 Ingy döt Net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in

data/README.rdoc

@@ -83,4 +83,4 @@ http://jsony.org/ coming soon.
 
 = Copyright
 
-Copyright (c) 2012 Ingy döt Net. See LICENSE for further details.
+Copyright (c) 2012, 2013 Ingy döt Net. See LICENSE for further details.

data/Rakefile

@@ -11,6 +11,12 @@ DevNull = '2>/dev/null'
 require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
+if File.exists? 'test/testml.yaml'
+  if File.exists? 'lib/rake/testml.rb'
+    $:.unshift "#{Dir.getwd}/lib"
+  end
+  require 'rake/testml'
+end
 
 task :default => 'help'
 
@@ -18,9 +24,12 @@ CLEAN.include GemDir, GemFile, 'data.tar.gz', 'metadata.gz'
 
 desc 'Run the tests'
 task :test do
+  load '.env' if File.exists? '.env'
   Rake::TestTask.new do |t|
     t.verbose = true
-    t.test_files = FileList['test/*.rb']
+    t.test_files = ENV['DEV_TEST_FILES'] &&
+      FileList[ENV['DEV_TEST_FILES'].split] ||
+      FileList['test/**/*.rb'].sort
   end
 end
 

data/lib/jsony/receiver.rb

@@ -23,13 +23,12 @@ class JSONY::Receiver < Pegex::Tree
 
   def got_bare got
     case got
-    when 'true' # XXX is it a bug in jsony-pm that it's unanchored
+    when 'true'
       true
     when 'false'
       false
     when 'null'
-      'fake-nil'
-      # TODO golf this \ if possible
+      Pegex::Constant::Null
     when \
       /^(
         -?

data/test/testml.rb

@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'testml'
+$:.unshift "#{Dir.getwd}/test"
+require 'testml_bridge'
+
+class TestMLTestCase < Test::Unit::TestCase
+  (Dir.glob('test/testml/*.tml')
+    .collect {|f| f.sub(/^test\//, '')}
+    .select { |f| f !~ /edge/ }
+  ).each do |file|
+    method_name = 'test_' + file.gsub(/\W/, '_').sub(/_tml$/, '')
+    define_method(method_name.to_sym) do
+      TestML.new(
+        testml: file,
+        bridge: TestMLBridge,
+      ).run(self)
+    end
+  end
+end

data/test/testml.yaml

@@ -0,0 +1,2 @@
+source_testml_dir: ../../jsony-tml
+local_testml_dir: ./testml

data/test/testml/comments.tml

@@ -0,0 +1,11 @@
+%TestML 0.1.0
+
+# Make sure the JSONY parses to what we expect:
+*jsony.jsony_decode.yaml == *json.json_decode.yaml
+
+=== Trailing comment
+--- SKIP
+--- jsony
+- foo # foo
+- bar
+--- json: [ "foo", "bar", "baz" ]

data/test/{decode.rb → testml/decode.tml}

@@ -1,21 +1,10 @@
-require './test/lib/test_helper'
+%TestML 0.1.0
 
-TestML.run do |t|
-  # Make sure the JSONY parses to what we expect:
-  t.eval '*jsony.jsony_load.String == *json.json_load.String'
+# Make sure the JSONY parses to what we expect:
+*jsony.jsony_decode.yaml == *json.json_decode.yaml
 
-  # Make sure JSONY parses the JSON form the same as a JSON parser:
-  t.eval '*json.jsony_load.String == *json.json_load.String'
-end
-
-TestML.data <<'.'
-#%TestML 1.0
-#
-## Make sure the JSONY parses to what we expect:
-#*jsony.jsony_load.String == *json.json_load.String;
-#
-## Make sure JSONY parses the JSON form the same as a JSON parser:
-#*json.jsony_load.String == *json.json_load.String;
+# Make sure JSONY parses the JSON form the same as a JSON parser:
+*json.jsony_decode.yaml == *json.json_decode.yaml
 
 === String splitting 1
 --- jsony: foo bar baz
@@ -173,4 +162,4 @@ baz: 42
 - foo bar
 - foo bar
 --- json: [["foo", "bar"],["foo", "bar"]]
-.
+

data/test/testml/edge.tml

@@ -0,0 +1,48 @@
+# These JSONY streams need JSON equivalence, or need to be declared as
+# decoding (parsing) errors:
+
+%TestML 0.1.0
+
+=== Empty Stream
+--- jsony: ''
+
+=== Whitespace Stream
+--- jsony: '              '
+
+=== Collections as mapping keys
+--- jsony
+{
+      [foo bar] baz
+        {foo bar} baz
+}
+
+=== Duplicate mapping keys
+--- jsony: { foo foo foo foo }
+
+=== Odd number of nodes in mapping
+--- jsony: { foo bar baz }
+
+=== Semis and commas in jsony
+--- jsony
+{
+       foo: bar, baz
+          do :re ,mi
+                 oh : my , lord
+}
+
+=== Comment syntax
+--- jsony
+/* comment */
+# comment
+What happens?
+
+=== Unterminated Quotes
+--- jsony
+{
+      name 'Ingy dot Net
+        size 42
+}
+
+=== Unquoted punctuation
+--- jsony
+! @ # $ % ^ { & * ( | }'}

data/test/testml/fail.tml

@@ -0,0 +1,10 @@
+%TestML 0.1.0
+
+# Make sure these strings do not parse as JSONY.
+*jsony.jsony_decode.Catch.OK
+
+=== Comma in bareword
+--- jsony: { url: http://foo.com,2012 }
+
+=== Unmatched [
+--- jsony: foo[bar

data/test/testml/json.tml

@@ -0,0 +1,11 @@
+%TestML 0.1.0
+
+# Test various json streams, to make sure jsony can parse it properly.
+*json.jsony_decode.yaml == *json.json_decode.yaml
+
+=== Various Numbers
+--- SKIP
+--- json: [1,-2,3,4.5,67,0.8e-9]
+
+=== Object with no space
+--- json: {"a":"b","c":{"d":"e"},"f":["g","h"],"i":[{},[],[[]]]}

data/test/testml_bridge.rb

@@ -0,0 +1,20 @@
+require 'testml/bridge'
+require 'testml/util'
+include TestML::Util
+require 'jsony'
+require 'yaml'
+require 'json'
+
+class TestMLBridge < TestML::Bridge
+  def jsony_decode(jsony)
+    native JSONY.load(jsony.value)
+  end
+
+  def json_decode(json)
+    native JSON.parse(json.value)
+  end
+
+  def yaml(object)
+    str YAML.dump(object)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsony
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pegex
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: testml-lite
+  name: testml
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 description: ! 'JSONY is a data language that is simlar to JSON, just more chill.
   All valid
 
@@ -67,9 +67,14 @@ files:
 - lib/jsony.rb
 - lib/jsony/grammar.rb
 - lib/jsony/receiver.rb
-- share/jsony.pgx
-- test/decode.rb
-- test/lib/test_helper.rb
+- test/testml.rb
+- test/testml.yaml
+- test/testml/comments.tml
+- test/testml/decode.tml
+- test/testml/edge.tml
+- test/testml/fail.tml
+- test/testml/json.tml
+- test/testml_bridge.rb
 homepage: http://jsony.org
 licenses:
 - MIT

data/share/jsony.pgx

@@ -1,88 +0,0 @@
-%grammar jsony
-%version 0.0.1
-
-jsony:
-    seq | map | top_seq | top_map | list
-
-node: map | seq | scalar
-
-map:
-    ~LCURLY~
-    pair*
-    ~RCURLY~
-
-pair: string /~<COLON>?~/ node /~<COMMA>?~/
-
-seq:
-    ~LSQUARE~
-    node* %% /~<COMMA>?~/
-    ~RSQUARE~
-
-top_seq: top_seq_entry+
-
-top_seq_entry:
-    /~ <DASH> <SPACE>+ /
-    (
-        node* %% / (: <SPACE>* <COMMA> <SPACE>* <EOL> ~ | <SPACE>+ ) /
-        ( <comment> | <EOL> )
-    )
-
-top_map:
-    (string /~<COLON>~/ node ~)+
-
-list: node* %% /~<COMMA>?~/
-
-scalar: double | single | bare
-
-string: scalar
-
-# Interpretation of http://www.json.org/
-double: /
-    <DOUBLE>
-        (
-            (:
-                <BACK> (:       # Backslash escapes
-                    [
-                        <DOUBLE>    # Double Quote
-                        <BACK>      # Back Slash
-                        <SLASH>     # Foreward Slash
-                        b           # Back Space
-                        f           # Form Feed
-                        n           # New Line
-                        r           # Carriage Return
-                        t           # Horizontal Tab
-                    ]
-                |
-                    u <HEX>{4}      # Unicode octet pair
-                )
-            |
-                [^ <DOUBLE> <CONTROLS> ]  # Anything else
-            )*
-        )
-    <DOUBLE>
-/
-
-# TODO: Support '' as escape for single quote
-single: /
-    <SINGLE>
-    ([^ <SINGLE> ]*)
-    <SINGLE>
-/
-
-bare: /( [^ <excludes> ]* [^ <excludes> <COLON> ] )/
-
-excludes: /
-    <WS>
-    <LCURLY><RCURLY>
-    <LSQUARE><RSQUARE>
-    <SINGLE><DOUBLE>
-    <COMMA>
-/
-
-ws: /(: <WS> | <comment> )/
-
-comment: /(:
-    <HASH> <SPACE> <ANY>* <EOL> |
-    <HASH> <EOL> |
-    <SPACE>* <EOL>
-)/

data/test/lib/test_helper.rb

@@ -1,10 +0,0 @@
-require 'testml/lite'
-require 'jsony'
-require 'json'
-
-class TestPegex < TestML::Lite
-  include TestML::Lite::TestCases
-  def jsony_load str; JSONY.load str end
-  def json_load str; JSON.load str end
-  def String obj; obj.inspect end
-end