elster 0.0.6 → 0.0.7

data/Users/jwebb/src/bigjason/elster/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elster (0.0.6)
+    elster (0.0.7)
       multi_json
 
 GEM

data/Users/jwebb/src/bigjason/elster/README.md

@@ -1,6 +1,6 @@
 # Elster
 
-A simple streaming JSON encoder.
+Elster is a streaming JSON encoder written in pure ruby.
 
 ## Installation
 

data/Users/jwebb/src/bigjason/elster/lib/elster/exceptions.rb

@@ -0,0 +1,4 @@
+module Elster
+  class JsonContainerTypeError < StandardError
+  end
+end

data/Users/jwebb/src/bigjason/elster/lib/elster/streamer.rb

@@ -44,6 +44,10 @@ module Elster
     #
     #   { "mistake" : [ "HUGE!" ] }
     def key(key, value=nil, &block)
+      if @current_type == :array
+        raise JsonContainerTypeError, "Attempted to write an object `key` value inside a JSON array."
+      end
+
       if @item_count > 0
         write ","
       else
@@ -82,6 +86,10 @@ module Elster
     #
     #   [ 1, { "name" : "Wiggens" } ]
     def add(value=nil, &block)
+      if @current_type == :object
+        raise JsonContainerTypeError, "Attempted to add an array value inside a JSON object."
+      end
+
       if @item_count > 0
         write ","
       else
@@ -119,7 +127,7 @@ module Elster
       when nil
         encode_nil(value)
       else
-        MultiJson.dump(value)
+        encode_generic(value)
       end
     end
 
@@ -127,7 +135,7 @@ module Elster
       MultiJson.dump(value)
     end
 
-    SAFE_RE = Regexp.new("\\A[#{Regexp.escape((32..126).select{|c| c != 34}.map{|c| c.chr}.join)}]+\\z")
+    SAFE_RE = Regexp.new("\\A[#{Regexp.escape((32..126).select{|c| ![34, 92].include?(c)}.map{|c| c.chr}.join)}]+\\z")
     def encode_string(value)
       if value =~ SAFE_RE
         "\"#{value}\""

data/Users/jwebb/src/bigjason/elster/lib/elster/version.rb

@@ -1,3 +1,3 @@
 module Elster
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/Users/jwebb/src/bigjason/elster/lib/elster.rb

@@ -1,2 +1,3 @@
 require "elster/version"
+require "elster/exceptions"
 require "elster/streamer"

data/Users/jwebb/src/bigjason/elster/test/streamer_test.rb

@@ -110,11 +110,43 @@ class StreamerTest < MiniTest::Unit::TestCase
     assert_equal 44, parsed[1]["age"]
   end
 
+  def test_array_nested_array
+    json.add("99")
+    json.add do
+      json.add(1)
+      json.add(2)
+    end
+    json.add(99)
+    json.close
+
+    assert_equal "99", parsed[0]
+    assert_equal [1, 2], parsed[1]
+    assert_equal 99, parsed[2]
+  end
+
+  def test_array_of_nils
+    json.add
+    json.add
+    json.add(nil)
+    json.close
+
+    assert_equal [nil, nil, nil], parsed
+  end
+
+  def test_object_of_nils
+    json.key(:name)
+    json.key(:age)
+    json.close
+
+    assert_equal({"name" => nil, "age" => nil}, parsed)
+  end
+
   def test_ruby_hash
-    json.key("name", {:first => "Bobert"})
+    json.key("name", {:first => "Bobert", :age => 99})
     json.close
 
     assert_equal "Bobert", parsed["name"]["first"]
+    assert_equal 99, parsed["name"]["age"]
   end
 
   def test_ruby_array
@@ -124,18 +156,18 @@ class StreamerTest < MiniTest::Unit::TestCase
     assert_equal [1, 2], parsed["an_array"]
   end
 
-  def test_string_with_cr_at_end
-    json.key("description", "I am \n")
+  def test_string_with_cr
+    json.key("description", "I am \nmulti\nlined")
     json.close
 
-    assert_equal "I am \n", parsed["description"]
+    assert_equal "I am \nmulti\nlined", parsed["description"]
   end
 
-  def test_string_with_cr
-    json.key("description", "I am \nmulti\nlined")
+  def test_string_with_cr_at_end
+    json.key("description", "I am \n")
     json.close
 
-    assert_equal "I am \nmulti\nlined", parsed["description"]
+    assert_equal "I am \n", parsed["description"]
   end
 
   def test_boolean_true
@@ -151,4 +183,26 @@ class StreamerTest < MiniTest::Unit::TestCase
 
     assert_equal false, parsed["no_works"]
   end
+
+  def test_encode_basic_chars
+    expected = " !\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+    json.key("chars", expected)
+    json.close
+
+    assert_equal expected, parsed["chars"]
+  end
+
+  def test_no_key_in_arrays
+    json.add(1)
+    assert_raises(Elster::JsonContainerTypeError) do
+      json.key("DoesntMatter", "Nothing Written")
+    end
+  end
+
+  def test_no_add_in_objects
+    json.key("DoesntMatter", "Nothing will be written")
+    assert_raises(Elster::JsonContainerTypeError) do
+      json.add(1)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -101,6 +101,7 @@ files:
 - /Users/jwebb/src/bigjason/elster/elster.gemspec
 - /Users/jwebb/src/bigjason/elster/Gemfile
 - /Users/jwebb/src/bigjason/elster/Gemfile.lock
+- /Users/jwebb/src/bigjason/elster/lib/elster/exceptions.rb
 - /Users/jwebb/src/bigjason/elster/lib/elster/streamer.rb
 - /Users/jwebb/src/bigjason/elster/lib/elster/version.rb
 - /Users/jwebb/src/bigjason/elster/lib/elster.rb
@@ -108,6 +109,7 @@ files:
 - /Users/jwebb/src/bigjason/elster/pkg/elster-0.0.2.gem
 - /Users/jwebb/src/bigjason/elster/pkg/elster-0.0.3.gem
 - /Users/jwebb/src/bigjason/elster/pkg/elster-0.0.5.gem
+- /Users/jwebb/src/bigjason/elster/pkg/elster-0.0.6.gem
 - /Users/jwebb/src/bigjason/elster/Rakefile
 - /Users/jwebb/src/bigjason/elster/README.md
 - /Users/jwebb/src/bigjason/elster/test/streamer_test.rb
@@ -125,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1630700077536672737
+      hash: -398928207981350799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1630700077536672737
+      hash: -398928207981350799
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24