wankel 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820fc80e5cf50976025731b5151b1ba941a46758
-  data.tar.gz: 8db0022010b5da08d31b52df372918b7de07c73d
+  metadata.gz: 794731e10604a40d87557559c974422920b468a0
+  data.tar.gz: b328c5d3230268990c5d34004c6e8ae885e2d437
 SHA512:
-  metadata.gz: 2f1846a7234dade3c2afb24a19be695c270ae8f8d61df172527f7afba27d6a77be2df2e9783cb2d7b12f0db779507e86e6ffc0be36f68ac564312d5fc0e23dac
-  data.tar.gz: c38cad9f0d72a5786542ae6983de3c6957e5f6e51b521773e51283bea5c481059e30c1453b201e02148f8f8f646a6e75f976bf0394d893dd8971f4bd758c0f8d
+  metadata.gz: 468bfdbee4e692305cceb4647c298d218cc43f4ec3278890254da41fc497657b1ac5300d92bab4f215a0d723bf65f9141778ffba1365a27da2957ed781739650
+  data.tar.gz: 857c6ad778dc3d6a5917c03ccbac6c35531bdfeba8fefde80af1f0f30c0bfaf28f1954774932c46afc187c9f28ca2bca08e2110ae272def85772502560c48a64

data/.gitignore

@@ -9,3 +9,4 @@ coverage
 *.log
 Makefile
 tmp
+.DS_Store

data/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in sunstone.gemspec
+gemspec

data/README.md

@@ -1,5 +1,7 @@
 <a href="http://wanklerb.com">![Wankel](/logo.png)</a>
 
+[![Circle CI](https://circleci.com/gh/malomalo/wankel/tree/master.svg?style=svg)](https://circleci.com/gh/malomalo/wankel/tree/master)
+
 **Wankel** is a Ruby gem that provides C bindings to the
 [YAJL 2](http://lloyd.github.io/yajl/) C Library.
 
@@ -78,11 +80,11 @@ encoder = Wankel::SaxEncoder.new(output)
 encoder.map_open
 encoder.string("key")
 encoder.number(123)
+encoder.string("type")
+encoder.value("value-determined-by-method")
 encoder.map_close
 encoder.complete
-output.rewind
-output.read
-# => '{"key":123}'
+output.string # => '{"key":123,"type":"value-determined-by-method"}'
 ```
 
 Parsing Options

data/Rakefile

@@ -1,3 +1,7 @@
+require 'bundler/setup'
+require "bundler/gem_tasks"
+Bundler.require(:development)
+
 require "rake/extensiontask"
 require "rake/testtask"
 require "rubygems/package_task"
@@ -61,5 +65,3 @@ task :c_coverage do
     SimpleCov::ResultMerger.store_result(data)
   end
 end
-
-# https://github.com/defunkt/sdoc-helpers

data/lib/wankel.rb

@@ -16,4 +16,29 @@ class Wankel
       :validate_utf8 => false,
       :escape_solidus => false
     }
+end
+
+class Wankel::SaxEncoder
+  
+  def value(val)
+    case val
+    when NilClass
+      null
+    when TrueClass, FalseClass
+      boolean(val)
+    when Numeric
+      number(val)
+    when String
+      string(val)
+    when Array
+      array_open
+      val.each {|v| value(v) }
+      array_close
+    when Hash
+      map_open
+      val.each {|k, v| string(k.to_s); value(v) }
+      map_close
+    end
+  end
+  
 end

data/test/encoding/sax_encoder_test.rb

@@ -1,7 +1,17 @@
+require 'test_helper'
 require 'stringio'
 
 class Wankel::SaxEncoderTest < Minitest::Test
   
+  def setup
+    @output = StringIO.new
+    @encoder = Wankel::SaxEncoder.new(@output)
+  end
+  
+  def assert_output(value)
+    assert_equal(value, @output.string)
+  end
+  
   test 'default inherited from Wankel' do
       encoder = Wankel::SaxEncoder.new(StringIO.new)
       assert_equal(Wankel::DEFAULTS, encoder.instance_variable_get("@options"))
@@ -13,77 +23,127 @@ class Wankel::SaxEncoderTest < Minitest::Test
   end
 
   test "number" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.number(1234)
-    encoder.complete
-    assert_equal("1234", output.string)
+    @encoder.number(1234)
+    @encoder.complete
+    
+    assert_output("1234")
   end
   
   test "string" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.string("hello world")
-    encoder.complete
-    assert_equal('"hello world"', output.string)
+    @encoder.string("hello world")
+    @encoder.complete
+    
+    assert_output('"hello world"')
   end
     
   test "null" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.null
-    encoder.complete
-    assert_equal("null", output.string)
+    @encoder.null
+    @encoder.complete
+
+    assert_output("null")
   end
   
   test "boolean(false)" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.boolean(false)
-    encoder.complete
-    assert_equal("false", output.string)
+    @encoder.boolean(false)
+    @encoder.complete
+    
+    assert_output("false")
   end
   
   test "boolean(true)" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.boolean(true)
-    encoder.complete
-    assert_equal("true", output.string)
+    @encoder.boolean(true)
+    @encoder.complete
+
+    assert_output("true")
   end
       
   test "map_open" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.map_open
-    encoder.complete
-    assert_equal("{", output.string)
+    @encoder.map_open
+    @encoder.complete
+    
+    assert_output("{")
   end
   
   test "map_close" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.map_open
-    encoder.map_close
-    encoder.complete
-    assert_equal("{}", output.string)
+    @encoder.map_open
+    @encoder.map_close
+    @encoder.complete
+    
+    assert_output("{}")
   end
   
   test "array_open" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.array_open
-    encoder.complete
-    assert_equal("[", output.string)
+    @encoder.array_open
+    @encoder.complete
+    
+    assert_output("[")
   end
   
   test "array_close" do
-    output = StringIO.new
-    encoder = Wankel::SaxEncoder.new(output)
-    encoder.array_open
-    encoder.array_close
-    encoder.complete
-    assert_equal("[]", output.string)
+    @encoder.array_open
+    @encoder.array_close
+    @encoder.complete
+    
+    assert_output("[]")
+  end
+
+  test "value(NUMBER)" do
+    @encoder.value(123)
+    @encoder.complete
+    
+    assert_output("123")
+  end
+  
+  test "value(STRING)" do
+    @encoder.value("hello")
+    @encoder.complete
+    
+    assert_output("\"hello\"")
   end
+  
+  test "value(NIL)" do
+    @encoder.value(nil)
+    @encoder.complete
+    
+    assert_output("null")
+  end
+  
+  test "value(BOOLEAN)" do
+    @encoder.value(true)
+    @encoder.complete
+    
+    assert_output("true")
+    
+    @output.rewind
+    @encoder.value(false)
+    @encoder.complete
+    
+    assert_output("true")
+  end
+  
+  test "value(ARRAY)" do
+    @encoder.value([])
+    @encoder.complete
+    
+    assert_output("[]")
+  end
+  
+  test "value(ARRAY_WITH_VALUES)" do
+    @encoder.value([1, "hello", nil, false, true, 45.21, {:key => 'val'}])
+    @encoder.complete
+    
+    assert_output("[1,\"hello\",null,false,true,45.21,{\"key\":\"val\"}]")
+  end
+  
+  test "value(HASH)" do
+    @encoder.value(:one => 'one', :two => 2, :three => true, :four => nil, 5 => [45.21])
+    @encoder.complete
+    
+    assert_output('{"one":"one","two":2,"three":true,"four":null,"5":[45.21]}')
+  end
+  
+end
+__END__
+test "map_open" do
+test "map_close" do
 
-end

data/wankel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wankel'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   s.licenses    = ['MIT']
   s.authors     = ['Jon Bracy']
   s.email       = ['jonbracy@gmail.com']
@@ -19,11 +19,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest',            '~> 5.3'
   s.add_development_dependency 'minitest-reporters',  '~> 1.0'
   s.add_development_dependency 'mocha',               '~> 1.1'
-end
-
-# spec.requirements << 'libmagick, v6.0'
-# spec.extra_rdoc_files = ['README', 'doc/user-guide.txt']
-# s.metadata = { "issue_tracker" => "https://example/issues" }
-# spec.rdoc_options << '--title' << 'Rake -- Ruby Make' <<
-#   '--main' << 'README' <<
-#   '--line-numbers'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wankel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -97,7 +98,6 @@ files:
 - ext/wankel/yajl_helpers.c
 - ext/wankel/yajl_helpers.h
 - lib/wankel.rb
-- lib/wankel/ex_sax_parser.rb
 - logo.png
 - test/encoding/encoding_test.rb
 - test/encoding/sax_encoder_test.rb
@@ -259,4 +259,3 @@ test_files:
 - test/performance.rb
 - test/test_helper.rb
 - test/wankel_test.rb
-has_rdoc: 

data/lib/wankel/ex_sax_parser.rb

@@ -1,75 +0,0 @@
-class Wankel::SaxParser
-
-  def on_map_start
-    puts 'start map'
-  end
-
-  def on_map_end
-    puts 'end map'
-  end
-
-  def on_map_key(key)
-    puts 'key'
-  end
-  
-  def on_null
-    puts "null"
-  end
-
-  def on_boolean(value)
-    puts value
-  end
-
-  def on_integer(i)
-    puts "integer"
-  end
-
-  def on_double(d)
-    puts "double"
-  end
-
-  def on_string(s)
-    puts "string"
-  end
-
-  def on_array_start
-    puts "start array"
-  end
-
-  def on_array_end
-    puts "end array"
-  end
-
-end
-
-
-class Wankel::SaxEncoder
-
-  def number
-  end
-  
-  def string
-  end
-  
-  def null
-  end
-  
-  def bool
-  end
-  
-  def map_open
-  end
-  
-  def map_close
-  end
-  
-  def array_open
-  end
-  
-  def array_close
-  end
-  
-  def complete
-  end
-
-end