wankel 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794731e10604a40d87557559c974422920b468a0
-  data.tar.gz: b328c5d3230268990c5d34004c6e8ae885e2d437
+  metadata.gz: d39a95397c69844f5192789cd5df648a8e9a8b47
+  data.tar.gz: 62d409b5d77f50cb3747ea8bf2cc18e38fa271a0
 SHA512:
-  metadata.gz: 468bfdbee4e692305cceb4647c298d218cc43f4ec3278890254da41fc497657b1ac5300d92bab4f215a0d723bf65f9141778ffba1365a27da2957ed781739650
-  data.tar.gz: 857c6ad778dc3d6a5917c03ccbac6c35531bdfeba8fefde80af1f0f30c0bfaf28f1954774932c46afc187c9f28ca2bca08e2110ae272def85772502560c48a64
+  metadata.gz: efd5c840d75fef714ed9f3483107f3ab18938630f21f025567586496afb3f92067842e2694c79b59ff3b42d2425177a3ab1cf9c6482ddc19c635819886622976
+  data.tar.gz: be6ee04733bc4f3a02e1402fba54ec017559a258564b4da7768c77b5925b40cb800d17f5f33739dd74a62081ba84ae3446c171089df3bd1973c3f6f019e41a80

data/.tm_properties

@@ -0,0 +1 @@
+exclude = '{$exclude,tmp,.tm_properties}'

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.2
+  - 2.2.0-rc1
+cache: bundler
+install:
+  - wget 'https://github.com/lloyd/yajl/archive/2.1.0.tar.gz'
+  - tar -xvf '2.1.0.tar.gz'
+  - cd 'yajl-2.1.0' && ./configure && make && sudo make install
+  - sudo ldconfig
+  - bundle install
+  - bundle exec rake compile
+script: bundle exec rake test

data/CHANGELOG.md

@@ -2,8 +2,14 @@
 
 New Features:
 
+- Added `Wankel::SaxEncoder#value(VALUE)`
+- Abilitly to change the output stream of a `Wankel::SaxEncoder` during generation
+  via `Wankel::SaxEncoder#output=`
+
 Major Changes:
 
+- `Wankel::SaxEncoder#complete` changed to `Wankel::SaxEncoder#flush`
+
 Minor Changes:
 
 Bugfixes:

data/README.md

@@ -83,7 +83,7 @@ encoder.number(123)
 encoder.string("type")
 encoder.value("value-determined-by-method")
 encoder.map_close
-encoder.complete
+encoder.flush
 output.string # => '{"key":123,"type":"value-determined-by-method"}'
 ```
 

data/ext/wankel/wankel_sax_encoder.c

@@ -15,8 +15,8 @@ static VALUE wankelSaxEncoder_map_open(VALUE self);
 static VALUE wankelSaxEncoder_map_close(VALUE self);
 static VALUE wankelSaxEncoder_array_open(VALUE self);
 static VALUE wankelSaxEncoder_array_close(VALUE self);
-static VALUE wankelSaxEncoder_complete(VALUE self);
-static void wankelSaxEncoder_flush(wankel_encoder * p);
+static VALUE wankelSaxEncoder_flush(VALUE self);
+static void wankelSaxEncoder_write_buffer(wankel_encoder * p);
 static VALUE wankel_sax_encoder_alloc(VALUE klass);
 static void wankel_sax_encoder_free(void * handle);
 static void wankel_sax_encoder_mark(void * handle);
@@ -80,6 +80,21 @@ static VALUE wankelSaxEncoder_initialize(int argc, VALUE * argv, VALUE self) {
     return self;
 }
 
+static VALUE wankelSaxEncoder_change_io(VALUE self, VALUE io) {
+    wankel_encoder * p;
+    
+    if (!rb_respond_to(io, intern_io_write)) {
+        rb_raise(e_encodeError, "output must be a an IO");
+    }
+
+    Data_Get_Struct(self, wankel_encoder, p);
+        
+    wankelSaxEncoder_flush(self);
+    p->output = io;
+    
+    return Qnil;
+}
+
 static VALUE wankelSaxEncoder_number(VALUE self, VALUE number) {
     size_t len;
     const char * cptr;
@@ -98,7 +113,7 @@ static VALUE wankelSaxEncoder_number(VALUE self, VALUE number) {
     status = yajl_gen_number(p->g, cptr, len);
 	yajl_helper_check_gen_status(status);
 
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -118,7 +133,7 @@ static VALUE wankelSaxEncoder_string(VALUE self, VALUE string) {
     status = yajl_gen_string(p->g, (const unsigned char *)cptr, len);
 	yajl_helper_check_gen_status(status);
 
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -131,7 +146,7 @@ static VALUE wankelSaxEncoder_null(VALUE self) {
     status = yajl_gen_null(p->g);
 	yajl_helper_check_gen_status(status);
 	
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -144,7 +159,7 @@ static VALUE wankelSaxEncoder_boolean(VALUE self, VALUE b) {
 	status = yajl_gen_bool(p->g, RTEST(b));
 	yajl_helper_check_gen_status(status);
 	
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -157,7 +172,7 @@ static VALUE wankelSaxEncoder_map_open(VALUE self) {
     status = yajl_gen_map_open(p->g);
 	yajl_helper_check_gen_status(status);
 	
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -170,7 +185,7 @@ static VALUE wankelSaxEncoder_map_close(VALUE self) {
     status = yajl_gen_map_close(p->g);
 	yajl_helper_check_gen_status(status);
 	
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -183,7 +198,7 @@ static VALUE wankelSaxEncoder_array_open(VALUE self) {
     status = yajl_gen_array_open(p->g);
 	yajl_helper_check_gen_status(status);
 	
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
@@ -196,12 +211,12 @@ static VALUE wankelSaxEncoder_array_close(VALUE self) {
     status = yajl_gen_array_close(p->g);
 	yajl_helper_check_gen_status(status);
 	
-	wankelSaxEncoder_flush(p);
+	wankelSaxEncoder_write_buffer(p);
 	
 	return Qnil;
 }
 
-static VALUE wankelSaxEncoder_complete(VALUE self) {
+static VALUE wankelSaxEncoder_flush(VALUE self) {
     size_t len;
 	VALUE rbBuffer;
 	wankel_encoder * p;
@@ -220,7 +235,7 @@ static VALUE wankelSaxEncoder_complete(VALUE self) {
 	return Qnil;
 }
 
-void wankelSaxEncoder_flush(wankel_encoder * p) {
+void wankelSaxEncoder_write_buffer(wankel_encoder * p) {
 	VALUE rbBuffer;
     yajl_gen_status status;
     const unsigned char * buffer;
@@ -252,7 +267,8 @@ void Init_wankel_sax_encoder() {
     rb_define_method(c_wankelSaxEncoder, "map_close", wankelSaxEncoder_map_close, 0);
     rb_define_method(c_wankelSaxEncoder, "array_open", wankelSaxEncoder_array_open, 0);
     rb_define_method(c_wankelSaxEncoder, "array_close", wankelSaxEncoder_array_close, 0);
-    rb_define_method(c_wankelSaxEncoder, "complete", wankelSaxEncoder_complete, 0);
+    rb_define_method(c_wankelSaxEncoder, "flush", wankelSaxEncoder_flush, 0);
+    rb_define_method(c_wankelSaxEncoder, "output=", wankelSaxEncoder_change_io, 1);
 
     
 	intern_to_s = rb_intern("to_s");

data/test/encoding/sax_encoder_test.rb

@@ -24,42 +24,42 @@ class Wankel::SaxEncoderTest < Minitest::Test
 
   test "number" do
     @encoder.number(1234)
-    @encoder.complete
+    @encoder.flush
     
     assert_output("1234")
   end
   
   test "string" do
     @encoder.string("hello world")
-    @encoder.complete
+    @encoder.flush
     
     assert_output('"hello world"')
   end
     
   test "null" do
     @encoder.null
-    @encoder.complete
+    @encoder.flush
 
     assert_output("null")
   end
   
   test "boolean(false)" do
     @encoder.boolean(false)
-    @encoder.complete
+    @encoder.flush
     
     assert_output("false")
   end
   
   test "boolean(true)" do
     @encoder.boolean(true)
-    @encoder.complete
+    @encoder.flush
 
     assert_output("true")
   end
       
   test "map_open" do
     @encoder.map_open
-    @encoder.complete
+    @encoder.flush
     
     assert_output("{")
   end
@@ -67,14 +67,14 @@ class Wankel::SaxEncoderTest < Minitest::Test
   test "map_close" do
     @encoder.map_open
     @encoder.map_close
-    @encoder.complete
+    @encoder.flush
     
     assert_output("{}")
   end
   
   test "array_open" do
     @encoder.array_open
-    @encoder.complete
+    @encoder.flush
     
     assert_output("[")
   end
@@ -82,66 +82,100 @@ class Wankel::SaxEncoderTest < Minitest::Test
   test "array_close" do
     @encoder.array_open
     @encoder.array_close
-    @encoder.complete
+    @encoder.flush
     
     assert_output("[]")
   end
 
   test "value(NUMBER)" do
     @encoder.value(123)
-    @encoder.complete
+    @encoder.flush
     
     assert_output("123")
   end
   
   test "value(STRING)" do
     @encoder.value("hello")
-    @encoder.complete
+    @encoder.flush
     
     assert_output("\"hello\"")
   end
   
   test "value(NIL)" do
     @encoder.value(nil)
-    @encoder.complete
+    @encoder.flush
     
     assert_output("null")
   end
   
   test "value(BOOLEAN)" do
     @encoder.value(true)
-    @encoder.complete
+    @encoder.flush
     
     assert_output("true")
     
     @output.rewind
     @encoder.value(false)
-    @encoder.complete
+    @encoder.flush
     
     assert_output("true")
   end
   
   test "value(ARRAY)" do
     @encoder.value([])
-    @encoder.complete
+    @encoder.flush
     
     assert_output("[]")
   end
   
   test "value(ARRAY_WITH_VALUES)" do
     @encoder.value([1, "hello", nil, false, true, 45.21, {:key => 'val'}])
-    @encoder.complete
+    @encoder.flush
     
     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
+    @encoder.flush
     
     assert_output('{"one":"one","two":2,"three":true,"four":null,"5":[45.21]}')
   end
   
+  test 'flush' do
+    output = StringIO.new
+    
+    # Set large write_buffer_size to test flush
+    encoder = Wankel::SaxEncoder.new(output, :write_buffer_size => 1_000_000)
+    encoder.value({key: "value"})
+    
+    assert_equal("", output.string)
+    encoder.flush
+    assert_equal('{"key":"value"}', output.string)
+  end
+  
+  test "output=, changing the output io during generation" do
+    output1 = StringIO.new
+    output2 = StringIO.new
+    
+    # Set large write_buffer_size to test flush
+    encoder = Wankel::SaxEncoder.new(output1, :write_buffer_size => 1_000_000)
+    encoder.map_open
+    encoder.string("key")
+    encoder.string("value")
+    
+    assert_equal("", output1.string)
+    encoder.output = output2
+    assert_equal('{"key":"value"', output1.string)
+    
+    encoder.string("other-key")
+    encoder.string("other-value")
+    encoder.map_close
+    assert_equal("", output2.string)
+    encoder.flush
+    assert_equal(',"other-key":"other-value"}', output2.string)
+  end
+  
 end
 __END__
 test "map_open" do

data/wankel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'wankel'
-  s.version     = '0.3.1'
+  s.version     = '0.4.0'
   s.licenses    = ['MIT']
   s.authors     = ['Jon Bracy']
   s.email       = ['jonbracy@gmail.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wankel
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -75,6 +75,8 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".tm_properties"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE