quickbooks_api 0.0.3 → 0.0.4

data/lib/quickbooks/api.rb

@@ -72,7 +72,7 @@ def hash_to_obj(data)
   key = data.keys.first
   value = data[key]
 
-  key_path = find_nested_key(container.template(true), key)
+  key_path = find_nested_key(container.template(true), key.to_s)
   raise(RuntimeError, "#{key} class not found in api template") unless key_path
 
   wrapped_data = build_hash_wrapper(key_path, value)

data/lib/quickbooks/dtd_parser.rb

@@ -36,6 +36,7 @@ def build_qbxml_class(xml_obj)
   unless qbxml_class_defined?(obj_name) 
     klass = Class.new(QbxmlBase)
     get_schema_namespace.const_set(obj_name, klass) 
+    xml_obj = set_required_attributes(xml_obj)
     add_xml_template(klass, xml_obj.to_xml)
   else
     klass = get_schema_namespace.const_get(obj_name)

data/lib/quickbooks/qbxml_base.rb

@@ -6,38 +6,22 @@ class Quickbooks::QbxmlBase
   extend  Quickbooks::Support
   extend  Quickbooks::Support::API
 
-#QB_TYPE_CONVERSION_MAP= {
-  #"AMTTYPE"          => lambda {|d| String(d)},
-  #"BOOLTYPE"         => lambda {|d| String(d)},
-  #"DATETIMETYPE"     => lambda {|d| Date.parse(d)},
-  #"DATETYPE"         => lambda {|d| Date.parse(d)},
-  #"ENUMTYPE"         => lambda {|d| String(d)},
-  #"FLOATTYPE"        => lambda {|d| String(d)},
-  #"GUIDTYPE"         => lambda {|d| String(d)},
-  #"IDTYPE"           => lambda {|d| String(d)},
-  #"INTTYPE"          => lambda {|d| Integer(d)},
-  #"PERCENTTYPE"      => lambda {|d| Float(d)},
-  #"PRICETYPE"        => lambda {|d| Float(d)},
-  #"QUANTYPE"         => lambda {|d| Integer(d)},
-  #"STRTYPE"          => lambda {|d| String(d)},
-  #"TIMEINTERVALTYPE" => lambda {|d| String(d)}
-#}
-
 QB_TYPE_CONVERSION_MAP= {
-  "AMTTYPE"          => lambda {|d| String(d)},
-  "BOOLTYPE"         => lambda {|d| String(d)},
-  "DATETIMETYPE"     => lambda {|d| String(d)},
-  "DATETYPE"         => lambda {|d| String(d)},
-  "ENUMTYPE"         => lambda {|d| String(d)},
-  "FLOATTYPE"        => lambda {|d| String(d)},
-  "GUIDTYPE"         => lambda {|d| String(d)},
-  "IDTYPE"           => lambda {|d| String(d)},
-  "INTTYPE"          => lambda {|d| String(d)},
-  "PERCENTTYPE"      => lambda {|d| String(d)},
-  "PRICETYPE"        => lambda {|d| String(d)},
-  "QUANTYPE"         => lambda {|d| String(d)},
-  "STRTYPE"          => lambda {|d| String(d)},
-  "TIMEINTERVALTYPE" => lambda {|d| String(d)}
+  "AMTTYPE"          => lambda {|d| d ? Float(d) : 0.0 },
+  #"BOOLTYPE"         => lambda {|d| d ? (d == 'True' ? true : false) : false },
+  "BOOLTYPE"         => lambda {|d| d ? String(d) : '' },
+  "DATETIMETYPE"     => lambda {|d| d ? Time.parse(d).xmlschema : Time.now.xmlschema },
+  "DATETYPE"         => lambda {|d| d ? Date.parse(d).xmlschema : Date.today.xmlschema },
+  "ENUMTYPE"         => lambda {|d| d ? String(d) : ''},
+  "FLOATTYPE"        => lambda {|d| d ? Float(d) : 0.0},
+  "GUIDTYPE"         => lambda {|d| d ? String(d) : ''},
+  "IDTYPE"           => lambda {|d| d ? String(d) : ''},
+  "INTTYPE"          => lambda {|d| d ? Integer(d) : 0 },
+  "PERCENTTYPE"      => lambda {|d| d ? Float(d) : 0.0 },
+  "PRICETYPE"        => lambda {|d| d ? Float(d) : 0.0 },
+  "QUANTYPE"         => lambda {|d| d ? Integer(d.to_i) : 0 },
+  "STRTYPE"          => lambda {|d| d ? String(d) : ''},
+  "TIMEINTERVALTYPE" => lambda {|d| d ? String(d) : ''}
 }
 
 
@@ -101,7 +85,9 @@ def inner_attributes
     end
   
   values = top_level_attrs.values.compact
-  if values.size > 1 || values.first.is_a?(Array)
+  if values.empty?
+    {}
+  elsif values.size > 1 || values.first.is_a?(Array)
     attributes
   else
     values.first.inner_attributes

data/lib/quickbooks/qbxml_parser.rb

@@ -92,5 +92,4 @@ def set_attribute_value(instance, attr_name, data)
   end
 end
 
-
 end

data/lib/quickbooks/support/api.rb

@@ -9,10 +9,16 @@ module Quickbooks::Support::API
     :qb    => {:dtd_file => "qbxmlops70.xml", 
                :namespace => QBXML, 
                :container_class => lambda { Quickbooks::QBXML::QBXML },
+               :required_xml_attributes => {
+                 "onError" => "stopOnError"
+               }
               }.freeze,
     :qbpos => {:dtd_file => "qbposxmlops30.xml", 
                :namespace => QBPOSXML, 
                :container_class => lambda { Quickbooks::QBPOSXML::QBPOSXML },
+               :required_xml_attributes => {
+                 "onError" => "stopOnError"
+               }
               }.freeze,
   }.freeze
 
@@ -48,6 +54,10 @@ private
     "#{RUBY_SCHEMA_PATH}/#{schema_type.to_s}/templates"
   end
 
+  def get_required_xml_attributes
+    SCHEMA_MAP[schema_type][:required_xml_attributes]
+  end
+
   # fetches all the dynamically generated schema classes
   def cached_classes
     cached_classes = SCHEMA_MAP.inject({}) do |h, (schema_type, opts)|

data/lib/quickbooks/support/class_builder.rb

@@ -11,9 +11,10 @@ def add_strict_attribute(klass, attr_name, type)
 
     def #{attr_name}=(obj)
       expected_type = self.class.#{attr_name}_type
-      if obj.class == expected_type
+      case obj 
+      when expected_type, Array
         @#{attr_name} = obj
-      elsif obj.is_a?(Hash)
+      when Hash
         @#{attr_name} = #{type}.new(obj)
       else
         raise(TypeError, "expecting an object of type \#{expected_type}") 
@@ -25,8 +26,8 @@ end
 
 def add_casting_attribute(klass, attr_name, type)
   type_casting_proc = klass::QB_TYPE_CONVERSION_MAP[type]
-  type = type_casting_proc.call(nil).class
-  add_attribute_type(klass, attr_name, type)
+  ruby_type = type_casting_proc.call(nil).class
+  add_attribute_type(klass, attr_name, ruby_type)
 
   eval <<-class_body
   class #{klass}

data/lib/quickbooks/support/qbxml.rb

@@ -28,4 +28,16 @@ module Quickbooks::Support::QBXML
     qbxml.join('')
   end
 
+  def set_required_attributes(xml_obj)
+    required_attributes = get_required_xml_attributes
+    xml_obj.attributes.each do |a,v|
+      if required_attributes.keys.include?(a)
+        xml_obj.set_attribute(a, required_attributes[a])
+      else
+        xml_obj.remove_attribute(a)
+      end
+    end
+    xml_obj
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quickbooks_api
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alex Skryl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -05:00
+date: 2011-06-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency