ruby-jing 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d008f4db22a52baedf6f25339cd24ba6e9848ea
-  data.tar.gz: 3ac4428cf7a0d8c372a401e4585f2c13bc1d8ba9
+  metadata.gz: 19b9643f4db8f71aa3ef7df70166632203585784
+  data.tar.gz: 7df428f044ebfae4cffcf95f0cf1adca60227782
 SHA512:
-  metadata.gz: d4d4a4682496576208a44f81ca98fdd712067f874d35747881f8a966f05061b59c9d62c3b643225bd19b115785b1f9a22279675fe4acad91c73ec6b7a255822b
-  data.tar.gz: bd73c441aa2ac74bca835316823624234fc1af79d2237847f4e4d4740f1393b915a33f23ee3f30c743f91bd60030d9dc37a1a64c0f92cacf2e139dbd2146eaa4
+  metadata.gz: be774aaf821cd382797c28b93146db7da50b114fc357c86bfefbd6e46a4d825f97c27ea88184634b4d08970a84af337852b1e697c95cdc73bce4b4d048b67c39
+  data.tar.gz: f49cdcd0d6fa805f8530a8d2f531619885afbcdd3c614e4cd876c61f1e9906d9ff5ef9e929a407bff568ef886e5f79605b6ddfa681ca517badd456e777935c1a

data/README.rdoc

@@ -12,7 +12,7 @@ RELAX NG schema validation using the {Jing CLI}[http://www.thaiopensource.com/re
   jing = Jing.new("schema.rng")
   begin
     errors = jing.validate("doc.xml")
-  rescue Jing::OptionError, Jing::ExecutionError => e
+  rescue Jing::Error => e
     abort "what what what #{e}"
   end
 
@@ -112,6 +112,7 @@ Better, don't ya think?
 
 * {Docs}[http://rdoc.info/gems/ruby-jing/frames]
 * {Bugs}[http://github.com/sshaw/ruby-jing/issues]
+* {Source}[http://github.com/sshaw/ruby-jing]
 
 === Author
 

data/lib/jing.rb

@@ -1,7 +1,7 @@
 require "optout"
 
 class Jing
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   DEFAULT_JAR = File.join(File.dirname(__FILE__), "jing-20091111.jar")
 
   Error = Class.new(StandardError)
@@ -10,6 +10,7 @@ class Jing
 
   @@option_builder = Optout.options do
     on :java,     :required => true, :default => "java"
+    on :java_opts,        String
     on :jar,      "-jar", Optout::File.exists, :default => DEFAULT_JAR
     on :compact,  "-c",   Optout::Boolean
     on :encoding, "-e",   String
@@ -35,7 +36,7 @@ class Jing
   # [:compact (Boolean)] Set to +true+ if the schema uses the RELAX NG compact syntax. Defaults to false, will be set to +true+ is the schema has a +.rnc+ extension.
   # [:encoding (String)] Encoding of the XML document.
   # [:id_check (Boolean)] Disable checking of ID/IDREF/IDREFS. Defaults to +false+
-
+  #
   # === Errors
   #
   # [ArgumentError] If the options are not +nil+ or a +Hash+.
@@ -51,6 +52,9 @@ class Jing
     @options[:compact] = true if @options[:compact].nil? and @options[:schema] =~ /\.rnc\Z/i   # Don't override an explicit setting
     # Optout quirk: true will *include* the switch, which means we *don't* want to check
     @options[:id_check] = !@options[:id_check] if @options.include?(:id_check)
+    if @options[:encoding]
+      @options[:java_opts] = "-Dfile.encoding=#{@options[:encoding]}"
+    end
   end
 
   ##
@@ -90,7 +94,7 @@ class Jing
     errors
   end
 
-  # Validate an XML document against the schema. To receive a list of vlidation errors use #validate.
+  # Validate an XML document against the schema. To receive a list of validation errors use #validate.
   #
   #  puts "yay!" if jing.valid?("doc.xml")
   #
@@ -124,16 +128,19 @@ class Jing
 
   def parse_output(output)
     errors = []
-    output.split("\n").map do |line|
+    output.split("\n").each do |line|
       if line =~ /\A(.+):(\d+):(\d+):\s+\w+:\s+(.+)\Z/
-	errors << {
-	  :source  => $1,
-	  :line    => $2.to_i,
-	  :column  => $3.to_i,
-	  :message => $4
-	}
+        errors << {
+          :source  => $1,
+          :line    => $2.to_i,
+          :column  => $3.to_i,
+          :message => $4
+        }
       end
     end
     errors
+  rescue ArgumentError => e
+    raise ExecutionError, "potentially wrong encoding of jing output." \
+      "try setting the file's encoding via the :encoding option: #{e}"
   end
 end

data/test/test_jing.rb

@@ -43,7 +43,7 @@ class TestJing < MiniTest::Unit::TestCase
   def test_encoding_option
     enc = "iso-8859-1"
     cmd = fakeshell { Jing.new(RNG_SCHEMA, :encoding => enc).validate(VALID_XML) }
-    assert_match /\A'java'\s+ -jar\s+ '#{Jing::DEFAULT_JAR}'\s+ -e\s+ '#{enc}'/x, cmd
+    assert_match /\A'java'\s+ '-Dfile.encoding=#{enc}'\s+ -jar\s+ '#{Jing::DEFAULT_JAR}'\s+ -e\s+ '#{enc}'/x, cmd
   end
 
   def test_id_check_option
@@ -100,7 +100,7 @@ class TestJing < MiniTest::Unit::TestCase
     assert_equal 1, errors.size
 
     err = errors[0]
-    assert_equal INVALID_XML, err[:source]
+    assert_equal INVALID_XML, Pathname.new(err[:source]).cleanpath.to_s
     assert_equal 4, err[:line]
     assert_match /\A\d\d?\z/, err[:column].to_s
     assert_match /\bemail\b/, err[:message]

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jing
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: |2
@@ -62,10 +62,10 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- README.rdoc
 - lib/jing-20091111.jar
 - lib/jing.rb
 - test/test_jing.rb
-- README.rdoc
 homepage: http://github.com/sshaw/ruby-jing
 licenses:
 - MIT
@@ -76,17 +76,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.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: RELAX NG schema validation using the Jing CLI