rforce 0.3 → 0.4

data/History.txt

@@ -1,19 +1,24 @@
-== 0.1.0 2005-09-02
+== 0.4 2010-01-21
 
-* 1 major enhancement:
-  * Initial release
+* 1 minor enhancement:
+  * Moved RubyGems dependencies into the gemspec where they belong
 
-== 0.2.0 2008-07-03
+== 0.3 2009-04-16
 
-* 1 major enhancement:
-  * Incorporated fixes from ActiveSalesforce project
+* 1 minor enhancement:
+  * Updated for Ruby 1.9
 
 == 0.2.1 2008-07-04
 
 * 1 minor enhancement:
   * Updated examples for SalesForce API v10
 
-== 0.3 2009-04-16
- 
-* 1 minor enhancement:
-  * Updated for Ruby 1.9
+== 0.2.0 2008-07-03
+
+* 1 major enhancement:
+  * Incorporated fixes from ActiveSalesforce project
+
+== 0.1.0 2005-09-02
+
+* 1 major enhancement:
+  * Initial release

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 lib/rforce.rb
 lib/rforce/binding.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
@@ -13,5 +14,4 @@ spec/rforce_spec.rb
 spec/soap-response.xml
 spec/spec.opts
 spec/spec_helper.rb
-tasks/rspec.rake
 tasks/timing.rake

data/README.txt

@@ -53,7 +53,7 @@ Rather than enforcing adherence to the sforce.com schema, RForce assumes you are
 
 == LICENSE:
 
-Copyright (c) 2005-2009 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

data/Rakefile

@@ -1,15 +1,17 @@
 # -*- ruby -*-
 
 $:.unshift './lib'
+
 require 'rubygems'
 require 'hoe'
 require 'rforce/version'
 
 Hoe.new('rforce', RForce::VERSION) do |p|
-  p.developer('Ian Dees', 'undees@gmail.com')
-  p.extra_deps = [['builder', '>= 2.0.0'], ['facets', '>= 2.4']]
-  p.extra_dev_deps = [['hoe', '>= 1.7.0']]
+  p.developer         'Ian Dees', 'undees@gmail.com'
+  p.extra_deps      = [['builder', '>= 2.0.0'], ['facets', '>= 2.4']]
+  p.extra_dev_deps  = [['rspec', '>= 1.3']]
   p.remote_rdoc_dir = ''
+  p.rspec_options   = ['-rubygems', '--options', 'spec/spec.opts']
 end
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }

data/lib/rforce.rb

@@ -1,5 +1,5 @@
 =begin
-Copyright (c) 2005-2009 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
@@ -46,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'
-begin; require 'rforce/soap_response_hpricot'; rescue LoadError; end
-begin; require 'rforce/soap_response_expat'; rescue LoadError; end
-
+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]]
@@ -111,5 +84,4 @@ module RForce
       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
@@ -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

data/lib/rforce/soap_pullable.rb

@@ -1,3 +1,5 @@
+require 'facets/openhash'
+
 module RForce
   module SoapPullable
     SOAP_ENVELOPE = 'soapenv:Envelope'
@@ -21,7 +23,11 @@ module RForce
     end
 
     def text(data)
-      @current_value = data.strip.empty? ? nil : data
+      adding = data.strip.empty? ? nil : data
+
+      if adding
+        @current_value = (@current_value || '') + adding
+      end
     end
 
     def tag_end(name)

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

@@ -8,8 +8,8 @@ module RForce
     def initialize(content)
       @content = content
     end
-    
-    def parse   
+
+    def parse
       @current_value = nil
       @stack = []
       @parsed = OpenHash.new({})
@@ -25,7 +25,7 @@ module RForce
         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,9 +15,13 @@ 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|
@@ -24,11 +29,11 @@ module RForce
       end
 
       if node.is_a?(Hpricot::Text)
-        return node.inner_text.to_s
+        return SoapResponseHpricot.unescapeXML(node.inspect[1..-2])
       end
-      
+
       if children.first.is_a?(Hpricot::Text)
-        return children.first.to_s
+        return SoapResponseHpricot.unescapeXML(children.first.inspect[1..-2])
       end
 
       # Convert nodes with children into MethodHashes.
@@ -38,11 +43,11 @@ module RForce
       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]

data/lib/rforce/version.rb

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

data/spec/rforce_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper'
 
 describe 'expand' do
   it 'turns Ruby into XML' do
@@ -68,6 +68,25 @@ describe 'a SoapResponse implementation' do
     pending 'hpricot not installed' unless @hpricot_recs
     @hpricot_recs.should resemble(@rexml_recs)
   end
+
+  it 'understands XML entities' do
+    expected = "Bee's knees"
+    @rexml_recs.first.Description.should == expected
+
+    pending 'expat not installed' unless @expat_recs
+    @expat_recs.first.Description.should == expected
+
+    pending 'hpricot not installed' unless @hpricot
+    @hpricot_recs.first.Description.should == expected
+  end
+end
+
+describe 'SoapResponseHpricot' do
+  it 'parses basic XML entities' do
+    text = '<tag attr="Bee's knees & toes">'
+    SoapResponseHpricot.unescapeXML(text).should ==
+      %q(<tag attr="Bee's knees & toes">)
+  end
 end
 
 CreateXml = <<HERE.gsub(/\n\s*/, '')
@@ -84,4 +103,3 @@ CreateXml = <<HERE.gsub(/\n\s*/, '')
   </partner:sObjects>
 </partner:create>
 HERE
-

data/spec/soap-response.xml

@@ -39,7 +39,7 @@
 	  <sf:AssistantName xsi:nil="true"/>
 	  <sf:LeadSource xsi:nil="true"/>
 	  <sf:Birthdate xsi:nil="true"/>
-	  <sf:Description xsi:nil="true"/>
+	  <sf:Description>Bee&apos;s knees</sf:Description>
 	  <sf:OwnerId>0000000000ABcDEFGH</sf:OwnerId>
 	  <sf:CreatedDate>2008-03-01T01:52:35.000Z</sf:CreatedDate>
 	  <sf:CreatedById>0000000000ABcDEFGH</sf:CreatedById>

data/spec/spec_helper.rb

@@ -1,12 +1,4 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+gem 'builder'
 require 'rforce'
 
 include RForce

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rforce
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Ian Dees
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2010-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,14 @@ dependencies:
         version: "2.4"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: "1.3"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.1
+        version: 2.5.0
     version: 
 description: RForce is a simple, usable binding to the SalesForce API.
 email: 
@@ -71,6 +71,7 @@ files:
 - lib/rforce.rb
 - lib/rforce/binding.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
@@ -79,10 +80,11 @@ files:
 - spec/soap-response.xml
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/rspec.rake
 - tasks/timing.rake
 has_rdoc: true
 homepage: http://rforce.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -104,9 +106,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rforce
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: RForce is a simple, usable binding to the SalesForce API.
 test_files: []
 

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end