RubyGems - rison - Versions diffs - 1.1.0 → 1.2.0 - Mend

rison 1.1.0 → 1.2.0

Files changed (6) hide show

data/README.html CHANGED Viewed

@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>rison.rubyforge.org</title>
+  <title>rison.rb</title>
   <style type="text/css" media="screen">
     html {
       height: 100%; margin-bottom: 1px;
@@ -13,13 +13,16 @@
     }
     code {
       font-family: "Panic Sans", "Bitstream Vera Sans Mono", Consolas, Monaco, monospace;
+      font-size: 11px;
     }
   </style>
 </head>
 <body>
-<h1>rison<span style="color:#F99">.rb</span></h1>
+<h1>rison<span style="color:#F99">.rb</span> <small>1.2.0</small></h1>
+<p>A <a href="http://dhaka.rubyforge.org/">Dhaka</a>-based <a href="http://mjtemplate.org/examples/rison.html">Rison</a> parser.</p>
 <h2>Installing</h2>
@@ -36,6 +39,8 @@
   Rison.load('(a:0)')      # => {:a => 0}
+  Rison.load('abc def')    # => Rison::ParseError: invalid Rison string: "abc def"
   Rison.dump(true)         # => '!t'
@@ -43,13 +48,9 @@
   Rison.dump({:a => 0})    # => '(a:0)'
-</code></pre>
-<h2>Links</h2>
+  Rison.dump(Array)        # => ArgumentError: cannot serialize: Array
-<p><a href="http://mjtemplate.org/examples/rison.html">Rison - Compact Data in URIs</a></p>
-<p><a href="http://dhaka.rubyforge.org/">Dhaka</a></p>
+</code></pre>
 </body>

data/Rakefile.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 GEMSPEC = Gem::Specification.new do |s|
   s.name = 'rison'
-  s.version = '1.1.0'
+  s.version = '1.2.0'
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = false
   s.summary = 'Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)'

data/lib/rison.rb CHANGED Viewed

@@ -6,8 +6,24 @@ require 'rison/dump'
 module Rison
+  class ParseError < ArgumentError
+    attr_reader :result
+    def initialize(invalid_string, result)
+      @result = result
+      super "invalid Rison string: %p" % invalid_string
+    end
+  end
   def self.load(data)
-    evaluate(parse(lex(data)))
+    lexed = lex(data)
+    parsed = parse(lexed)
+    raise ParseError.new(data, parsed) if parsed.has_error?
+    evaluate(parsed)
   end

data/test/test_dump.rb CHANGED Viewed

@@ -62,4 +62,8 @@ class RisonDumpTests < Test::Unit::TestCase
   def test_non_empty_arrays
     assert_equal %{!(!t,!f,!n,'')}, r([true, false, nil, ''])
   end
+  def test_undumpable_objects
+    assert_raises(ArgumentError) { r(Array) }
+  end
 end

data/test/test_parser.rb CHANGED Viewed

@@ -4,13 +4,11 @@ require 'rison'
 class RisonParserTests < Test::Unit::TestCase
   def rison(string)
-    parsed = Rison.parse(Rison.lex(string))
-    parsed.has_error?? parsed : Rison.evaluate(parsed)
+    Rison.load(string)
   end
   def assert_invalid(string)
-    rison(string).is_a?(Dhaka::ParseErrorResult)
+    assert_raises(Rison::ParseError) { rison(string) }
   end
   # cf. http://mjtemplate.org/examples/rison.html
@@ -94,7 +92,14 @@ class RisonParserTests < Test::Unit::TestCase
   end
   def test_invalid_expressions
+    assert_invalid '-h'
+    assert_invalid '1.5e+2'
+    assert_invalid '1.5E2'
+    assert_invalid '1.5E+2'
+    assert_invalid '1.5E-2'
     assert_invalid 'abc def'
+    assert_invalid 'US $10'
+    assert_invalid 'user@domain.com'
   end
 end

metadata CHANGED Viewed

@@ -1,40 +1,34 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.9.4.7
-specification_version: 2
 name: rison
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-date: 2007-11-19 00:00:00 +00:00
-summary: Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)
-require_paths:
-- lib
-email: twoggle@gmail.com
-homepage: http://rison.rubyforge.org/
-rubyforge_project:
-description: Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)
+  version: 1.2.0
+platform: ruby
+authors:
+- Tim Fletcher
 autorequire:
-default_executable:
 bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
-  version:
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
-  version:
-platform: ruby
-signing_key:
 cert_chain: []
-post_install_message:
-authors:
-- Tim Fletcher
+date: 2007-12-06 00:00:00 +00:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dhaka
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+description: Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)
+email: twoggle@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
 files:
 - lib/rison
 - lib/rison/dump.rb
@@ -48,25 +42,31 @@ files:
 - COPYING.txt
 - Rakefile.rb
 - README.html
-test_files: []
+has_rdoc: false
+homepage: http://rison.rubyforge.org/
+post_install_message:
 rdoc_options: []
-extra_rdoc_files: []
-executables: []
-extensions: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
 requirements: []
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: dhaka
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
-    version:
+rubyforge_project:
+rubygems_version: 0.9.5
+signing_key:
+specification_version: 2
+summary: Pure Ruby parser for Rison (http://mjtemplate.org/examples/rison.html)
+test_files: []