ruby_rnv 0.3.1 → 0.4.0

data/ext/rnv/src/xsd.h

@@ -14,10 +14,9 @@
 #define XSD_ER_WS 5
 #define XSD_ER_ENUM 6
 
-extern void xsd_default_verror_handler(rnv_t *rnv, int erno,va_list ap);
+extern void xsd_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap);
 
 extern void xsd_init(rx_st_t *rx_st);
-extern void xsd_clear(void);
 
 extern int xsd_allows(rx_st_t *rx_st, char *typ,char *ps,char *s,int n);
 extern int xsd_equal(rx_st_t *rx_st, char *typ,char *val,char *s,int n);

data/lib/rnv/data_type_library.rb

@@ -2,21 +2,19 @@ module RNV
   # Datatype library callback object
   # @see https://www.oasis-open.org/committees/relax-ng/spec-20010811.html#IDA1I1R
   class DataTypeLibrary
-    # @param [String] typ
+    # @param [String] typ the data type
     # @param [String] val
     # @param [String] s
-    # @param [Integer] n
     # @return [Boolean]
-    def equal(typ, val, s, n)
+    def equal(typ, val, s)
       true
     end
 
-    # @param [String] typ
+    # @param [String] typ the data type
     # @param [String] ps
-    # @param [String] s
-    # @param [Integer] n
+    # @param [String] s the value
     # @return [Boolean]
-    def allows(typ, ps, s, n)
+    def allows(typ, ps, s)
       true
     end
   end

data/lib/rnv/error.rb

@@ -1,13 +1,39 @@
 module RNV
   class Error
+    def message
+      @original_message
+    end
+
+    def expected
+      @original_expected
+    end
+
+    # @param [String] data original content
+    # @return [String] context
+    def contextualize(data, max_len = 60)
+      out = ""
+      if data and @line
+        err_data = data.split("\n")[@line - 1]
+        err_data.insert(@col - 1, "🢑")
+
+        start = 0
+        if @col > max_len
+          start = @col - max_len
+        end
+        out += (start > 0 ? "…" : "") + err_data[start..(@col + max_len)].strip + (@col + max_len < err_data.length ? "…" : "")
+      end
+      out
+    end
+
     # @return [String]
     def to_s
-      "#{@line}:#{@col}:error: #{@message}\n#{@expected}"
+      "#{@line}:#{@col}:error: #{self.message}\n#{self.expected}"
     end
 
     # @return [String]
     def inspect
-      "#<RNV::Error code: :#{@code}, message: '#{@message}', expected: '#{@expected} line: #{@line}, column: #{@col}>"
+      #"#<RNV::Error code: :#{@code}, message: '#{@message}', expected: '#{@expected}, line: #{@line}, column: #{@col}>"
+      "#<RNV::Error code: :#{@code}, message: '#{self.message}', expected: '#{self.expected}, line: #{@line}, column: #{@col}>"
     end
   end
 end

data/lib/rnv/validator.rb

@@ -13,26 +13,26 @@ module RNV
     end
 
     def start_element_namespace(name, attrs = [], prefix = nil, uri = nil, ns = nil)
-      update_line_col
       tag_attrs = attrs.map { |attr| [attr.uri ? "#{attr.uri}:#{attr.localname}" : attr.localname, attr.value] }
       tag_name = uri ? "#{uri}:#{name}" : name
       @document.start_tag(@pre_processor.tag(tag_name), @pre_processor.attributes(tag_attrs))
+      update_line_col
     end
 
     def end_element_namespace(name, prefix = nil, uri = nil)
-      update_line_col
       tag_name = uri ? "#{uri}:#{name}" : name
       @document.end_tag(@pre_processor.tag(tag_name))
+      update_line_col
     end
 
     def characters str
-      update_line_col
       @document.characters(@pre_processor.text(str))
+      update_line_col
     end
 
     def cdata_block str
-      update_line_col
       @document.characters(@pre_processor.text(str))
+      update_line_col
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rnv
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,8 @@ files:
 - Gemfile
 - ext/rnv/extconf.rb
 - ext/rnv/ruby_rnv.c
+- ext/rnv/ruby_rnv.h
+- ext/rnv/ruby_rnv_err.c
 - ext/rnv/src/ary.c
 - ext/rnv/src/ary.h
 - ext/rnv/src/drv.c