ruby-jq 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 881c22001fafffd7b85c7048843b48f9c9e8c709
-  data.tar.gz: ba8c1a7ae07eae88cdc446967c677b36e6ed7cdf
+  metadata.gz: 5cec2eb595c9df2296574f2c0f8e451517feead1
+  data.tar.gz: e2537b1e04395fb0eee5f53bdcde7683d0ac9fe9
 SHA512:
-  metadata.gz: a667ac22e8c98b17b11e3fb86b2407494b7cebb56ed922c3ff5c11e67bc33e54de9d476dd5c42419e52bb12badb78b8b24c322c8e08bfc9b7b6de5228cce2d34
-  data.tar.gz: 0ac8b7e8dbbc9ad7657f0c6557e922115f63f3535642730f35b18783e12e7a5593395c0af986e1ab9ae30d8a4c5bbb35a8132c2df20c52f77c19b66dd2a88e46
+  metadata.gz: c0cf18747748b7d27d73bfa93059d6ed492954971a6fb5d8b5b5ee5baccf36c0f427d165e1941766b858b180941a1df3e9fc270433ccdc5b2ab3dd892a19473c
+  data.tar.gz: a102046963d2664782213e77ddb961e9def674c1af04c6458cc60eacde79eebcfa077b3f7bee89c057366c08218b97272091b7fbb2942dd37422d615c0e19b9e

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 rvm:
-- 2.0.0
-- 2.1.5
-- 2.2.1
+- 2.2.9
+- 2.3.6
+- 2.4.3
+- 2.5.0
+before_install:
+- gem update --system
+- gem install bundler
 before_script:
 - wget http://ftp.gnu.org/gnu/bison/bison-3.0.2.tar.gz
 - tar xf bison-3.0.2.tar.gz
@@ -16,6 +20,7 @@ before_script:
 - cd jq
 - autoreconf -i
 - ./configure --enable-shared
+- rm $PWD/docs/Gemfile.lock
 - BUNDLE_GEMFILE="$PWD/docs/Gemfile" bundle install
 - BUNDLE_GEMFILE="$PWD/docs/Gemfile" bundle exec make
 - sudo make install

data/ext/jq_core.c

@@ -56,7 +56,7 @@ static VALUE rb_jq_close(VALUE self) {
   return Qnil;
 }
 
-static void jq_process(jq_state *jq, jv value, VALUE (*proc)(), int *status) {
+static void jq_process(jq_state *jq, jv value, VALUE (*proc)(), int *status, VALUE *errmsg) {
   jq_start(jq, value, 0);
   jv result;
 
@@ -66,14 +66,20 @@ static void jq_process(jq_state *jq, jv value, VALUE (*proc)(), int *status) {
     rb_protect(proc, rb_str_new2(str), status);
   }
 
-  jv_free(result);
+  if (jv_invalid_has_msg(jv_copy(result))) {
+    jv msg = jv_invalid_get_msg(result);
+    *errmsg = rb_str_new2(jv_string_value(msg));
+    jv_free(msg);
+  } else {
+    jv_free(result);
+  }
 }
 
 static void jq_parse(jq_state *jq, struct jv_parser *parser, VALUE (*proc)(), int *status, VALUE *errmsg) {
   jv value;
 
   while (jv_is_valid((value = jv_parser_next(parser))) && *status == 0) {
-    jq_process(jq, value, proc, status);
+    jq_process(jq, value, proc, status, errmsg);
   }
 
   if (jv_invalid_has_msg(jv_copy(value))) {

data/lib/jq/version.rb

@@ -1,3 +1,3 @@
 module JQ
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/jq_spec.rb

@@ -229,11 +229,11 @@ describe JQ do
 
     expect(searched.length).to eq(1)
     expect(searched[0]).to be_kind_of(String)
-    expect(JSON.parse(searched[0])).to eq(JSON.parse(expected))
+    expect(MultiJson.load(searched[0])).to eq(MultiJson.load(expected))
 
     JQ(src, :parse_json => false).search('.') do |value|
       expect(value).to be_kind_of(String)
-      expect(JSON.parse(value)).to eq(JSON.parse(expected))
+      expect(MultiJson.load(value)).to eq(MultiJson.load(expected))
     end
   end
 
@@ -269,6 +269,14 @@ describe JQ do
     }.to raise_error(RuntimeError)
   end
 
+  it 'runtime halt in jq raises error' do
+    expect {
+      JQ('{}').search('.data | keys') do |value|
+        value
+      end
+    }.to raise_error(JQ::Error).with_message('null (null) has no keys')
+  end
+
   it 'query for hash' do
     src = {'FOO' => 100, 'BAR' => [200, 200]}
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jq
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby bindings for jq
@@ -87,9 +87,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -114,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for jq