qbxml 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11572014f70b00b684710498b5f2072e4c716a34
-  data.tar.gz: d8d4be361ed0a330345637c270221fb06f1f03c0
+  metadata.gz: 6c56d438dd81ddd6797733fb49d66380275dd355
+  data.tar.gz: b9e9a280fab05871d6d0ad11de67647edc381f05
 SHA512:
-  metadata.gz: bfac0afceeca6efd56a5459f0c21b1180d76c6705ff070a30d254db62c35255015e66d1be3ecc6fe88272b0f351ca18d06e38c0f32e5e9b810c871d324720436
-  data.tar.gz: eb5a9c9a4346d810b638000608ef37f02d382a5dc9683576bc67f757af49a0b0e66fbcb1bcd691c171bd1ea6d861941fd80510175857ebf83d69bc95d56feb47
+  metadata.gz: 6667cb6c3aa3064f6a30b5405b1b58141f7e286d16ccdec61fe7068af9327d09d542e51ec64228d6d5206655472869a5e42ffe0e44a225ebf52deb604489e76c
+  data.tar.gz: 4299dd57e9015bb93eec46c7491389af1ac501920f4cec8d86d84e77e0174312b4cc5094f24de864804949570f7ccfcabecd1cbf8f12e8483fdfe84762ba1906

data/.travis.yml

@@ -1,6 +1,22 @@
 language: ruby
+
 rvm:
-  - 1.9
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.1
+
+gemfile:
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_4.1.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5.0.gemfile
+
+before_install:
+  - if ruby --version | cut -d ' ' -f 2 | grep -q 2.1.5p273 ; then gem update --system 2.4.8; fi

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails-4.1" do
+  gem "activesupport", "~> 4.1.0"
+end
+
+appraise "rails-4.2" do
+  gem "activesupport", "~> 4.2.0"
+end
+
+appraise "rails-5.0" do
+  gem "activesupport", "~> 5.0.0"
+end

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ../
+  specs:
+    qbxml (0.3.0)
+      activesupport (>= 4.1.0)
+      builder (~> 3.0)
+      nokogiri (~> 1.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.1.16)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    coderay (1.1.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    method_source (0.8.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.1.0)
+  appraisal
+  pry
+  pry-nav
+  qbxml!
+  rake
+  rspec
+  simplecov
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ../
+  specs:
+    qbxml (0.3.0)
+      activesupport (>= 4.1.0)
+      builder (~> 3.0)
+      nokogiri (~> 1.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    coderay (1.1.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    method_source (0.8.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.2.0)
+  appraisal
+  pry
+  pry-nav
+  qbxml!
+  rake
+  rspec
+  simplecov
+
+BUNDLED WITH
+   1.12.5

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile.lock

@@ -0,0 +1,80 @@
+PATH
+  remote: ../
+  specs:
+    qbxml (0.3.0)
+      activesupport (>= 4.1.0)
+      builder (~> 3.0)
+      nokogiri (~> 1.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    i18n (0.7.0)
+    json (2.0.2)
+    method_source (0.8.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 5.0.0)
+  appraisal
+  pry
+  pry-nav
+  qbxml!
+  rake
+  rspec
+  simplecov
+
+BUNDLED WITH
+   1.12.5

data/lib/qbxml/hash.rb

@@ -85,15 +85,23 @@ private
     name = node.name
     schema = opts[:schema]
     opts[:typecast_cache] ||= {}
+    opts[:is_repetitive_cache] ||= {}
 
     # Insert node hash into parent hash correctly.
     case hash[name]
       when Array
         hash[name] << node_hash
       when Hash, String
+        # This parent has multiple nodes with the same name, but when we checked the first time,
+        # we found it is not defined as repetitive. I guess this means the schema is a liar.
         hash[name] = [hash[name], node_hash]
       else
-        hash[name] = node_hash
+        # We didn't see this node name under this parent yet.
+        if is_repetitive?(schema, node.path, opts[:is_repetitive_cache])
+          hash[name] = [node_hash]
+        else
+          hash[name] = node_hash
+        end
     end
 
     # Handle child elements
@@ -142,6 +150,21 @@ private
     type_proc[value]
   end
 
+  # Determines if the node is repetitive. Just because something is repetitive doesn't mean it always repeats.
+  # For example, a customer query could return 1 result or 100, but in both cases, we should be returning an
+  # Array.
+  def self.is_repetitive?(schema, xpath, is_repetitive_cache)
+    # Yes, we are parsing comments.
+    comment_path = xpath.gsub(/\[\d+\]/,'') + "/comment()"
+    return is_repetitive_cache[comment_path] || parse_repetitive_from_comment(schema, comment_path)
+  end
+
+  def self.parse_repetitive_from_comment(schema, comment_path)
+    comment = schema.xpath(comment_path).first
+    return false if comment.nil?
+    return comment.text.include?('may rep')
+  end
+
   def self.deep_convert(hash, opts = {}, &block)
     hash.inject(self.new) do |h, (k,v)|
       k = k.to_s

data/lib/qbxml/types.rb

@@ -5,7 +5,7 @@ module Qbxml::Types
     :qbpos => :qbposxml
   }.freeze
 
-  FLOAT_CAST = Proc.new {|d| d ? Float(d) : 0.0}
+  FLOAT_CAST = Proc.new {|d| d ? d.to_f : 0.0}
   BOOL_CAST  = Proc.new {|d| d ? (d.to_s.downcase == 'true' ? true : false) : false }
   DATE_CAST  = Proc.new {|d| d ? Date.parse(d).strftime("%Y-%m-%d") : Date.today.strftime("%Y-%m-%d") }
   TIME_CAST  = Proc.new {|d| d ? Time.parse(d).xmlschema : Time.now.xmlschema }

data/lib/qbxml/version.rb

@@ -1,3 +1,3 @@
 class Qbxml
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/qbxml.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('activesupport', '>= 3.2.9')
+  gem.add_dependency('activesupport', '>= 4.1.0')
   gem.add_dependency('nokogiri', '~> 1.5')
   gem.add_dependency('builder', '~> 3.0')
 
@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('rake')
+  gem.add_development_dependency('appraisal')
 end

data/test/unit/xml_to_hash_test.rb

@@ -26,5 +26,99 @@ class XmlToHashTest < Minitest::Test
     assert_equal h, qbxml.from_qbxml("<?qbxml version=\"7.0\"?>\n<QBXML>\n  <QBXMLMsgsRq>\n    <InvoiceQueryRq>\n      <IncludeRetElement>TxnID</IncludeRetElement>\n    <IncludeRetElement>RefNumber</IncludeRetElement>\n    </InvoiceQueryRq>\n  </QBXMLMsgsRq>\n</QBXML>\n")
   end
 
-end
+  def test_array_with_one_element
+    qbxml = Qbxml.new
+    h = {
+      "qbxml" => {
+        "xml_attributes" => {},
+        "qbxml_msgs_rs" => {
+          "xml_attributes" => {},
+          'customer_query_rs' => {
+            "xml_attributes" => {},
+            'customer_ret' => [{
+              "xml_attributes"=> {},
+              'list_id' => 'abc'
+            }]
+          }
+        }
+      }
+    }
+    assert_equal h, qbxml.from_qbxml("<?qbxml version=\"7.0\"?>\n<QBXML>\n  <QBXMLMsgsRs>\n    <CustomerQueryRs>\n      <CustomerRet><ListID>abc</ListID></CustomerRet>\n    </CustomerQueryRs>\n  </QBXMLMsgsRs>\n</QBXML>\n")
+  end
+
+  def test_float_percentage
+    qbxml = Qbxml.new
+    h = {
+      "qbxml" => {
+        "xml_attributes" => {},
+        "qbxml_msgs_rs" => {
+          "xml_attributes" => {},
+          "item_query_rs" => {
+            "xml_attributes" => {
+              "requestID" => "Retrieve items",
+              "statusCode" => "0",
+              "statusSeverity" => "Info",
+              "statusMessage" => "Status OK",
+              "iteratorRemainingCount" => "0",
+              "iteratorID" => "{10c05cbd-b25b-4a85-8aa0-8bce89e6e900}"
+            },
+            "item_service_ret" => {
+              "xml_attributes" => {},
+              "list_id" => "80000005-1468535148",
+              "time_created" => "2016-07-14T15:25:48+00:00",
+              "time_modified" => "2016-07-14T15:25:48+00:00",
+              "edit_sequence" => "1468535148",
+              "name" => "let's get intuit",
+              "full_name" => "let's get intuit",
+              "is_active" => true,
+              "sublevel" => 0,
+              "sales_or_purchase" => {
+                "xml_attributes" => {},
+                "price_percent" => 18.0,
+                "account_ref" => {
+                  "xml_attributes" => {},
+                  "list_id" => "80000015-1457547358",
+                  "full_name" => "Repairs and Maintenance"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    xml = <<-XML
+      <QBXML>
+        <QBXMLMsgsRs>
+          <ItemQueryRs requestID="Retrieve items"
+                       statusCode="0"
+                       statusSeverity="Info"
+                       statusMessage="Status OK"
+                       iteratorRemainingCount="0"
+                       iteratorID="{10c05cbd-b25b-4a85-8aa0-8bce89e6e900}">
+            <ItemServiceRet>
+              <ListID>80000005-1468535148</ListID>
+              <TimeCreated>2016-07-14T15:25:48+00:00</TimeCreated>
+              <TimeModified>2016-07-14T15:25:48+00:00</TimeModified>
+              <EditSequence>1468535148</EditSequence>
+              <Name>let's get intuit</Name>
+              <FullName>let's get intuit</FullName>
+              <IsActive>true</IsActive>
+              <Sublevel>0</Sublevel>
+              <SalesOrPurchase>
+                <PricePercent>18.0%</PricePercent>
+                <AccountRef>
+                  <ListID>80000015-1457547358</ListID>
+                  <FullName>Repairs and Maintenance</FullName>
+                </AccountRef>
+              </SalesOrPurchase>
+            </ItemServiceRet>
+          </ItemQueryRs>
+        </QBXMLMsgsRs>
+      </QBXML>
+    XML
 
+    assert_equal h, qbxml.from_qbxml(xml)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbxml
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Skryl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Quickbooks XML Parser
 email:
 - rut216@gmail.com
@@ -133,10 +147,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.1.gemfile.lock
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_4.2.gemfile.lock
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.0.gemfile.lock
 - lib/qbxml.rb
 - lib/qbxml/hash.rb
 - lib/qbxml/qbxml.rb
@@ -200,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Quickbooks XML Parser and Validation Tool