quickbooks_api 0.1.1 → 0.1.2

data/lib/quickbooks/api.rb

@@ -67,7 +67,7 @@ class Quickbooks::API
   # RUBY 2 QBXML
 
   def hash_to_obj(data)
-    key, value = data.detect { |name, value| name != :xml_attributes }
+    key, value = data.detect { |name, value| name != 'xml_attributes' && name != :xml_attributes }
     key_path = container_class.template(true).path_to_nested_key(key.to_s)
     raise(RuntimeError, "#{key} class not found in api template") unless key_path
 

data/lib/quickbooks/logger.rb

@@ -8,7 +8,7 @@ end
 
 class Quickbooks::Log
   private_class_method :new
-  LOG_LEVEL = 1
+  LOG_LEVEL = 6
 
   def self.init(log_level)
     @log = BufferedLogger.new(STDOUT, log_level || LOG_LEVEL)

data/lib/quickbooks/parser/qbxml_base.rb

@@ -6,12 +6,12 @@ class Quickbooks::Parser::QbxmlBase
 
   QBXML_BASE = Quickbooks::Parser::QbxmlBase
 
-  FLOAT_CAST = lambda {|d| d ? Float(d) : 0.0}                                  
-  BOOL_CAST  = lambda {|d| d ? (d == 'True' ? true : false) : false }          
-  DATE_CAST  = lambda {|d| d ? Date.parse(d).xmlschema : Date.today.xmlschema } 
-  TIME_CAST  = lambda {|d| d ? Time.parse(d).xmlschema : Time.now.xmlschema }   
-  INT_CAST   = lambda {|d| d ? Integer(d.to_i) : 0 }                                 
-  STR_CAST   = lambda {|d| d ? String(d) : ''}                                  
+  FLOAT_CAST = Proc.new {|d| d ? Float(d) : 0.0}                                  
+  BOOL_CAST  = Proc.new {|d| d ? (d == 'True' ? true : false) : false }          
+  DATE_CAST  = Proc.new {|d| d ? Date.parse(d).xmlschema : Date.today.xmlschema } 
+  TIME_CAST  = Proc.new {|d| d ? Time.parse(d).xmlschema : Time.now.xmlschema }   
+  INT_CAST   = Proc.new {|d| d ? Integer(d.to_i) : 0 }                                 
+  STR_CAST   = Proc.new {|d| d ? String(d) : ''}                                  
 
   QB_TYPE_CONVERSION_MAP= {
     "AMTTYPE"          => FLOAT_CAST,
@@ -37,7 +37,8 @@ class Quickbooks::Parser::QbxmlBase
 
   def initialize(params = nil)
     return unless params.is_a?(Hash)
-    @xml_attributes = params[:xml_attributes] || {}
+    @xml_attributes = params['xml_attributes'] || params[:xml_attributes] || {}
+    params.delete('xml_attributes')
     params.delete(:xml_attributes)
 
     params.each do |attr, value|
@@ -59,14 +60,15 @@ class Quickbooks::Parser::QbxmlBase
   end
 
   def self.attribute_names
-    instance_methods(false).reject { |m| m == "xml_attributes" || m[-1..-1] == '=' || m =~ /_xml_class/} 
+    # 1.9.2 changes instance_methods behavior to return symbols instead of strings
+    instance_methods(false).reject { |m| m[-1..-1] == '=' || m.to_s =~ /xml_attributes/ || m =~ /_xml_class/}.map { |m| m.to_s }
   end
 
   # returns innermost attributes without outer layers of the hash
   #
   def inner_attributes(parent = nil)
     attrs = attributes(false)
-    attrs.delete(:xml_attributes)
+    attrs.delete('xml_attributes')
     values = attrs.values.compact
 
     if values.empty?
@@ -87,7 +89,7 @@ class Quickbooks::Parser::QbxmlBase
 
   def attributes(recursive = true)
     attrs = {}
-    attrs[:xml_attributes] = xml_attributes
+    attrs['xml_attributes'] = xml_attributes
     self.class.attribute_names.inject(attrs) do |h, m|
       val = self.send(m)
       if !val.nil?

data/lib/quickbooks/parser/xml_generation.rb

@@ -32,15 +32,15 @@ private
 
   def build_qbxml_nodes(node, val)
     val = [val].flatten
-    val.inject([]) do |a, v|
-      a << case v
-        when QbxmlBase
-          v.to_qbxml
-        else
-          n = node.clone
-          n.children = val.to_s
-          n
-        end
+    val.map do |v|
+      case v
+      when QbxmlBase
+        v.to_qbxml
+      else
+        n = node.clone
+        n.children = v.to_s
+        n.to_s
+      end
     end
   end
 

data/lib/quickbooks/support/monkey_patches.rb

@@ -1,20 +1,20 @@
 class Hash
 
   def path_to_nested_key(key)
-    self.each do |k,v|
+    each do |k,v|
       path = [k]
       if k == key
         return path
       elsif v.is_a? Hash
         nested_path = v.path_to_nested_key(key)
-        nested_path ? (return path + nested_path) : nil
+        return (path + nested_path) if nested_path
       end
     end
     return nil
   end
 
   def self.nest(path, value)
-    hash_constructor = lambda { |h, k| h[k] = Hash.new(&hash_constructor) }
+    hash_constructor = Proc.new { |h, k| h[k] = Hash.new(&hash_constructor) }
     nested_hash = Hash.new(&hash_constructor)
 
     last_key = path.last

metadata

@@ -1,60 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: quickbooks_api
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Alex Skryl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-07 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70319842955620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70319842955620
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70319842955000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70319842955000
 description: A QuickBooks QBXML wrapper for Ruby
 email: rut216@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/quickbooks/api.rb
 - lib/quickbooks/config.rb
 - lib/quickbooks/dtd_parser.rb
@@ -83,39 +67,28 @@ files:
 - xml_schema/qbxmlops70.xml
 - README
 - TODO
-has_rdoc: true
 homepage: http://github.com/skryl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: QuickBooks XML API
 test_files: []
-