lector 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lector (0.0.2)
+    lector (0.0.4)
       citrus
 
 GEM

data/lib/lector/reader.citrus

@@ -33,7 +33,7 @@ grammar Lector::RubyParse
   end
 
   rule code
-    ("#=" code:string) <Lector::Types::Code>
+    ("#=" string) <Lector::Types::Code>
   end
 
   rule symbol

data/lib/lector/types.rb

@@ -14,9 +14,9 @@ module Lector
     module Code
       def val
         if $_LECTOR_READ_EVAL
-          eval(code.to_s.slice(3..-2))
+          eval(to_s.slice(3..-2))
         else
-          code.to_s.slice(3..-2)
+          raise RuntimeError, "Evaluation isn't allowed if :read_eval is false"
         end
       end
     end

data/lib/lector/version.rb

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

data/lib/lector.rb

@@ -8,8 +8,9 @@ end
 module Lector
   module RubyParse; end
   def self.read_s(string, opts = {})
-    $_LECTOR_READ_EVAL = opts[:read_eval]
-    Lector::RubyParse::parse(string).val
+    $_LECTOR_READ_EVAL = opts[:read_eval] || false
+    string_without_comments = $_LECTOR_READ_EVAL ? string : string.gsub(/#[^=].*$/, '')
+    Lector::RubyParse::parse(string_without_comments).val
   end
   def self.read_file(file, opts = {})
     read_s(File.read(file), opts)

data/spec/lector/reader_spec.rb

@@ -91,16 +91,27 @@ describe Lector do
     it 'preserves other escaped characters' do
       Lector::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}
+    end
   end
 
   context 'read-evaling' do
-    it "returns the code when read-eval is off" do
-      Lector::read_s("#='1+2'").should == '1+2'
+    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
-    it "evals the code when read-eval is on" do
+
+    it "embedded code works when :read_eval is on" do
       Lector::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]
+    end
   end
 
   context 'reading files' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lector
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: