soapforce 0.3.0 → 0.5.0

data/spec/lib/configuration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Soapforce do
+describe Soapforce::Configuration do
 
   after do
     Soapforce.instance_variable_set :@configuration, nil
@@ -10,7 +10,7 @@ describe Soapforce do
     subject { Soapforce.configuration }
 
     it { should be_a Soapforce::Configuration }
-    it { subject.client_id.should be_nil }
+    it { expect(subject.client_id).to be_nil }
 
   end
 

data/spec/lib/query_result_spec.rb

@@ -4,15 +4,15 @@ describe Soapforce::QueryResult do
 
   describe 'empty object' do
     subject { Soapforce::QueryResult.new }
-    
+
     context "should have defaults" do
-      it { subject.size.should == 0 }
-      it { subject.query_locator.should be_nil }
-      it { subject.first.should be_nil }
-      it { subject.last.should be_nil }
-      it { subject.should be_done }
+      it { expect(subject.size).to eq 0 }
+      it { expect(subject.query_locator).to be_nil }
+      it { expect(subject.first).to be_nil }
+      it { expect(subject.last).to be_nil }
+      it { expect(subject).to be_done }
     end
-    
+
   end
 
   describe 'result object' do
@@ -29,16 +29,16 @@ describe Soapforce::QueryResult do
         Soapforce::QueryResult.new(hash)
       }
 
-      it { subject.size.should == 1 }
-      it { subject.query_locator.should be_nil }
-      it { subject.should be_done }
-      
+      it { expect(subject.size).to eq 1 }
+      it { expect(subject.query_locator).to be_nil }
+      it { expect(subject).to be_done }
+
       it "#each" do
         count = 0
         subject.each do |obj|
           count +=1
-          obj[:id].should == count
-          obj.Id.should == count
+          expect(obj[:id]).to eq count
+          expect(obj.Id).to eq count
         end
         expect(count).to be(1)
       end
@@ -59,19 +59,31 @@ describe Soapforce::QueryResult do
         Soapforce::QueryResult.new(hash)
       }
 
-      it { subject.size.should == 2 }
-      it { subject.query_locator.should be_nil }
-      it { subject.should be_done }
-      
+      it { expect(subject.size).to eq 2 }
+      it { expect(subject.records).to be_an(Array) }
+      it { expect(subject.query_locator).to be_nil }
+      it { expect(subject).to be_done }
+
       it "#each" do
         count = 0
         subject.each do |obj|
           count +=1
-          obj[:id].should == count
-          obj.Id.should == count
+          expect(obj[:id]).to eq count
+          expect(obj.Id).to eq count
         end
         expect(count).to be(2)
       end
+
+      it "#map" do
+        count = 0
+        subject.map do |obj|
+          count +=1
+          expect(obj[:id]).to eq count
+          expect(obj.Id).to eq count
+        end
+        expect(count).to be(2)
+      end
+
     end
 
   end

data/spec/lib/result_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Soapforce::Result do
+
+  describe 'symbol keys' do
+    subject { Soapforce::Result.new({new_workitem_ids: 12345, success: true}) }
+
+    it { expect(subject[:new_workitem_ids]).to eq 12345 }
+    it { expect(subject["newWorkitemIds"]).to eq 12345 }
+    it { expect(subject[:success]).to eq true }
+    it { expect(subject["success"]).to eq true }
+  end
+
+  describe 'string keys' do
+    subject { Soapforce::Result.new({"newWorkitemIds" => 12345, "success" => true}) }
+
+    it { expect(subject[:new_workitem_ids]).to eq 12345 }
+    it { expect(subject["newWorkitemIds"]).to eq 12345 }
+    it { expect(subject[:success]).to eq true }
+    it { expect(subject["success"]).to eq true }
+  end
+
+
+end

data/spec/lib/sobject_spec.rb

@@ -2,43 +2,159 @@ require 'spec_helper'
 
 describe Soapforce::SObject do
 
-  describe 'empty object' do
-    subject { Soapforce::SObject.new(id: [1, 1], name: "testing", stage_name: "Prospecting") }
+  describe 'symbol snakecase keys' do
+    subject {
+      Soapforce::SObject.new({
+        id: [1, 1],
+        name: "testing",
+        stage_name: "Prospecting",
+        opportunity_line_items: {
+          done: true,
+          query_locator: nil,
+          size: 2,
+          records: [
+            {id: 1, name: "Opportunity 1", stage_name: "Prospecting"},
+            {id: 2, name: "Opportunity 2", stage_name: "Closed Won"}
+          ]
+        }
+      })
+    }
 
     context "should have defaults" do
-      it { subject.Id.should == 1 }
-      it { subject.Name.should == "testing" }
-      it { subject.StageName.should == "Prospecting" }
-      it { subject.InvalidField.should be_nil }
+      it { expect(subject.Id).to eq 1 }
+      it { expect(subject.Name).to eq "testing" }
+      it { expect(subject.StageName).to eq "Prospecting" }
+      it { expect(subject.InvalidField).to be_nil }
 
-      it { subject[:id].should == [1, 1] }
-      it { subject[:name].should == "testing" }
-      it { subject[:stage_name].should == "Prospecting" }
-      it { subject[:no_field].should be_nil }
+      it { expect(subject[:id]).to eq 1 }
+      it { expect(subject[:name]).to eq "testing" }
+      it { expect(subject[:stage_name]).to eq "Prospecting" }
+      it { expect(subject[:no_field]).to be_nil }
     end
 
     context "assignment" do
       it "should assign through hash index" do
-        subject[:nothing].should be_nil
+        expect(subject[:nothing]).to be_nil
         subject[:nothing] = "New Value"
-        subject[:nothing].should == "New Value"
-        subject.Nothing.should == "New Value"
+        expect(subject[:nothing]).to eq "New Value"
+        expect(subject.Nothing).to eq "New Value"
+      end
+    end
+
+    context "child relationship" do
+      it "returns records as QueryResult" do
+        items = subject.OpportunityLineItems
+
+        expect(items).to be_an_instance_of(Soapforce::QueryResult)
+        expect(items.size).to eq 2
+        expect(items).to be_done
+
+        number = 1
+        subject.OpportunityLineItems.each do |sobject|
+          expect(sobject.Id).to eq number
+          expect(sobject.Name).to eq "Opportunity #{number}"
+          number += 1
+        end
       end
     end
 
     context "respond to hash methods" do
 
       it "should has_key?" do
-        subject.has_key?(:name).should be_true
-        subject.has_key?(:stage_name).should be_true
-        subject.has_key?(:nothing).should be_false
+        expect(subject).to have_key(:name)
+        expect(subject).to have_key(:stage_name)
+        expect(subject).to_not have_key(:nothing)
       end
 
       it "should return keys" do
-        subject.keys.should == [:id, :name, :stage_name]
+        expect(subject.keys).to eq [:id, :name, :stage_name, :opportunity_line_items]
       end
     end
 
   end
 
+  describe 'string keys' do
+    subject {
+      Soapforce::SObject.new(
+        "Id" => [1, 1],
+        "Name" => "testing",
+        "StageName" => "Prospecting",
+        "OpportunityLineItems" => {
+          "done" => true,
+          "queryLocator" => nil,
+          "size" => 2,
+          "records" => [
+            {"Id" => 1, "Name" => "Opportunity 1", "StageName" => "Prospecting"},
+            {"Id" => 2, "Name" => "Opportunity 2", "StageName" => "Closed Won"}
+          ]
+        }
+      )
+    }
+
+    context "should have defaults" do
+      it { expect(subject.Id).to eq 1 }
+      it { expect(subject.Name).to eq "testing" }
+      it { expect(subject.StageName).to eq "Prospecting" }
+      it { expect(subject.InvalidField).to be_nil }
+
+      it { expect(subject["Id"]).to eq 1 }
+      it { expect(subject["Name"]).to eq "testing" }
+      it { expect(subject["StageName"]).to eq "Prospecting" }
+      it { expect(subject["NoField"]).to be_nil }
+    end
+
+    context "assignment" do
+      it "should assign through hash index" do
+        expect(subject["nothing"]).to be_nil
+        subject["nothing"] = "New Value"
+        expect(subject["nothing"]).to eq "New Value"
+        expect(subject.Nothing).to eq "New Value"
+      end
+    end
+
+    context "respond to hash methods" do
+
+      it "should has_key?" do
+        expect(subject).to have_key("Name")
+        expect(subject).to have_key("StageName")
+        expect(subject).to_not have_key("nothing")
+      end
+
+      it "should return keys" do
+        expect(subject.keys).to eq ["Id", "Name", "StageName", "OpportunityLineItems"]
+      end
+    end
+
+    context "child relationship" do
+      it "returns records as QueryResult" do
+        items = subject.OpportunityLineItems
+        expect(items).to be_an_instance_of(Soapforce::QueryResult)
+        expect(items.size).to eq 2
+        expect(items).to be_done
+
+        number = 1
+        subject.OpportunityLineItems.each do |sobject|
+          expect(sobject.Id).to eq number
+          expect(sobject.Name).to eq "Opportunity #{number}"
+          number += 1
+        end
+      end
+    end
+
+  end
+
+  describe 'empty id field' do
+    subject { Soapforce::SObject.new({ id: [nil, nil], name: "testing", stage_name: "Prospecting" }) }
+
+    context "should have defaults" do
+      it { expect(subject).to_not have_key(:id) }
+      it { expect(subject.Name).to eq "testing" }
+      it { expect(subject.StageName).to eq "Prospecting" }
+      it { expect(subject.InvalidField).to be_nil }
+      it { expect(subject.to_hash).to eq({:name=>"testing", :stage_name=>"Prospecting"}) }
+    end
+  end
+
+
+
 end

data/spec/support/fixture_helpers.rb

@@ -28,12 +28,12 @@ module FixtureHelpers
     def soap_envelope(headers, body)
 envelope = <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xmlns:tns="urn:partner.soap.sforce.com" 
-xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
-xmlns:ins0="urn:sobject.partner.soap.sforce.com" 
-xmlns:ins1="urn:fault.partner.soap.sforce.com">
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tns="urn:partner.soap.sforce.com"
+ xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:ins0="urn:sobject.partner.soap.sforce.com"
+ xmlns:ins1="urn:fault.partner.soap.sforce.com">
 #{soap_headers(headers)}
 <env:Body>#{body}</env:Body>
 </env:Envelope>

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: soapforce
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Joe Heth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.0
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.0
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
 description: A ruby client for the Salesforce SOAP API based on Savon.
 email:
 - joeheth@gmail.com
@@ -97,9 +97,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -109,6 +109,7 @@ files:
 - lib/soapforce/client.rb
 - lib/soapforce/configuration.rb
 - lib/soapforce/query_result.rb
+- lib/soapforce/result.rb
 - lib/soapforce/sobject.rb
 - lib/soapforce/version.rb
 - resources/partner.wsdl.xml
@@ -139,6 +140,7 @@ files:
 - spec/lib/client_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/query_result_spec.rb
+- spec/lib/result_spec.rb
 - spec/lib/sobject_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb
@@ -152,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Wraps Savon with helper methods and custom types for interacting with the
@@ -194,6 +196,7 @@ test_files:
 - spec/lib/client_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/query_result_spec.rb
+- spec/lib/result_spec.rb
 - spec/lib/sobject_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb