edn 0.9.1 → 0.9.2

data/README.md

@@ -42,9 +42,9 @@ By default, this will work for strings, symbols, numbers, arrays, hashes, sets,
 
 In **edn**, you have _keywords_, which look like Ruby symbols and have the same meaning and purpose. These are converted to Ruby symbols. 
 
-You have **edn** _symbols_, which generally reflect variable names, but have several purposes. We parse these and return `EDN::Type::Symbol` values for them, as they are not directly portable into Ruby. 
+You have **edn** _symbols_, which generally reflect variable names, but have several purposes. We parse these and return `EDN::Type::Symbol` values for them, as they are not directly portable into Ruby. To create an **edn** symbol in Ruby, call `EDN::Type::Symbol.new` or `EDN.symbol` with a string argument, or use the convenience unary operator `~` like so: `~"elf/rings"`.
 
-You have _vectors_, which map to Ruby arrays, and _lists_, which are linked lists in Clojure. We map these to `EDN::Type::List` values, which are type-compatible with arrays.
+You have _vectors_, which map to Ruby arrays, and _lists_, which are linked lists in Clojure. We map these to `EDN::Type::List` values, which are type-compatible with arrays. To create an **edn** list in Ruby, call `EDN::Type::List.new` or `EDN.list` with all arguments to go in the list. If you have an array, you will use the splat operator, like so: `EDN.list(*[1, 2, 3])`. You can also use the `~` unary operator like so: `~[1, 2, 3]`.
 
 **edn** has character types, but Ruby does not. These are converted into one-character strings.
 
@@ -126,5 +126,5 @@ This method calls `.to_edn` on the second argument and joins the arguments appro
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[edn]: https://github.com/richhickey/edn
-[README]: https://github.com/richhickey/edn/blob/master/README.md
+[edn]: https://github.com/edn-format/edn
+[README]: https://github.com/edn-format/edn/blob/master/README.md

data/lib/edn.rb

@@ -1,8 +1,9 @@
 $:.push(File.dirname(__FILE__))
-require "edn/version"
-require "edn/core_ext"
-require "edn/parser"
-require "edn/transform"
+require 'edn/version'
+require 'edn/types'
+require 'edn/core_ext'
+require 'edn/parser'
+require 'edn/transform'
 
 module EDN
   @parser = EDN::Parser.new
@@ -31,7 +32,7 @@ module EDN
     @tags[tag] = nil
   end
 
-  def self.tag_value(tag, value)
+  def self.tagged_value(tag, value)
     func = @tags[tag]
     if func
       func.call(value)
@@ -43,6 +44,14 @@ module EDN
   def self.tagout(tag, value)
     ["##{tag}", value.to_edn].join(" ")
   end
+
+  def self.symbol(text)
+    EDN::Type::Symbol.new(text)
+  end
+
+  def self.list(*values)
+    EDN::Type::List.new(*values)
+  end
 end
 
 EDN.register("inst") do |value|

data/lib/edn/core_ext.rb

@@ -22,6 +22,10 @@ module EDN
     end
 
     module String
+      def ~@
+        EDN::Type::Symbol.new(self)
+      end
+
       def to_edn
         self.inspect
       end
@@ -34,6 +38,10 @@ module EDN
     end
 
     module Array
+      def ~@
+        EDN::Type::List.new(*self)
+      end
+
       def to_edn
         '[' + self.map(&:to_edn).join(" ") + ']'
       end

data/lib/edn/parser.rb

@@ -1,5 +1,30 @@
 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
+
 module EDN
   class Parser < Parslet::Parser
     root(:top)
@@ -28,13 +53,14 @@ module EDN
     }
 
     rule(:tagged_value) {
-      tag >> space >> base_value.as(:value)
+      tag >> space? >> base_value.as(:value)
     }
 
     # Collections
 
     rule(:vector) {
       str('[') >>
+      space? >>
       top.repeat.as(:vector) >>
       space? >>
       str(']')
@@ -105,7 +131,7 @@ module EDN
     # Parts
 
     rule(:tag) {
-      str('#') >> symbol.as(:tag)
+      str('#') >> match['[:alpha:]'].present? >> symbol.as(:tag)
     }
 
     rule(:symbol_chars) {
@@ -131,8 +157,18 @@ module EDN
       match['0-9']
     }
 
+    rule(:newline) { str("\r").maybe >> str("\n") }
+
+    rule(:comment) {
+      str(';') >> (newline.absent? >> any).repeat
+    }
+
+    rule(:discard) {
+      str('#_') >> space? >> (tagged_value | base_value).ignore
+    }
+
     rule(:space) {
-      match('[\s,]').repeat(1)
+      (discard | comment | match['\s,']).repeat(1)
     }
 
     rule(:space?) { space.maybe }

data/lib/edn/transform.rb

@@ -37,7 +37,7 @@ module EDN
     rule(:map => subtree(:array)) { Hash[array.map { |hash| [hash[:key], hash[:value]] }] }
 
     rule(:tag => simple(:tag), :value => subtree(:value)) {
-      EDN.tag_value(tag.to_s, value)
+      EDN.tagged_value(tag.to_s, value)
     }
   end
 end

data/lib/edn/version.rb

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

data/spec/edn/parser_spec.rb

@@ -5,12 +5,38 @@ describe EDN::Parser do
 
   let(:parser) { EDN::Parser.new }
 
+  it "can contain comments" do
+    edn = ";; This is some sample data\n[1 2 ;; the first two values\n3]"
+    parser.should parse(edn)
+    parser.parse(edn).should ==
+      {:vector=>[{:integer=>"1", :precision=>nil},
+                 {:integer=>"2", :precision=>nil},
+                 {:integer=>"3", :precision=>nil}]}
+  end
+
+  it "can discard using the discard reader macro" do
+    edn = "[1 2 #_3 {:foo #_bar baz}]"
+    parser.should parse(edn)
+    parser.parse(edn).should ==
+      {:vector=>[{:integer=>"1", :precision=>nil},
+                 {:integer=>"2", :precision=>nil},
+                 {:map => [{:key=>{:keyword=>{:symbol=>"foo"}}, :value=>{:symbol=>"baz"}}]}]}
+  end
+
   context "value" do
     it "should consume nil" do
       parser.value.should parse("nil")
     end
   end
 
+  context "comment" do
+    it "should consume and throw away comments" do
+      comment = "; this is a comment"
+      parser.comment.should parse(comment)
+      parser.comment.parse(comment).should == "; this is a comment"
+    end
+  end
+
   context "boolean" do
     it "should consume true" do
       parser.boolean.should parse("true")
@@ -75,8 +101,8 @@ describe EDN::Parser do
 
   context "tag" do
     it "should consume any tags" do
-      rant(RantlyHelpers::SYMBOL).each do |symbol|
-        parser.tag.should parse("##{symbol}")
+      rant(RantlyHelpers::TAG).each do |tag|
+        parser.tag.should parse(tag)
       end
     end
   end

data/spec/edn/transform_spec.rb

@@ -35,7 +35,7 @@ describe EDN::Transform do
 
   context "symbol" do
     it "should emit an EDN symbol" do
-      subject.apply(:symbol => "test").should == EDN::Type::Symbol.new('test')
+      subject.apply(:symbol => "test").should == ~'test'
     end
   end
 
@@ -74,10 +74,10 @@ describe EDN::Transform do
 
   context "list" do
     it "should emit a list" do
-      subject.apply(:list => []).should == EDN::Type::List.new
-      subject.apply(:list => [{:integer => "1", :precision => nil}, {:string => "abc"}]).should == EDN::Type::List.new(1, "abc")
+      subject.apply(:list => []).should == EDN.list
+      subject.apply(:list => [{:integer => "1", :precision => nil}, {:string => "abc"}]).should == ~[1, "abc"]
       subject.apply(:list => [{:list => [{:integer => "1", :precision => nil}, {:string => "abc"}]}, {:float => "3.14", :precision => nil}]).should == \
-        EDN::Type::List.new(EDN::Type::List.new(1, "abc"), 3.14)
+        ~[~[1, "abc"], 3.14]
     end
 
     it "should be type-compatible with arrays" do

data/spec/edn_spec.rb

@@ -11,8 +11,8 @@ describe EDN do
       EDN.read('"hello\nworld"').should == "hello\nworld"
       EDN.read(':hello').should == :hello
       EDN.read(':hello/world').should == :"hello/world"
-      EDN.read('hello').should == EDN::Type::Symbol.new('hello')
-      EDN.read('hello/world').should == EDN::Type::Symbol.new('hello/world')
+      EDN.read('hello').should == ~'hello'
+      EDN.read('hello/world').should == ~'hello/world'
       EDN.read('true').should == true
       EDN.read('false').should == false
       EDN.read('nil').should == nil

data/spec/spec_helper.rb

@@ -8,6 +8,10 @@ REPEAT = (ENV["REPEAT"] || 100).to_i
 
 RSpec.configure do |c|
   c.fail_fast = true
+  c.filter_run_including :focused => true
+  c.alias_example_to :fit, :focused => true
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.run_all_when_everything_filtered = true
 end
 
 module RantlyHelpers
@@ -42,7 +46,10 @@ module RantlyHelpers
 
   FLOAT_WITH_EXP = lambda { |_|
     # limited range because of Infinity
-    [float, choose("e", "E", "e+", "E+", "e-", "e+"), range(1, 100)].
+    f = float.to_s
+    guard f !~ /[Ee]/
+
+    [f, choose("e", "E", "e+", "E+", "e-", "e+"), range(1, 100)].
     map(&:to_s).
     join("")
   }
@@ -104,8 +111,14 @@ module RantlyHelpers
            MAP)
   }
 
+  TAG = lambda { |_|
+    tag = call(SYMBOL)
+    guard tag =~ /^[A-Za-z]/
+    "##{tag}"
+  }
+
   TAGGED_VALUE = lambda { |_|
-    "#" + [call(SYMBOL), call(BASIC_VALUE)].join(" ")
+    [call(TAG), call(BASIC_VALUE)].join(" ")
   }
 
   INST = lambda { |_|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -981297228036091023
+      hash: -3622317026699243756
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -981297228036091023
+      hash: -3622317026699243756
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23