elster 0.0.2 → 0.0.3

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

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elster (0.0.2)
+    elster (0.0.3)
       multi_json
 
 GEM
@@ -16,11 +16,18 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry (0.9.10-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+      spoon (~> 0.0)
     slop (3.3.2)
+    spoon (0.0.1)
     turn (0.8.3)
       ansi
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

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

@@ -18,17 +18,19 @@ Or install it yourself as:
 
 ## Usage
 
-    output = StringIO.new
-    json = Elster::Streamer.new(output)
-    json.key(:name, "George")
-    json.key(:kids) do
-      json.add("Job")
-      json.add("Buster")
-    end
-    json.close
-
-    puts output.string
-    # {"name":"George","kids":["Job","Buster"]}
+``` ruby
+output = StringIO.new
+json = Elster::Streamer.new(output)
+json.key(:name, "George")
+json.key(:kids) do
+  json.add("Job")
+  json.add("Buster")
+end
+json.close
+
+puts output.string
+# {"name":"George","kids":["Job","Buster"]}
+```
 
 ## Contributing
 

data/Users/jwebb/src/bigjason/elster/Rakefile

@@ -1,2 +1,44 @@
 #!/usr/bin/env rake
+require "rubygems"
+require "bundler/setup"
+Bundler.require
+
 require "bundler/gem_tasks"
+require "benchmark"
+
+desc "Run all tests"
+task :test do
+  require 'turn'
+  require "pry"
+  require "test/unit"
+  require_relative "./test/streamer_test"
+end
+
+desc "Run a simple benchmark"
+task :benchmark do
+  require "stringio"
+  ITERATIONS = 100000
+
+  Benchmark.bm do |x|
+    x.report("Elster  ") do
+      result = Elster::Streamer.new StringIO.new
+      ITERATIONS.times do |i|
+        result.key("name_#{i}", "Jason #{i}")
+        result.key("age_#{i}", i)
+        result.key("nil_#{i}", nil)
+      end
+      result.close
+    end
+
+    x.report("Hash    ") do
+      result = {}
+      ITERATIONS.times do |i|
+        result["name_#{i}"] = "Jason #{i}"
+        result["age_#{i}"] = i
+        result["nil_#{i}"] = nil
+      end
+      MultiJson.dump(result)
+    end
+  end
+
+end

data/Users/jwebb/src/bigjason/elster/elster.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = Elster::VERSION
 
   gem.add_dependency "multi_json"
+
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "turn"
   gem.add_development_dependency "pry"

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

@@ -1,8 +1,8 @@
-require "stringio"
 require "multi_json"
 
 module Elster
   class Streamer
+    attr_reader :output
     # Create a new instance of Streamer with the specified output stream. The
     # `output` must respond to `write`.
     def initialize(output)
@@ -106,11 +106,36 @@ module Elster
     end
 
     def encode_value(value)
+      case value
+      when Numeric
+        encode_number(value)
+      when String
+        encode_string(value)
+      when nil
+        encode_nil(value)
+      else
+        MultiJson.dump(value)
+      end
+    end
+
+    def encode_generic(value)
       MultiJson.dump(value)
     end
 
     def encode_string(value)
-      encode_value(value.to_s)
+      if /\A[\w\d \t]+\Z/ =~ value
+        "\"#{value}\""
+      else
+        encode_generic(value.to_s)
+      end
+    end
+
+    def encode_number(value)
+      value.to_s
+    end
+
+    def encode_nil(value)
+      "null"
     end
 
     def nest_in

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

@@ -1,3 +1,3 @@
 module Elster
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

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

@@ -1,10 +1,5 @@
-require "test/unit"
-require 'turn'
 require "stringio"
 require "json"
-require "pry"
-
-require "elster"
 
 class StreamerTest < MiniTest::Unit::TestCase
   attr_reader :output, :json
@@ -102,7 +97,7 @@ class StreamerTest < MiniTest::Unit::TestCase
     assert_equal "Bobertson", parsed[0]["child"]["name"]
   end
 
-  def tested_array_nested_object
+  def test_array_nested_object
     json.add do
       json.key(:name, "Bobert")
     end
@@ -114,4 +109,25 @@ class StreamerTest < MiniTest::Unit::TestCase
     assert_equal "Bobert", parsed[0]["name"]
     assert_equal 44, parsed[1]["age"]
   end
+
+  def test_ruby_hash
+    json.key("name", {:first => "Bobert"})
+    json.close
+
+    assert_equal "Bobert", parsed["name"]["first"]
+  end
+
+  def test_ruby_array
+    json.key("an_array", [1, 2])
+    json.close
+
+    assert_equal [1, 2], parsed["an_array"]
+  end
+
+  def test_string_with_cr
+    json.key("description", "I am \nmulti\nlined")
+    json.close
+
+    assert_equal "I am \nmulti\nlined", parsed["description"]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elster
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70299023008800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299023008800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70299022991060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299022991060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70299022965300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299022965300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70299022961820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299022961820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - bigjasonwebb@gmail.com
@@ -85,6 +105,7 @@ files:
 - /Users/jwebb/src/bigjason/elster/lib/elster/version.rb
 - /Users/jwebb/src/bigjason/elster/lib/elster.rb
 - /Users/jwebb/src/bigjason/elster/LICENSE
+- /Users/jwebb/src/bigjason/elster/pkg/elster-0.0.2.gem
 - /Users/jwebb/src/bigjason/elster/Rakefile
 - /Users/jwebb/src/bigjason/elster/README.md
 - /Users/jwebb/src/bigjason/elster/test/streamer_test.rb
@@ -100,17 +121,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2730646358943498707
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2730646358943498707
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple streaming JSON encoder.
 test_files: []
-has_rdoc: