edn 0.9.2 → 0.9.3

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# 0.9.3 (17 Sep 2012)
+
+* Updated to latest EDN spec
+** Added new symbol characters
+** Added ability to have a + before a number
+
+# 0.9.2 (13 Sep 2012)
+
+* EDN spec fully implemented

data/README.md

@@ -4,6 +4,19 @@
 
 **edn-ruby** is a Ruby library to read and write [edn][edn] (extensible data notation), a subset of Clojure used for transferring data between applications, much like JSON, YAML, or XML.
 
+## Metadata
+
+tags and metadata do not work together
+
+metadata keys can be symbols, keywords, or strings
+
+only collections and symbols can have metadata
+
+^foo => ^{:tag foo}
+^:foo => ^{:foo true}
+These do stack.
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/edn/parser.rb

@@ -1,29 +1,5 @@
 require 'parslet'
-
-class IgnoreParslet < Parslet::Atoms::Base
-  def initialize(parslet)
-    @parslet = parslet
-  end
-  def to_s_inner(prec)
-    @parslet.to_s(prec)
-  end
-  def try(source, context)
-    success, value = result = @parslet.try(source, context)
-
-    return succ(nil) if success
-    return result
-  end
-end
-
-module IgnoreDSL
-  def ignore
-    IgnoreParslet.new(self)
-  end
-end
-
-class Parslet::Atoms::Base
-  include IgnoreDSL
-end
+require 'parslet/ignore'
 
 module EDN
   class Parser < Parslet::Parser
@@ -90,13 +66,13 @@ module EDN
     # Primitives
 
     rule(:integer) {
-      (str('-').maybe >>
+      (match['\-\+'].maybe >>
        (str('0') | match('[1-9]') >> digit.repeat)).as(:integer) >>
       str('N').maybe.as(:precision)
     }
 
     rule(:float) {
-      (str('-').maybe >>
+      (match['\-\+'].maybe >>
        (str('0') | (match('[1-9]') >> digit.repeat)) >>
        str('.') >> digit.repeat(1) >>
        (match('[eE]') >> match('[\-+]').maybe >> digit.repeat).maybe).as(:float) >>
@@ -111,7 +87,7 @@ module EDN
 
     rule(:character) {
       str("\\") >>
-      (str('newline') | str('space') | str('tab') |
+      (str('newline') | str('space') | str('tab') | str('return') |
        match['[:graph:]']).as(:character)
     }
 
@@ -137,11 +113,11 @@ module EDN
     rule(:symbol_chars) {
       (symbol_first_char >>
        valid_chars.repeat) |
-      match['\-\.']
+      match['\-\+\.']
     }
 
     rule(:symbol_first_char) {
-      (match['\-\.'] >> match['0-9'].absent? |
+      (match['\-\+\.'] >> match['0-9'].absent? |
        match['\#\:0-9'].absent?) >> valid_chars
     }
 
@@ -150,7 +126,7 @@ module EDN
     }
 
     rule(:sym_punct) {
-      match['\.\*\+\!\-\?\:\#\_']
+      match['\.\*\+\!\-\?\$_%&=:#']
     }
 
     rule(:digit) {

data/lib/edn/version.rb

@@ -1,3 +1,3 @@
 module EDN
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/lib/parslet/ignore.rb

@@ -0,0 +1,24 @@
+class IgnoreParslet < Parslet::Atoms::Base
+  def initialize(parslet)
+    @parslet = parslet
+  end
+  def to_s_inner(prec)
+    @parslet.to_s(prec)
+  end
+  def try(source, context)
+    success, value = result = @parslet.try(source, context)
+
+    return succ(nil) if success
+    return result
+  end
+end
+
+module IgnoreDSL
+  def ignore
+    IgnoreParslet.new(self)
+  end
+end
+
+class Parslet::Atoms::Base
+  include IgnoreDSL
+end

data/spec/edn/parser_spec.rb

@@ -53,6 +53,12 @@ describe EDN::Parser do
         parser.integer.should parse(int)
       end
     end
+
+    it "should consume integers prefixed with a +" do
+      rant(RantlyHelpers::INTEGER).each do |int|
+        parser.integer.should parse("+#{int.to_i.abs.to_s}")
+      end
+    end
   end
 
   context "float" do
@@ -67,6 +73,12 @@ describe EDN::Parser do
         parser.float.should parse(float)
       end
     end
+
+    it "should consume floats prefixed with a +" do
+      rant(RantlyHelpers::FLOAT).each do |float|
+        parser.float.should parse("+#{float.to_f.abs.to_s}")
+      end
+    end
   end
 
   context "symbol" do

data/spec/edn_spec.rb

@@ -54,10 +54,15 @@ describe EDN do
     it "reads any valid value" do
       values = rant(RantlyHelpers::VALUE)
       values.each do |value|
-        if value == "nil"
-          EDN.read(value).should be_nil
-        else
-          EDN.read(value).should_not be_nil
+        begin
+          if value == "nil"
+            EDN.read(value).should be_nil
+          else
+            EDN.read(value).should_not be_nil
+          end
+        rescue Exception => ex
+          puts "Bad value: #{value}"
+          raise ex
         end
       end
     end
@@ -68,7 +73,12 @@ describe EDN do
       values = rant(RantlyHelpers::VALUE)
       values.each do |value|
         expect {
-          EDN.read(value).to_edn
+          begin
+            EDN.read(value).to_edn
+          rescue Exception => ex
+            puts "Bad value: #{value}"
+            raise ex
+          end
         }.to_not raise_error
       end
     end

data/spec/spec_helper.rb

@@ -26,9 +26,10 @@ module RantlyHelpers
 
   PLAIN_SYMBOL = lambda { |_|
     sized(range(1, 100)) {
-      s = string(/[[:alnum:]]|[\-\.\.\*\+\!\-\?\:\#\_]/)
-      guard s =~ /^[A-Za-z\-\.\.\*\+\!\-\?\:\#\_]/
-      guard s !~ /^[\-\.][0-9]/
+      s = string(/[[:alnum:]]|[\.\*\+\!\-\?\$_%&=:#]/)
+#      guard s =~ /^[A-Za-z\.\*\+\!\-\?\$_%&=:#]/
+      guard s !~ /^[0-9]/
+      guard s !~ /^[\+\-\.][0-9]/
       guard s !~ /^[\:\#]/
       s
     }
@@ -122,7 +123,11 @@ module RantlyHelpers
   }
 
   INST = lambda { |_|
-    DateTime.new(range(0, 2500), range(1, 12), range(1, 28), range(0, 23), range(0, 59), range(0, 59), "#{range(-12,12)}").to_edn
+    begin
+      DateTime.new(range(0, 2500), range(1, 12), range(1, 28), range(0, 23), range(0, 59), range(0, 59), "#{range(-12,12)}").to_edn
+    rescue ArgumentError
+      guard false
+    end
   }
 
   def rant(fun, count = REPEAT)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -83,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -99,6 +100,7 @@ files:
 - lib/edn/type/uuid.rb
 - lib/edn/types.rb
 - lib/edn/version.rb
+- lib/parslet/ignore.rb
 - spec/edn/parser_spec.rb
 - spec/edn/transform_spec.rb
 - spec/edn_spec.rb
@@ -117,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3622317026699243756
+      hash: -2167184458695188347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3622317026699243756
+      hash: -2167184458695188347
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23