cxml-ruby 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38b4bf64619173383fb1d6bbb76d1877bc70746752d884b6f9d79f967fcb70c0
-  data.tar.gz: 2f42907da9ebe23561a44f0a39ac1143e32660b465c5b19cea13dbbcd1328ee4
+  metadata.gz: a5aed2303e25923bfa9f60fc5f0156f277df0f08a4f5d2c1f86598f762d273f6
+  data.tar.gz: 3a613e2eb5e2a6873e861624942ea04242f25f61ef883c5ab05925e16f4a7659
 SHA512:
-  metadata.gz: 18ab3bad5fb8231724c14e29eb19c71ed1abdca1c9efd45832de27d46125070a705790a7813926f2f21273fdc010238de30d2405a251bcc28af389f5e075db76
-  data.tar.gz: 5b3206398d10770f12215be79a4f6877db2d6efafc9679e31cc08a756384247466c90cd061b3f044befbfc39e631f35cb0029f83792dce69220e9ca75e05347d
+  metadata.gz: a6a49b19ccd68bf63238deae57a4b07df188458bdb5684064d2f0bb5d8c4be7e98bb281dbab6a0660a4e41e462a80e620887df43e27691d8ea87d5e410bc4c54
+  data.tar.gz: bd436f24c35a1fe90ebfc9ca83d5544b3341c604a73faf3381783ecf32b9d2755bcd2fdb0115c30f3d0fe1fc9442cd55da44f4e4a7dec040551319a1eedf6d4c

data/CHANGELOG.md

@@ -14,9 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
-## [0.4.1] - 2020-04-20
-### Changed
-- Cast all node content values to strings before passing to Ox serializer.
+## [0.5.0] - 2020-04-30
+### Added
+- Support parsing and specifying different DTDs.
 
 ## [0.4.0] - 2020-04-20
 ### Changed

data/lib/cxml/document.rb

@@ -3,10 +3,11 @@
 module CXML
   class Document < DocumentNode
     accessible_attributes %i[
-      version
+      dtd
       payload_id
-      xml_lang
       timestamp
+      version
+      xml_lang
     ]
     accessible_nodes %i[
       header
@@ -27,6 +28,10 @@ module CXML
       @version ||= '1.2.037'
     end
 
+    def dtd
+      @dtd ||= 'cXML'
+    end
+
     # Check if document is request
     # @return [Boolean]
     def request?
@@ -62,7 +67,7 @@ module CXML
     private
 
     def dtd_url
-      "http://xml.cxml.org/schemas/cXML/#{version}/cXML.dtd"
+      "http://xml.cxml.org/schemas/cXML/#{version}/#{dtd}.dtd"
     end
 
     def ox_doc

data/lib/cxml/parser.rb

@@ -11,15 +11,37 @@ module CXML
 
     def parse
       @parsed_data = node_to_hash document
+      if dtd_url
+        @parsed_data[:version] = version
+        @parsed_data[:dtd] = dtd
+      end
+      @parsed_data
     end
 
     def document
       doc = Ox.load(data)
+      @doc_type_string = doc.nodes.detect do |node|
+        node.value&.match?(/^cXML /)
+      end&.value
       doc.nodes.detect do |node|
         node.value&.match?(/^cxml$/i)
       end || doc
     end
 
+    def version
+      dtd_url&.match(%r{cXML/(.*)/.*\.dtd})&.to_a&.last
+    end
+
+    def dtd
+      dtd_url&.match(%r{cXML/.*/(.*)\.dtd})&.to_a&.last
+    end
+
+    def dtd_url
+      return nil unless @doc_type_string
+
+      @doc_type_string.match(/http.*\.dtd/)&.to_a&.first
+    end
+
     private
 
     def node_to_hash(node) # rubocop:disable Metrics/AbcSize

data/lib/cxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CXML
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/spec/document_spec.rb

@@ -66,6 +66,20 @@ describe CXML::Document do
         doc.response.should be_nil
         doc.message.should be_nil
       end
+
+      it 'sets the correct document version' do
+        doc.version.should be_a String
+        doc.version.should eq '1.2.011'
+      end
+
+      it 'sets the correct document dtd' do
+        doc.dtd.should be_a String
+        doc.dtd.should eq 'cXML'
+        described_class
+          .new
+          .from_xml(fixture('invoice_backed_and_unbacked_by_pos.xml'))
+          .dtd.should eq 'InvoiceDetail'
+      end
     end
 
     context 'when a response document is passed' do

data/spec/fixtures/invoice_taxes_at_line_multiple_taxes.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE cXML SYSTEM "http://xml.cXML.org/schemas/cXML/1.2...oiceDetail.dtd">
+<!DOCTYPE cXML SYSTEM "http://xml.cXML.org/schemas/cXML/1.2.0.11/InvoiceDetail.dtd">
 
 <cXML version="1.0" payloadID="1240598937@SUBDOMAIN.coupahost.com" timestamp="2018-05-04T01:24:51-07:00">
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxml-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Josh Beckman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox