ruby-jq 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c764b0f3f3cd5367eea7ecff568fe0ec2d377089afa98f958ba593b2501f9f
-  data.tar.gz: 1acddbfaac0eff780f1062f35f4c5e63c5d2802fc67a0a3dfb60033cc236e79d
+  metadata.gz: 05ca27e78db064b6859a2708c228ca789731dbdd8f1c90fd1975f5bfdff3c2ab
+  data.tar.gz: 2f35f8b1f0d98b62c895f6033e6ae8756d8e54e39dd9bc092e4ae7f0848d8c80
 SHA512:
-  metadata.gz: 899bbe330b88c9bcfb872c8192b83fb482f5d27f5fb3dd67a7a35971f96a44ed95a9e1c405836f72bc5334963834a25c5ec7221259fcb659d5db85eb1db4448b
-  data.tar.gz: da28113ca9cf1414250b9137a1e3904b7bf5943bba55ae689b0efec4527cee60ce96eee575bf211acaf7067f23cac2aee478359ada210941451a69b870f09c42
+  metadata.gz: f5c138883fec3bd9c3b76b974b54f38c1e111c0f9b875b625d16bd171c90812f02caff1ddf5b155b649086fae1c4eac20dd895713434e9d502f4ac74158df32d
+  data.tar.gz: 7e757bd1b61761aa12ca923a342c39cf74e824e4abd872ee463d7589a5bd16e95c7e127590d68d7d9fb29ad16c66bd73365de64e718e8f0205745b2565acbd9b

data/.rubocop.yml

@@ -0,0 +1,14 @@
+AllCops:
+  Exclude:
+    - 'tmp/**/*'
+  TargetRubyVersion: 2.3
+Metrics/LineLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false

data/.travis.yml

@@ -12,3 +12,6 @@ addons:
   apt:
     packages:
       - libonig-dev
+cache:
+  directories:
+    - /home/travis/.rvm/

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ruby-jq.gemspec

data/README.md

@@ -59,7 +59,10 @@ jq.search('.[]') do |value|
   # => [1, "2", 3]
 end
 
-jq = JQ(src, :parse_json => false)
+p jq.search('.[]')
+# => ["FOO", {"BAR"=>[100, 200]}, 1.23, [1, "2", 3]]
+
+jq = JQ(src, parse_json: false)
 
 jq.search('.[1].BAR') do |value|
   p value

data/Rakefile

@@ -1,10 +1,18 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rake/extensiontask'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new('spec')
+
 Rake::ExtensionTask.new('jq_core') do |ext|
   ext.ext_dir = 'ext'
 end
 
-task :default => [:compile, :spec]
+RuboCop::RakeTask.new do |task|
+  task.options = %w[-c .rubocop.yml]
+end
+
+task default: %i[compile rubocop spec]

data/ext/extconf.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'mkmf'
 
 def using_system_libraries?
-  arg_config('--use-system-libraries', !!ENV['RUBYJQ_USE_SYSTEM_LIBRARIES'])
+  arg_config('--use-system-libraries', ENV.key?('RUBYJQ_USE_SYSTEM_LIBRARIES'))
 end
 
 unless using_system_libraries?
@@ -10,24 +12,24 @@ unless using_system_libraries?
   require 'rubygems'
   require 'mini_portile2'
 
-  recipe = MiniPortile.new("jq", "1.6")
-  recipe.files = ["https://github.com/stedolan/jq/archive/jq-1.6.tar.gz"]
+  recipe = MiniPortile.new('jq', '1.6')
+  recipe.files = ['https://github.com/stedolan/jq/archive/jq-1.6.tar.gz']
   recipe.configure_options = [
-    "--enable-shared",
-    "--disable-maintainer-mode"
+    '--enable-shared',
+    '--disable-maintainer-mode'
   ]
   class << recipe
     def configure
-      execute("autoreconf", "autoreconf -i")
+      execute('autoreconf', 'autoreconf -i')
       super
     end
   end
   recipe.cook
   recipe.activate
-  $LIBPATH = ["#{recipe.path}/lib"] | $LIBPATH
-  $CPPFLAGS << " -I#{recipe.path}/include"
+  $LIBPATH = ["#{recipe.path}/lib"] | $LIBPATH # rubocop:disable Style/GlobalVars
+  $CPPFLAGS << " -I#{recipe.path}/include" # rubocop:disable Style/GlobalVars
 end
 
-abort "libjq not found" unless have_library('jq')
+abort 'libjq not found' unless have_library('jq')
 
 create_makefile('jq_core')

data/ext/jq_core.c

@@ -2,6 +2,24 @@
 
 static VALUE rb_eJQ_Error;
 
+static void jq_err_cb(void *data, jv msg) {
+  VALUE errmsg;
+  struct jq_container *p = (struct jq_container *) data;
+  msg = jq_format_error(msg);
+
+  errmsg = rb_str_new2(jv_string_value(msg));
+
+  if (NIL_P(p->errmsg)) {
+    p->errmsg = errmsg;
+  } else {
+    rb_str_concat(errmsg, rb_str_new2("\n"));
+    rb_str_concat(errmsg, p->errmsg);
+    p->errmsg = errmsg;
+  }
+
+  jv_free(msg);
+}
+
 static void rb_jq_free(struct jq_container *p) {
   xfree(p);
 }
@@ -12,6 +30,7 @@ static VALUE rb_jq_alloc(VALUE klass) {
   p->jq = NULL;
   p->parser = NULL;
   p->closed = 1;
+  p->errmsg = Qnil;
   return Data_Wrap_Struct(klass, 0, rb_jq_free, p);
 }
 
@@ -28,16 +47,24 @@ static VALUE rb_jq_initialize(VALUE self, VALUE program) {
     rb_raise(rb_eJQ_Error, "%s", strerror(errno));
   }
 
+  jq_set_error_cb(jq, jq_err_cb, p);
+
   compiled = jq_compile(jq, RSTRING_PTR(program));
 
   if (!compiled) {
     jq_teardown(&jq);
-    rb_raise(rb_eJQ_Error, "compile error");
+
+    if (NIL_P(p->errmsg)) {
+      rb_raise(rb_eJQ_Error, "compile error");
+    } else {
+      rb_raise(rb_eJQ_Error, "%s", RSTRING_PTR(p->errmsg));
+    }
   }
 
   p->jq = jq;
   p->parser = NULL;
   p->closed = 0;
+  p->errmsg = Qnil;
 
   return Qnil;
 }
@@ -51,14 +78,15 @@ static VALUE rb_jq_close(VALUE self) {
     p->jq = NULL;
     p->parser = NULL;
     p->closed = 1;
+    p->errmsg = Qnil;
   }
 
   return Qnil;
 }
 
 static void jq_process(jq_state *jq, jv value, VALUE (*proc)(), int *status, VALUE *errmsg) {
-  jq_start(jq, value, 0);
   jv result;
+  jq_start(jq, value, 0);
 
   while (jv_is_valid(result = jq_next(jq))) {
     jv dumped = jv_dump_string(result, 0);

data/ext/jq_core.h

@@ -11,6 +11,7 @@ struct jq_container {
   jq_state *jq;
   struct jv_parser *parser;
   int closed;
+  VALUE errmsg;
 };
 
 #endif //__JQ_CORE_H__

data/lib/jq.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'multi_json'
 require 'tempfile'
 require 'stringio'
@@ -6,6 +8,6 @@ require 'jq_core'
 require 'jq/version'
 require 'jq/parser'
 
-def JQ(src, options = {})
+def JQ(src, options = {}) # rubocop:disable Naming/MethodName
   JQ::Parser.new(src, options)
 end

data/lib/jq/extend.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require 'jq'
 
-module JQ::Extend
-  def jq(program, &block)
-    src = MultiJson.dump(self)
-    JQ(src).search(program, &block)
+module JQ
+  module Extend
+    def jq(program, &block)
+      src = MultiJson.dump(self)
+      JQ(src).search(program, &block)
+    end
   end
 end
 

data/lib/jq/parser.rb

@@ -1,65 +1,73 @@
-class JQ::Parser
-  BUFSIZ = 4096
+# frozen_string_literal: true
 
-  def initialize(src, options = {})
-    @src = kind_of_io?(src) ? src : src.to_s
-    @options = {
-      :parse_json => true,
-    }.merge(options)
-  end
+module JQ
+  class Parser
+    BUFSIZ = 4096
 
-  def search(program, &block)
-    @src.rewind if kind_of_io?(@src)
-    retval = nil
+    def initialize(src, options = {})
+      @src = kind_of_io?(src) ? src : src.to_s
+      @options = {
+        parse_json: true
+      }.merge(options)
+    end
 
-    if block
-      block_orig = block
+    def search(program, &block)
+      @src.rewind if kind_of_io?(@src)
+      retval = nil
 
-      block = proc do |str|
-        block_orig.call(parse_json(str))
-      end
-    else
-      retval = []
+      if block
+        block_orig = block
 
-      block = proc do |str|
-        retval << parse_json(str)
+        block = proc do |str|
+          block_orig.call(parse_json(str))
+        end
+      else
+        retval = []
+
+        block = proc do |str|
+          retval << parse_json(str)
+        end
       end
-    end
 
-    jq(program) do |jq_core|
-      if kind_of_io?(@src)
-        while buf = @src.read(BUFSIZ)
-          jq_core.update(buf, !@src.eof?, &block)
+      jq(program) do |jq_core|
+        if kind_of_io?(@src)
+          while (buf = @src.read(BUFSIZ))
+            jq_core.update(buf, !@src.eof?, &block)
+          end
+        else
+          jq_core.update(@src, false, &block)
         end
-      else
-        jq_core.update(@src, false, &block)
       end
+
+      retval
     end
 
-    return retval
-  end
+    private
 
-  private
-  def jq(program)
-    jq_core = nil
+    def jq(program)
+      jq_core = nil
+      retval = nil
 
-    begin
-      jq_core = JQ::Core.new(program)
-      retval = yield(jq_core)
-    ensure
-      jq_core.close if jq_core
+      begin
+        jq_core = JQ::Core.new(program)
+        retval = yield(jq_core)
+      ensure
+        jq_core&.close
+      end
+
+      retval
     end
-  end
 
-  def parse_json(str)
-    if @options[:parse_json]
-      MultiJson.load("[#{str}]").first
-    else
-      str
+    def parse_json(str)
+      if @options[:parse_json]
+        MultiJson.load("[#{str}]").first
+      else
+        str
+      end
     end
-  end
 
-  def kind_of_io?(obj)
-    [IO, Tempfile, StringIO].any? {|c| obj.kind_of?(c) }
+    def kind_of_io?(obj)
+      [IO, Tempfile, StringIO].any? { |c| obj.is_a?(c) }
+    end
   end
 end

data/lib/jq/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module JQ
-  VERSION = "0.1.9"
+  VERSION = '0.2.0'
 end

data/ruby-jq.gemspec

@@ -1,28 +1,30 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jq/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ruby-jq"
+  spec.name          = 'ruby-jq'
   spec.version       = JQ::VERSION
-  spec.author        = "winebarrel"
-  spec.email         = "sgwr_dts@yahoo.co.jp"
-  spec.description   = "Ruby bindings for jq"
-  spec.summary       = "Ruby bindings for jq"
-  spec.homepage      = "https://github.com/winebarrel/ruby-jq"
-  spec.license       = "MIT"
+  spec.author        = 'winebarrel'
+  spec.email         = 'sgwr_dts@yahoo.co.jp'
+  spec.description   = 'Ruby bindings for jq'
+  spec.summary       = 'Ruby bindings for jq'
+  spec.homepage      = 'https://github.com/winebarrel/ruby-jq'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.extensions    = "ext/extconf.rb"
-  #spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  #spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.extensions    = 'ext/extconf.rb'
+  # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  # spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "multi_json"
-  spec.add_runtime_dependency "mini_portile2", ">= 2.2.0"
+  spec.add_dependency 'multi_json'
+  spec.add_runtime_dependency 'mini_portile2', '>= 2.2.0'
 
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake-compiler'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
 end

data/spec/jq_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe JQ do
   specify 'int' do
     expect(JQ('1').search('.')).to eq([1])
@@ -16,72 +18,73 @@ describe JQ do
   end
 
   specify 'string' do
-    expect(JQ('"Zzz"').search('.')).to eq(["Zzz"])
+    expect(JQ('"Zzz"').search('.')).to eq(['Zzz'])
 
     JQ('"Zzz"').search('.') do |value|
-      expect(value).to eq("Zzz")
+      expect(value).to eq('Zzz')
     end
   end
 
   specify 'array' do
-    expect(JQ('[1, "2", 3]').search('.')).to eq([[1, "2", 3]])
+    expect(JQ('[1, "2", 3]').search('.')).to eq([[1, '2', 3]])
 
     JQ('[1, "2", 3]').search('.') do |value|
-      expect(value).to eq([1, "2", 3])
+      expect(value).to eq([1, '2', 3])
     end
   end
 
   specify 'hash' do
-    expect(JQ('{"foo":100, "bar":"zoo"}').search('.')).to eq([{"foo" => 100, "bar" => "zoo"}])
+    expect(JQ('{"foo":100, "bar":"zoo"}').search('.')).to eq([{ 'foo' => 100, 'bar' => 'zoo' }])
 
     JQ('{"foo":100, "bar":"zoo"}').search('.') do |value|
-      expect(value).to eq({"foo" => 100, "bar" => "zoo"})
+      expect(value).to eq('foo' => 100, 'bar' => 'zoo')
     end
   end
 
   specify 'composition' do
-    src = <<-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
+    src = <<~JSON
+      {
+          "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"
+                      }
+                  }
+              }
+          }
+      }
+    JSON
 
     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"}}
+      'glossary' =>
+        { 'GlossDiv' =>
+          { 'GlossList' =>
+            { 'GlossEntry' =>
+              { 'GlossSee' => 'markup',
+                'GlossDef' =>
+                { 'GlossSeeAlso' => %w[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])
 
@@ -91,49 +94,50 @@ describe JQ do
   end
 
   specify '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"
+    Tempfile.open("ruby-jq.spec.#{$PROCESS_ID}") do |src|
+      src.puts(<<~JSON)
+        {
+            "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
+      JSON
 
       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"}}
+        'glossary' =>
+          { 'GlossDiv' =>
+            { 'GlossList' =>
+              { 'GlossEntry' =>
+                { 'GlossSee' => 'markup',
+                  'GlossDef' =>
+                  { 'GlossSeeAlso' => %w[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])
 
@@ -144,50 +148,51 @@ describe JQ do
   end
 
   specify '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"
+    Tempfile.open("ruby-jq.spec.#{$PROCESS_ID}") do |src|
+      src.puts('[' + (1..10).map { <<~JSON }.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
+      JSON
 
       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"}}
+          'glossary' =>
+            { 'GlossDiv' =>
+              { 'GlossList' =>
+                { 'GlossEntry' =>
+                  { 'GlossSee' => 'markup',
+                    'GlossDef' =>
+                    { 'GlossSeeAlso' => %w[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])
@@ -199,86 +204,90 @@ describe JQ do
   end
 
   specify 'parse_json => false' do
-    src = <<-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
+    src = <<~JSON
+      {
+          "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"
+                      }
+                  }
+              }
+          }
+      }
+    JSON
 
     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"}}'
-    searched = JQ(src, :parse_json => false).search('.')
+    searched = JQ(src, parse_json: false).search('.')
 
     expect(searched.length).to eq(1)
     expect(searched[0]).to be_kind_of(String)
     expect(MultiJson.load(searched[0])).to eq(MultiJson.load(expected))
 
-    JQ(src, :parse_json => false).search('.') do |value|
+    JQ(src, parse_json: false).search('.') do |value|
       expect(value).to be_kind_of(String)
       expect(MultiJson.load(value)).to eq(MultiJson.load(expected))
     end
   end
 
   specify 'each value' do
-    src = <<-EOS
-{"menu": {
-  "id": "file",
-  "value": "File",
-  "popup": {
-    "menuitem": [
-      {"value": "New", "onclick": "CreateNewDoc()"},
-      {"value": "Open", "onclick": "OpenDoc()"},
-      {"value": "Close", "onclick": "CloseDoc()"}
-    ]
-  }
-}}
-    EOS
-
-    expect(JQ(src).search('.menu.popup.menuitem[].value')).to eq(["New", "Open", "Close"])
+    src = <<~JSON
+      {"menu": {
+        "id": "file",
+        "value": "File",
+        "popup": {
+          "menuitem": [
+            {"value": "New", "onclick": "CreateNewDoc()"},
+            {"value": "Open", "onclick": "OpenDoc()"},
+            {"value": "Close", "onclick": "CloseDoc()"}
+          ]
+        }
+      }}
+    JSON
+
+    expect(JQ(src).search('.menu.popup.menuitem[].value')).to eq(%w[New Open Close])
   end
 
   specify 'compile error' do
-    expect {
+    expect do
       JQ('{}').search('...')
-    }.to raise_error(JQ::Error)
+    end.to raise_error(JQ::Error).with_message(<<~ERRMSG.chomp)
+      jq: 1 compile error
+      jq: error: Invalid numeric literal at EOF at line 1, column 3 (while parsing '...') at <top-level>, line 1:
+      ...
+    ERRMSG
   end
 
   specify 'runtime error' do
-    expect {
-      JQ('{}').search('.') do |value|
+    expect do
+      JQ('{}').search('.') do |_value|
         raise 'runtime error'
       end
-    }.to raise_error(RuntimeError)
+    end.to raise_error(RuntimeError)
   end
 
   specify 'runtime halt in jq raises error' do
-    expect {
+    expect do
       JQ('{}').search('.data | keys') do |value|
         value
       end
-    }.to raise_error(JQ::Error).with_message('null (null) has no keys')
+    end.to raise_error(JQ::Error).with_message('null (null) has no keys')
   end
 
   specify 'query for hash' do
-    src = {'FOO' => 100, 'BAR' => [200, 200]}
+    src = { 'FOO' => 100, 'BAR' => [200, 200] }
 
     expect(src.jq('.BAR[]')).to eq([200, 200])
 
@@ -298,10 +307,10 @@ describe JQ do
   end
 
   specify 'error in block' do
-    expect {
-      JQ('[1,2,3]').search('.[]') do |value|
+    expect do
+      JQ('[1,2,3]').search('.[]') do |_value|
         1 / 0
       end
-    }.to raise_error(ZeroDivisionError)
+    end.to raise_error(ZeroDivisionError)
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
-$: << File.dirname(__FILE__) + '/../lib'
+# frozen_string_literal: true
+
+$LOAD_PATH << File.dirname(__FILE__) + '/../lib'
 require 'tempfile'
 require 'jq'
 require 'jq/extend'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jq
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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
 email: sgwr_dts@yahoo.co.jp
 executables: []
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt