cxml-ruby 0.3.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8099da5b031d246dc2a1b8d30573135a3c35c233a003f337093d427cefbf1c
-  data.tar.gz: f5c612fcfbd98677ee6c1997a9d99f8b696434cef5a8b9df10cc02019b609451
+  metadata.gz: 87772dd26f3194f54c29efa9a993202f79e8102f9bda767bbab87fb43579b9be
+  data.tar.gz: 227e6acd1a26406c8eaeabdec57326e5ac85ff5a965ff11c0d24650d786c3f51
 SHA512:
-  metadata.gz: 83392422960e9a04d9a1d1a0becf00de7d424e7f79167a204fbfd3a582be98280c9f063658537a4c7a07d4d0931f0167b6265cb5c662cc5b1b0f63f96836a057
-  data.tar.gz: b55b5c92d354643dcd877016a6ef0ca8f0599d21cd5a3ab419eeddafa9864ef888a8c7c396caf634eb93944c61919f5900eb0ed2097a2b7b6903353046d513f9
+  metadata.gz: 812724e750bb2f67a33fa0cd2acef0d03996d394574ea265f40b90c842f1b5244de9ab7ca74a7acedc38a6dbd0d96030933be52a6ef0cf7d2713328117d660bb
+  data.tar.gz: 93d10408aaaafaa739ffa6841a83b0ecabe253247cff418684887ac8bfb3fed328e29a649e09d9e1ed043f8aa3d7adfcfbff4104156fb5e80993463d9ed147b6

data/.github/workflows/ruby.yml

@@ -15,6 +15,7 @@ jobs:
         ruby-version: 2.6.x
     - name: Test with Rake
       run: |
+        sudo apt-get install libxml2-utils
         gem install bundler
         bundle install --jobs 4 --retry 3
         bundle exec rake

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   Exclude:
     - Gemfile
     - vendor/**/*
+  NewCops: enable
 
 # # Disable checking for block length
 Metrics/BlockLength:
@@ -54,6 +55,9 @@ Style/Documentation:
 Style/ClassAndModuleChildren:
   Enabled: false
 
+Style/ArrayCoercion:
+  Enabled: false
+
 Style/HashEachMethods:
   Enabled: true
 

data/CHANGELOG.md

@@ -14,6 +14,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [0.6.1] - 2020-09-04
+### Fixed
+- Handle parsing CDATA tags in cXML content (Thanks @CRiva!).
+
+## [0.6.0] - 2020-05-01
+### Fixed
+- Conform to cXML DTD spec for ordered output of child nodes.
+### Added
+- Support parsing and validating output against DTDs in specs.
+
+## [0.5.0] - 2020-04-30
+### Added
+- Support parsing and specifying different DTDs.
+
+## [0.4.0] - 2020-04-20
+### Changed
+- Return parsed nodes as plain string if they have no attributes and only string content.
+
 ## [0.3.0] - 2020-04-19
 ### Changed
 - Drop Nokogiri and XMLSimple in favor of Ox.

data/cxml-ruby.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Josh Beckman', 'Eleni Chappen']
   s.email       = ['josh@officeluv.com', 'eleni@officeluv.com']
 
+  s.required_ruby_version = '>= 2.4'
   s.add_dependency('ox', '~> 2.13')
 
   s.add_development_dependency('pry', '~> 0.12')

data/lib/cxml-ruby.rb

@@ -26,7 +26,7 @@ module CXML
   def self.logger
     return @logger if @logger
 
-    @logger ||= Logger.new(STDOUT, level: :warn)
+    @logger ||= Logger.new($stdout, level: :warn)
   end
 
   def self.logger=(new_logger)

data/lib/cxml/address.rb

@@ -8,9 +8,12 @@ module CXML
       iso_country_code
     ]
     accessible_nodes %i[
-      email
       name
       postal_address
+      email
+      phone
+      fax
+      url
     ]
   end
 end

data/lib/cxml/comment.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CXML
+  class Comments < DocumentNode
+    accessible_attributes %i[
+      xml_lang
+    ]
+  end
+end

data/lib/cxml/contact.rb

@@ -8,9 +8,12 @@ module CXML
       address_id
     ]
     accessible_nodes %i[
-      email
       name
       postal_address
+      email
+      phone
+      fax
+      url
     ]
   end
 end

data/lib/cxml/credential.rb

@@ -41,8 +41,8 @@ module CXML
       type
     ]
     accessible_nodes %i[
-      shared_secret
       identity
+      shared_secret
       credential_mac
     ]
   end

data/lib/cxml/deposit_amount.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CXML
+  class DepositAmount < DocumentNode
+    accessible_nodes %i[
+      money
+    ]
+  end
+end

data/lib/cxml/document.rb

@@ -2,11 +2,13 @@
 
 module CXML
   class Document < DocumentNode
+    attr_writer :dtd
+
     accessible_attributes %i[
-      version
       payload_id
-      xml_lang
       timestamp
+      version
+      xml_lang
     ]
     accessible_nodes %i[
       header
@@ -27,6 +29,10 @@ module CXML
       @version ||= '1.2.037'
     end
 
+    def dtd
+      @dtd ||= 'cXML'
+    end
+
     # Check if document is request
     # @return [Boolean]
     def request?
@@ -59,18 +65,17 @@ module CXML
       'cXML'
     end
 
-    private
-
     def dtd_url
-      "http://xml.cxml.org/schemas/cXML/#{version}/cXML.dtd"
+      "http://xml.cxml.org/schemas/cXML/#{version}/#{dtd}.dtd"
     end
 
+    private
+
     def ox_doc
       doc = Ox::Document.new
       instruct = Ox::Instruct.new(:xml)
       instruct[:version] = '1.0'
       instruct[:encoding] = 'UTF-8'
-      instruct[:standalone] = 'yes'
       doc << instruct
       doc << Ox::DocType.new("cXML SYSTEM \"#{dtd_url}\"")
       doc

data/lib/cxml/document_node.rb

@@ -54,7 +54,7 @@ module CXML
 
     def to_element
       element = ox_element
-      element << content if content
+      element << content.to_s if content
       self.class.nodes.each do |child_node_name|
         child_value = send(child_node_name)
         if child_value.is_a?(Array)
@@ -88,12 +88,12 @@ module CXML
       value_element = Ox::Element.new(camelize(name))
       if value.is_a? Hash
         value.each do |value_key, value_val|
-          next value_element << value_val if value_key == :content
+          next value_element << value_val.to_s if value_key == :content
 
           value_element[value_key] = value_val
         end
       else
-        value_element << value
+        value_element << value.to_s
       end
       element << value_element
       element
@@ -108,7 +108,7 @@ module CXML
         string_attr = if attr.to_sym == :xml_lang
                         'xml:lang'
                       else
-                        camelize(attr, false)
+                        camelize(attr, uppercase_first_letter: false)
                       end
         obj[string_attr] = value
       end
@@ -127,10 +127,18 @@ module CXML
     rescue NameError => e
       raise(e) unless e.to_s.match?(klass)
 
-      send("#{key}=", val)
+      initialize_attribute_raw(key, val)
     end
 
-    def camelize(string, uppercase_first_letter = true)
+    def initialize_attribute_raw(key, val)
+      if val.is_a?(Hash) && val.keys == [:content]
+        send("#{key}=", val[:content])
+      else
+        send("#{key}=", val)
+      end
+    end
+
+    def camelize(string, uppercase_first_letter: true)
       string = if uppercase_first_letter
                  string.to_s.sub(/^[a-z\d]*/, &:capitalize)
                else

data/lib/cxml/invoice_detail_item.rb

@@ -14,28 +14,28 @@ module CXML
       reference_date
     ]
     accessible_nodes %i[
-      comments
-      distribution
-      extrinsics
+      unit_of_measure
+      unit_price
+      invoice_detail_item_reference
+      subtotal_amount
+      tax
+      invoice_detail_line_special_handling
+      invoice_detail_line_shipping
       gross_amount
       invoice_detail_discount
+      net_amount
+      distribution
+      comments
+      extrinsics
       invoice_detail_item_industry
-      invoice_detail_item_reference
-      invoice_detail_line_shipping
-      invoice_detail_line_special_handling
       invoice_item_modifications
-      net_amount
       packaging
       price_basis_quantity
       ship_notice_id_info
       ship_notice_line_item_reference
-      subtotal_amount
-      tax
       total_allowances
       total_amount_without_tax
       total_charges
-      unit_of_measure
-      unit_price
     ]
 
     def initialize_extrinsic(value)

data/lib/cxml/invoice_detail_item_reference.rb

@@ -6,12 +6,14 @@ module CXML
       line_number
     ]
     accessible_nodes %i[
-      description
       item_id
+      description
       classification
       manufacturer_part_id
       manufacturer_name
       country
+      serial_number
+      supplier_batch_id
     ]
   end
 end

data/lib/cxml/invoice_detail_request_header.rb

@@ -11,16 +11,16 @@ module CXML
       purpose
     ]
     accessible_nodes %i[
-      comments
-      document_reference
-      extrinsics
       invoice_detail_header_indicator
       invoice_detail_line_indicator
-      invoice_detail_shipping
-      invoice_id_info
       invoice_partners
+      document_reference
+      invoice_id_info
+      invoice_detail_shipping
       payment_term
       period
+      comments
+      extrinsics
     ]
 
     def initialize_invoice_partner(value)

data/lib/cxml/invoice_detail_summary.rb

@@ -3,13 +3,15 @@
 module CXML
   class InvoiceDetailSummary < DocumentNode
     accessible_nodes %i[
+      subtotal_amount
+      tax
+      special_handling_amount
+      shipping_amount
       gross_amount
       invoice_detail_discount
       net_amount
-      shipping_amount
-      special_handling_amount
-      subtotal_amount
-      tax
+      deposit_amount
+      due_amount
       total_allowances
       total_amount_without_tax
       total_charges

data/lib/cxml/item_detail.rb

@@ -3,10 +3,14 @@
 module CXML
   class ItemDetail < DocumentNode
     accessible_nodes %i[
+      unit_price
       description
       unit_of_measure
-      unit_price
       classification
+      manufacturer_part_id
+      manufacturer_name
+      url
+      lead_time
       extrinsics
     ]
 

data/lib/cxml/order_request_header.rb

@@ -23,26 +23,27 @@ module CXML
       type
     ]
     accessible_nodes %i[
+      total
+      ship_to
       bill_to
-      comments
+      shipping
+      tax
+      payment
+      payment_term
       contact
-      control_keys
-      delivery_period
+      comments
+      followup
       document_reference
+      supplier_order_info
       extrinsics
+      control_keys
+      delivery_period
       followup
       id_reference
       legal_identity
       order_request_header_industry
       organizational_unit
-      payment
-      payment_term
-      ship_to
-      shipping
-      supplier_order_info
-      tax
       terms_of_delivery
-      total
     ]
 
     def type

data/lib/cxml/parser.rb

@@ -11,27 +11,55 @@ 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)
+      return node.value if node.is_a?(Ox::CData)
       return node if node.is_a? String
+      return node.nodes.first if node.nodes.all?(String) && node.attributes.empty?
+
+      transform_node_to_hash node
+    end
 
-      hash = node.attributes || {}
+    def transform_node_to_hash(node)
+      hash = node.attributes
       hash.transform_keys!(&method(:underscore_key))
       node.nodes.reduce(hash) do |acc, child_node|
         next acc if child_node.is_a?(Ox::Comment)
 
         node_hash = {}
-        name = child_node.is_a?(String) ? :content : child_node.value
+        name = child_node.is_a?(String) || child_node.is_a?(Ox::CData) ? :content : child_node.value
         node_hash[underscore_key(name)] = node_to_hash(child_node)
         acc.merge(node_hash) do |_key, val1, val2|
           [val1, val2].flatten