literal_parser 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28871bb27419b6dfc757d953bd2f6f5ed2415e0c
+  data.tar.gz: 3a056f983667edb3df7f96854b901c522f1ef7d8
+SHA512:
+  metadata.gz: 794cca369d91f721ca86ba72686d1d92060576ccc151b1947ef74614529b3b6557c87f5aa0ebaf07cea1acb6e7671a2ae929f5f32516469b62d5e8cb40b30558
+  data.tar.gz: 15b76587ba6c95a9bd68dfd14218648edc4f96747488142c4ae80ac262aad8dfd7780f47e727ec19924baf26c3a23084c2025e8900fb24f4d4962bab84ded455

data/lib/literal_parser.rb

@@ -116,7 +116,9 @@ class LiteralParser
 
     RRegexp         = %r{/((?:[^\\/]+|\\.)*)/([imxnNeEsSuU]*)} # Match a regular expression
 
-    RSymbol         = /:\w+|:#{RSString}|:#{RDString}/         # Match a symbol
+    RSymbol         = /:[A-Za-z_]\w*|:#{RSString}|:#{RDString}/         # Match a symbol
+
+    RHashKeySymbol  = /([A-Za-z_]\w*):/                        # Match a symbol used as key in a Hash
 
     RDate           = /(\d{4})-(\d{2})-(\d{2})/                # Match a date
 
@@ -257,13 +259,23 @@ class LiteralParser
         if @scanner.scan(RHashEnd)
           value
         else
-          key = scan_value
-          raise SyntaxError, "Expected =>" unless @scanner.scan(RHashArrow)
+          if @scanner.scan(RHashKeySymbol)
+            key = @scanner[1].to_sym
+            @scanner.scan(RHashVoid)
+          else
+            key = scan_value
+            raise SyntaxError, "Expected =>" unless @scanner.scan(RHashArrow)
+          end
           val = scan_value
           value[key] = val
           while @scanner.scan(RHashSeparator)
-            key = scan_value
-            raise SyntaxError, "Expected =>" unless @scanner.scan(RHashArrow)
+            if @scanner.scan(RHashKeySymbol)
+              key = @scanner[1].to_sym
+              @scanner.scan(RHashVoid)
+            else
+              key = scan_value
+              raise SyntaxError, "Expected =>" unless @scanner.scan(RHashArrow)
+            end
             val = scan_value
             value[key] = val
           end

data/lib/literal_parser/version.rb

@@ -9,5 +9,5 @@ end
 class LiteralParser
 
   # The version of the LiteralParser library
-  Version = Gem::Version.new("1.0.0")
+  Version = Gem::Version.new("1.0.1")
 end

data/literal_parser.gemspec

@@ -2,10 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name                      = "literal_parser"
-  s.version                   = "1.0.0"
+  s.version                   = "1.0.1"
   s.authors                   = "Stefan Rusterholz"
   s.email                     = "stefan.rusterholz@gmail.com"
   s.homepage                  = "https://github.com/apeiros/literal_parser"
+  s.license                   = 'BSD 2-Clause'
 
   s.description               = <<-DESCRIPTION.gsub(/^    /, '').chomp
     Parse Strings containing ruby literals and return a proper ruby object.

data/test/unit/lib/literal_parser.rb

@@ -57,9 +57,9 @@ suite "LiteralParser" do
     assert_equal expected_array, LiteralParser.parse(array_string)
   end
   test "Parse Hash" do
-    array_string    = '{nil => false, true => 123, 12.5 => 2012-05-20, :sym => "str"}'
-    expected_array  = {nil => false, true => 123, 12.5 => Date.civil(2012,5,20), :sym => "str"}
-    assert_equal expected_array, LiteralParser.parse(array_string)
+    hash_string    = '{nil => false, true => 123, 12.5 => 2012-05-20, :sym => "str", sym2: 123}'
+    expected_hash  = {nil => false, true => 123, 12.5 => Date.civil(2012,5,20), :sym => "str", :sym2 => 123}
+    assert_equal expected_hash, LiteralParser.parse(hash_string)
   end
   test "Parse Constants" do
     assert_equal Time, LiteralParser.parse('Time')

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: literal_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Stefan Rusterholz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies: []
 description: Parse Strings containing ruby literals and return a proper ruby object.
 email: stefan.rusterholz@gmail.com
@@ -26,26 +25,26 @@ files:
 - Rakefile
 - README.markdown
 homepage: https://github.com/apeiros/literal_parser
-licenses: []
+licenses:
+- BSD 2-Clause
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 3
 summary: Parse Strings containing ruby literals and return a proper ruby object.