quickbooks 0.9.9 → 1.0.2

data/Manifest.txt

@@ -9,7 +9,6 @@ lib/quickbooks/adapters/http_adapter.rb
 lib/quickbooks/adapters/https_adapter.rb
 lib/quickbooks/adapters/ole_adapter.rb
 lib/quickbooks/adapters/spew_adapter.rb
-lib/quickbooks/adapters/tcp_adapter.rb
 lib/quickbooks/adapters/test_adapter.rb
 lib/quickbooks/element.rb
 lib/quickbooks/element_collection.rb

data/README.txt

@@ -9,7 +9,7 @@ The only comprehensive Ruby interface to Quickbooks. THIS IS A DEMO VERSION. Vis
 
 == SYNOPSIS:
 
-  jim = QB::Customer.first(:fullname => ["Jim Stout"])
+  jim = QB::Customer.first(:FullName => "Jim Stout")
   jim.destroy # Note that you cannot delete items in QuickBooks
               # but you CAN delete them using the API.
 

data/lib/quickbooks/adapters/https_adapter.rb

@@ -18,18 +18,18 @@ module Quickbooks
       class Connection < HttpAdapter::Connection
         private
           def new_connection
-            root_ca_file = '/Users/daniel/Projects/qbonline/demoCA/cacert.pem'
+            # root_ca_file = File.dirname(__FILE__) + '/cacert.pem'
             http = Net::HTTP.new(@ip, @port)
             http.use_ssl = true
-            if File.exist?(root_ca_file)
-              http.ca_file = root_ca_file
-              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-              # http.verify_depth = 5
-              http.verify_depth = 5
-              http.enable_post_connection_check = false #true
-            else
+            # if File.exist?(root_ca_file)
+            #   http.ca_file = root_ca_file
+            #   http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            #   # http.verify_depth = 5
+            #   http.verify_depth = 5
+            #   http.enable_post_connection_check = false #true
+            # else
               http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
+            # end
             http
           end
       end

data/lib/quickbooks/element_collection.rb

@@ -59,7 +59,6 @@ class ElementCollection
   # TODO: Has a problem when an element is a new_record and a child isn't, or vice-versa.
   def to_element #:nodoc:
     element_klass = @type < Quickbooks::Model ? (@type.short_name + (@parent.new_record? ? 'Add' : 'Mod')) : @type.short_name
-    puts "Converting to #{element_klass}"
     elements = ElementCollection.new(@parent, element_klass)
     items.each {|e| elements << (@type < Quickbooks::Model ? e.to_element : e)}
     return elements
@@ -89,7 +88,11 @@ class ElementCollection
 
   def add_item(item)
     item = @type.new(item) unless item.is_a?(@type)
-    item.send(:dirty!) if dirty?
+    if dirty?
+      item.send(:dirty!)
+    elsif item.dirty?
+      dirty!
+    end
     items << item
     return item
   end
@@ -101,5 +104,7 @@ class ElementCollection
 
   def dirty!
     @dirty = true
+    # Shall all items be declared dirty when the collection container becomes dirty?
+    # items.each {|e| e.send(:dirty!)}
   end
 end

data/lib/quickbooks/model.rb

@@ -308,9 +308,14 @@ module Quickbooks
           attributes[key] = ElementCollection.new(self, key, value)
           attributes[key].send(:dirty!)
         else
-          # If it *should* be an array element, it shouldn't be set here as a single value. This is just for safeguard, so that syntax
-          # always shows what is going on. For an array element, set it with: object.some_attr = [value]
-          raise RuntimeError, "You can't set a single value into a multi-value element to using equals(=). Use \"model[:#{key}] << value\" to append, or wrap the value in an array -- \"model[:#{key}] = [ value ]\" -- if you want to completely replace the current value set."
+          if attributes[key].nil? || attributes[key].empty?
+            attributes[key] = ElementCollection.new(self, key, [value])
+            attributes[key].send(:dirty!)
+          else
+            # If it *should* be an array element, it shouldn't be set here as a single value. This is just for safeguard, so that syntax
+            # always shows what is going on. For an array element, set it with: object.some_attr = [value]
+            raise RuntimeError, "You can't set a singular value directly over an element that already contains multiple values. Use \"model[:#{key}] << value\" to append, or wrap the value in an array to explicitly replace the current contents -- \"model[:#{key}] = [ value ]\"."
+          end
         end
       else
         value = @new_record.nil? ? attr_klass.instantiate(value) : attr_klass.new(value) unless value.is_a?(attr_klass)
@@ -518,8 +523,14 @@ module Quickbooks
     
     def associate(association_name, value)
       instance_variable_set("@#{association_name}", value)
-      ref = value.to_ref
       ref_klass = self.class.associations[association_name].klass
+      ref = if value.respond_to?(:to_ref)
+        value.to_ref
+      elsif value.respond_to?(:[]) && !value.is_a?(Array)
+        ref_klass.new(value)
+      else
+        raise ArgumentError, "To assign to #{association_name}, set to a #{ref_klass} object or a Hash with the appropriate values to create one."
+      end
       !ref.nil? ?
         self[ref_klass] = ref :
         self.delete(ref_klass)

data/lib/quickbooks/ruby_ext.rb

@@ -57,11 +57,11 @@ class String
   def xml_escaped
     gsub(/[&<>'"]/) {|match|
       case match
-      when '&' then return '&amp;'
-      when '<' then return '&lt;'
-      when '>' then return '&gt;'
-      when "'" then return '&apos;'
-      when '"' then return '&quote;'
+      when '&' then '&amp;'
+      when '<' then '&lt;'
+      when '>' then '&gt;'
+      when "'" then '&apos;'
+      when '"' then '&quote;'
       end
     }
   end
@@ -154,6 +154,7 @@ module Quickbooks
         end
       end
       obj = stack.pop
+      raise RuntimeError, "Error while parsing xml response. XML:\n#{xml}" if obj.nil?
       obj.send(:clean!)
       obj
     end

data/lib/quickbooks/version.rb

@@ -1,9 +1,9 @@
 module Quickbooks #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 9
-    BUILD_DATE = '2009-08-05'
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 2
+    BUILD_DATE = '2010-01-13'
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/quickbooks/xsd/complex_type.rb

@@ -35,7 +35,15 @@ module Quickbooks
       def validate(object,required=true)
         # Validate the object's contents
         puts "#{$DEBUG<<"\t"}Validating CONFORMS TO #ComplexType #{name} (#{required ? 'REQUIRED' : 'OPTIONAL'})" if $DEBUG
-        r = items.inject(Valean.new) {|r,i| r << i.validate(object,required?(i)); r}
+        # If the object's contents are Enumerable (multiple values), we'll have to validate each of them individually
+        # and return the combined result of all of their validations.
+        r = if object.is_a?(Enumerable) && !object.is_a?(Hash)
+          object.inject(Valean.new) do |r,obj|
+            items.inject(r) {|r,i| r << i.validate(obj,required?(i)); r}
+          end
+        else
+          items.inject(Valean.new) {|r,i| r << i.validate(object,required?(i)); r}
+        end
         $DEBUG.chop! if $DEBUG
         puts "#{$DEBUG}\t- #{r}" if $DEBUG
         r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quickbooks
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 1.0.2
 platform: ruby
 authors: 
 - BehindLogic
@@ -67,7 +67,6 @@ files:
 - lib/quickbooks/adapters/https_adapter.rb
 - lib/quickbooks/adapters/ole_adapter.rb
 - lib/quickbooks/adapters/spew_adapter.rb
-- lib/quickbooks/adapters/tcp_adapter.rb
 - lib/quickbooks/adapters/test_adapter.rb
 - lib/quickbooks/element.rb
 - lib/quickbooks/element_collection.rb

data/lib/quickbooks/adapters/tcp_adapter.rb

@@ -1,71 +0,0 @@
-require 'net/http'
-
-# THIS IS A LEGACY ADAPTER, ITS USE IS NOT RECOMMENDED! It is insecure and unstable.
-# This adapter sends QBXML via an HTTP connection which is kept open for each session, and expects intelligent real-time QB responses from the other end.
-module Quickbooks
-  module Adapters
-    module HttpAdapter
-      # Whatever we do here, we just have to be sure that decrypt(encrypt(data)) == data
-      module SimpleEncryption
-        def encrypt(data)
-          data
-        end
-
-        def decrypt(data)
-          data
-        end
-      end
-
-      class Connection
-        include SimpleEncryption
-        def initialize(ip, port, shared_key)
-          @ip = ip
-          @port = port
-          @shared_key = shared_key
-        end
-
-        # Returns true if there is an open connection to Quickbooks, false if not. Use session? to determine an open session.
-        def connected?
-          (@connection ||= new_connection).started?
-        end
-
-        def close
-          @connection.finish rescue nil
-        end
-
-        # Sends a request to Quickbooks. This request should be a valid QBXML request. Use Qbxml::Request to generate valid requests.
-        def send_xml(xml)
-          # TODO: request.basic_auth url.user, url.password
-          res = try_retry(1, EOFError, :before_retry => lambda {@connection.finish}) {
-            connection.post('/ProcessRequest', encrypt(xml), {'Content-Type' => 'application/xml'})
-          }
-          response = decrypt(res.body)
-          return response
-        # rescue => e
-          # Rescue from the error: I guess we have to return a pretend response that says the network failed.
-          # raise "Failsafe not yet implemented!: #{e.inspect}"
-        end
-
-        def qbxml_versions
-          res = try_retry(1, EOFError, :before_retry => lambda {@connection.finish}) { connection.get('/QBXMLVersionsForSession') }
-          response = decrypt(res.body)
-          return response.chomp.split(/,/)
-        end
-        def latest_qbxml_version
-          @latest_qbxml_version ||= qbxml_versions.sort.last
-        end
-
-        # Returns the active connection to Quickbooks, or creates a new one if none exists.
-        def connection
-          @connection.start unless connected?
-          @connection
-        end
-
-        private
-          def new_connection
-            Net::HTTP.new(@ip, @port)
-          end
-      end
-    end
-  end
-end