parsr 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7 # (current default)
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - jruby
+  - ruby-head
+  - ree
+

data/README.md

@@ -6,5 +6,7 @@ just as Python's [ast.literal_eval](http://docs.python.org/library/ast.html#ast.
 ## Example
 
 ```ruby
-Parsr.literal_eval(%q{ [1, "2", 3.4 => 5..6, foo: [7] ] })
+Parsr.literal_eval(%q{ [1, "2", 3.4 => 5..6, foo: [7, bar: /(bb|[^b]{2})/ix] ] })
 ```
+
+[![Build Status](https://secure.travis-ci.org/byroot/parsr.png)](http://travis-ci.org/byroot/parsr)

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new

data/lib/parsr.rb

@@ -3,18 +3,9 @@ require 'strscan'
 class Parsr
 
   BASE_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'parsr'))
-
-  autoload :ArrayRule,      "#{BASE_PATH}/array_rule"
-  autoload :ConstantsRule,  "#{BASE_PATH}/constants_rule"
-  autoload :FloatRule,      "#{BASE_PATH}/float_rule"
-  autoload :HashRule,       "#{BASE_PATH}/hash_rule"
-  autoload :IntegerRule,    "#{BASE_PATH}/integer_rule"
-  autoload :RangeRule,      "#{BASE_PATH}/range_rule"
-  autoload :RawStringRule,  "#{BASE_PATH}/raw_string_rule"
-  autoload :StringRule,     "#{BASE_PATH}/string_rule"
-  autoload :SymbolRule,     "#{BASE_PATH}/symbol_rule"
-  autoload :Token,          "#{BASE_PATH}/token"
-  autoload :VERSION,        "#{BASE_PATH}/version"
+  autoload :Rules,   "#{BASE_PATH}/rules"
+  autoload :Token,   "#{BASE_PATH}/token"
+  autoload :VERSION, "#{BASE_PATH}/version"
 
   Error = Class.new(Exception)
   IllegalValue = Class.new(Error)
@@ -49,17 +40,7 @@ class Parsr
   class << self
 
     def literal_eval(string)
-      @literal_parser ||= self.new(
-        ArrayRule,
-        HashRule,
-        RangeRule,
-        ConstantsRule,
-        SymbolRule,
-        FloatRule,
-        IntegerRule,
-        RawStringRule,
-        StringRule
-      )
+      @literal_parser ||= self.new(*Parsr::Rules::All)
       @literal_parser.parse(string)
     end
 

data/lib/parsr/rules.rb

@@ -0,0 +1,15 @@
+module Parsr::Rules
+  BASE_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'rules'))
+  autoload :All,        "#{BASE_PATH}/all"
+  autoload :Array,      "#{BASE_PATH}/array"
+  autoload :Constants,  "#{BASE_PATH}/constants"
+  autoload :Float,      "#{BASE_PATH}/float"
+  autoload :Hash,       "#{BASE_PATH}/hash"
+  autoload :Integer,    "#{BASE_PATH}/integer"
+  autoload :Numeric,    "#{BASE_PATH}/numeric"
+  autoload :Range,      "#{BASE_PATH}/range"
+  autoload :Regexp,     "#{BASE_PATH}/regexp"
+  autoload :RawString,  "#{BASE_PATH}/raw_string"
+  autoload :String,     "#{BASE_PATH}/string"
+  autoload :Symbol,     "#{BASE_PATH}/symbol"
+end

data/lib/parsr/rules/all.rb

@@ -0,0 +1,14 @@
+module Parsr::Rules
+  All = [
+    Parsr::Rules::Array,
+    Parsr::Rules::Hash,
+    Parsr::Rules::Range,
+    Parsr::Rules::Constants,
+    Parsr::Rules::Symbol,
+    Parsr::Rules::Float,
+    Parsr::Rules::Integer,
+    Parsr::Rules::Regexp,
+    Parsr::Rules::RawString,
+    Parsr::Rules::String
+  ]
+end

data/lib/parsr/{array_rule.rb → rules/array.rb}

@@ -1,4 +1,4 @@
-module Parsr::ArrayRule
+module Parsr::Rules::Array
 
   class Unterminated < Parsr::SyntaxError
     message "unexpected '%{rest}', expecting ']'"
@@ -31,7 +31,7 @@ module Parsr::ArrayRule
 
     def parse_unclosed_hash(scanner, token, &block)
       hash = []
-      while pair = Parsr::HashRule.parse_pair(scanner, token, &block)
+      while pair = Parsr::Rules::Hash.parse_pair(scanner, token, &block)
         token = nil
         hash << pair
         break unless scanner.scan(/\s*\,\s*/)

data/lib/parsr/{constants_rule.rb → rules/constants.rb}

@@ -1,4 +1,4 @@
-module Parsr::ConstantsRule
+module Parsr::Rules::Constants
 
   class << self
 

data/lib/parsr/{float_rule.rb → rules/float.rb}

@@ -1,6 +1,7 @@
-module Parsr::FloatRule
+module Parsr::Rules::Float
+  include Parsr::Rules::Numeric
 
-  PATTERN = /[\-\+]?\d+\.\d+/
+  PATTERN = /#{SIGN}#{DIGITS}\.#{DIGITS}/
 
   class << self
 

data/lib/parsr/{hash_rule.rb → rules/hash.rb}

@@ -1,4 +1,4 @@
-module Parsr::HashRule
+module Parsr::Rules::Hash
 
   class MissingValue < Parsr::SyntaxError
     message "unexpected '%{rest}'"

data/lib/parsr/{integer_rule.rb → rules/integer.rb}

@@ -1,6 +1,7 @@
-module Parsr::IntegerRule
+module Parsr::Rules::Integer
+  include Parsr::Rules::Numeric
 
-  PATTERN = /[\-\+]?\d+/
+  PATTERN = /#{SIGN}#{DIGITS}/
 
   class << self
 

data/lib/parsr/rules/numeric.rb

@@ -0,0 +1,6 @@
+module Parsr::Rules::Numeric
+
+  SIGN = /[\-\+]?/
+  DIGITS = /\d(?:[\d\_]*\d)?/
+
+end

data/lib/parsr/{range_rule.rb → rules/range.rb}

@@ -1,6 +1,6 @@
-module Parsr::RangeRule
+module Parsr::Rules::Range
 
-  NUMBER_PATTERN = Regexp.union(Parsr::FloatRule::PATTERN, Parsr::IntegerRule::PATTERN)
+  NUMBER_PATTERN = Regexp.union(Parsr::Rules::Float::PATTERN, Parsr::Rules::Integer::PATTERN)
   PATTERN = /(#{NUMBER_PATTERN})(\.{2,3})(#{NUMBER_PATTERN})/
 
   class << self

data/lib/parsr/{raw_string_rule.rb → rules/raw_string.rb}

@@ -1,4 +1,4 @@
-module Parsr::RawStringRule
+module Parsr::Rules::RawString
 
   class Unterminated < Parsr::SyntaxError
     message 'unterminated string meets end of file'

data/lib/parsr/rules/regexp.rb

@@ -0,0 +1,40 @@
+module Parsr::Rules::Regexp
+
+  OPTIONS = {
+    'i' => Regexp::IGNORECASE,
+    'm' => Regexp::MULTILINE,
+    'x' => Regexp::EXTENDED,
+  }.freeze
+
+  class Unterminated < Parsr::SyntaxError
+    message 'unterminated regexp meets end of file'
+  end
+
+  class << self
+
+    def match(scanner)
+      if scanner.scan(/\//)
+        buffer = ''
+        while chunk = (parse_content(scanner) || parse_escape(scanner))
+          buffer << chunk
+        end
+        return Parsr::Token.new(Regexp.new(buffer, parse_options(scanner)))
+      end
+    end
+
+    def parse_content(scanner)
+      scanner.matched if scanner.scan(/[^\\\/]+/)
+    end
+
+    def parse_escape(scanner)
+      return scanner.matched if scanner.scan(%r{\\.})
+    end
+
+    def parse_options(scanner)
+      raise Unterminated.new(scanner) unless scanner.scan(/\/[imx]*/)
+      scanner.matched[1..-1].chars.map{ |o| OPTIONS[o] }.reduce(0) { |a, b| a | b }
+    end
+
+  end
+
+end

data/lib/parsr/{string_rule.rb → rules/string.rb}

@@ -1,4 +1,4 @@
-module Parsr::StringRule
+module Parsr::Rules::String
 
   ESCAPED_CHARS = {'\n' => "\n", '\b' => "\b", '\f' => "\f", '\r' => "\r", '\t' => "\t"}
   

data/lib/parsr/{symbol_rule.rb → rules/symbol.rb}

@@ -1,4 +1,4 @@
-module Parsr::SymbolRule
+module Parsr::Rules::Symbol
 
   PATTERN = /\:[a-zA-Z_][0-9a-zA-Z_]*/
 

data/lib/parsr/version.rb

@@ -1,3 +1,3 @@
 class Parsr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/parsr.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
 end

data/spec/parsr/{array_rule_spec.rb → rules/array_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::ArrayRule do
+describe Parsr::Rules::Array do
   include_context 'rule'
 
   describe '.match' do

data/spec/parsr/{constants_rule_spec.rb → rules/constants_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::ConstantsRule do
+describe Parsr::Rules::Constants do
   include_context 'rule'
 
   describe '.match' do

data/spec/parsr/{float_rule_spec.rb → rules/float_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::FloatRule do
+describe Parsr::Rules::Float do
   include_context 'rule'
 
   describe '.match' do
@@ -21,6 +21,10 @@ describe Parsr::FloatRule do
       match('-42.42').value.should be == -42.42
     end
 
+    it 'should match floats with underscores for clarity' do
+      match('1_000.000_1').value.should be == 1_000.000_1
+    end
+
   end
 
 end

data/spec/parsr/{hash_rule_spec.rb → rules/hash_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::HashRule do
+describe Parsr::Rules::Hash do
   include_context 'rule'
 
   describe '.match' do

data/spec/parsr/{integer_rule_spec.rb → rules/integer_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::IntegerRule do
+describe Parsr::Rules::Integer do
   include_context 'rule'
 
   describe '.match' do
@@ -32,6 +32,17 @@ describe Parsr::IntegerRule do
       result.should_not be_a(Parsr::Token)
     end
 
+    it 'should match integers with containing an underscore for clarity' do
+      result = match('1_000')
+      result.should be_a Parsr::Token
+      result.value.should be == 1_000
+    end
+
+    it 'should not match integers with underscore prefix' do
+      result = match('_1_000')
+      result.should be_nil
+    end
+
   end
 
 end

data/spec/parsr/{range_rule_spec.rb → rules/range_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::RangeRule do
+describe Parsr::Rules::Range do
   include_context 'rule'
 
   describe '.match' do

data/spec/parsr/{raw_string_rule_spec.rb → rules/raw_string_spec.rb}

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'spec_helper'
 
-describe Parsr::RawStringRule do
+describe Parsr::Rules::RawString do
   include_context 'rule'
 
   describe '.match' do
@@ -45,7 +45,7 @@ describe Parsr::RawStringRule do
     it 'should raise an Parsr::RawStringRule::Unterminated if raw string is not terminated' do
       expect{
         match(%q{'bryan\\'s kitchen})
-      }.to raise_error(Parsr::RawStringRule::Unterminated)
+      }.to raise_error(Parsr::Rules::RawString::Unterminated)
     end
 
   end

data/spec/parsr/rules/regexp_spec.rb

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Parsr::Rules::Regexp do
+  include_context 'rule'
+
+  describe '.match' do
+
+    it 'should match an empty regexp' do
+      match(%q{//}).value.should be == //
+    end
+
+    it 'should match a simple regexp' do
+      match(%q{/foo/}).value.should be == /foo/
+    end
+
+    it 'should match a regexp wth space' do
+      match(%q{/foo bar/}).value.should be == /foo bar/
+    end
+
+    it 'should match a regexp containing a backslash' do
+      eval(%q{ /\\\\/}).should be == /\\/
+      match(%q{/\\\\/}).value.should be == /\\/
+    end
+
+    it 'should match a regexp containing a metacharacters' do
+      match(%q{/\d/}).value.should be == /\d/
+    end
+
+    it 'should match a regexp with options' do
+      match(%q{/\d/ix}).value.should be == /\d/ix
+    end
+
+    it 'should match a regexp containing an escaped slash' do
+      match(%q{/\//}).value.should be == /\//
+    end
+
+    it 'should raise an Parsr::RegexpRule::Unterminated if regexp is not terminated' do
+      expect{
+        match(%q{/\\/})
+      }.to raise_error(Parsr::Rules::Regexp::Unterminated)
+    end
+
+  end
+
+end

data/spec/parsr/{string_rule_spec.rb → rules/string_spec.rb}

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'spec_helper'
 
-describe Parsr::StringRule do
+describe Parsr::Rules::String do
   include_context 'rule'
 
   describe '.match' do

data/spec/parsr/{symbol_rule_spec.rb → rules/symbol_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Parsr::SymbolRule do
+describe Parsr::Rules::Symbol do
   include_context 'rule'
 
   it 'should match identifiers' do

data/spec/parsr_spec.rb

@@ -40,8 +40,8 @@ describe Parsr do
 
     it 'should be able to parse some complexes literals' do
       Parsr.literal_eval(%q{
-        [1, "2", foo: {egg: 'spam', 'bar,' => true}, 3 => 4.2]
-      }).should be == [1, "2", {:foo => {:egg => 'spam', 'bar,' => true}, 3 => 4.2}]
+        [1, "2", foo: {egg: /\\d+\\/\\\\/ix, 'bar,' => true}, 3 => 4.2]
+      }).should be == [1, "2", {:foo => {:egg => /\d+\/\\/ix, 'bar,' => true}, 3 => 4.2}]
     end
 
     it 'should be able to parse an array included in another array' do

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-require File.dirname(__FILE__) + '/../lib/parsr'
 require 'rspec'
 
 RSpec.configure do |c|

metadata

@@ -1,100 +1,141 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: parsr
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70119921863760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70119921863760
-description: Parsr aim to provide a way to safely evaluate a ruby expression composed
-  only with literals, just as Python's ast.literal_eval
-email:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Parsr aim to provide a way to safely evaluate a ruby expression composed only with literals, just as Python's ast.literal_eval
+email: 
 - jean.boussier@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/parsr.rb
-- lib/parsr/array_rule.rb
-- lib/parsr/constants_rule.rb
-- lib/parsr/float_rule.rb
-- lib/parsr/hash_rule.rb
-- lib/parsr/integer_rule.rb
-- lib/parsr/range_rule.rb
-- lib/parsr/raw_string_rule.rb
-- lib/parsr/string_rule.rb
-- lib/parsr/symbol_rule.rb
+- lib/parsr/rules.rb
+- lib/parsr/rules/all.rb
+- lib/parsr/rules/array.rb
+- lib/parsr/rules/constants.rb
+- lib/parsr/rules/float.rb
+- lib/parsr/rules/hash.rb
+- lib/parsr/rules/integer.rb
+- lib/parsr/rules/numeric.rb
+- lib/parsr/rules/range.rb
+- lib/parsr/rules/raw_string.rb
+- lib/parsr/rules/regexp.rb
+- lib/parsr/rules/string.rb
+- lib/parsr/rules/symbol.rb
 - lib/parsr/token.rb
 - lib/parsr/version.rb
 - parsr.gemspec
-- spec/parsr/array_rule_spec.rb
-- spec/parsr/constants_rule_spec.rb
-- spec/parsr/float_rule_spec.rb
-- spec/parsr/hash_rule_spec.rb
-- spec/parsr/integer_rule_spec.rb
-- spec/parsr/range_rule_spec.rb
-- spec/parsr/raw_string_rule_spec.rb
-- spec/parsr/string_rule_spec.rb
-- spec/parsr/symbol_rule_spec.rb
+- spec/parsr/rules/array_spec.rb
+- spec/parsr/rules/constants_spec.rb
+- spec/parsr/rules/float_spec.rb
+- spec/parsr/rules/hash_spec.rb
+- spec/parsr/rules/integer_spec.rb
+- spec/parsr/rules/range_spec.rb
+- spec/parsr/rules/raw_string_spec.rb
+- spec/parsr/rules/regexp_spec.rb
+- spec/parsr/rules/string_spec.rb
+- spec/parsr/rules/symbol_spec.rb
 - spec/parsr_spec.rb
 - spec/spec_helper.rb
 - spec/support/rule_shared_context.rb
 homepage: https://github.com/byroot/parsr/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple parser to safe eval ruby literals
-test_files:
-- spec/parsr/array_rule_spec.rb
-- spec/parsr/constants_rule_spec.rb
-- spec/parsr/float_rule_spec.rb
-- spec/parsr/hash_rule_spec.rb
-- spec/parsr/integer_rule_spec.rb
-- spec/parsr/range_rule_spec.rb
-- spec/parsr/raw_string_rule_spec.rb
-- spec/parsr/string_rule_spec.rb
-- spec/parsr/symbol_rule_spec.rb
+test_files: 
+- spec/parsr/rules/array_spec.rb
+- spec/parsr/rules/constants_spec.rb
+- spec/parsr/rules/float_spec.rb
+- spec/parsr/rules/hash_spec.rb
+- spec/parsr/rules/integer_spec.rb
+- spec/parsr/rules/range_spec.rb
+- spec/parsr/rules/raw_string_spec.rb
+- spec/parsr/rules/regexp_spec.rb
+- spec/parsr/rules/string_spec.rb
+- spec/parsr/rules/symbol_spec.rb
 - spec/parsr_spec.rb
 - spec/spec_helper.rb
 - spec/support/rule_shared_context.rb