cxml-ruby 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f3a92004a0de57a2c595125aef836e25e4b59c52fc26b2ae349404b31dee88
-  data.tar.gz: 9ff26daee0357c90ed5ee4526a8acb5548a7079b75acb7f41127b7b2e232d889
+  metadata.gz: ce8099da5b031d246dc2a1b8d30573135a3c35c233a003f337093d427cefbf1c
+  data.tar.gz: f5c612fcfbd98677ee6c1997a9d99f8b696434cef5a8b9df10cc02019b609451
 SHA512:
-  metadata.gz: acc6d892e319799d7b3c82d53e629d061022c5fe01eef31045221793319158bdbd30076849bbd8ea3afed63bf94c592f3df6e9f9cb20d2474a087a83a69d9a15
-  data.tar.gz: 924e231c90767fa651cd7c9e245ad7af0d8f9eff00425d38ad95515219e25268e361c630a41c76928ca38507d4c61347a3702bbb709473a8f16abb1f3201d5e9
+  metadata.gz: 83392422960e9a04d9a1d1a0becf00de7d424e7f79167a204fbfd3a582be98280c9f063658537a4c7a07d4d0931f0167b6265cb5c662cc5b1b0f63f96836a057
+  data.tar.gz: b55b5c92d354643dcd877016a6ef0ca8f0599d21cd5a3ab419eeddafa9864ef888a8c7c396caf634eb93944c61919f5900eb0ed2097a2b7b6903353046d513f9

data/.rubocop.yml

@@ -69,6 +69,10 @@ Lint/RaiseException:
 Lint/StructNewOverride:
   Enabled: true
 
+Naming/FileName:
+  Exclude:
+    - lib/cxml-ruby.rb
+
 # # Mixing the styles looks just silly.
 # Style/HashSyntax:
 #   EnforcedStyle: ruby19_no_mixed_keys

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+---
+
+## [0.3.0] - 2020-04-19
+### Changed
+- Drop Nokogiri and XMLSimple in favor of Ox.
+- Change Parser class interface to be OO.

data/README.md

@@ -22,7 +22,11 @@ Currently supports these top-level documents in v1.2.037:
 
 ```rb
 some_xml = '....'
+parsed_hash = CXML::Parser.new(data: some_xml).parse
+# or
 doc = CXML::Document.new.from_xml(some_xml)
+# or
+doc = CXML::Document.new(parsed_hash)
 # raises CXML::UnknownAttributeError if unknown fields are present
 
 doc.response.status.code
@@ -31,17 +35,17 @@ doc.response.status.success?
 # => true
 
 # initialize docs with a hash
-CXML::Document.new(response: { status: { code: '200' } }).render.to_xml
+CXML::Document.new(response: { status: { code: '200' } }).to_xml
 # => '<?xml.....'
 
 # initialize docs with instances
 status = CXML::Status.new(code: '200')
 response = CXML::Response.new(status: status)
-CXML::Document.new(response: response).render.to_xml
+CXML::Document.new(response: response).to_xml
 # => '<?xml.....'
 
 # Set a different version
-CXML::Document.new(version: '1.1.0', response: { status: { code: '200' } }).render.to_xml
+CXML::Document.new(version: '1.1.0', response: { status: { code: '200' } }).to_xml
 # => '<?xml.....'
 ```
 

data/cxml-ruby.gemspec

@@ -12,14 +12,13 @@ Gem::Specification.new do |s|
   s.authors     = ['Josh Beckman', 'Eleni Chappen']
   s.email       = ['josh@officeluv.com', 'eleni@officeluv.com']
 
+  s.add_dependency('ox', '~> 2.13')
+
   s.add_development_dependency('pry', '~> 0.12')
   s.add_development_dependency('rake', '~> 13.0')
   s.add_development_dependency('rspec', '~> 3.9')
   s.add_development_dependency('rubocop', '~> 0.81')
 
-  s.add_dependency('nokogiri', '~> 1.10')
-  s.add_dependency('xml-simple', '~> 1.1')
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/cxml/browser_form_post.rb

@@ -5,9 +5,5 @@ module CXML
     accessible_nodes %i[
       url
     ]
-
-    def render_nodes(node)
-      node.URL(url)
-    end
   end
 end

data/lib/cxml/document.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require('time')
-
 module CXML
   class Document < DocumentNode
     accessible_attributes %i[
@@ -29,11 +27,6 @@ module CXML
       @version ||= '1.2.037'
     end
 
-    def from_xml(xml_string)
-      initialize(Parser.new.parse(xml_string))
-      self
-    end
-
     # Check if document is request
     # @return [Boolean]
     def request?
@@ -52,20 +45,35 @@ module CXML
       !message.nil?
     end
 
-    def render
-      node = CXML.builder
-      node.doc.create_internal_subset(
-        'cXML',
-        nil,
-        "http://xml.cxml.org/schemas/cXML/#{version}/cXML.dtd"
-      )
-      node.cXML(node_attributes) do |doc|
-        header&.render(doc)
-        request&.render(doc)
-        response&.render(doc)
-        message&.render(doc)
-      end
-      node
+    def from_xml(xml_string)
+      initialize(Parser.new(data: xml_string).parse)
+      self
+    end
+
+    def to_xml(doc = ox_doc)
+      doc << to_element
+      Ox.dump doc
+    end
+
+    def node_name
+      'cXML'
+    end
+
+    private
+
+    def dtd_url
+      "http://xml.cxml.org/schemas/cXML/#{version}/cXML.dtd"
+    end
+
+    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
     end
   end
 end

data/lib/cxml/document_node.rb

@@ -48,37 +48,55 @@ module CXML
       end
     end
 
-    def render(node = CXML.builder)
-      node.send(self.class.name.split('::').last, node_attributes) do |n|
-        n.text(content) if content
-        render_nodes(n)
-      end
-      node
+    def node_name
+      self.class.name.split('::').last
     end
 
-    def render_nodes(node)
+    def to_element
+      element = ox_element
+      element << content if content
       self.class.nodes.each do |child_node_name|
         child_value = send(child_node_name)
         if child_value.is_a?(Array)
           child_value.each do |child_value_n|
-            render_child_node(node, child_node_name, child_value_n)
+            render_child_node(element, child_node_name, child_value_n)
           end
         else
-          render_child_node(node, child_node_name, child_value)
+          render_child_node(element, child_node_name, child_value)
         end
       end
+      element
     end
 
     private
 
-    def render_child_node(node, name, value)
+    def ox_element
+      element = Ox::Element.new node_name
+      node_attributes.each do |key, val|
+        element[key] = val
+      end
+      element
+    end
+
+    def render_child_node(element, name, value)
       return if value.respond_to?(:empty?) ? value.empty? : !value
 
       if value.is_a?(DocumentNode)
-        value.render(node)
+        element << value.to_element
+        return element
+      end
+      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
+
+          value_element[value_key] = value_val
+        end
       else
-        node.send(camelize(name), value)
+        value_element << value
       end
+      element << value_element
+      element
     end
 
     def node_attributes
@@ -118,6 +136,8 @@ module CXML
                else
                  string.to_s.sub(/^(?:(?=\b|[A-Z_])|\w)/, &:downcase)
                end
+      return 'URL' if string.match?(/^url$/i)
+
       string.gsub(/_id(_)?$/, '_ID\1').gsub(%r{(?:_|(/))([a-z\d]*)}) do
         "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}"
       end.gsub('/', '::')

data/lib/cxml/parser.rb

@@ -1,26 +1,42 @@
 # frozen_string_literal: true
 
-require('nokogiri')
-require('xmlsimple')
-
 module CXML
   class Parser
-    def parse(data)
-      hash = XmlSimple.xml_in(data, { 'ForceArray' => false })
-      hash.transform_keys!(&method(:underscore_key))
-      hash.transform_values!(&method(:underscore_hash_values))
-      hash
+    attr_accessor :data,
+                  :parsed_data
+
+    def initialize(data:)
+      @data = data
+    end
+
+    def parse
+      @parsed_data = node_to_hash document
+    end
+
+    def document
+      doc = Ox.load(data)
+      doc.nodes.detect do |node|
+        node.value&.match?(/^cxml$/i)
+      end || doc
     end
 
     private
 
-    def underscore_hash_values(value)
-      return value.map(&method(:underscore_hash_values)) if value.is_a?(Array)
-      return value unless value.is_a?(Hash)
+    def node_to_hash(node)
+      return node if node.is_a? String
+
+      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)
 
-      value.transform_keys!(&method(:underscore_key))
-      value.transform_values!(&method(:underscore_hash_values))
-      value
+        node_hash = {}
+        name = child_node.is_a?(String) ? :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
+        end
+      end
     end
 
     def underscore_key(key)

data/lib/cxml/start_page.rb

@@ -5,9 +5,5 @@ module CXML
     accessible_nodes %i[
       url
     ]
-
-    def render_nodes(node)
-      node.URL(url)
-    end
   end
 end

data/lib/cxml/supplier_setup.rb

@@ -5,9 +5,5 @@ module CXML
     accessible_nodes %i[
       url
     ]
-
-    def render_nodes(node)
-      node.URL(url)
-    end
   end
 end

data/lib/cxml/version.rb

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

data/lib/cxml-ruby.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
 require('time')
-require('nokogiri')
 require('logger')
+require('ox')
 require('cxml/document_node')
 Dir[File.join(__dir__, 'cxml', '*.rb')].sort.each { |file| require file }
 
 module CXML
   def self.parse(str)
-    CXML::Parser.new.parse(str)
-  end
-
-  def self.builder
-    Nokogiri::XML::Builder.new(encoding: 'UTF-8')
+    CXML::Parser.new(data: str).parse
   end
 
   def self.configure

data/spec/credential_spec.rb

@@ -9,12 +9,10 @@ describe CXML::Credential do
   it { should respond_to :credential_mac }
   it { should respond_to :identity }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:sender) { doc.header.sender }
   let(:credential) { sender.credential }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
     it 'sets the attributes that are passed' do
@@ -24,8 +22,8 @@ describe CXML::Credential do
   end
 
   describe '#render' do
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:sender_output_data) { output_data[:header][:sender] }
     let(:credential_output_data) { sender_output_data[:credential] }
 

data/spec/document_spec.rb

@@ -33,8 +33,6 @@ describe CXML::Document do
     end
   end
 
-  let(:parser) { CXML::Parser.new }
-
   it { should respond_to :version }
   it { should respond_to :payload_id }
   it { should respond_to :timestamp }
@@ -56,7 +54,7 @@ describe CXML::Document do
     end
 
     context 'when a request document is passed' do
-      let(:data) { parser.parse(fixture('request_doc.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('request_doc.xml')).parse }
       include_examples :document_has_mandatory_values
       include_examples :document_has_a_header
       include_examples :document_has_a_timestamp
@@ -71,7 +69,7 @@ describe CXML::Document do
     end
 
     context 'when a response document is passed' do
-      let(:data) { parser.parse(fixture('response_status_200.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('response_status_200.xml')).parse }
       include_examples :document_has_mandatory_values
       include_examples :document_has_a_timestamp
 
@@ -85,7 +83,7 @@ describe CXML::Document do
     end
 
     context 'when a punch out order message is passed' do
-      let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
       include_examples :document_has_mandatory_values
       include_examples :document_has_a_header
       include_examples :document_has_a_timestamp
@@ -100,21 +98,20 @@ describe CXML::Document do
     end
   end
 
-  describe '#render' do
+  describe '#to_xml' do
     let(:doc) { CXML::Document.new(data) }
-    let(:builder) { doc.render }
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
 
-    it { should respond_to :render }
+    it { should respond_to :to_xml }
 
     context 'when a request document is rendered' do
-      let(:data) { parser.parse(fixture('request_doc.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('request_doc.xml')).parse }
       include_examples :document_render_defaults
     end
 
     context 'when a valid response is rendered' do
-      let(:data) { parser.parse(fixture('response_status_200.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('response_status_200.xml')).parse }
       it 'returns xml content' do
         output_xml.should_not be_nil
       end
@@ -131,7 +128,7 @@ describe CXML::Document do
     end
 
     context 'when a invalid response is rendered' do
-      let(:data) { parser.parse(fixture('response_status_400.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('response_status_400.xml')).parse }
       it 'returns xml content' do
         output_xml.should_not be_nil
       end
@@ -143,7 +140,7 @@ describe CXML::Document do
     end
 
     context 'when a punch out order message document is rendered' do
-      let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
       include_examples :document_render_defaults
 
       it 'outputs the punch out order message xml' do

data/spec/header_spec.rb

@@ -18,13 +18,11 @@ describe CXML::Header do
   it { should respond_to :from }
   it { should respond_to :to }
   it { should respond_to :sender }
-  it { should respond_to :render }
 
   let(:parser) { CXML::Parser.new }
   let(:doc) { CXML::Document.new(data) }
-  let(:builder) { doc.render }
   let(:header) { doc.header }
-  let(:data) { parser.parse(fixture('request_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('request_doc.xml')).parse }
 
   describe '#initialize' do
     it 'sets the mandatory attributes' do
@@ -35,8 +33,8 @@ describe CXML::Header do
   end
 
   describe '#render' do
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:header_output_data) { output_data[:header] }
     let(:from_identity) { header_output_data[:from][:credential][:identity] }
     let(:to_identity) { header_output_data[:to][:credential][:identity] }
@@ -44,7 +42,7 @@ describe CXML::Header do
     include_examples :render_defaults
 
     context 'when the header is rendered as not a response' do
-      let(:data) { parser.parse(fixture('request_doc.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('request_doc.xml')).parse }
       it 'will NOT swap the to and from attributes' do
         from_identity.should eq(header.from.credential.identity)
         to_identity.should eq(header.to.credential.identity)

data/spec/invoice_detail_request_spec.rb

@@ -10,35 +10,35 @@ describe CXML::InvoiceDetailRequest do
 
   describe '#initialize' do
     it 'sets invoice_detail_request_header' do
-      data = CXML::Parser.new.parse(fixture('invoice_taxes_at_line.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_taxes_at_line.xml')).parse
       doc = CXML::Document.new(data)
       instance = doc.request.invoice_detail_request
       instance.invoice_detail_request_header
               .should be_an_instance_of CXML::InvoiceDetailRequestHeader
     end
     it 'sets invoice_detail_request_header' do
-      data = CXML::Parser.new.parse(fixture('invoice_taxes_at_total.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_taxes_at_total.xml')).parse
       doc = CXML::Document.new(data)
       instance = doc.request.invoice_detail_request
       instance.invoice_detail_request_header
               .should be_an_instance_of CXML::InvoiceDetailRequestHeader
     end
     it 'sets invoice_detail_request_header' do
-      data = CXML::Parser.new.parse(fixture('invoice_taxes_at_line_multiple_taxes.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_taxes_at_line_multiple_taxes.xml')).parse
       doc = CXML::Document.new(data)
       instance = doc.request.invoice_detail_request
       instance.invoice_detail_request_header
               .should be_an_instance_of CXML::InvoiceDetailRequestHeader
     end
     it 'sets invoice_detail_request_header' do
-      data = CXML::Parser.new.parse(fixture('invoice_backed_and_unbacked_by_pos.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_backed_and_unbacked_by_pos.xml')).parse
       doc = CXML::Document.new(data)
       instance = doc.request.invoice_detail_request
       instance.invoice_detail_request_header
               .should be_an_instance_of CXML::InvoiceDetailRequestHeader
     end
     it 'sets invoice_detail_request_header' do
-      data = CXML::Parser.new.parse(fixture('invoice_backed_by_multiple_pos.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_backed_by_multiple_pos.xml')).parse
       doc = CXML::Document.new(data)
       instance = doc.request.invoice_detail_request
       instance.invoice_detail_request_header
@@ -47,30 +47,30 @@ describe CXML::InvoiceDetailRequest do
   end
   describe '#to_xml' do
     it 'serializes the same output' do
-      data = CXML::Parser.new.parse(fixture('invoice_taxes_at_line.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_taxes_at_line.xml')).parse
       doc = CXML::Document.new(data)
-      CXML::Parser.new.parse(doc.render.to_xml).should eq(data)
+      CXML::Parser.new(data: doc.to_xml).parse.should eq(data)
     end
     it 'serializes the same output' do
-      data = CXML::Parser.new.parse(fixture('invoice_backed_and_unbacked_by_pos.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_backed_and_unbacked_by_pos.xml')).parse
       doc = CXML::Document.new(data)
-      CXML::Parser.new.parse(doc.render.to_xml).should eq(data)
+      CXML::Parser.new(data: doc.to_xml).parse.should eq(data)
     end
     it 'serializes the same output' do
-      data = CXML::Parser.new.parse(fixture('invoice_backed_by_multiple_pos.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_backed_by_multiple_pos.xml')).parse
       doc = CXML::Document.new(data)
-      CXML::Parser.new.parse(doc.render.to_xml).should eq(data)
+      CXML::Parser.new(data: doc.to_xml).parse.should eq(data)
     end
     it 'serializes the same output' do
-      data = CXML::Parser.new.parse(fixture('invoice_taxes_at_line_multiple_taxes.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_taxes_at_line_multiple_taxes.xml')).parse
       doc = CXML::Document.new(data)
-      CXML::Parser.new.parse(doc.render.to_xml).should eq(data)
+      CXML::Parser.new(data: doc.to_xml).parse.should eq(data)
     end
     it 'serializes the same output' do
       fixture_xml = fixture('invoice_taxes_at_total.xml')
-      data = CXML::Parser.new.parse(fixture_xml)
+      data = CXML::Parser.new(data: fixture_xml).parse
       doc = CXML::Document.new(data)
-      CXML::Parser.new.parse(doc.render.to_xml).should eq(data)
+      CXML::Parser.new(data: doc.to_xml).parse.should eq(data)
     end
     it 'serializes from an instance' do
       money = CXML::Money.new(amount: '5', currency: 'USD')
@@ -78,7 +78,7 @@ describe CXML::InvoiceDetailRequest do
       instance = described_class.new(invoice_detail_summary: summary)
       data = CXML::Request.new(invoice_detail_request: instance)
       doc = CXML::Document.new(request: data)
-      parsed = CXML::Parser.new.parse(doc.render.to_xml)
+      parsed = CXML::Parser.new(data: doc.to_xml).parse
       parsed[:request][:invoice_detail_request]
         .should eq(instance.serializable_hash)
       parsed[:request][:invoice_detail_request][:invoice_detail_summary][:gross_amount][:money]

data/spec/item_detail_spec.rb

@@ -7,14 +7,12 @@ describe CXML::ItemDetail do
   it { should respond_to :unit_of_measure }
   it { should respond_to :unit_price }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:punch_out_order_message) { doc.message.punch_out_order_message }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
-    let(:item_in) { CXML::ItemIn.new(build_item_in(parser)) }
+    let(:item_in) { CXML::ItemIn.new(build_item_in) }
     let(:item_detail) { item_in.item_detail }
 
     it 'sets the mandatory attributes' do
@@ -26,11 +24,11 @@ describe CXML::ItemDetail do
 
   describe '#render' do
     before(:each) do
-      punch_out_order_message.add_item(build_item_in(parser))
+      punch_out_order_message.add_item(build_item_in)
     end
 
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:punch_out_order_message_output_data) { output_data[:message][:punch_out_order_message] }
     let(:item_in_output_data) { punch_out_order_message_output_data[:item_in] }
     let(:item_detail_output_data) { item_in_output_data[:item_detail] }

data/spec/item_id_spec.rb

@@ -6,14 +6,12 @@ describe CXML::ItemID do
   it { should respond_to :supplier_part_id }
   it { should respond_to :supplier_part_auxiliary_id }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:punch_out_order_message) { doc.message.punch_out_order_message }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
-    let(:item_in) { CXML::ItemIn.new(build_item_in(parser)) }
+    let(:item_in) { CXML::ItemIn.new(build_item_in) }
     let(:item_id) { item_in.item_id }
 
     it 'sets the attributes that are passed' do
@@ -23,11 +21,11 @@ describe CXML::ItemID do
 
   describe '#render' do
     before(:each) do
-      punch_out_order_message.add_item(build_item_in(parser))
+      punch_out_order_message.add_item(build_item_in)
     end
 
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:punch_out_order_message_output_data) { output_data[:message][:punch_out_order_message] }
     let(:item_in_output_data) { punch_out_order_message_output_data[:item_in] }
     let(:item_id_output_data) { item_in_output_data[:item_id] }

data/spec/item_in_spec.rb

@@ -8,14 +8,12 @@ describe CXML::ItemIn do
   it { should respond_to :line_number }
   it { should respond_to :quantity }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:punch_out_order_message) { doc.message.punch_out_order_message }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
-    let(:item_in) { CXML::ItemIn.new(build_item_in(parser)) }
+    let(:item_in) { CXML::ItemIn.new(build_item_in) }
 
     it 'sets the mandatory attributes' do
       item_in.quantity.should_not be_nil
@@ -24,11 +22,11 @@ describe CXML::ItemIn do
 
   describe '#render' do
     before(:each) do
-      punch_out_order_message.add_item(build_item_in(parser))
+      punch_out_order_message.add_item(build_item_in)
     end
 
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:punch_out_order_message_output_data) { output_data[:message][:punch_out_order_message] }
     let(:item_in_output_data) { punch_out_order_message_output_data[:item_in] }
 

data/spec/money_spec.rb

@@ -8,12 +8,10 @@ describe CXML::Money do
   it { should respond_to :alternate_amount }
   it { should respond_to :amount }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:punch_out_order_message) { doc.message.punch_out_order_message }
-  let(:builder) { doc.render }
-  let(:item_in) { CXML::ItemIn.new(build_item_in(parser)) }
+  let(:item_in) { CXML::ItemIn.new(build_item_in) }
   let(:item_detail) { item_in.item_detail }
   let(:money) { item_detail.unit_price.money }
 
@@ -26,11 +24,11 @@ describe CXML::Money do
 
   describe '#render' do
     before(:each) do
-      punch_out_order_message.add_item(build_item_in(parser))
+      punch_out_order_message.add_item(build_item_in)
     end
 
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:punch_out_order_message_output_data) { output_data[:message][:punch_out_order_message] }
     let(:item_in_output_data) { punch_out_order_message_output_data[:item_in] }
     let(:item_detail_output_data) { item_in_output_data[:item_detail] }

data/spec/punch_out_order_message_header_spec.rb

@@ -5,13 +5,10 @@ require 'spec_helper'
 describe CXML::PunchOutOrderMessageHeader do
   it { should respond_to :total }
   it { should respond_to :operation_allowed }
-  it { should respond_to :render }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:punch_out_order_message_header) { doc.message.punch_out_order_message.punch_out_order_message_header }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
     it 'sets the mandatory attributes' do
@@ -20,8 +17,8 @@ describe CXML::PunchOutOrderMessageHeader do
   end
 
   describe '#render' do
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:punch_out_order_message_output_data) { output_data[:message][:punch_out_order_message] }
     let(:punch_out_order_message_header_output_data) do
       punch_out_order_message_output_data[:punch_out_order_message_header]

data/spec/punch_out_order_message_spec.rb

@@ -6,13 +6,10 @@ describe CXML::PunchOutOrderMessage do
   it { should respond_to :add_item }
   it { should respond_to :buyer_cookie }
   it { should respond_to :items_in }
-  it { should respond_to :render }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:punch_out_order_message) { doc.message.punch_out_order_message }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
     it 'sets the mandatory attributes' do
@@ -23,18 +20,18 @@ describe CXML::PunchOutOrderMessage do
 
   describe '#add_item' do
     it 'adds items to the order' do
-      punch_out_order_message.add_item(build_item_in(parser))
+      punch_out_order_message.add_item(build_item_in)
       punch_out_order_message.items_in.count.should == 1
     end
   end
 
   describe '#render' do
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:punch_out_order_message_output_data) { output_data[:message][:punch_out_order_message] }
 
     it 'contains the required nodes' do
-      punch_out_order_message.add_item(build_item_in(parser))
+      punch_out_order_message.add_item(build_item_in)
       punch_out_order_message_output_data[:punch_out_order_message_header].should_not be_empty
       punch_out_order_message_output_data[:buyer_cookie].should_not be_empty
       punch_out_order_message_output_data.should include(:item_in)

data/spec/punch_out_setup_request_spec.rb

@@ -10,9 +10,8 @@ describe CXML::PunchOutSetupRequest do
   it { should respond_to :extrinsics }
   it { should respond_to :contact }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_setup_request_doc.xml')) }
-  let(:data_coupa) { parser.parse(fixture('punch_out_setup_request_doc_coupa.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_setup_request_doc.xml')).parse }
+  let(:data_coupa) { CXML::Parser.new(data: fixture('punch_out_setup_request_doc_coupa.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:doc_coupa) { CXML::Document.new(data_coupa) }
   let(:request) { doc.request }
@@ -34,7 +33,7 @@ describe CXML::PunchOutSetupRequest do
       punch_out_setup_request_coupa.extrinsics.first.name.should_not be_nil
     end
     it 'sets the shipping attributes when present' do
-      data = parser.parse(fixture('punch_out_setup_request_doc_with_ship_to.xml'))
+      data = CXML::Parser.new(data: fixture('punch_out_setup_request_doc_with_ship_to.xml')).parse
       doc = CXML::Document.new(data)
       doc.request.punch_out_setup_request.ship_to.should_not be_nil
       doc.request.punch_out_setup_request.ship_to.address.name.should_not be_nil
@@ -43,12 +42,10 @@ describe CXML::PunchOutSetupRequest do
 
   describe '#render' do
     it 'contains the required nodes' do
-      parser = CXML::Parser.new
-      data = parser.parse(fixture('punch_out_setup_request_doc_with_ship_to.xml'))
+      data = CXML::Parser.new(data: fixture('punch_out_setup_request_doc_with_ship_to.xml')).parse
       doc = CXML::Document.new(data)
-      builder = doc.render
-      output_xml = builder.to_xml
-      output_data = parser.parse(output_xml)
+      output_xml = doc.to_xml
+      output_data = CXML::Parser.new(data: output_xml).parse
       output_data[:request][:punch_out_setup_request][:buyer_cookie]
         .should eq data[:request][:punch_out_setup_request][:buyer_cookie]
       output_data[:request][:punch_out_setup_request][:browser_form_post]

data/spec/purchase_order_request_spec.rb

@@ -3,20 +3,17 @@
 require 'spec_helper'
 
 describe CXML::OrderRequest do
-  it { should respond_to :render }
   it { should respond_to :order_request_header }
   it { should respond_to :items_out }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('purchase_order_request_200.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('purchase_order_request_200.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:order_request) { doc.request.order_request }
-  let(:builder) { doc.render }
-  let(:output_xml) { builder.to_xml }
-  let(:output_data) { parser.parse(output_xml) }
+  let(:output_xml) { doc.to_xml }
+  let(:output_data) { CXML::Parser.new(data: output_xml).parse }
   let(:order_request_output_data) { output_data[:request][:order_request] }
 
-  describe '#render' do
+  describe '#to_xml' do
     it 'contains the required nodes' do
       order_request_output_data[:order_request_header].should_not be_empty
       order_request_output_data[:item_out].should be_a Array

data/spec/request_spec.rb

@@ -9,24 +9,21 @@ describe CXML::Request do
 
   describe '#initialize' do
     it 'sets punch_out_setup_request attributes' do
-      parser = CXML::Parser.new
-      data = parser.parse(fixture('punch_out_setup_request_doc.xml'))
+      data = CXML::Parser.new(data: fixture('punch_out_setup_request_doc.xml')).parse
       doc = CXML::Document.new(data)
       doc.request.deployment_mode.should_not be_nil
       doc.request.punch_out_setup_request
          .should be_an_instance_of CXML::PunchOutSetupRequest
     end
     it 'sets purchase_order_request attributes' do
-      parser = CXML::Parser.new
-      data = parser.parse(fixture('purchase_order_request_200.xml'))
+      data = CXML::Parser.new(data: fixture('purchase_order_request_200.xml')).parse
       doc = CXML::Document.new(data)
       doc.request.deployment_mode.should_not be_nil
       doc.request.order_request
          .should be_an_instance_of CXML::OrderRequest
     end
     it 'sets invoice_detail_request attributes' do
-      parser = CXML::Parser.new
-      data = parser.parse(fixture('invoice_taxes_at_line.xml'))
+      data = CXML::Parser.new(data: fixture('invoice_taxes_at_line.xml')).parse
       doc = CXML::Document.new(data)
       doc.request.deployment_mode.should_not be_nil
       doc.request.invoice_detail_request

data/spec/response_spec.rb

@@ -7,11 +7,9 @@ describe CXML::Response do
   it { should respond_to :status }
   it { should respond_to :punch_out_setup_response }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('response_status_200.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('response_status_200.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:response) { doc.response }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
     it 'sets the mandatory attributes' do
@@ -21,11 +19,11 @@ describe CXML::Response do
   end
 
   describe '#render' do
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
 
     context 'when a valid response is rendered' do
-      let(:data) { parser.parse(fixture('response_status_200.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('response_status_200.xml')).parse }
 
       it 'returns xml content' do
         output_xml.should_not be_nil
@@ -43,7 +41,7 @@ describe CXML::Response do
     end
 
     context 'when a invalid response is rendered' do
-      let(:data) { parser.parse(fixture('response_status_400.xml')) }
+      let(:data) { CXML::Parser.new(data: fixture('response_status_400.xml')).parse }
 
       it 'returns xml content' do
         output_xml.should_not be_nil

data/spec/sender_spec.rb

@@ -6,11 +6,9 @@ describe CXML::Sender do
   it { should respond_to :credential }
   it { should respond_to :user_agent }
 
-  let(:parser) { CXML::Parser.new }
-  let(:data) { parser.parse(fixture('punch_out_order_message_doc.xml')) }
+  let(:data) { CXML::Parser.new(data: fixture('punch_out_order_message_doc.xml')).parse }
   let(:doc) { CXML::Document.new(data) }
   let(:sender) { doc.header.sender }
-  let(:builder) { doc.render }
 
   describe '#initialize' do
     it 'sets the mandatory attributes' do
@@ -20,8 +18,8 @@ describe CXML::Sender do
   end
 
   describe '#render' do
-    let(:output_xml) { builder.to_xml }
-    let(:output_data) { parser.parse(output_xml) }
+    let(:output_xml) { doc.to_xml }
+    let(:output_data) { CXML::Parser.new(data: output_xml).parse }
     let(:sender_output_data) { output_data[:header][:sender] }
 
     it 'contains the required nodes' do

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 $LOAD_PATH.unshift File.expand_path('..', __dir__)
 
-require 'cxml'
+require 'cxml-ruby'
 require 'pry'
 
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }

data/spec/support/helpers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-def build_item_in(parser)
-  parser.parse(fixture('item_in.xml'))
+def build_item_in
+  CXML::Parser.new(data: fixture('item_in.xml')).parse
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxml-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Beckman
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -67,34 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.81'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: Ruby library to parse/generate documents with the cXML protocol
 email:
 - josh@officeluv.com
@@ -107,6 +93,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md