lector 0.0.4 → 0.0.5

data/.document

@@ -3,3 +3,4 @@ bin/*
 - 
 features/**/*.feature
 LICENSE.txt
+README.md

data/Gemfile

@@ -4,4 +4,5 @@ gemspec
 
 group :test do
   gem 'rake'
+  gem 'rns'
 end

data/Gemfile.lock

@@ -1,46 +1,42 @@
 PATH
   remote: .
   specs:
-    lector (0.0.4)
+    lector (0.0.5)
       citrus
 
 GEM
   remote: http://rubygems.org/
   specs:
     citrus (2.4.1)
-    coderay (0.9.8)
+    coderay (1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.11)
-    guard (1.0.1)
+    guard (1.0.2)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-rspec (0.5.8)
-      guard (>= 0.8.4)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
-    multi_json (1.0.3)
-    pry (0.9.7.4)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
+    guard-rspec (0.7.0)
+      guard (>= 0.10.0)
+    method_source (0.7.1)
+    multi_json (1.3.4)
+    pry (0.9.9.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rake (0.9.2.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.8)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rns (0.0.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.0)
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (2.1.0)
+    slop (2.4.4)
     thor (0.14.6)
 
 PLATFORMS
@@ -52,5 +48,6 @@ DEPENDENCIES
   lector!
   pry
   rake
+  rns
   rspec
   simplecov

data/LICENSE.txt

@@ -0,0 +1,24 @@
+lector is distributed under the following terms:
+
+Copyright (c) Alan Dipert <alan@dipert.org>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/README.md

@@ -1,4 +1,6 @@
-`lector` reads Ruby data as a string or from a file without evaluating the code it reads. [![Build Status](https://secure.travis-ci.org/alandipert/lector.png)](http://travis-ci.org/alandipert/lector)
+`lector` reads Ruby data from strings or files without necessarily evaluating either.
+
+Oh yeah, and the build status?  We have one of those: [![Build Status](https://secure.travis-ci.org/alandipert/lector.png)](http://travis-ci.org/alandipert/lector)
 
 # Usage
 
@@ -14,9 +16,9 @@
 ```
 # read-eval is off by default:
 > Lector::read_s("{three: #='1+2'}")
- => {:three=>"1+2"}
+RuntimeError: Evaluation isn't allowed if :read_eval is false
 
-# but you can turn it on...
+# but when you turn it on...
 > Lector::read_s("{three: #='1+2'}", :read_eval => true)
  => {:three=>3} 
 ```

data/lector.gemspec

@@ -5,10 +5,11 @@ require "lector/version"
 Gem::Specification.new do |s|
   s.name        = "lector"
   s.version     = Lector::VERSION
-  s.authors     = ["Alan Dipert", "Michael Fogus", "Alex Redington"]
-  s.email       = ["alan@dipert.org"]
+  s.authors     = ["Alan Dipert", "Jon Distad", "Michael Fogus", "Alex Redington"]
+  s.email       = ["alan@dipert.org", "jon.distad@gmail.com"]
   s.homepage    = "http://github.com/alandipert/lector"
   s.summary     = %q{A Ruby data reader.}
+  s.license     = "BSD-new"
   s.description = %q{lector parses Ruby data into Ruby data structures.}
 
   s.rubyforge_project = "lector"

data/lib/lector/digits.citrus

@@ -0,0 +1,23 @@
+grammar Lector::Digits
+
+  rule digit
+    [0-9] ('_' & [0-9])?
+  end
+
+  rule nonzero
+    [1-9] ('_' & [0-9])?
+  end
+
+  rule hexdigit
+    [0-9a-fA-F] ('_' & [0-9a-fA-F])?
+  end
+
+  rule octaldigit
+    [0-7] ('_' & [0-7])?
+  end
+
+  rule octalzero
+    '0' ('_' & [0-7])?
+  end
+
+end

data/lib/lector/reader.citrus

@@ -1,5 +1,7 @@
 grammar Lector::RubyParse
 
+  include Lector::Digits
+
   rule ruby_data
     (space* form space*) <Lector::Types::Data>
   end
@@ -53,26 +55,29 @@ grammar Lector::RubyParse
   end
 
   rule number
-    hex_integer | float | integer
+    hex_integer | float | octal_integer | integer
+  end
+
+  rule integer
+    ([+-]? ('0' | nonzero digit*)) <Lector::Types::Integer>
   end
 
   rule hex_integer
-    /([-+]?)0[xX]([0-9A-Fa-f]+)?/ <Lector::Types::HexInteger>
+    ([+-]? `0x` hexdigit+) <Lector::Types::HexInteger>
   end
 
-  rule float
-    ((number:/[-+]?[0-9]+\.[0-9]*(?:[eE][-+]?[0-9]+)?/)
-     | (number:/[-+]?[0-9][eE][-+]?[0-9]+/)) <Lector::Types::Float>
+  rule octal_integer
+    ([+-]? octalzero octaldigit+) <Lector::Types::OctalInteger>
   end
 
-  rule integer
-    /([-+]?0)|([-+]?[1-9]\d*)?/ <Lector::Types::Integer>
+  rule float
+    (integer '.' digit+ (`e` integer)?
+     | integer `e` integer) <Lector::Types::Float>
   end
 
   rule array
-    #TODO: Spurious commas should be parse errors.
     ('['
-     ((space* form space* ',')* (space* form space*))
+     ((space* form space* ',')* (space* form space*)?)
      ']') <Lector::Types::Array>
   end
 

data/lib/lector/types.rb

@@ -5,6 +5,7 @@ module Lector
     module Nil; def val; nil; end; end
     module Integer; def val; to_i; end; end
     module HexInteger; def val; to_i 16; end; end
+    module OctalInteger; def val; to_i 8; end; end
     module Float; def val; to_f; end; end
     module SimpleSymbol; def val; slice(1..-1).to_sym; end; end
     module StringSymbol; def val; slice(2..-2).to_sym; end; end

data/lib/lector/version.rb

@@ -1,3 +1,3 @@
 module Lector
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/lector.rb

@@ -2,11 +2,13 @@ require 'citrus'
 require 'lector/types'
 
 module Lector
+  Citrus.load('lib/lector/digits', :force => true)
   Citrus.load('lib/lector/reader', :force => true)
 end
 
 module Lector
   module RubyParse; end
+  module Digits; end
   def self.read_s(string, opts = {})
     $_LECTOR_READ_EVAL = opts[:read_eval] || false
     string_without_comments = $_LECTOR_READ_EVAL ? string : string.gsub(/#[^=].*$/, '')

data/spec/lector/reader_spec.rb

@@ -1,126 +1,182 @@
 require File.join(File.dirname(__FILE__), *%w[.. spec_helper.rb])
 require 'pry'
 require 'tempfile'
+require 'rns'
+
+Rns::using(Lector => [:read_s, :read_file]) do
+  describe Lector do
+    context 'reading strings' do
+      it 'parses integers' do
+        read_s("+42").should == 42
+        read_s("-42").should == -42
+        read_s("42").should == 42
+        read_s("-42").should == -42
+        read_s("-0").should == 0
+        read_s("+0").should == 0
+      end
 
-describe Lector do
-  context 'reading strings' do
-    it 'parses integers' do
-      Lector::read_s("+42").should == 42
-      Lector::read_s("-42").should == -42
-      Lector::read_s("42").should == 42
-      Lector::read_s("-42").should == -42
-      Lector::read_s("-0").should == 0
-      Lector::read_s("+0").should == 0
-    end
+      it "parses hex integers" do
+        read_s("0x0").should == 0
+        read_s("0xF").should == 15
+        read_s("+0xF").should == 15
+        read_s("-0xF").should == -15
+      end
 
-    it "parses hex integers" do
-      Lector::read_s("0xF").should == 15
-      Lector::read_s("+0xF").should == 15
-      Lector::read_s("-0xF").should == -15
-    end
+      it "parses ocatals" do
+        read_s("00").should == 0
+        read_s("010").should == 8
+        read_s("-010").should == -8
+        read_s("+010").should == 8
+      end
 
-    it "parses floating point numbers" do
-      Lector::read_s("1.1").should == 1.1
-      Lector::read_s("-1.1").should == -1.1
-      Lector::read_s("-1.21e10").should == -12_100_000_000.0
-      Lector::read_s("+1.21e10").should == 12_100_000_000.0
-      Lector::read_s("1e4").should == 10_000
-    end
+      it "parses floating point numbers" do
+        read_s("1.1").should == 1.1
+        read_s("-1.1").should == -1.1
+        read_s("-1.21e10").should == -12_100_000_000.0
+        read_s("+1.21e10").should == 12_100_000_000.0
+        read_s("1e4").should == 10_000
+        expect { read_s("1.") }.to raise_error(Citrus::ParseError)
+        expect { read_s("1.e5") }.to raise_error(Citrus::ParseError)
+      end
 
-    it "parses true and false" do
-      Lector::read_s("true").should == true
-      Lector::read_s("false").should == false
-    end
+      context "parsing individual underscores in the middle of numbers" do
+        it "in integers" do
+          read_s("1_0").should == 10
+          read_s("1_03_4").should == 1034
+          expect { read_s("1_03_4_") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1__03_4") }.to raise_error(Citrus::ParseError)
+        end
+
+        it "in octals" do
+          read_s("0_1_0").should == 010
+          read_s("0_1_03_4").should == 01034
+          expect { read_s("0_1_03_4_") }.to raise_error(Citrus::ParseError)
+          expect { read_s("0_1__03_4") }.to raise_error(Citrus::ParseError)
+        end
+
+        it "in hex" do
+          read_s("0x3_f_0").should == 0x3F0
+          read_s("0x1_0D_4").should == 0x10D4
+          expect { read_s("0x1_03_4_") }.to raise_error(Citrus::ParseError)
+          expect { read_s("0x_1_03_4") }.to raise_error(Citrus::ParseError)
+          expect { read_s("0x1__03_4") }.to raise_error(Citrus::ParseError)
+        end
+
+        it "in floats" do
+          read_s("1_0.2_3").should == 10.23
+          read_s("1_0.2_3e4_5").should == 10.23e45
+          expect { read_s("1__0.2") }.to raise_error(Citrus::ParseError)
+          expect { read_s("_1_0.2") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1._2") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1.1__2") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1.2_") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1.2e1__3") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1.2e_3") }.to raise_error(Citrus::ParseError)
+          expect { read_s("1.2e3_") }.to raise_error(Citrus::ParseError)
+        end
+      end
 
-    it "parses nil" do
-      Lector::read_s("nil").should == nil
-    end
+      it "parses true and false" do
+        read_s("true").should == true
+        read_s("false").should == false
+      end
 
-    it 'parses symbols' do
-      Lector::read_s(":sym").should == :sym
-      Lector::read_s(':"blah"').should == :blah
-      Lector::read_s(':"blah blah"').should == :"blah blah"
-      Lector::read_s(":'foo foo'").should == :"foo foo"
-    end
+      it "parses nil" do
+        read_s("nil").should == nil
+      end
 
-    it 'parses arrays of single elements' do
-      Lector::read_s('[42]').should == [42]
-    end
+      it 'parses symbols' do
+        read_s(":sym").should == :sym
+        read_s(':"blah"').should == :blah
+        read_s(':"blah blah"').should == :"blah blah"
+        read_s(":'foo foo'").should == :"foo foo"
+      end
 
-    it 'ignores whitespace' do
-      Lector::read_s("[ 42   ]").should == [42]
-    end
+      it 'parses arrays of single elements' do
+        read_s('[42]').should == [42]
+      end
 
-    it 'parses arrays of multiple elements' do
-      Lector::read_s("[42, -1]").should == [42, -1]
-    end
+      it 'ignores whitespace' do
+        read_s("[ 42   ]").should == [42]
+      end
 
-    it 'parses hashes' do
-      Lector::read_s("{a: 7, b: 6}").should == {:a => 7, :b => 6}
-      Lector::read_s("{b: 6}").should == {:b => 6}
-      Lector::read_s("{:a => 7, :b => 6}").should == {:a => 7, :b => 6}
-      Lector::read_s("{:a => 7, b: 6}").should == {:a => 7, :b => 6}
-    end
+      it 'parses arrays of multiple elements' do
+        read_s("[42, -1]").should == [42, -1]
+      end
 
-    it 'parses nested collections' do
-      Lector::read_s("[[1,2], 3, 4]").should == [[1, 2], 3, 4]
-    end
+      it 'fails to parse arrays with spurious commas' do
+        expect { read_s('[1,,2]') }.to raise_error(Citrus::ParseError)
+      end
 
-    it 'has no problem with hashes of arrays' do
-      Lector::read_s("{a: [1, 2], b: [3, 4]}").should == {:a => [1, 2], :b => [3, 4]}
-      Lector::read_s("{:a => [1, 2], :b => [3, 4]}").should == {:a => [1, 2], :b => [3, 4]}
-    end
+      it 'allows trailing commas in arrays' do
+        read_s('[1,2,]').should == [1,2]
+      end
 
-    it 'copes when data is surrounded by whitespace' do
-      Lector::read_s("
+      it 'parses hashes' do
+        read_s("{a: 7, b: 6}").should == {:a => 7, :b => 6}
+        read_s("{b: 6}").should == {:b => 6}
+        read_s("{:a => 7, :b => 6}").should == {:a => 7, :b => 6}
+        read_s("{:a => 7, b: 6}").should == {:a => 7, :b => 6}
+      end
+
+      it 'parses nested collections' do
+        read_s("[[1,2], 3, 4]").should == [[1, 2], 3, 4]
+      end
+
+      it 'has no problem with hashes of arrays' do
+        read_s("{a: [1, 2], b: [3, 4]}").should == {:a => [1, 2], :b => [3, 4]}
+        read_s("{:a => [1, 2], :b => [3, 4]}").should == {:a => [1, 2], :b => [3, 4]}
+      end
+
+      it 'copes when data is surrounded by whitespace' do
+        read_s("
 {a: 7, b: 6}   ").should == {:a => 7, :b => 6}
-    end
+      end
 
-    it 'reads double-quoted strings' do
-      Lector::read_s('"a string by any other name is just as tangly"').should == 'a string by any other name is just as tangly'
-    end
+      it 'reads double-quoted strings' do
+        read_s('"a string by any other name is just as tangly"').should == 'a string by any other name is just as tangly'
+      end
 
-    it 'reads single-quoted strings' do
-      Lector::read_s("'i only have single quotes'").should == 'i only have single quotes'
-    end
+      it 'reads single-quoted strings' do
+        read_s("'i only have single quotes'").should == 'i only have single quotes'
+      end
 
-    it 'reads strings with escaped quotes' do
-      Lector::read_s('"a string with an \"escaped quote\""').should == 'a string with an "escaped quote"'
-    end
+      it 'reads strings with escaped quotes' do
+        read_s('"a string with an \"escaped quote\""').should == 'a string with an "escaped quote"'
+      end
 
-    it 'preserves other escaped characters' do
-      Lector::read_s('"a string with a\nnewline"').should == 'a string with a\nnewline'
-    end
+      it 'preserves other escaped characters' do
+        read_s('"a string with a\nnewline"').should == 'a string with a\nnewline'
+      end
 
-    it 'deals with comments' do
-      Lector::read_s("{#Here's a comment in the code.\nx: #And another!\n10}").
-        should == {:x => 10}
+      it 'deals with comments' do
+        read_s("{#Here's a comment in the code.\nx: #And another!\n10}").
+          should == {:x => 10}
+      end
     end
-  end
 
-  context 'read-evaling' do
-    it "blows up when read-eval is off and there's embedded code" do
-      expect {
-        Lector::read_s("#='1+2'").should == '1+2'
-      }.to raise_error(RuntimeError)
-    end
+    context 'read-evaling' do
+      it "blows up when read-eval is off and there's embedded code" do
+        expect { read_s("#='1+2'") }.to raise_error(RuntimeError)
+      end
 
-    it "embedded code works when :read_eval is on" do
-      Lector::read_s("#='1+2'", :read_eval => true).should == 3
-    end
+      it "embedded code works when :read_eval is on" do
+        read_s("#='1+2'", :read_eval => true).should == 3
+      end
 
-    it "copes when strings have comments" do
-      Lector::read_s("[:a#some comment\n,:b,:c]").should == [:a, :b, :c]
+      it "copes when strings have comments" do
+        read_s("[:a#some comment\n,:b,:c]").should == [:a, :b, :c]
+      end
     end
-  end
 
-  context 'reading files' do
-    it 'should be able to round-trip data to file' do
-      hsh = {:a => [1, 2], nil => false, :b => [3, 4], blah: [1.2, {:x => 20}]}
-      Tempfile.new('lector').tap do |f|
-        f.write(hsh.to_s)
-        f.rewind
-        Lector::read_file(f).should == hsh
+    context 'reading files' do
+      it 'should be able to round-trip data to file' do
+        hsh = {:a => [1, 2], nil => false, :b => [3, 4], blah: [1.2, {:x => 20}]}
+        Tempfile.new('lector').tap do |f|
+          f.write(hsh.to_s)
+          f.rewind
+          read_file(f).should == hsh
+        end
       end
     end
   end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: lector
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
 - Alan Dipert
+- Jon Distad
 - Michael Fogus
 - Alex Redington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -112,6 +113,7 @@ dependencies:
 description: lector parses Ruby data into Ruby data structures.
 email:
 - alan@dipert.org
+- jon.distad@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,17 +125,20 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - lector.gemspec
 - lib/lector.rb
+- lib/lector/digits.citrus
 - lib/lector/reader.citrus
 - lib/lector/types.rb
 - lib/lector/version.rb
 - spec/lector/reader_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/alandipert/lector
-licenses: []
+licenses:
+- BSD-new
 post_install_message: 
 rdoc_options: []
 require_paths: