dynamics_crm 0.6.0 → 0.7.1

data/lib/dynamics_crm/metadata/retrieve_metadata_changes_response.rb

@@ -0,0 +1,18 @@
+module DynamicsCRM
+  module Metadata
+
+    class RetrieveMetadataChangesResponse < DynamicsCRM::Response::ExecuteResult
+      attr_reader :entities
+
+      def initialize(xml)
+        super
+        @entities = []
+
+        self.delete("EntityMetadata").each do |em_xml|
+          @entities << EntityMetadata.new(em_xml)
+        end
+      end
+    end
+
+  end
+end

data/lib/dynamics_crm/version.rb

@@ -1,3 +1,3 @@
 module DynamicsCRM
-  VERSION = "0.6.0"
+  VERSION = "0.7.1"
 end

data/lib/dynamics_crm/xml/attributes.rb

@@ -23,10 +23,22 @@ module DynamicsCRM
             type = "EntityReference"
           when Entity
             type = "Entity"
+          when EntityCollection
+            type = "EntityCollection"
           when Query
             type = "QueryExpression"
           when FetchExpression
             type = "FetchExpression"
+          when Money
+            type = "Money"
+          when DynamicsCRM::Metadata::FilterExpression
+            type = "FilterExpression"
+          when DynamicsCRM::Metadata::PropertiesExpression
+            type = "PropertiesExpression"
+          when DynamicsCRM::Metadata::AttributeQueryExpression
+            type = "AttributeQueryExpression"
+          when DynamicsCRM::Metadata::EntityQueryExpression
+            type = "EntityQueryExpression"
           else
             if key.to_s == "EntityFilters"
               type = "EntityFilters"
@@ -64,6 +76,9 @@ module DynamicsCRM
             type = get_type(key, value)
           end
 
+          # escape strings to avoid xml parsing errors
+          value = CGI.escapeHTML(value) if value.is_a?(String)
+
           xml << build_xml(key, value, type)
         end
 
@@ -83,7 +98,7 @@ module DynamicsCRM
 
         # If we have an object that can convert itself, use it.
         if (value.respond_to?(:to_xml) && value.class.to_s.include?("DynamicsCRM"))
-          xml <<  "<c:value i:type=\"a:#{type}\">\n" << value.to_xml({exclude_root: true, namespace: 'a'}) << "</c:value>"
+          xml << render_object_xml(type, value)
         else
           xml << render_value_xml(type, value)
         end
@@ -138,6 +153,17 @@ module DynamicsCRM
         xml
       end
 
+      def render_object_xml(type, value)
+          case type
+          when "EntityQueryExpression"
+            xml = %Q{<c:value i:type="d:#{type}" xmlns:d="http://schemas.microsoft.com/xrm/2011/Metadata/Query">} << value.to_xml({namespace: 'd'}) << "</c:value>"
+          else
+            xml = %Q{<c:value i:type="a:#{type}">} << value.to_xml({exclude_root: true, namespace: 'a'}) << "</c:value>"
+          end
+
+          return xml
+      end
+
       def class_name
         self.class.to_s.split("::").last
       end
@@ -169,4 +195,4 @@ module DynamicsCRM
     class FormattedValues < Attributes; end
   end
 
-end
+end

data/lib/dynamics_crm/xml/entity_collection.rb

@@ -37,6 +37,16 @@ module DynamicsCRM
         }
       end
 
+      def to_xml(options={})
+        options[:exclude_root] = true
+        namespace = options[:namespace] ? "#{options[:namespace]}:" : ''
+
+        entities_xml = entities.inject("") { |result,entity|
+          result << %Q{<#{namespace}Entity>#{entity.to_xml(options)}</#{namespace}Entity>}
+        }
+        %Q{<#{namespace}Entities>#{entities_xml}</#{namespace}Entities>}
+      end
+
     end
     # EntityCollection
   end

data/lib/dynamics_crm/xml/message_builder.rb

@@ -44,9 +44,9 @@ module DynamicsCRM
                   <u:Expires>#{get_tomorrow_time}</u:Expires>
                 </u:Timestamp>
                 <o:UsernameToken u:Id="uuid-cdb639e6-f9b0-4c01-b454-0fe244de73af-1">
-                  <o:Username>#{username}</o:Username>
+                  <o:Username>#{REXML::Text.new(username).to_s}</o:Username>
                   <o:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">
-                    #{password}
+                    #{REXML::Text.new(password).to_s}
                   </o:Password>
                 </o:UsernameToken>
               </o:Security>
@@ -298,7 +298,7 @@ module DynamicsCRM
         # Default namespace is /crm/2011/Contracts
         ns_alias = "b"
         # Metadata Service calls are under the /xrm/2011/Contracts schema.
-        if ["RetrieveAllEntities", "RetrieveEntityMetadata", "RetrieveEntity", "RetrieveAttribute", "RetrieveMultiple"].include?(action)
+        if ["RetrieveAllEntities", "RetrieveEntityMetadata", "RetrieveEntity", "RetrieveAttribute", "RetrieveMultiple", "RetrieveMetadataChanges"].include?(action)
           ns_alias = 'a'
         end
 

data/lib/dynamics_crm/xml/message_parser.rb

@@ -41,6 +41,8 @@ module DynamicsCRM
               value = value_element.get_elements("d:EntityMetadata")
             when "d:ArrayOfAttributeMetadata"
               value = value_element.get_elements("d:AttributeMetadata")
+            when "b:EntityMetadataCollection"
+              value = value_element.get_elements("b:EntityMetadata")
             when "b:AliasedValue"
               value = value_element.elements["b:Value"].text
             when "b:Money"

data/lib/dynamics_crm/xml/money.rb

@@ -0,0 +1,16 @@
+module DynamicsCRM
+  module XML
+    class Money
+
+      attr_accessor :value
+
+      def initialize(value, precision=2)
+        @value = "%.#{precision}f" % value
+      end
+
+      def to_xml(options={})
+        "<a:Value>#{@value}</a:Value>"
+      end
+    end
+  end
+end

data/spec/fixtures/retrieve_metadata_changes_response.xml

@@ -0,0 +1,215 @@
+<s:Envelope xmlns:s='http://www.w3.org/2003/05/soap-envelope' xmlns:a='http://www.w3.org/2005/08/addressing' xmlns:u='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'>
+  <s:Header>
+    <a:Action s:mustUnderstand='1'>
+      http://schemas.microsoft.com/xrm/2011/Contracts/Services/IOrganizationService/ExecuteResponse
+    </a:Action>
+    <a:RelatesTo>urn:uuid:5a1b5d6a-8dba-4518-9e1c-fe5c2d972221</a:RelatesTo>
+    <ActivityId CorrelationId='4780d5c3-f5aa-42a4-ab0b-d8d784d6c963' xmlns='http://schemas.microsoft.com/2004/09/ServiceModel/Diagnostics'>00000000-0000-0000-0000-000000000000</ActivityId>
+    <o:Security s:mustUnderstand='1' xmlns:o='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'>
+      <u:Timestamp u:Id='_0'>
+        <u:Created>2015-02-24T17:34:18.908Z</u:Created>
+        <u:Expires>2015-02-24T17:39:18.908Z</u:Expires>
+      </u:Timestamp>
+    </o:Security>
+  </s:Header>
+  <s:Body>
+    <ExecuteResponse xmlns='http://schemas.microsoft.com/xrm/2011/Contracts/Services'>
+      <ExecuteResult i:type='b:RetrieveMetadataChangesResponse' xmlns:b='http://schemas.microsoft.com/xrm/2011/Contracts' xmlns:i='http://www.w3.org/2001/XMLSchema-instance'>
+        <b:ResponseName>RetrieveMetadataChanges</b:ResponseName>
+        <b:Results xmlns:c='http://schemas.datacontract.org/2004/07/System.Collections.Generic'>
+          <b:KeyValuePairOfstringanyType>
+            <c:key>ServerVersionStamp</c:key>
+            <c:value i:type='d:string' xmlns:d='http://www.w3.org/2001/XMLSchema'>22934563!02/24/2015 17:34:18</c:value>
+          </b:KeyValuePairOfstringanyType>
+          <b:KeyValuePairOfstringanyType>
+            <c:key>DeletedMetadata</c:key>
+            <c:value i:type='d:DeletedMetadataCollection' xmlns:d='http://schemas.microsoft.com/xrm/2011/Metadata/Query'/>
+          </b:KeyValuePairOfstringanyType>
+          <b:KeyValuePairOfstringanyType>
+            <c:key>EntityMetadata</c:key>
+            <c:value i:type='b:EntityMetadataCollection' xmlns:d='http://schemas.microsoft.com/xrm/2011/Metadata'>
+              <b:EntityMetadata>
+                <d:MetadataId>e3fe4ff2-a630-49bb-a1e9-debc3a076815</d:MetadataId>
+                <d:ActivityTypeMask i:nil='true'/>
+                <d:Attributes>
+                  <d:AttributeMetadata i:type='d:LookupAttributeMetadata'>
+                    <d:MetadataId>4ff40786-b76b-42bf-ab77-0f3a8fc558c5</d:MetadataId>
+                    <d:AttributeOf i:nil='true'/>
+                    <d:AttributeType>Lookup</d:AttributeType>
+                    <d:Description i:nil='true'/>
+                    <d:DisplayName>
+                      <b:LocalizedLabels>
+                        <b:LocalizedLabel>
+                          <d:MetadataId>bbc675a7-c9d8-4744-9875-b6cf8f6a226a</d:MetadataId>
+                          <b:Label>Contact</b:Label>
+                          <b:LanguageCode>1033</b:LanguageCode>
+                        </b:LocalizedLabel>
+                      </b:LocalizedLabels>
+                      <b:UserLocalizedLabel>
+                        <d:MetadataId>bbc675a7-c9d8-4744-9875-b6cf8f6a226a</d:MetadataId>
+                        <b:Label>Contact</b:Label>
+                        <b:LanguageCode>1033</b:LanguageCode>
+                      </b:UserLocalizedLabel>
+                    </d:DisplayName>
+                    <d:IsCustomAttribute i:nil='true'/>
+                    <d:LogicalName>contactid</d:LogicalName>
+                    <d:RequiredLevel>
+                      <b:CanBeChanged>false</b:CanBeChanged>
+                      <b:ManagedPropertyLogicalName>canmodifyrequirementlevelsettings</b:ManagedPropertyLogicalName>
+                      <b:Value>None</b:Value>
+                    </d:RequiredLevel>
+                    <d:AttributeTypeName xmlns:e='http://schemas.microsoft.com/xrm/2013/Metadata'>
+                      <e:Value>LookupType</e:Value>
+                    </d:AttributeTypeName>
+                    <d:Targets i:nil='true' xmlns:e='http://schemas.microsoft.com/2003/10/Serialization/Arrays'/>
+                  </d:AttributeMetadata>
+                  <d:AttributeMetadata>
+                    <d:MetadataId>b7583f6b-c3af-49bb-bab1-abb9da954b2c</d:MetadataId>
+                    <d:AttributeOf>resolvebyslastatus</d:AttributeOf>
+                    <d:AttributeType>Virtual</d:AttributeType>
+                    <d:Description i:nil='true'/>
+                    <d:DisplayName>
+                      <b:LocalizedLabels/>
+                      <b:UserLocalizedLabel i:nil='true'/>
+                    </d:DisplayName>
+                    <d:IsCustomAttribute i:nil='true'/>
+                    <d:LogicalName>resolvebyslastatusname</d:LogicalName>
+                    <d:RequiredLevel>
+                      <b:CanBeChanged>false</b:CanBeChanged>
+                      <b:ManagedPropertyLogicalName>canmodifyrequirementlevelsettings</b:ManagedPropertyLogicalName>
+                      <b:Value>None</b:Value>
+                    </d:RequiredLevel>
+                    <d:AttributeTypeName i:nil='true' xmlns:e='http://schemas.microsoft.com/xrm/2013/Metadata'/>
+                  </d:AttributeMetadata>
+                </d:Attributes>
+                <d:Description i:nil='true'/>
+                <d:DisplayName i:nil='true'/>
+                <d:LogicalName>incident</d:LogicalName>
+                <d:ObjectTypeCode i:nil='true'/>
+              </b:EntityMetadata>
+              <b:EntityMetadata>
+                <d:MetadataId>608861bc-50a4-4c5f-a02c-21fe1943e2cf</d:MetadataId>
+                <d:ActivityTypeMask i:nil='true'/>
+                <d:Attributes>
+                  <d:AttributeMetadata>
+                    <d:MetadataId>38a3d266-1c2f-454e-8136-43439b75f094</d:MetadataId>
+                    <d:AttributeOf>customertypecode</d:AttributeOf>
+                    <d:AttributeType>Virtual</d:AttributeType>
+                    <d:Description i:nil='true'/>
+                    <d:DisplayName>
+                      <b:LocalizedLabels/>
+                      <b:UserLocalizedLabel i:nil='true'/>
+                    </d:DisplayName>
+                    <d:IsCustomAttribute i:nil='true'/>
+                    <d:LogicalName>customertypecodename</d:LogicalName>
+                    <d:RequiredLevel>
+                      <b:CanBeChanged>false</b:CanBeChanged>
+                      <b:ManagedPropertyLogicalName>canmodifyrequirementlevelsettings</b:ManagedPropertyLogicalName>
+                      <b:Value>None</b:Value>
+                    </d:RequiredLevel>
+                    <d:AttributeTypeName i:nil='true' xmlns:e='http://schemas.microsoft.com/xrm/2013/Metadata'/>
+                  </d:AttributeMetadata>
+                  <d:AttributeMetadata>
+                    <d:MetadataId>4e40d60b-79fb-41b7-a0cd-a62996c46688</d:MetadataId>
+                    <d:AttributeOf i:nil='true'/>
+                    <d:AttributeType>Uniqueidentifier</d:AttributeType>
+                    <d:Description i:nil='true'/>
+                    <d:DisplayName>
+                      <b:LocalizedLabels>
+                        <b:LocalizedLabel>
+                          <d:MetadataId>7f6747a3-1c34-4ecf-a1ae-b766612c730f</d:MetadataId>
+                          <b:Label>Process</b:Label>
+                          <b:LanguageCode>1033</b:LanguageCode>
+                        </b:LocalizedLabel>
+                      </b:LocalizedLabels>
+                      <b:UserLocalizedLabel>
+                        <d:MetadataId>7f6747a3-1c34-4ecf-a1ae-b766612c730f</d:MetadataId>
+                        <b:Label>Process</b:Label>
+                        <b:LanguageCode>1033</b:LanguageCode>
+                      </b:UserLocalizedLabel>
+                    </d:DisplayName>
+                    <d:IsCustomAttribute i:nil='true'/>
+                    <d:LogicalName>processid</d:LogicalName>
+                    <d:RequiredLevel>
+                      <b:CanBeChanged>false</b:CanBeChanged>
+                      <b:ManagedPropertyLogicalName>canmodifyrequirementlevelsettings</b:ManagedPropertyLogicalName>
+                      <b:Value>None</b:Value>
+                    </d:RequiredLevel>
+                    <d:AttributeTypeName i:nil='true' xmlns:e='http://schemas.microsoft.com/xrm/2013/Metadata'/>
+                  </d:AttributeMetadata>
+                </d:Attributes>
+                <d:Description i:nil='true'/>
+                <d:DisplayName i:nil='true'/>
+                <d:LogicalName>contact</d:LogicalName>
+                <d:ObjectTypeCode i:nil='true'/>
+              </b:EntityMetadata>
+              <b:EntityMetadata>
+                <d:MetadataId>c1961a14-d4e6-470c-8d1e-23ae6b1bbb8d</d:MetadataId>
+                <d:ActivityTypeMask i:nil='true'/>
+                <d:Attributes>
+                  <d:AttributeMetadata i:type='d:StringAttributeMetadata'>
+                    <d:MetadataId>181e147a-bd89-4528-a8c5-1e6971097ec3</d:MetadataId>
+                    <d:AttributeOf>createdonbehalfby</d:AttributeOf>
+                    <d:AttributeType>String</d:AttributeType>
+                    <d:Description i:nil='true'/>
+                    <d:DisplayName>
+                      <b:LocalizedLabels/>
+                      <b:UserLocalizedLabel i:nil='true'/>
+                    </d:DisplayName>
+                    <d:IsCustomAttribute i:nil='true'/>
+                    <d:LogicalName>createdonbehalfbyyominame</d:LogicalName>
+                    <d:RequiredLevel>
+                      <b:CanBeChanged>false</b:CanBeChanged>
+                      <b:ManagedPropertyLogicalName>canmodifyrequirementlevelsettings</b:ManagedPropertyLogicalName>
+                      <b:Value>None</b:Value>
+                    </d:RequiredLevel>
+                    <d:AttributeTypeName xmlns:e='http://schemas.microsoft.com/xrm/2013/Metadata'>
+                      <e:Value>StringType</e:Value>
+                    </d:AttributeTypeName>
+                    <d:MaxLength i:nil='true'/>
+                    <d:YomiOf i:nil='true'/>
+                  </d:AttributeMetadata>
+                  <d:AttributeMetadata i:type='d:LookupAttributeMetadata'>
+                    <d:MetadataId>59a81bda-e398-4058-957e-394e15da9ff2</d:MetadataId>
+                    <d:AttributeOf i:nil='true'/>
+                    <d:AttributeType>Lookup</d:AttributeType>
+                    <d:Description i:nil='true'/>
+                    <d:DisplayName>
+                      <b:LocalizedLabels>
+                        <b:LocalizedLabel>
+                          <d:MetadataId>cd2eb1d5-438b-41e8-b422-fe738c48b518</d:MetadataId>
+                          <b:Label>Owning User</b:Label>
+                          <b:LanguageCode>1033</b:LanguageCode>
+                        </b:LocalizedLabel>
+                      </b:LocalizedLabels>
+                      <b:UserLocalizedLabel>
+                        <d:MetadataId>cd2eb1d5-438b-41e8-b422-fe738c48b518</d:MetadataId>
+                        <b:Label>Owning User</b:Label>
+                        <b:LanguageCode>1033</b:LanguageCode>
+                      </b:UserLocalizedLabel>
+                    </d:DisplayName>
+                    <d:IsCustomAttribute i:nil='true'/>
+                    <d:LogicalName>owninguser</d:LogicalName>
+                    <d:RequiredLevel>
+                      <b:CanBeChanged>false</b:CanBeChanged>
+                      <b:ManagedPropertyLogicalName>canmodifyrequirementlevelsettings</b:ManagedPropertyLogicalName>
+                      <b:Value>None</b:Value>
+                    </d:RequiredLevel>
+                    <d:AttributeTypeName xmlns:e='http://schemas.microsoft.com/xrm/2013/Metadata'>
+                      <e:Value>LookupType</e:Value>
+                    </d:AttributeTypeName>
+                    <d:Targets i:nil='true' xmlns:e='http://schemas.microsoft.com/2003/10/Serialization/Arrays'/>
+                  </d:AttributeMetadata>
+                </d:Attributes>
+                <d:Description i:nil='true'/>
+                <d:DisplayName i:nil='true'/>
+                <d:LogicalName>annotation</d:LogicalName>
+                <d:ObjectTypeCode i:nil='true'/>
+              </b:EntityMetadata>
+            </c:value>
+          </b:KeyValuePairOfstringanyType>
+        </b:Results>
+      </ExecuteResult>
+    </ExecuteResponse>
+  </s:Body>
+</s:Envelope>

data/spec/lib/client_spec.rb

@@ -12,13 +12,13 @@ describe DynamicsCRM::Client do
     context "Online" do
       it "authenticates with username and password" do
 
-        subject.stub(:post).and_return(fixture("request_security_token_response"))
+        allow(subject).to receive(:post).and_return(fixture("request_security_token_response"))
 
         subject.authenticate('testing', 'password')
 
-        subject.instance_variable_get("@security_token0").should start_with("tMFpDJbJHcZnRVuby5cYmRbCJo2OgOFLEOrUHj+wz")
-        subject.instance_variable_get("@security_token1").should start_with("CX7BFgRnW75tE6GiuRICjeVDV+6q4KDMKLyKmKe9A8U")
-        subject.instance_variable_get("@key_identifier").should == "D3xjUG3HGaQuKyuGdTWuf6547Lo="
+        expect(subject.instance_variable_get("@security_token0")).to start_with("tMFpDJbJHcZnRVuby5cYmRbCJo2OgOFLEOrUHj+wz")
+        expect(subject.instance_variable_get("@security_token1")).to start_with("CX7BFgRnW75tE6GiuRICjeVDV+6q4KDMKLyKmKe9A8U")
+        expect(subject.instance_variable_get("@key_identifier")).to eq("D3xjUG3HGaQuKyuGdTWuf6547Lo=")
       end
 
       # This is only method in this suite that actually sends a POST message to Dynamics.
@@ -28,9 +28,9 @@ describe DynamicsCRM::Client do
           subject.authenticate('testuser@orgnam.onmicrosoft.com', 'qwerty')
           fail("Expected Fault to be raised")
         rescue DynamicsCRM::XML::Fault => f
-          f.code.should == "S:Sender"
-          f.subcode.should == "wst:FailedAuthentication"
-          f.reason.should == "Authentication Failure"
+          expect(f.code).to eq("S:Sender")
+          expect(f.subcode).to eq("wst:FailedAuthentication")
+          expect(f.reason).to eq("Authentication Failure")
         end
       end
     end
@@ -40,17 +40,17 @@ describe DynamicsCRM::Client do
 
       it "authenticates with username and password" do
 
-        subject.stub(:post).and_return(fixture("request_security_token_response_onpremise"))
+        allow(subject).to receive(:post).and_return(fixture("request_security_token_response_onpremise"))
 
         subject.authenticate('testing', 'password')
 
-        subject.instance_variable_get("@security_token0").should start_with("ydfdQsDU9ow4XhoBi+0+n+/9Z7Dvfi")
-        subject.instance_variable_get("@security_token1").should start_with("GcCk8ivhLAAPEbQI8qScynWLReTWE0AC5")
-        subject.instance_variable_get("@key_identifier").should == "_ed121435-64ea-45b0-9b15-e5769afdb746"
+        expect(subject.instance_variable_get("@security_token0")).to start_with("ydfdQsDU9ow4XhoBi+0+n+/9Z7Dvfi")
+        expect(subject.instance_variable_get("@security_token1")).to start_with("GcCk8ivhLAAPEbQI8qScynWLReTWE0AC5")
+        expect(subject.instance_variable_get("@key_identifier")).to eq("_ed121435-64ea-45b0-9b15-e5769afdb746")
 
-        subject.instance_variable_get("@cert_issuer_name").strip.should start_with("SERIALNUMBER=12369287, CN=Go Daddy Secure")
-        subject.instance_variable_get("@cert_serial_number").should == "112094107365XXXXX"
-        subject.instance_variable_get("@server_secret").should == "XZwQpJKfAy00NNWU1RwdtDpVyW/nfabuCq4H38GgKrM="
+        expect(subject.instance_variable_get("@cert_issuer_name").strip).to start_with("SERIALNUMBER=12369287, CN=Go Daddy Secure")
+        expect(subject.instance_variable_get("@cert_serial_number")).to eq("112094107365XXXXX")
+        expect(subject.instance_variable_get("@server_secret")).to eq("XZwQpJKfAy00NNWU1RwdtDpVyW/nfabuCq4H38GgKrM=")
       end
     end
 
@@ -58,16 +58,16 @@ describe DynamicsCRM::Client do
 
   describe "#retrieve" do
     before(:each) do
-      subject.stub(:post).and_return(fixture("retrieve_account_all_columns"))
+      allow(subject).to receive(:post).and_return(fixture("retrieve_account_all_columns"))
     end
 
     let(:result) { subject.retrieve("account", "93f0325c-a592-e311-b7f3-6c3be5a8a0c8") }
 
     it "retrieves object by id and acts as hash" do
-      result.should be_a(DynamicsCRM::Response::RetrieveResult)
-      result.type.should == "account"
-      result.id.should == "93f0325c-a592-e311-b7f3-6c3be5a8a0c8"
-      result.name.should == "Adventure Works (sample)"
+      expect(result).to be_a(DynamicsCRM::Response::RetrieveResult)
+      expect(result.type).to eq("account")
+      expect(result.id).to eq("93f0325c-a592-e311-b7f3-6c3be5a8a0c8")
+      expect(result.name).to eq("Adventure Works (sample)")
     end
 
     it "exposes entity object" do
@@ -87,11 +87,11 @@ describe DynamicsCRM::Client do
   describe "#retrieve_multiple" do
     it "retrieves multiple entities by criteria" do
 
-      subject.stub(:post).and_return(fixture("retrieve_multiple_result"))
+      allow(subject).to receive(:post).and_return(fixture("retrieve_multiple_result"))
 
       result = subject.retrieve_multiple("account", ["name", "Equal", "Test Account"], columns=[])
 
-      result.should be_a(DynamicsCRM::Response::RetrieveMultipleResult)
+      expect(result).to be_a(DynamicsCRM::Response::RetrieveMultipleResult)
 
       expect(result['EntityName']).to eq('account')
       expect(result['MinActiveRowVersion']).to eq(-1)
@@ -100,31 +100,31 @@ describe DynamicsCRM::Client do
       expect(result['TotalRecordCount']).to eq(-1)
       expect(result['TotalRecordCountLimitExceeded']).to eq(false)
 
-      result.entities.size.should == 3
+      expect(result.entities.size).to eq(3)
       entities = result.entities
 
       entities[0].logical_name == "account"
-      entities[0].id.should == "7bf2e032-ad92-e311-9752-6c3be5a87df0"
-      entities[0].attributes["accountid"].should == "7bf2e032-ad92-e311-9752-6c3be5a87df0"
+      expect(entities[0].id).to eq("7bf2e032-ad92-e311-9752-6c3be5a87df0")
+      expect(entities[0].attributes["accountid"]).to eq("7bf2e032-ad92-e311-9752-6c3be5a87df0")
 
-      entities[1].attributes["accountid"].should == "dbe9d7c9-2c98-e311-9752-6c3be5a87df0"
-      entities[2].attributes["accountid"].should == "8ff0325c-a592-e311-b7f3-6c3be5a8a0c8"
+      expect(entities[1].attributes["accountid"]).to eq("dbe9d7c9-2c98-e311-9752-6c3be5a87df0")
+      expect(entities[2].attributes["accountid"]).to eq("8ff0325c-a592-e311-b7f3-6c3be5a8a0c8")
     end
   end
 
   describe "#retrieve_attachments" do
     it "retrieves document records from annotation object" do
-      subject.stub(:post).and_return(fixture("retrieve_multiple_result"))
+      allow(subject).to receive(:post).and_return(fixture("retrieve_multiple_result"))
 
       result = subject.retrieve_attachments("93f0325c-a592-e311-b7f3-6c3be5a8a0c8")
-      result.should be_a(DynamicsCRM::Response::RetrieveMultipleResult)
+      expect(result).to be_a(DynamicsCRM::Response::RetrieveMultipleResult)
     end
   end
 
   describe "#fetch" do
     it "uses FetchXML to retrieve multiple" do
 
-      subject.stub(:post).and_return(fixture("fetch_xml_response"))
+      allow(subject).to receive(:post).and_return(fixture("fetch_xml_response"))
 
       xml = %Q{
         <fetch version="1.0" output-format="xml-platform" mapping="logical" distinct="true">
@@ -143,7 +143,7 @@ describe DynamicsCRM::Client do
       }
 
       entity_collection = subject.fetch(xml)
-      entity_collection.should be_a(DynamicsCRM::XML::EntityCollection)
+      expect(entity_collection).to be_a(DynamicsCRM::XML::EntityCollection)
 
       expect(entity_collection.entity_name).to eq('new_tinderboxdocument')
       expect(entity_collection.min_active_row_version).to eq(-1)
@@ -155,10 +155,10 @@ describe DynamicsCRM::Client do
       expect(entity_collection.entities.size).to eq(3)
 
       entity = entity_collection.entities.first
-      entity.id.should == "9c27cf91-ada3-e311-b64f-6c3be5a87df0"
-      entity.logical_name.should == "new_tinderboxdocument"
-      entity.attributes["new_tinderboxdocumentid"].should == entity.id
-      entity.attributes["new_name"].should == "6 orders of Product SKU JJ202"
+      expect(entity.id).to eq("9c27cf91-ada3-e311-b64f-6c3be5a87df0")
+      expect(entity.logical_name).to eq("new_tinderboxdocument")
+      expect(entity.attributes["new_tinderboxdocumentid"]).to eq(entity.id)
+      expect(entity.attributes["new_name"]).to eq("6 orders of Product SKU JJ202")
     end
   end
 
@@ -166,13 +166,41 @@ describe DynamicsCRM::Client do
   describe "#create" do
     it "creates new entity with parameters" do
 
-      subject.stub(:post).and_return(fixture("create_response"))
+      allow(subject).to receive(:post).and_return(fixture("create_response"))
 
       result = subject.create("account", {name: "Adventure Works"})
 
-      result.should be_a(DynamicsCRM::Response::CreateResult)
-      result.id.should == "c4944f99-b5a0-e311-b64f-6c3be5a87df0"
-      result.Id.should == "c4944f99-b5a0-e311-b64f-6c3be5a87df0"
+      expect(result).to be_a(DynamicsCRM::Response::CreateResult)
+      expect(result.id).to eq("c4944f99-b5a0-e311-b64f-6c3be5a87df0")
+      expect(result.Id).to eq("c4944f99-b5a0-e311-b64f-6c3be5a87df0")
+    end
+
+    it "creates new entity with custom fields and relationship" do
+
+      params = {
+               :tndrbox_id => 929177,
+             :tndrbox_name => "TEST",
+      :tndrbox_description => "",
+           :tndrbox_status => "Draft",
+            :tndrbox_views => 0,
+         :tndrbox_category => nil,
+          "tndrbox_opportunity_id" => {
+                        :id => "71a4a3af-d7ab-e411-80c7-00155dd44307",
+              :logical_name => "opportunity"
+          },
+          :tndrbox_value => {
+              :value => 0.0,
+               :type => "Money"
+          }
+      }
+
+      allow(subject).to receive(:post).and_return(fixture("create_response"))
+
+      result = subject.create('opportunity', params)
+
+      expect(result).to be_a(DynamicsCRM::Response::CreateResult)
+      expect(result.id).to eq("c4944f99-b5a0-e311-b64f-6c3be5a87df0")
+      expect(result.Id).to eq("c4944f99-b5a0-e311-b64f-6c3be5a87df0")
     end
   end
 
@@ -181,7 +209,7 @@ describe DynamicsCRM::Client do
 
       file = Tempfile.new(["sample-file", "pdf"])
 
-      subject.should_receive(:create).with("annotation", {
+      expect(subject).to receive(:create).with("annotation", {
         objectid: {id: "f4944f99-b5a0-e311-b64f-6c3be5a87df0", logical_name: "opportunity"},
         subject: "Sample Subject",
         notetext: "Post message",
@@ -206,22 +234,22 @@ describe DynamicsCRM::Client do
   describe "#update" do
     it "updates entity by id" do
 
-      subject.stub(:post).and_return(fixture("update_response"))
+      allow(subject).to receive(:post).and_return(fixture("update_response"))
 
       result = subject.update("account", "c4944f99-b5a0-e311-b64f-6c3be5a87df0", {name: "Adventure Park"})
 
-      result.should be_a(DynamicsCRM::Response::UpdateResponse)
+      expect(result).to be_a(DynamicsCRM::Response::UpdateResponse)
     end
   end
 
   describe "#delete" do
     it "deletes entity by id" do
 
-      subject.stub(:post).and_return(fixture("update_response"))
+      allow(subject).to receive(:post).and_return(fixture("update_response"))
 
       result = subject.delete("account", "c4944f99-b5a0-e311-b64f-6c3be5a87df0")
 
-      result.should be_a(DynamicsCRM::Response::DeleteResponse)
+      expect(result).to be_a(DynamicsCRM::Response::DeleteResponse)
     end
   end
 
@@ -230,53 +258,53 @@ describe DynamicsCRM::Client do
   describe "#retrieve_all_entities" do
     it "retrieve entity list" do
 
-      subject.stub(:post).and_return(fixture("retrieve_all_entities"))
+      allow(subject).to receive(:post).and_return(fixture("retrieve_all_entities"))
 
       result = subject.retrieve_all_entities
 
-      result.should be_a(DynamicsCRM::Metadata::RetrieveAllEntitiesResponse)
-      result.entities.should_not be_nil
+      expect(result).to be_a(DynamicsCRM::Metadata::RetrieveAllEntitiesResponse)
+      expect(result.entities).not_to be_nil
 
       entities = result.entities
-      entities.size.should == 3
+      expect(entities.size).to eq(3)
 
-      entities[0].LogicalName.should == "opportunity"
-      entities[1].LogicalName.should == "new_tinderboxdocument"
-      entities[2].LogicalName.should == "new_tinderboxcontent"
+      expect(entities[0].LogicalName).to eq("opportunity")
+      expect(entities[1].LogicalName).to eq("new_tinderboxdocument")
+      expect(entities[2].LogicalName).to eq("new_tinderboxcontent")
     end
   end
 
   describe "#retrieve_entity" do
     it "retrieve entity metadata" do
 
-      subject.stub(:post).and_return(fixture("retrieve_entity_response"))
+      allow(subject).to receive(:post).and_return(fixture("retrieve_entity_response"))
 
       result = subject.retrieve_entity("opportunity")
 
-      result.should be_a(DynamicsCRM::Metadata::RetrieveEntityResponse)
-      result.entity.should_not be_nil
+      expect(result).to be_a(DynamicsCRM::Metadata::RetrieveEntityResponse)
+      expect(result.entity).not_to be_nil
       entity = result.entity
-      entity.should be_a(DynamicsCRM::Metadata::EntityMetadata)
+      expect(entity).to be_a(DynamicsCRM::Metadata::EntityMetadata)
 
-      entity.LogicalName.should == "opportunity"
-      entity.PrimaryIdAttribute.should == "opportunityid"
-      entity.PrimaryNameAttribute.should == "name"
+      expect(entity.LogicalName).to eq("opportunity")
+      expect(entity.PrimaryIdAttribute).to eq("opportunityid")
+      expect(entity.PrimaryNameAttribute).to eq("name")
     end
   end
 
   describe "#retrieve_attribute" do
     it "retrieve attribute metadata" do
 
-      subject.stub(:post).and_return(fixture("retrieve_attribute_response"))
+      allow(subject).to receive(:post).and_return(fixture("retrieve_attribute_response"))
 
       result = subject.retrieve_attribute("new_tinderboxdocument", "new_value")
 
-      result.should be_a(DynamicsCRM::Metadata::RetrieveAttributeResponse)
-      result.attribute.should_not be_nil
+      expect(result).to be_a(DynamicsCRM::Metadata::RetrieveAttributeResponse)
+      expect(result.attribute).not_to be_nil
       attribute = result.attribute
 
-      attribute.EntityLogicalName.should == "new_tinderboxdocument"
-      attribute.LogicalName.should == "new_value"
+      expect(attribute.EntityLogicalName).to eq("new_tinderboxdocument")
+      expect(attribute.LogicalName).to eq("new_value")
     end
   end
 
@@ -288,7 +316,7 @@ describe DynamicsCRM::Client do
 
     describe "#associate" do
       it "associates contacts with account" do
-        subject.stub(:post).and_return(fixture("associate_response"))
+        allow(subject).to receive(:post).and_return(fixture("associate_response"))
 
         subject.associate("account", "7BF2E032-AD92-E311-9752-6C3BE5A87DF0", "contact_customer_accounts", contacts)
       end
@@ -296,33 +324,104 @@ describe DynamicsCRM::Client do
 
     describe "#disassociate" do
       it "disassociates contacts with accounts" do
-        subject.stub(:post).and_return(fixture("disassociate_response"))
+        allow(subject).to receive(:post).and_return(fixture("disassociate_response"))
 
         subject.disassociate("account", "7BF2E032-AD92-E311-9752-6C3BE5A87DF0", "contact_customer_accounts", contacts)
       end
     end
   end
 
+  describe "#retrieve_metadata_changes" do
+    it "retrieves entity metadata" do
+      allow(subject).to receive(:post).and_return(fixture("retrieve_metadata_changes_response"))
+
+      entity_filter = DynamicsCRM::Metadata::FilterExpression.new('Or')
+      entity_filter.add_condition(['SchemaName', 'Equals', 'Contact'])
+      entity_filter.add_condition(['SchemaName', 'Equals', 'Annotation'])
+      entity_filter.add_condition(['SchemaName', 'Equals', 'Incident'])
+      entity_properties = DynamicsCRM::Metadata::PropertiesExpression.new(['Attributes'])
+
+      attribute_filter = DynamicsCRM::Metadata::FilterExpression.new('And')
+      attribute_filter.add_condition(['IsCustomAttribute', 'Equals', false])
+      attribute_properties = DynamicsCRM::Metadata::PropertiesExpression.new(['LogicalName', 'AttributeType', 'AttributeOf', 'DisplayName', 'RequiredLevel'])
+      attribute_query = DynamicsCRM::Metadata::AttributeQueryExpression.new(attribute_filter, attribute_properties)
+
+      entity_query = DynamicsCRM::Metadata::EntityQueryExpression.new({
+        criteria: entity_filter,
+        properties: entity_properties,
+        attribute_query: attribute_query
+      })
+
+      result = subject.retrieve_metadata_changes(entity_query)
+      expect(result).to be_a(DynamicsCRM::Metadata::RetrieveMetadataChangesResponse)
+      entities = result.entities
+      expect(entities).not_to be_nil
+      expect(entities.size).to eq(3)
+
+      attributes = entities[0].attributes
+      expect(attributes.size).to eq(2)
+      attribute  = attributes.first
+      expect(attribute.logical_name).to eq("contactid")
+      expect(attribute.attribute_of).to be_empty
+      expect(attribute.type).to eq("Lookup")
+      expect(attribute.display_name).to eq("Contact")
+      expect(attribute.required_level).to eq("None")
+
+      attributes = entities[1].attributes
+      expect(attributes.size).to eq(2)
+      attribute  = attributes.first
+      expect(attribute.logical_name).to eq("customertypecodename")
+      expect(attribute.attribute_of).to eq("customertypecode")
+      expect(attribute.type).to eq("Virtual")
+      expect(attribute.display_name).to be_empty
+      expect(attribute.required_level).to eq("None")
+
+      attributes = entities[2].attributes
+      expect(attributes.size).to eq(2)
+      attribute = attributes.first
+      expect(attribute.logical_name).to eq("createdonbehalfbyyominame")
+      expect(attribute.attribute_of).to eq("createdonbehalfby")
+      expect(attribute.type).to eq("String")
+      expect(attribute.display_name).to be_empty
+      expect(attribute.required_level).to eq("None")
+    end
+  end
+
   describe "#who_am_i" do
     it "returns user information" do
-      subject.stub(:post).and_return(fixture("who_am_i_result"))
+      allow(subject).to receive(:post).and_return(fixture("who_am_i_result"))
 
       response = subject.who_am_i
-      response.UserId.should == "1bfa3886-df7e-468c-8435-b5adfb0441ed"
-      response.BusinessUnitId.should == "4e87d619-838a-e311-89a7-6c3be5a80184"
-      response.OrganizationId.should == "0140d597-e270-494a-89e1-bd0b43774e50"
+      expect(response.UserId).to eq("1bfa3886-df7e-468c-8435-b5adfb0441ed")
+      expect(response.BusinessUnitId).to eq("4e87d619-838a-e311-89a7-6c3be5a80184")
+      expect(response.OrganizationId).to eq("0140d597-e270-494a-89e1-bd0b43774e50")
     end
   end
 
   describe "#load_entity" do
     it "returns Model::Opportunity" do
       response = subject.load_entity("opportunity", "c4944f99-b5a0-e311-b64f-6c3be5a87df0")
-      response.should be_a(DynamicsCRM::Model::Opportunity)
+      expect(response).to be_a(DynamicsCRM::Model::Opportunity)
     end
 
     it "returns Model::Entity" do
       response = subject.load_entity("account", "c4944f99-b5a0-e311-b64f-6c3be5a87df0")
-      response.should be_a(DynamicsCRM::Model::Entity)
+      expect(response).to be_a(DynamicsCRM::Model::Entity)
+    end
+  end
+
+  describe "#determine_region" do
+    context "Client receives only hostname" do
+      it "return the correct region" do
+        client = DynamicsCRM::Client.new(hostname: 'xunda.api.crm2.dynamics.com')
+        expect(client.region).to eq('urn:crmsam:dynamics.com')
+      end
+    end
+    context "Client receives only organization_name" do
+      it "return the correct region" do
+        client = DynamicsCRM::Client.new(organization_name: 'xunda')
+        expect(client.region).to eq('urn:crmna:dynamics.com')
+      end
     end
   end