ruby-jq 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWVjZTVhZmQ4MzYwZTI4OTU0YWNhMmMxMmI3MjIzMjU1MmE0Y2Y4Nw==
+    OTUzMDNjM2E5MDlmYzBlZWNkZjYwOTJiN2M3MzcyZmZlYzNhZDQxZA==
   data.tar.gz: !binary |-
-    OGMwZjZhODEzYWFjMjhmNmE4NGZiM2YyOTFlZDRkNmM0MDRhZTFhOA==
+    MDUyMzQ0MjBiMjcxZjU0MWRiYWExOTA2ODljN2IwZTY1MTUyZTM2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjZiODYyOTRiYTMzNDZjMWE1OTY4ZGIxMzE3MmMwZjA5M2ZiODAyODhiYzY4
-    YTNlNDMxNWVhYjBlY2ExMjI4MWJlMjhkMDJkMjg1YWQzNjQxNWJjYTY2MmEx
-    ODExNzJhZmI2OWJhY2NmNDI3MjYyYWQxMjhiYjUwMWY5Njg1ZWU=
+    NGVlNTM5MGRkZDg2ODI1ZjljY2JlMTI2OWQwZjE2ODczMmE4NzVhNDViOTA5
+    MDBlMDcxMjA4NWI2MzRlYWUwYmUwZDE2OGQ5MTk5MjgyY2M5NjU2NzlhMWU2
+    YzZhMzdhNWM2NGU3MTAxZTZlMjEyMzIyZTJjNmQxYTlkOTAzNTM=
   data.tar.gz: !binary |-
-    OWRiOTg4OTU5ZmExNzRlYWEwMWQxNTg2YTYxYzNkNDcyYjgwY2M2ZDQ3YzNi
-    NGRiZjA1ZjAxYzczYTY2M2IwN2VkNjg4YmQzNWUwYzQ5NzE0NDJlM2IyNDg3
-    MTdmY2MzMjMzYTY3YzQzOWJmN2Y0ZjZiNTgzOTE4YTEyM2Q5ZTk=
+    ZTRhMWFjZjQxZGFjNzEzZDBmY2FmMTNiYjAzNzQ1YjQwYjMxY2RiZjU1Y2Yz
+    YjI2YTMwMzNlMDcyNjliZmVjYzg2OGQwNDFkZTg2OWRiNWE4NjI2MDAwODcz
+    N2QzZGYzZTYwNjNiOTJhNTAxM2Q3MzMxNTg4NWRhMzdlODM0OWI=

data/ext/jq_core.c

@@ -10,6 +10,7 @@ static VALUE rb_jq_alloc(VALUE klass) {
   struct jq_container *p;
   p = ALLOC(struct jq_container);
   p->jq = NULL;
+  p->parser = NULL;
   p->closed = 1;
   return Data_Wrap_Struct(klass, 0, rb_jq_free, p);
 }
@@ -35,6 +36,7 @@ static VALUE rb_jq_initialize(VALUE self, VALUE program) {
   }
 
   p->jq = jq;
+  p->parser = NULL;
   p->closed = 0;
 
   return Qnil;
@@ -46,6 +48,8 @@ static VALUE rb_jq_close(VALUE self) {
 
   if (!p->closed) {
     jq_teardown(&p->jq);
+    p->jq = NULL;
+    p->parser = NULL;
     p->closed = 1;
   }
 
@@ -65,40 +69,27 @@ static void jq_process(jq_state *jq, jv value, VALUE (*proc)(), int *status) {
   jv_free(result);
 }
 
-static void jq_parse(jq_state *jq, char *buf, int is_partial, VALUE (*proc)()) {
-  struct jv_parser* parser = jv_parser_new();
+static void jq_parse(jq_state *jq, struct jv_parser *parser, VALUE (*proc)(), int *status, VALUE *errmsg) {
   jv value;
-  int status = 0, error = 0;
-  VALUE errmsg;
 
-  jv_parser_set_buf(parser, buf, strlen(buf), is_partial);
-
-  while (jv_is_valid((value = jv_parser_next(parser))) && status == 0) {
-    jq_process(jq, value, proc, &status);
+  while (jv_is_valid((value = jv_parser_next(parser))) && *status == 0) {
+    jq_process(jq, value, proc, status);
   }
 
   if (jv_invalid_has_msg(jv_copy(value))) {
     jv msg = jv_invalid_get_msg(value);
-    error = 1;
-    errmsg = rb_str_new2(jv_string_value(msg));
+    *errmsg = rb_str_new2(jv_string_value(msg));
     jv_free(msg);
   } else {
     jv_free(value);
   }
-
-  jv_parser_free(parser);
-
-  if (status != 0) {
-    rb_jump_tag(status);
-  }
-
-  if (error) {
-    rb_raise(rb_eJQ_Error, "%s", RSTRING_PTR(errmsg));
-  }
 }
 
-static VALUE rb_jq_update(VALUE self, VALUE buf, VALUE is_partial) {
+static VALUE rb_jq_update(VALUE self, VALUE buf, VALUE v_is_partial) {
   struct jq_container *p;
+  int is_partial = v_is_partial ? 1 : 0;
+  int status = 0;
+  VALUE errmsg = Qnil;
 
   if (!rb_block_given_p()) {
     rb_raise(rb_eArgError, "no block given");
@@ -106,7 +97,26 @@ static VALUE rb_jq_update(VALUE self, VALUE buf, VALUE is_partial) {
 
   Data_Get_Struct(self, struct jq_container, p);
   Check_Type(buf, T_STRING);
-  jq_parse(p->jq, RSTRING_PTR(buf), is_partial ? 1 : 0, rb_yield);
+
+  if (!p->parser) {
+    p->parser = jv_parser_new();
+  }
+
+  jv_parser_set_buf(p->parser, RSTRING_PTR(buf), RSTRING_LEN(buf), is_partial);
+  jq_parse(p->jq, p->parser, rb_yield, &status, &errmsg);
+
+  if (!is_partial) {
+    jv_parser_free(p->parser);
+    p->parser = NULL;
+  }
+
+  if (status != 0) {
+    rb_jump_tag(status);
+  }
+
+  if (!NIL_P(errmsg)) {
+    rb_raise(rb_eJQ_Error, "%s", RSTRING_PTR(errmsg));
+  }
 
   return Qnil;
 }

data/ext/jq_core.h

@@ -9,6 +9,7 @@
 
 struct jq_container {
   jq_state *jq;
+  struct jv_parser *parser;
   int closed;
 };
 

data/lib/jq/parser.rb

@@ -1,18 +1,20 @@
 require 'jq_core'
 require 'json'
+require 'tempfile'
+require 'stringio'
 
 class JQ::Parser
   BUFSIZ = 4096
 
   def initialize(src, options = {})
-    @src = src.kind_of?(IO) ? src : src.to_s
+    @src = kind_of_io?(src) ? src : src.to_s
     @options = {
       :parse_json => true,
     }.merge(options)
   end
 
   def search(program, &block)
-    @src.rewind if @src.kind_of?(IO)
+    @src.rewind if kind_of_io?(@src)
     retval = nil
 
     if block
@@ -30,9 +32,9 @@ class JQ::Parser
     end
 
     jq(program) do |jq_core|
-      if @src.kind_of?(IO)
+      if kind_of_io?(@src)
         while buf = @src.read(BUFSIZ)
-          jq_core.update(buf, !src.eof?, &block)
+          jq_core.update(buf, !@src.eof?, &block)
         end
       else
         jq_core.update(@src, false, &block)
@@ -61,4 +63,8 @@ class JQ::Parser
       str
     end
   end
+
+  def kind_of_io?(obj)
+    [IO, Tempfile, StringIO].any? {|c| obj.kind_of?(c) }
+  end
 end

data/lib/jq/version.rb

@@ -1,3 +1,3 @@
 module JQ
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/jq_spec.rb

@@ -92,6 +92,114 @@ describe JQ do
     end
   end
 
+  it 'read from file' do
+    Tempfile.open("ruby-jq.spec.#{$$}") do |src|
+      src.puts(<<-EOS)
+{
+    "glossary": {
+        "title": "example glossary",
+    "GlossDiv": {
+            "title": "S",
+      "GlossList": {
+                "GlossEntry": {
+                    "ID": "SGML",
+          "SortAs": "SGML",
+          "GlossTerm": "Standard Generalized Markup Language",
+          "Acronym": "SGML",
+          "Abbrev": "ISO 8879:1986",
+          "GlossDef": {
+                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
+            "GlossSeeAlso": ["GML", "XML"]
+                    },
+          "GlossSee": "markup"
+                }
+            }
+        }
+    }
+}
+      EOS
+
+      expected = {
+        "glossary"=>
+          {"GlossDiv"=>
+            {"GlossList"=>
+              {"GlossEntry"=>
+                {"GlossSee"=>"markup",
+                 "GlossDef"=>
+                  {"GlossSeeAlso"=>["GML", "XML"],
+                   "para"=>
+                    "A meta-markup language, used to create markup languages such as DocBook."},
+                 "Abbrev"=>"ISO 8879:1986",
+                 "Acronym"=>"SGML",
+                 "GlossTerm"=>"Standard Generalized Markup Language",
+                 "SortAs"=>"SGML",
+                 "ID"=>"SGML"}},
+             "title"=>"S"},
+           "title"=>"example glossary"}}
+
+      expect(JQ(src).search('.')).to eq([expected])
+
+      JQ(src).search('.') do |value|
+        expect(value).to eq(expected)
+      end
+    end
+  end
+
+  it 'read from file (> 4096)' do
+    Tempfile.open("ruby-jq.spec.#{$$}") do |src|
+      src.puts('[' + (1..10).map { (<<-EOS) }.join(',') + ']')
+{
+    "glossary": {
+        "title": "example glossary",
+    "GlossDiv": {
+            "title": "S",
+      "GlossList": {
+                "GlossEntry": {
+                    "ID": "SGML",
+          "SortAs": "SGML",
+          "GlossTerm": "Standard Generalized Markup Language",
+          "Acronym": "SGML",
+          "Abbrev": "ISO 8879:1986",
+          "GlossDef": {
+                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
+            "GlossSeeAlso": ["GML", "XML"]
+                    },
+          "GlossSee": "markup"
+                }
+            }
+        }
+    }
+}
+      EOS
+
+      expected = (1..10).map do
+        {
+          "glossary"=>
+            {"GlossDiv"=>
+              {"GlossList"=>
+                {"GlossEntry"=>
+                  {"GlossSee"=>"markup",
+                   "GlossDef"=>
+                    {"GlossSeeAlso"=>["GML", "XML"],
+                     "para"=>
+                      "A meta-markup language, used to create markup languages such as DocBook."},
+                   "Abbrev"=>"ISO 8879:1986",
+                   "Acronym"=>"SGML",
+                   "GlossTerm"=>"Standard Generalized Markup Language",
+                   "SortAs"=>"SGML",
+                   "ID"=>"SGML"}},
+               "title"=>"S"},
+             "title"=>"example glossary"}}
+      end
+
+      expect(JQ(src).search('.')).to eq([expected])
+
+      JQ(src).search('.') do |value|
+        expect(value).to eq(expected)
+      end
+    end
+  end
+
   it 'parse_json => false' do
     src = <<-EOS
 {
@@ -150,4 +258,12 @@ describe JQ do
       JQ('{}').search('...')
     }.to raise_error(JQ::Error)
   end
+
+  it 'runtime error' do
+    expect {
+      JQ('{}').search('.') do |value|
+        raise 'runtime error'
+      end
+    }.to raise_error(RuntimeError)
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 $: << File.dirname(__FILE__) + '/../lib'
+require 'tempfile'
 require 'jq'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - winebarrel