Fix acronym regexp to not match for example COM against CompanyName #2

Author: JasonBarnabe

lib/qbxml/hash.rb

@@ -18,7 +18,7 @@ def self.from_hash(hash, opts = {}, &block)
         lambda { |k|
           # QB wants things like ListID, not ListId. Adding inflections then using camelize can accomplish
           # the same thing, but then the inflections will apply to everything the user does everywhere.
-          k.camelize.gsub(Qbxml::Types::ACRONYM_REGEXP) { "#{$1}#{$2.upcase}" }
+          k.camelize.gsub(Qbxml::Types::ACRONYM_REGEXP) { "#{$1}#{$2.upcase}#{$3}" }
         }
       elsif opts[:underscore]
         lambda { |k| k.underscore } 

lib/qbxml/types.rb

@@ -35,6 +35,9 @@ module Qbxml::Types
               'PIN', 'SSN', 'COM', 'CLSID', 'FOB', 'EIN', 'UOM', 'PO', 'PIN', 'QB']
 
   # Based on the regexp in ActiveSupport::Inflector.camelize
-  ACRONYM_REGEXP = Regexp.new("(?:(^|[a-z]|\\/))(#{ACRONYMS.map{|a| a.capitalize}.join("|")})")
+  # Substring 1: Start of string, lower case letter, or slash
+  # Substring 2: One of the acronyms above, In Capitalized Casing
+  # Substring 3: End of string or capital letter
+  ACRONYM_REGEXP = Regexp.new("(?:(^|[a-z]|\\/))(#{ACRONYMS.map{|a| a.capitalize}.join("|")})([A-Z]|$)")
 
 end

test/unit/hash_to_xml_test.rb

@@ -44,6 +44,31 @@ def test_hash_to_xml_invoice_mod
     assert_equal xml, qbxml.to_qbxml({:invoice_mod_rq=>{:invoice_mod=>{:txn_id=>"1929B9-1423150873", :edit_sequence=>nil, :customer_ref=>{:list_id=>"4A50001-1013529664"}, :txn_date=>"2015-01-28", :ref_number=>"12345678", :memo=>"", :invoice_line_mod=>[{:txn_line_id=>-1, :item_ref=>{:full_name=>"Sales"}, :desc=>"Contract 123", :quantity=>"23.44165", :rate=> 515.0, :sales_tax_code_ref=>{:full_name=>"E"}}]}}})
   end
 
+  def test_hash_to_xml_customer_add
+    qbxml = Qbxml.new
+    xml = <<-EOF
+<?qbxml version="7.0"?>
+<QBXML>
+  <QBXMLMsgsRq>
+    <CustomerAddRq>
+      <CustomerAdd>
+        <Name>Joe Blow</Name>
+        <CompanyName>Joe Blow Inc.</CompanyName>
+        <BillAddress>
+          <Addr1>123 Fake Street</Addr1>
+          <City>Springfield</City>
+          <State>Texachussets</State>
+          <PostalCode>99999</PostalCode>
+          <Country>USA</Country>
+        </BillAddress>
+      </CustomerAdd>
+    </CustomerAddRq>
+  </QBXMLMsgsRq>
+</QBXML>
+    EOF
+    assert_equal xml, qbxml.to_qbxml({:customer_add_rq=>{:customer_add=>{:name=>"Joe Blow", :company_name=>"Joe Blow Inc.", :bill_address=>{:addr1=>"123 Fake Street", :city=>"Springfield", :state=>"Texachussets", :postal_code=>"99999", :country=>"USA"}}}})
+  end
+
   def test_array_of_strings
     assert_equal "<foo>\n  <bar>baz</bar>\n  <bar>guh</bar>\n</foo>\n", Qbxml::Hash.to_xml({:foo => {:bar => ['baz', 'guh']}}, {skip_instruct: true})
   end