quickbooks_api 0.0.4 → 0.0.7

data/lib/quickbooks/api.rb

@@ -40,9 +40,13 @@ def find(class_name)
   cached_classes.find { |c| to_attribute_name(c) == class_name }
 end
 
-def grep(keyword)
-  keyword = keyword.to_s
-  cached_classes.select { |c| to_attribute_name(c).include?(keyword) }
+def grep(pattern)
+  case pattern
+  when Regexp
+    cached_classes.select { |c| to_attribute_name(c).match(pattern) }
+  when String
+    cached_classes.select { |c| to_attribute_name(c).include?(pattern) }
+  end
 end
 
 # QBXML 2 RUBY

data/lib/quickbooks/qbxml_base.rb

@@ -29,6 +29,15 @@ def initialize(params = nil)
   return unless params.is_a?(Hash)
   params.each do |k,v|
     if self.respond_to?(k)
+      expected_type = self.class.send("#{k}_type")
+      v = \
+        case v
+        when Hash
+          expected_type.new(v)
+        when Array
+          v.inject([]) { |a,i| a << expected_type.new(i) }
+        else v
+        end
       self.send("#{k}=", v)
     end
   end
@@ -48,7 +57,7 @@ def to_qbxml
     log.debug "to_qbxml#attr_name: #{attr_name}"
 
     val = self.send(attr_name)
-    next unless val
+    next unless val && !val.blank?
 
     case val
     when Array
@@ -78,19 +87,23 @@ def self.attribute_names
 end
 
 
-def inner_attributes
-  top_level_attrs = \
-    self.class.attribute_names.inject({}) do |h, m|
-      h[m] = self.send(m); h
-    end
-  
-  values = top_level_attrs.values.compact
+def inner_attributes(parent = nil)
+  attrs = attributes(false)
+  values = attrs.values.compact
+
   if values.empty?
     {}
-  elsif values.size > 1 || values.first.is_a?(Array)
+  elsif values.first.is_a?(Array)
     attributes
+  elsif values.size > 1
+    parent.attributes
   else
-    values.first.inner_attributes
+    first_val = values.first
+    if first_val.respond_to?(:inner_attributes)
+      first_val.inner_attributes(self)
+    else
+      parent.attributes
+    end
   end
 end
 
@@ -141,20 +154,21 @@ end
 
 def build_qbxml_nodes(node, val)
   val.inject([]) do |a, v|
-    n = clone_qbxml_node(node,v)
+    n = \
+      case v
+      when Quickbooks::QbxmlBase
+        v.to_qbxml
+      else
+        clone_qbxml_node(node,v)
+      end
     a << n
   end
 end
 
 def clone_qbxml_node(node, val)
   n = node.clone
-  n.children = \
-    case val
-    when Quickbooks::QbxmlBase
-      val.to_qbxml 
-    else 
-      val.to_s
-    end; n
+  n.children = val.to_s
+  n
 end
 
 # qbxml class templates

data/lib/quickbooks/qbxml_parser.rb

@@ -74,8 +74,7 @@ def parse_leaf_node_data(xml_obj)
 end
 
 def fetch_qbxml_class_instance(xml_obj)
-  instance = get_schema_namespace.const_get(xml_obj.name).new
-  instance
+  get_schema_namespace.const_get(xml_obj.name).new
 end
 
 def set_attribute_value(instance, attr_name, data)

data/lib/quickbooks/support/class_builder.rb

@@ -14,8 +14,6 @@ def add_strict_attribute(klass, attr_name, type)
       case obj 
       when expected_type, Array
         @#{attr_name} = obj
-      when Hash
-        @#{attr_name} = #{type}.new(obj)
       else
         raise(TypeError, "expecting an object of type \#{expected_type}") 
       end

metadata

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