althor880-activerecord-activesalesforce-adapter 2.3.5 → 2.3.6

data/Rakefile

@@ -12,7 +12,6 @@ begin
     gemspec.add_dependency('rails', '>= 2.3.3')
     gemspec.add_dependency('builder', '>= 1.2.4')
     gemspec.add_dependency('xmlparser', '>= 0.6')
-    gemspec.add_dependency('facets', '>= 2.4')
     
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-2.3.5
+2.3.6

data/althor880-activerecord-activesalesforce-adapter.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{althor880-activerecord-activesalesforce-adapter}
-  s.version = "2.3.5"
+  s.version = "2.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Chasman", "Luigi Montanez", "Senthil Nayagam", "Justin Ball", "Jesse Hallett", "Andrew Freeberg"]
-  s.date = %q{2009-11-24}
+  s.date = %q{2010-02-25}
   s.email = %q{althor880@gmail.com}
   s.extra_rdoc_files = [
     "README"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "lib/rforce/binding.rb",
      "lib/rforce/method_keys.rb",
      "lib/rforce/soap_pullable.rb",
+     "lib/rforce/soap_response.rb",
      "lib/rforce/soap_response_expat.rb",
      "lib/rforce/soap_response_hpricot.rb",
      "lib/rforce/soap_response_rexml.rb",
@@ -67,26 +68,26 @@ Gem::Specification.new do |s|
   s.summary = %q{ActiveSalesforce (ASF) is a Rails connection adapter that provides direct access to Salesforce.com hosted data and metadata via the ActiveRecord model layer. Objects, fields, and relationships are all auto surfaced as active record attributes and rels.}
   s.test_files = [
     "test/unit",
+     "test/unit/config.yml",
      "test/unit/basic_test.rb",
+     "test/unit/recorded_test_case.rb",
      "test/unit/recorded_results",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_default_rule.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_update_mru.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_save_a_contact.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_create_a_contact.recording",
      "test/unit/recorded_results/AsfUnitTestsBasicTest.test_master_detail.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_add_notes_to_contact.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_assignment_rule_id.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_count_contacts.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_update_mru.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_get_created_by_from_contact.recording",
      "test/unit/recorded_results/AsfUnitTestsBasicTest.test_read_all_content_columns.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_batch_insert.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_first_name.recording",
      "test/unit/recorded_results/AsfUnitTestsBasicTest.test_client_id.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_create_a_contact.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_id.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_add_notes_to_contact.recording",
      "test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_addresses.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_first_name.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_id.recording",
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_batch_insert.recording",
      "test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_count_contacts.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_save_a_contact.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_get_created_by_from_contact.recording",
-     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_assignment_rule_id.recording",
-     "test/unit/config.yml",
-     "test/unit/recorded_test_case.rb"
+     "test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_default_rule.recording"
   ]
 
   if s.respond_to? :specification_version then
@@ -97,17 +98,15 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, [">= 2.3.3"])
       s.add_runtime_dependency(%q<builder>, [">= 1.2.4"])
       s.add_runtime_dependency(%q<xmlparser>, [">= 0.6"])
-      s.add_runtime_dependency(%q<facets>, [">= 2.4"])
     else
       s.add_dependency(%q<rails>, [">= 2.3.3"])
       s.add_dependency(%q<builder>, [">= 1.2.4"])
       s.add_dependency(%q<xmlparser>, [">= 0.6"])
-      s.add_dependency(%q<facets>, [">= 2.4"])
     end
   else
     s.add_dependency(%q<rails>, [">= 2.3.3"])
     s.add_dependency(%q<builder>, [">= 1.2.4"])
     s.add_dependency(%q<xmlparser>, [">= 0.6"])
-    s.add_dependency(%q<facets>, [">= 2.4"])
   end
 end
+

data/lib/rforce.rb

@@ -1,6 +1,5 @@
 =begin
-RForce v0.3
-Copyright (c) 2005-2008 Ian Dees and contributors
+Copyright (c) 2005-2010 Ian Dees and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +28,7 @@ SOFTWARE.
 #
 #  Example:
 #
-#    binding = RForce::Binding.new 'na1-api.salesforce.com'
+#    binding = RForce::Binding.new 'https://www.salesforce.com/services/Soap/u/10.0'
 #    binding.login 'username', 'password'
 #    answer = binding.search(
 #      :searchString =>
@@ -47,37 +46,10 @@ SOFTWARE.
 #    binding.create 'sObject {"xsi:type" => "Opportunity"}' => opportunity
 #
 
-
-require 'net/https'
-require 'uri'
-require 'zlib'
-require 'stringio'
-
-require 'rubygems'
-
-gem 'builder', '>= 2.0.0'
-require 'builder'
-
-gem 'facets', '>= 2.4'
-require 'facets/openhash'
-
 require 'rforce/binding'
-require 'rforce/soap_response_rexml'
-require 'rforce/soap_response_hpricot' rescue nil
-require 'rforce/soap_response_expat' rescue nil
-
+require 'rforce/soap_response'
 
 module RForce
-  # Use the fastest XML parser available.
-  def self.parser(name)
-      RForce.const_get(name) rescue nil
-  end
-  
-  SoapResponse = 
-    parser(:SoapResponseExpat) ||
-    parser(:SoapResponseHpricot) ||
-    SoapResponseRexml
-  
   # Expand Ruby data structures into XML.
   def expand(builder, args, xmlns = nil)
     # Nest arrays: [:a, 1, :b, 2] => [[:a, 1], [:b, 2]]
@@ -104,13 +76,12 @@ module RForce
       # Create an XML element and fill it with this
       # value's sub-items.
       case value
-      when Hash, Array
+      when Hash, Array then
         builder.tag!(key, attributes) do expand builder, value; end
 
-      when String
+      when String then
         builder.tag!(key, attributes) { builder.text! value }
       end
     end
   end
-  
 end

data/lib/rforce/binding.rb

@@ -1,3 +1,10 @@
+require 'net/https'
+require 'uri'
+require 'zlib'
+require 'stringio'
+require 'builder'
+
+
 module RForce
   # Implements the connection to the SalesForce server.
   class Binding
@@ -69,7 +76,7 @@ module RForce
 
       response = call_remote(:login, [:username, user, :password, password])
       
-      raise "Incorrect user name / password [#{response[:Fault][:faultstring]}]" unless response.loginResponse
+      raise "Incorrect user name / password [#{response.fault}]" unless response.loginResponse
 
       result = response[:loginResponse][:result]
       @session_id = result[:sessionId]
@@ -84,10 +91,13 @@ module RForce
     # a hash or (if order is important) an array of alternating
     # keys and values.
     def call_remote(method, args)
+
+      urn, soap_url = block_given? ? yield : ["urn:partner.soap.sforce.com", @url.path]
+
       # Create XML text from the arguments.
       expanded = ''
       @builder = Builder::XmlMarkup.new(:target => expanded)
-      expand(@builder, {method => args}, 'urn:partner.soap.sforce.com')
+      expand(@builder, {method => args}, urn)
 
       extra_headers = ""
       extra_headers << (AssignmentRuleHeaderUsingRuleId % assignment_rule_id) if assignment_rule_id
@@ -128,7 +138,7 @@ module RForce
       end
 
       # Send the request to the server and read the response.
-      response = @server.post2(@url.path, request.lstrip, headers)
+      response = @server.post2(soap_url, request.lstrip, headers)
 
       # decode if we have encoding
       content = decode(response)
@@ -142,7 +152,7 @@ module RForce
         request = encode(request)
 
         # Send the request to the server and read the response.
-        response = @server.post2(@url.path, request.lstrip, headers)
+        response = @server.post2(soap_url, request.lstrip, headers)
 
         content = decode(response)
       end
@@ -160,7 +170,7 @@ module RForce
 
       # decode gzip
       case encoding.strip
-      when 'gzip':
+      when 'gzip' then
         begin
           gzr = Zlib::GzipReader.new(StringIO.new(response.body))
           decoded = gzr.read

data/lib/rforce/soap_pullable.rb

@@ -1,7 +1,9 @@
+require 'rforce/method_keys'
+
 module RForce
   module SoapPullable
     SOAP_ENVELOPE = 'soapenv:Envelope'
-    
+
     # Split off the local name portion of an XML tag.
     def local(tag)
       first, second = tag.split ':'
@@ -10,32 +12,28 @@ module RForce
     end
 
     def tag_start(name, attrs)
-      tag_name = local name
-
       # For shorter hash keys, we can strip any namespaces of the SOAP
       # envelope tag from the tags inside it.
       if name == SOAP_ENVELOPE
         @namespaces = attrs.keys.grep(/xmlns:/).map {|k| k.split(':').last}
         return
       end
-            
-      @stack.push OpenHash.new({})
+
+      @stack.push(MethodHash.new)
     end
-    
+
     def text(data)
-      unless data.nil? || data.strip.empty? 
-        @current_value = "" if @current_value.nil?
-        @current_value << data
+      adding = data.strip.empty? ? nil : data
+
+      if adding
+        @current_value = (@current_value || '') + adding
       end
     end
-    
+
     def tag_end(name)
-      return if @done
+      return if @done || name == SOAP_ENVELOPE
 
       tag_name = local name
-      
-      return if tag_name == SOAP_ENVELOPE
-
       working_hash = @stack.pop
 
       # We are either done or working on a certain depth in the current
@@ -44,16 +42,18 @@ module RForce
         @parsed = working_hash
         @done = true
         return
-      else
-        index = @stack.size - 1
       end
 
+      index = @stack.size - 1
+
       # working_hash and @current_value have a mutually exclusive relationship.
       # If the current element doesn't have a value then it means that there
       # is a nested data structure.  In this case then working_hash is populated
       # and @current_value is nil.  Conversely, if @current_value has a value
-      # then we do not have a nested data sctructure and working_hash will
+      # then we do not have a nested data structure and working_hash will
       # be empty.
+      raise 'Parser is confused' unless working_hash.empty? || @current_value.nil?
+
       use_value = working_hash.empty? ? @current_value : working_hash
       tag_sym = tag_name.to_sym
       element = @stack[index][tag_sym]
@@ -85,7 +85,7 @@ module RForce
         # assigned yet.
         @stack[index][tag_sym] = use_value
       end
-      
+
       # We are done with the current tag so reset the data for the next one
       @current_value = nil
     end

data/lib/rforce/soap_response.rb

@@ -0,0 +1,12 @@
+begin; require 'rforce/soap_response_hpricot'; rescue LoadError; end
+begin; require 'rforce/soap_response_expat';   rescue LoadError; end
+require 'rforce/soap_response_rexml'
+
+
+module RForce
+  # Use the fastest XML parser available.
+  SoapResponse =
+    RForce::const_get(:SoapResponseExpat)   ||
+    RForce::const_get(:SoapResponseHpricot) ||
+    SoapResponseRexml
+end

data/lib/rforce/soap_response_expat.rb

@@ -4,28 +4,29 @@ require 'rforce/soap_pullable'
 module RForce
   class SoapResponseExpat
     include SoapPullable
+    include MethodKeys
 
     def initialize(content)
       @content = content
     end
-    
-    def parse   
+
+    def parse
       @current_value = nil
       @stack = []
-      @parsed = OpenHash.new({})
+      @parsed = {}
       @done = false
       @namespaces = []
 
       XML::Parser.new.parse(@content) do |type, name, data|
         case type
-        when XML::Parser::START_ELEM
+        when XML::Parser::START_ELEM then
           tag_start name, data
-        when XML::Parser::CDATA
+        when XML::Parser::CDATA then
           text data
-        when XML::Parser::END_ELEM
+        when XML::Parser::END_ELEM then
           tag_end name
         end
-          
+
         break if @done
       end
 

data/lib/rforce/soap_response_hpricot.rb

@@ -1,4 +1,5 @@
 require 'hpricot'
+require 'cgi'
 
 
 module RForce
@@ -14,46 +15,50 @@ module RForce
       node = document % 'soapenv:Body'
       self.class.node_to_ruby node
     end
-    
+
     private
-    
+
+    def self.unescapeXML(string)
+      CGI.unescapeHTML(string).gsub("'", "'")
+    end
+
     def self.node_to_ruby(node)
       # Convert text nodes into simple strings.
-      children = node.children.reject do |c|
+      children = (node.children || []).reject do |c|
         c.is_a?(Hpricot::Text) && c.to_s.strip.empty?
       end
 
       if node.is_a?(Hpricot::Text)
-        return node.inner_text
+        return SoapResponseHpricot.unescapeXML(node.inspect[1..-2])
       end
-      
+
       if children.first.is_a?(Hpricot::Text)
-        return children.first
+        return SoapResponseHpricot.unescapeXML(children.first.inspect[1..-2])
       end
 
       # Convert nodes with children into MethodHashes.
-      elements = OpenHash.new({})
+      elements = MethodHash.new
 
       # Add all the element's children to the hash.
       children.each do |e|
         next if e.is_a?(Hpricot::Text) && e.to_s.strip.empty?
         name = e.name
-        
+
         if name.include? ':'
           name = name.split(':').last
         end
-        
+
         name = name.to_sym
 
         case elements[name]
           # The most common case: unique child element tags.
-        when NilClass: elements[name] = node_to_ruby(e)
+        when NilClass then elements[name] = node_to_ruby(e)
 
           # Non-unique child elements become arrays:
 
           # We've already created the array: just
           # add the element.
-        when Array: elements[name] << node_to_ruby(e)
+        when Array then elements[name] << node_to_ruby(e)
 
           # We haven't created the array yet: do so,
           # then put the existing element in, followed

data/lib/rforce/soap_response_rexml.rb

@@ -8,10 +8,11 @@ module RForce
   # object whose methods correspond to nested XML elements.
   class SoapResponseRexml
     include SoapPullable
+    include MethodKeys
 
     %w(attlistdecl cdata comment doctype doctype_end elementdecl
        entity entitydecl instruction notationdecl xmldecl).each do |unused|
-      define_method(unused) {}
+      define_method(unused) {|*args|}
     end
 
     def initialize(content)
@@ -22,7 +23,7 @@ module RForce
     def parse
       @current_value = nil
       @stack = []
-      @parsed = OpenHash.new({})
+      @parsed = {}
       @done = false
       @namespaces = []
 

data/lib/rforce/version.rb

@@ -1,3 +1,3 @@
 module RForce
-  VERSION = '0.3'
+  VERSION = '0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: althor880-activerecord-activesalesforce-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - Doug Chasman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,16 +47,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.6"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.4"
-    version: 
 description: 
 email: althor880@gmail.com
 executables: []
@@ -87,6 +77,7 @@ files:
 - lib/rforce/binding.rb
 - lib/rforce/method_keys.rb
 - lib/rforce/soap_pullable.rb
+- lib/rforce/soap_response.rb
 - lib/rforce/soap_response_expat.rb
 - lib/rforce/soap_response_hpricot.rb
 - lib/rforce/soap_response_rexml.rb
@@ -139,22 +130,22 @@ signing_key:
 specification_version: 3
 summary: ActiveSalesforce (ASF) is a Rails connection adapter that provides direct access to Salesforce.com hosted data and metadata via the ActiveRecord model layer. Objects, fields, and relationships are all auto surfaced as active record attributes and rels.
 test_files: 
+- test/unit/config.yml
 - test/unit/basic_test.rb
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_default_rule.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_update_mru.recording
+- test/unit/recorded_test_case.rb
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_save_a_contact.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_create_a_contact.recording
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_master_detail.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_add_notes_to_contact.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_assignment_rule_id.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_count_contacts.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_update_mru.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_get_created_by_from_contact.recording
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_read_all_content_columns.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_batch_insert.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_first_name.recording
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_client_id.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_create_a_contact.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_id.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_add_notes_to_contact.recording
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_addresses.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_first_name.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact_by_id.recording
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_batch_insert.recording
 - test/unit/recorded_results/AsfUnitTestsBasicTest.test_find_a_contact.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_count_contacts.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_save_a_contact.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_get_created_by_from_contact.recording
-- test/unit/recorded_results/AsfUnitTestsBasicTest.test_assignment_rule_id.recording
-- test/unit/config.yml
-- test/unit/recorded_test_case.rb
+- test/unit/recorded_results/AsfUnitTestsBasicTest.test_use_default_rule.recording