secretariat 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3574ab368be0c92f96a25ad98e00f9c17a96da895d1ce3046a1c387eecf43d75
-  data.tar.gz: 90630718af00d0a76af1d75173d58f6c94f7eaf2485dafd9a75a773c2e2f7a97
+  metadata.gz: e6d3c5177f9a94e1341b1b533cfe34b91f9babe7eafa5d483cbf4b5f489509c0
+  data.tar.gz: d51e684d34ac4fc61007cd6243c26cc8cfd31df95799b39079841d6e23b352f8
 SHA512:
-  metadata.gz: c3d9e62d62321d142b502e32b01198256cb22e65b4f0502c071a525a96ae4dff5200d54ca2313a985bad0571c923ebb8c044f5b12b4fd3b1260a4799d2a743cc
-  data.tar.gz: 39ea3264258a3e058b24276caf8232d53db7516b1d10aa2cee66807ee25d601bb68413d61f18125021fcd0bad6bbced1aad14f4b7126392991984f5b8f6dc5db
+  metadata.gz: a1c7ea742126169c1b97b0ce347d8d7f6830f5eabb5542b814ae9313c9a0c4d904076124fccd18a182e217ce1a4e87008bc6e5350f7f53b562fee8795855486e
+  data.tar.gz: f228bac7b78241d5437b61fb1d9505c0ebb2ed2608f7489cf5145da34a662b5efd50a87090cf3b9ca27af9e2af6708865e3cf7039e0c466fc48711f3347017cb

data/README.md

@@ -1,22 +1,20 @@
 # A ZUGFeRD xml generator and validator
 
-More info coming soon. See tests for examples.
+See tests for examples.
 
 # Some words of caution
 
 1. This is an opinionated library optimised for my very specific usecase
 2. While I did start to add some validations to make sure you can't input absolute garbage into this, I cannot guarantee factual (as in taxation law) correctness of the resulting XML.
-3. This does not contain any code to attach the XML to a PDF file, mainly because I have yet to find a ruby library to do that.
+1. The library, for ZUGFeRD 2.x, currently only supports the EN16931 variant. This is probably what you want as well. PRs welcome.
+3. This does not contain any code to attach the XML to a PDF file, mainly because I have yet to find a ruby library to do that. For software that does this, take a look at [this python library](https://github.com/akretion/factur-x).
 
 # LICENSE
 
 See [LICENSE](LICENSE).
 
-Additionally, this project contains material, such as the schema files, which,
-according to the ZUGFeRD documentation, are also licensed under the Apache
-License.
+Additionally, this project contains material, such as the schema files, which, according to the ZUGFeRD documentation, are also licensed under the Apache License.
 
-Additionally, this project uses nokogiri and schematron-nokogiri, both
-licensed unter the MIT license.
+Additionally, this project uses nokogiri and [SchXslt](https://github.com/schxslt/schxslt), both licensed unter the MIT license.
 
 

data/lib/secretariat/validator.rb

@@ -15,25 +15,24 @@ limitations under the License.
 =end
 
 require 'nokogiri'
-require 'schematron-nokogiri'
-require 'open-uri'
 
 module Secretariat
   class Validator
     SCHEMATRON = [
       '../../schemas/zugferd_1/ZUGFeRD1p0.sch',
-      '../../schemas/zugferd_2/zf_en16931.sch'
+      '../../schemas/factur-x_1.0.0.7/Factur-X_1.0.07_EN16931.sch'
     ]
 
     SCHEMA = [
       '../../schemas/zugferd_1/ZUGFeRD1p0.xsd',
-      '../../schemas/zugferd_2/zf_en16931.xsd'
+      '../../schemas/factur-x_1.0.0.7/Factur-X_1.0.07_EN16931.xsd'
     ]
 
     SCHEMA_DIR = [
       '../../schemas/zugferd_1',
-      '../../schemas/zugferd_2'
+      '../../schemas/factur-x_1.0.0.7/'
     ]
+
     attr_accessor :doc, :version
     def initialize(io_or_str, version: 1)
       @doc = Nokogiri.XML(io_or_str)
@@ -44,10 +43,8 @@ module Secretariat
       Nokogiri::XML.Schema open(File.join(__dir__, SCHEMA[version - 1]))
     end
 
-    def schematron
-      SchematronNokogiri::Schema.new(
-        Nokogiri::XML(open(File.join(__dir__, SCHEMATRON[version - 1])))
-      )
+    def schematron_path
+      File.join(__dir__, SCHEMATRON[version - 1])
     end
 
     def validate_against_schema
@@ -55,11 +52,13 @@ module Secretariat
     end
 
     def validate_against_schematron
-      result = []
-      Dir.chdir File.join(__dir__, SCHEMA_DIR[version - 1]) do
-        result = schematron.validate(doc)
+      Dir.mktmpdir do |dir|
+        docpath = File.join(dir, 'doc.xml')
+        File.write(docpath, doc, mode: 'wb')
+        out = `java -jar bin/schxslt-cli.jar -v -d #{docpath} -s #{schematron_path}`
+        return [] if out.match("[valid]")
+        out.lines
       end
-      result
     end
   end
 end

data/lib/secretariat/version.rb

@@ -15,5 +15,5 @@ limitations under the License.
 =end
 
 module Secretariat
-  VERSION = '2.0.0'
+  VERSION = '3.0.0'
 end