edn 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 264ff1a11e92aaba18083680eb6504c5d6b24236
+  data.tar.gz: 9381907dfe329aa6d6048b49eb6288b85b97050f
+SHA512:
+  metadata.gz: 4a94597575dcca3006dd2bd20d79d69ebc3e1bae05484f459a4620f87e2d76f90562450aec24adc61a2df6a88762e8e5ae571a1ed3683b73d7b583f263ee8517
+  data.tar.gz: 9d6dce5fa89864ad64ce89ee8f9f57ed98328c7a42accfcf7725f29bb545af11dbbdf636c7c5d445c9052dd79f8abc21942bd872a2e602a6283130fcdd2ade40

data/lib/edn/parser.rb

@@ -54,7 +54,7 @@ module EDN
       set |
       map |
       boolean |
-      str('nil').as(:nil) |
+      _nil |
       keyword |
       string |
       character |
@@ -131,7 +131,11 @@ module EDN
     }
 
     rule(:boolean) {
-      str('true').as(:true) | str('false').as(:false)
+      (str('true').as(:true) | str('false').as(:false)) >> valid_chars.absent?
+    }
+
+    rule(:_nil) {
+      str('nil').as(:nil) >> valid_chars.absent?
     }
 
     # Parts

data/lib/edn/transform.rb

@@ -20,6 +20,7 @@ module EDN
       end
     }
 
+    rule(:string => []) { "" }
     rule(:string => simple(:x)) { EDN::StringTransformer.parse_string(x) }
     rule(:keyword => simple(:x)) { x.to_sym }
     rule(:symbol => simple(:x)) { EDN::Type::Symbol.new(x) }

data/lib/edn/version.rb

@@ -1,3 +1,3 @@
 module EDN
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/edn/transform_spec.rb

@@ -25,6 +25,10 @@ describe EDN::Transform do
     it "should not evaluate interpolated Ruby code" do
       subject.apply(:string => 'hello\n#{world}').should == "hello\n\#{world}"
     end
+
+    it "should emit empty strings as strings" do
+      subject.apply(:string => []).should == ""
+    end
   end
 
   context "keyword" do

data/spec/edn_spec.rb

@@ -5,6 +5,7 @@ describe EDN do
 
   context "#read" do
     it "reads single elements" do
+      EDN.read(%q{""}).should == ""
       EDN.read("1").should == 1
       EDN.read("3.14").should == 3.14
       EDN.read("3.14M").should == BigDecimal("3.14")
@@ -71,6 +72,20 @@ describe EDN do
         end
       end
     end
+
+    context "allows symbols starting with a reserved word" do
+      it "reads true-foo" do
+        EDN.read('true-foo').should == EDN::Type::Symbol.new('true-foo')
+      end
+
+      it "reads falsey" do
+        EDN.read('falsey').should == EDN::Type::Symbol.new('falsey')
+      end
+
+      it "reads nillable" do
+       EDN.read('nillable').should == EDN::Type::Symbol.new('nillable')
+      end
+    end
   end
 
   context "#register" do

metadata

@@ -1,105 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: edn
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Clinton N. Dreisbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rantly
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
-description: ! '''edn implements a reader for Extensible Data Notation by Rich Hickey.'''
+description: "'edn implements a reader for Extensible Data Notation by Rich Hickey.'"
 email:
 - clinton@thinkrelevance.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -128,34 +117,27 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1298335697156083659
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1298335697156083659
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! '''edn implements a reader for Extensible Data Notation by Rich Hickey.'''
+specification_version: 4
+summary: "'edn implements a reader for Extensible Data Notation by Rich Hickey.'"
 test_files:
 - spec/edn/metadata_spec.rb
 - spec/edn/parser_spec.rb