cxml-ruby 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc74760a69c8e09c9b0ed1424b2144ca67081706c0529c5bc3416a015914155e
-  data.tar.gz: 76469a8859133f67497651381acc3383fbc834e870c6928241518f8c272a0dee
+  metadata.gz: 87772dd26f3194f54c29efa9a993202f79e8102f9bda767bbab87fb43579b9be
+  data.tar.gz: 227e6acd1a26406c8eaeabdec57326e5ac85ff5a965ff11c0d24650d786c3f51
 SHA512:
-  metadata.gz: b9d816593ca065c4fe36cb8aeceb54d7f2d86453016a6a251c19d28cae413b2b54dfabf806aae3f0ce1585908d4bafb9d3c630a1caaf6a0a37999120795b7cec
-  data.tar.gz: f4bf1aa75c266bc6927f12f51093853f816bb910d2bd7924f76ad2222964aad95b39035a1b1c5fb3b524e04bac78c56f6fcb28c62ee4ed37cc3909ee289e07c4
+  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,10 @@ 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.

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/document.rb

@@ -3,6 +3,7 @@
 module CXML
   class Document < DocumentNode
     attr_writer :dtd
+
     accessible_attributes %i[
       payload_id
       timestamp

data/lib/cxml/document_node.rb

@@ -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
@@ -138,7 +138,7 @@ module CXML
       end
     end
 
-    def camelize(string, uppercase_first_letter = true)
+    def camelize(string, uppercase_first_letter: true)
       string = if uppercase_first_letter
                  string.to_s.sub(/^[a-z\d]*/, &:capitalize)
                else

data/lib/cxml/parser.rb

@@ -44,17 +44,22 @@ module CXML
 
     private
 
-    def node_to_hash(node) # rubocop:disable Metrics/AbcSize
+    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
+
+    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

data/lib/cxml/version.rb

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

data/spec/fixtures/item_in.xml

@@ -4,7 +4,7 @@
     <SupplierPartAuxiliaryID>lkajsdflsdf</SupplierPartAuxiliaryID>
   </ItemID>
   <ItemDetail>
-    <Description xml:lang="en">AGENDA MAGAZINE RACK A4 CHARCOAL 25990</Description>
+    <Description xml:lang="en"><![CDATA[AGENDA MAGAZINE RACK A4 CHARCOAL 25990]]></Description>
     <UnitOfMeasure>EA</UnitOfMeasure>
     <UnitPrice> <Money currency="GBP">5.35</Money> </UnitPrice>
     <Classification domain="UNSPSC">44000000</Classification>

data/spec/spec_helper.rb

@@ -25,7 +25,7 @@ def dtd_path_from_url(url)
   return 'spec/fixtures/1.2.037-cXML.dtd' unless url
 
   match = url.match(%r{/(\d+\.\d+\.\d+)/(\w+\.dtd)}).to_a
-  file = 'spec/fixtures/' + match.last(2).join('-')
+  file = "spec/fixtures/#{match.last(2).join('-')}"
   return file if File.exist?(file)
 
   system("curl #{url} -O && mv #{match.last} #{file}")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cxml-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Josh Beckman
 - Eleni Chappen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -250,7 +250,7 @@ homepage: https://github.com/officeluv/cxml-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -258,15 +258,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Parse/generate documents with the cXML protocol
 test_files: