dynamics_crm 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 511b29b2b863fee746767bb6bf4781d043f13969
-  data.tar.gz: 9bffa8007f6f12332be94fb81e447b05c43c88e8
+  metadata.gz: 98498eb29f5847c9e344859c2a728367d4e5227a
+  data.tar.gz: a6621ceb97f27de1298c7afba4b99cfd6f5fa44b
 SHA512:
-  metadata.gz: d093920089243f8f13e586cb5815c5b4ff2ddaffa504bd5e41e9de1f9c4e15a3356126e47887373bac5fe29d2b837432c299d97350c3afdd2b938fb3edf28499
-  data.tar.gz: 45c230a953e78736440accdea82c61d77c440b1c5efdd7779a40131d11e9ea91e025ea2a0092889de1dcf8f2b49ab24dbeea483a5fce455079177d075b35e156
+  metadata.gz: 1773ffbe9669459911e9c08bc44f241fa825ca14858f738084e7179cb5b46b965b8c01222c3c6c0b98651da0da0dbdd3f59d52c4cfe304197950e9473379b666
+  data.tar.gz: 261c9ae185cfdd0151ff118a56f78bb873ca69ef866dfbee46b9bc4e85265292c1cd1d5dad7ef1b18c143668fb9798938bf90089d92cb4dae3bb37d7a071e4a9

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -16,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 vendor
+

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.0
+  - 2.2.0
+  - 2.3.0
 notifications:
   email:
     recipients:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.8.0 (January 4, 2017)
+* Support ArrayOfEntity so one can create bound entities like ActivityParties on create #41
+* Add special case for nil value #43
+* Add support for double type #44
+* Support Or queries in Criteria #53
+* Removed dependency on Curb #54
+* Adds PageInfo support to QueryExpression. #56
+
 ## 0.7.0 (March 4, 2016)
 * Add EntityCollection to xml attributes #24
 * Fix illegal XML characters #25

data/README.md

@@ -41,8 +41,33 @@ client.retrieve('account', '53291AAB-4A9A-E311-B097-6C3BE5A8DD60')
 client.retrieve_multiple('account', [["name", "Equal", "Test Account"]])
 # => [#<DynamicsCRM::XML::Entity ... >]
 
-client.retrieve_multiple('account', [["name", "Equal", "Test Account"], ["Name, "CreatedBy"]])
+client.retrieve_multiple('account', [["name", "Equal", "Test Account"], ['salesstage', 'In', [0, 1, 2]]])
 # => [#<DynamicsCRM::XML::Entity ... >]
+
+client.retrieve_multiple('account', [["telephone1", "EndsWith", "5558675309"], ["mobilephone", "EndsWith", "5558675309"]], [], "Or")
+# => [#<DynamicsCRM::XML::Entity ... >]
+```
+
+### retrieve_multiple using QueryExpression
+
+```ruby
+# Build QueryExpression
+query = DynamicsCRM::XML::QueryExpression.new('account')
+query.columns = %w(accountid name)
+query.criteria.add_condition('name', 'NotEqual', 'Test Account')
+# Optional PageInfo
+query.page_info = DynamicsCRM::XML::PageInfo.new(count: 5, page_number: 1, return_total_record_count: true)
+
+# Get first page
+result = client.retrieve_multiple(query)
+
+while result.MoreRecords
+  # Next page
+  query.page_info.page_number += 1
+  query.page_info.paging_cookie = result.PagingCookie
+
+  result = client.retrieve_multiple(query)
+end
 ```
 
 ### fetch (FetchXml)

data/dynamics_crm.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = DynamicsCRM::VERSION
   spec.authors       = ["Joe Heth"]
   spec.email         = ["joeheth@gmail.com"]
-  spec.description   = %q{Ruby API for integrating with MS Dynamics 2011/2013 SOAP API}
-  spec.summary       = %q{Ruby gem for integrating with MS Dynamics 2011/2013 SOAP API}
+  spec.description   = %q{Ruby API for integrating with MS Dynamics SOAP API}
+  spec.summary       = %q{Ruby gem for integrating with MS Dynamics SOAP API}
   spec.homepage      = "https://github.com/TinderBox/dynamics_crm"
   spec.license       = "MIT"
 
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'curb', '>= 0.8', '< 1.0.0'
   spec.add_runtime_dependency 'mimemagic', '>= 0.2', '< 4.0.0'
   spec.add_runtime_dependency 'builder', '>= 3.0.0', '< 4.0.0'
 

data/lib/dynamics_crm.rb

@@ -4,14 +4,16 @@ require "dynamics_crm/xml/message_builder"
 require 'dynamics_crm/xml/message_parser'
 require "dynamics_crm/xml/fault"
 require "dynamics_crm/xml/attributes"
+require "dynamics_crm/xml/condition_expression"
 require "dynamics_crm/xml/column_set"
 require "dynamics_crm/xml/criteria"
-require "dynamics_crm/xml/query"
+require "dynamics_crm/xml/query_expression"
 require "dynamics_crm/xml/fetch_expression"
 require "dynamics_crm/xml/entity"
 require "dynamics_crm/xml/entity_reference"
 require "dynamics_crm/xml/entity_collection"
 require "dynamics_crm/xml/money"
+require "dynamics_crm/xml/page_info"
 require "dynamics_crm/response/result"
 require "dynamics_crm/response/retrieve_result"
 require "dynamics_crm/response/retrieve_multiple_result"
@@ -31,6 +33,7 @@ require "dynamics_crm/metadata/retrieve_all_entities_response"
 require "dynamics_crm/metadata/retrieve_entity_response"
 require "dynamics_crm/metadata/retrieve_attribute_response"
 require "dynamics_crm/metadata/retrieve_metadata_changes_response"
+require "dynamics_crm/metadata/double"
 # Model
 require "dynamics_crm/model/entity"
 require "dynamics_crm/model/opportunity"
@@ -44,8 +47,8 @@ require "dynamics_crm/client"
 require 'bigdecimal'
 require 'base64'
 require "rexml/document"
+require 'net/https'
 require 'mimemagic'
-require 'curl'
 require 'securerandom'
 require 'date'
 require 'cgi'

data/lib/dynamics_crm/client.rb

@@ -141,15 +141,19 @@ module DynamicsCRM
         })
     end
 
-    def retrieve_multiple(entity_name, criteria=[], columns=[])
-
-      query = XML::Query.new(entity_name)
-      query.columns = columns
-      query.criteria = XML::Criteria.new(criteria)
+    # Suports parameter list or QueryExpression object.
+    def retrieve_multiple(entity_name, criteria = [], columns = [], operator = nil)
+      if entity_name.is_a?(XML::QueryExpression)
+        query = entity_name
+      else
+        query = XML::QueryExpression.new(entity_name)
+        query.columns = columns
+        query.criteria = XML::Criteria.new(criteria, filter_operator: operator)
+      end
 
       request = retrieve_multiple_request(query)
       xml_response = post(organization_endpoint, request)
-      return Response::RetrieveMultipleResult.new(xml_response)
+      Response::RetrieveMultipleResult.new(xml_response)
     end
 
     def fetch(fetchxml)
@@ -321,30 +325,29 @@ module DynamicsCRM
 
     def post(url, request)
       log_xml("REQUEST", request)
+      uri = URI.parse(url)
 
-      c = Curl::Easy.new(url) do |http|
-        # Set up headers.
-        http.headers["Connection"] = "Keep-Alive"
-        http.headers["Content-type"] = "application/soap+xml; charset=UTF-8"
-        http.headers["Content-length"] = request.bytesize
-
-        http.ssl_verify_peer = false
-        http.timeout = timeout
-        http.follow_location = true
-        http.ssl_version = 1
-        # http.verbose = 1
-      end
+      http = Net::HTTP.new uri.host, uri.port
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      req = Net::HTTP::Post.new(uri.request_uri, {
+        "Connection" => "Keep-Alive",
+        "Content-type" => "application/soap+xml; charset=UTF-8",
+        "Content-length" => request.bytesize.to_s
+      })
+      req.body = request
+      response = http.request(req)
 
-      if c.http_post(request)
-        response = c.body_str
+      if response.code.to_i == 200
+        response_body = response.body
       else
         # Do something here on error.
       end
-      c.close
 
-      log_xml("RESPONSE", response)
+      log_xml("RESPONSE", response_body)
 
-      response
+      response_body
     end
 
     def log_xml(title, xml)

data/lib/dynamics_crm/metadata/double.rb

@@ -0,0 +1,5 @@
+module DynamicsCRM
+  module Metadata
+    Double = Struct.new(:value)
+  end
+end

data/lib/dynamics_crm/version.rb

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

data/lib/dynamics_crm/xml/attributes.rb

@@ -11,6 +11,8 @@ module DynamicsCRM
       def get_type(key, value)
         type = "string"
         case value
+          when ::Array
+            type = "ArrayOfEntity"
           when ::Fixnum
             type = "int"
           when ::BigDecimal, ::Float
@@ -31,6 +33,8 @@ module DynamicsCRM
             type = "FetchExpression"
           when Money
             type = "Money"
+          when DynamicsCRM::Metadata::Double
+            type = "double"
           when DynamicsCRM::Metadata::FilterExpression
             type = "FilterExpression"
           when DynamicsCRM::Metadata::PropertiesExpression
@@ -111,6 +115,13 @@ module DynamicsCRM
       def render_value_xml(type, value)
         xml = ""
         case type
+        when "ArrayOfEntity"
+          raise "We can only serialize Entities inside of ArrayOfEntity" unless value.all?{|a| a.is_a?(DynamicsCRM::XML::Entity)}
+          xml << %Q{
+          <c:value i:type="a:ArrayOfEntity">
+              #{value.map(&->(_) { _.to_xml({in_array: true}) }).join}
+          </c:value>
+        }
         when "EntityReference"
           xml << %Q{
             <c:value i:type="a:EntityReference">
@@ -131,7 +142,11 @@ module DynamicsCRM
             s_namespace = "http://schemas.microsoft.com/xrm/2011/Metadata"
           end
 
-          if type == "guid"
+          if value.nil?
+            xml << %Q{
+              <c:value i:nil="true"></c:value>
+            }
+          elsif type == "guid"
             xml << %Q{
               <c:value xmlns:d="http://schemas.microsoft.com/2003/10/Serialization/" i:type="d:guid">#{value}</c:value>
             }
@@ -143,6 +158,10 @@ module DynamicsCRM
             xml << %Q{
               <c:value i:type="s:#{type}" xmlns:s="http://www.w3.org/2001/XMLSchema">#{value.utc.strftime('%Y-%m-%dT%H:%M:%SZ')}</c:value>
             }
+          elsif type == "double"
+            xml << %Q{
+              <c:value i:type="s:#{type}" xmlns:s="#{s_namespace}">#{value.value}</c:value>
+            }
           else
             xml << %Q{
               <c:value i:type="s:#{type}" xmlns:s="#{s_namespace}">#{value}</c:value>
@@ -154,14 +173,14 @@ module DynamicsCRM
       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
+        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
+        xml
       end
 
       def class_name

data/lib/dynamics_crm/xml/condition_expression.rb

@@ -0,0 +1,48 @@
+module DynamicsCRM
+  module XML
+    # Loosely based on https://msdn.microsoft.com/en-us/library/gg334419.aspx
+    # Creates a ConditionExpression element to be used in retrieve calls.
+    class ConditionExpression
+      attr_accessor :attr_name, :operator, :value, :type
+      def initialize(attr_name, operator, value, type: nil)
+        @attr_name = attr_name
+        @operator = operator
+        @value = value
+        @values = Array(value)
+        @type = type
+      end
+
+      def value_type
+        return type unless type.nil?
+
+        type = @values.first.class.to_s.downcase
+        if type == 'fixnum'
+          type = 'int'
+        elsif %w(trueclass falseclass).include?(type)
+          type = 'boolean'
+        end
+
+        type
+      end
+
+      def to_xml(options = {})
+        ns = options[:namespace] ? options[:namespace] : 'a'
+
+        expression = %(<#{ns}:ConditionExpression>
+            <#{ns}:AttributeName>#{attr_name}</#{ns}:AttributeName>
+            <#{ns}:Operator>#{operator}</#{ns}:Operator>
+            <#{ns}:Values xmlns:d="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
+          )
+        @values.each do |v|
+          expression << %(<d:anyType i:type="s:#{value_type}" xmlns:s="http://www.w3.org/2001/XMLSchema">#{v}</d:anyType>)
+        end
+
+        expression << %(
+             </#{ns}:Values>
+        </#{ns}:ConditionExpression>)
+
+        expression
+      end
+    end
+  end
+end

data/lib/dynamics_crm/xml/criteria.rb

@@ -1,52 +1,44 @@
 module DynamicsCRM
   module XML
-
     class Criteria < Array
+      SUPPORTED_OPERATORS = %w(And Or)
+
+      def initialize(tuples = [], filter_operator: nil)
+        filter_operator ||= 'And'
+        raise "Supported operators: #{SUPPORTED_OPERATORS.join(',')}" if !SUPPORTED_OPERATORS.include?(filter_operator)
+
+        super(tuples)
+        @filter_operator = filter_operator
+
+        # Convert to ConditionExpression
+        @expressions = self.map do |tuple|
+          attr_name, operator, value, data_type = *tuple
+          ConditionExpression.new(attr_name, operator, value, type: data_type)
+        end
+      end
 
-      attr_accessor :filter_operator
-      def initialize(tuples=[])
-        super
-        @filter_operator = 'And'
+      def add_condition(attr_name, operator, value, type: nil)
+        @expressions << ConditionExpression.new(attr_name, operator, value, type: type)
       end
 
       # ConditionExpression can be repeated multiple times
-      # Operator: can be lots of values such as: eq (Equals), neq (Not Equals), gt (Greater Than) 
+      # Operator: can be lots of values such as: eq (Equals), neq (Not Equals), gt (Greater Than)
       #           get the values from a fetch xml query
       # Values -> Value can be repeated multiple times
       # FilterOperator: and OR or depending on the filter requirements
-      def to_xml(options={})
-        ns = options[:namespace] ? options[:namespace] : "a"
+      def to_xml(options = {})
+        ns = options[:namespace] ? options[:namespace] : 'a'
 
-        expressions = ""
-        self.each do |tuple|
-          attr_name = tuple[0]
-          operator = tuple[1]
-          values = tuple[2].is_a?(Array) ? tuple[2] : [tuple[2]]
-          # TODO: Improve type detection
-          type = (tuple[3] || values.first.class).to_s.downcase
-          type = "int" if type == "fixnum"
-          type = "boolean" if ["trueclass", "falseclass"].include?(type)
-
-          expressions << %Q{<#{ns}:ConditionExpression>
-              <#{ns}:AttributeName>#{attr_name}</#{ns}:AttributeName>
-              <#{ns}:Operator>#{operator}</#{ns}:Operator>
-              <#{ns}:Values xmlns:d="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
-            }
-              values.each do |v|
-                  expressions << %Q{<d:anyType i:type="s:#{type}" xmlns:s="http://www.w3.org/2001/XMLSchema">#{v}</d:anyType>}
-              end
-              
-          expressions << %Q{
-               </#{ns}:Values>
-          </#{ns}:ConditionExpression>}
-        end
+        xml_expression = @expressions.map do |conditional|
+          conditional.to_xml(options)
+        end.join('')
 
-        %Q{<#{ns}:Criteria>
+        %(<#{ns}:Criteria>
             <#{ns}:Conditions>
-              #{expressions}
+              #{xml_expression}
             </#{ns}:Conditions>
             <#{ns}:FilterOperator>#{@filter_operator}</#{ns}:FilterOperator>
-        </#{ns}:Criteria>}
+        </#{ns}:Criteria>)
       end
     end
     # Criteria

data/lib/dynamics_crm/xml/entity.rb

@@ -24,11 +24,19 @@ module DynamicsCRM
 
         return inner_xml if options[:exclude_root]
 
-        %Q{
-        <entity xmlns:a="http://schemas.microsoft.com/xrm/2011/Contracts">
-          #{inner_xml}
-        </entity>
-        }
+        if options[:in_array]
+          %Q{
+          <a:Entity>
+            #{inner_xml}
+          </a:Entity>
+          }
+        else
+          %Q{
+          <entity xmlns:a="http://schemas.microsoft.com/xrm/2011/Contracts">
+            #{inner_xml}
+          </entity>
+          }
+        end
       end
 
       def to_hash

data/lib/dynamics_crm/xml/page_info.rb

@@ -1,26 +1,31 @@
 module DynamicsCRM
   module XML
-
     class PageInfo
-
       attr_accessor :count, :page_number, :paging_cookie, :return_total_record_count
-      def initialize
-        @count = 20
-        @page_number = 1
-        @paging_cookie = nil
-        @return_total_record_count = false
+
+      def initialize(count: 20, page_number: 1, paging_cookie: nil, return_total_record_count: false)
+        @count = count
+        @page_number = page_number
+        @paging_cookie = paging_cookie
+        @return_total_record_count = return_total_record_count
       end
 
       # Using Entity vs entity causes the error: Value cannot be null.
       def to_xml
-        %Q{
+        cookie = if paging_cookie.nil?
+          '<b:PagingCookie i:nil="true" />'
+        else
+          %(<b:PagingCookie>#{CGI.escapeHTML(paging_cookie)}</b:PagingCookie>)
+        end
+
+        %(
         <b:PageInfo>
           <b:Count>#{count}</b:Count>
           <b:PageNumber>#{page_number}</b:PageNumber>
-          <b:PagingCookie i:nil="true" />
-          <b:ReturnTotalRecordCount>false</b:ReturnTotalRecordCount>
+          #{cookie}
+          <b:ReturnTotalRecordCount>#{return_total_record_count}</b:ReturnTotalRecordCount>
         </b:PageInfo>
-        }
+        )
       end
 
       def to_hash
@@ -31,8 +36,7 @@ module DynamicsCRM
           :return_total_record_count => return_total_record_count
         }
       end
-
     end
     # PageInfo
   end
-end
+end

data/lib/dynamics_crm/xml/query_expression.rb

@@ -0,0 +1,43 @@
+module DynamicsCRM
+  module XML
+    # Represents QueryExpression XML fragment.
+    class QueryExpression
+      attr_accessor :columns, :criteria, :entity_name, :page_info
+
+      def initialize(entity_name)
+        @entity_name = entity_name
+        @criteria = Criteria.new
+      end
+
+      def to_xml(options = {})
+        namespace = options[:namespace] ? options[:namespace] : 'b'
+
+        column_set = columns.is_a?(ColumnSet) ? columns : ColumnSet.new(columns)
+
+        xml = %(
+            #{column_set.to_xml(namespace: namespace, camel_case: true)}
+            #{criteria.to_xml(namespace: namespace)}
+            <#{namespace}:Distinct>false</#{namespace}:Distinct>
+            <#{namespace}:EntityName>#{entity_name}</#{namespace}:EntityName>
+            <#{namespace}:LinkEntities />
+            <#{namespace}:Orders />
+          )
+
+        xml << page_info.to_xml if page_info
+
+        if options[:exclude_root].nil?
+          xml = %(<query i:type="b:QueryExpression" xmlns:b="http://schemas.microsoft.com/xrm/2011/Contracts" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+              #{xml}
+          </query>)
+        end
+
+        xml
+      end
+    end
+    # QueryExpression
+
+    # Backward compatible class
+    class Query < QueryExpression
+    end
+  end
+end

data/spec/fixtures/entity_array_response.xml

@@ -0,0 +1,37 @@
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+  <s:Body>
+    <Create xmlns="http://schemas.microsoft.com/xrm/2011/Contracts/Services" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+      <entity xmlns:a="http://schemas.microsoft.com/xrm/2011/Contracts">
+        <a:Attributes xmlns:b="http://schemas.datacontract.org/2004/07/System.Collections.Generic">
+          <a:KeyValuePairOfstringanyType>
+            <b:key>from</b:key>
+            <b:value i:type="a:ArrayOfEntity">
+              <a:Entity>
+                <a:Attributes>
+                  <a:KeyValuePairOfstringanyType>
+                    <b:key>partyid</b:key>
+                    <b:value i:type="a:EntityReference">
+                      <a:Id>f36aa96c-e7a5-4c70-8254-47c8ba947561</a:Id>
+                      <a:LogicalName>systemuser</a:LogicalName>
+                      <a:Name i:nil="true" />
+                    </b:value>
+                  </a:KeyValuePairOfstringanyType>
+                </a:Attributes>
+                <a:EntityState i:nil="true" />
+                <a:FormattedValues />
+                <a:Id>00000000-0000-0000-0000-000000000000</a:Id>
+                <a:LogicalName>activityparty</a:LogicalName>
+                <a:RelatedEntities />
+              </a:Entity>
+            </b:value>
+          </a:KeyValuePairOfstringanyType>
+        </a:Attributes>
+        <a:EntityState i:nil="true" />
+        <a:FormattedValues xmlns:b="http://schemas.datacontract.org/2004/07/System.Collections.Generic" />
+        <a:Id>00000000-0000-0000-0000-000000000000</a:Id>
+        <a:LogicalName>phonecall</a:LogicalName>
+        <a:RelatedEntities xmlns:b="http://schemas.datacontract.org/2004/07/System.Collections.Generic" />
+      </entity>
+    </Create>
+  </s:Body>
+</s:Envelope>

data/spec/lib/client_spec.rb

@@ -36,7 +36,7 @@ describe DynamicsCRM::Client do
     end
 
     context "On-Premise" do
-      let(:subject) { DynamicsCRM::Client.new(organization_name: "psavtest", hostname: "psavtest.crm.powerobjects.net")}
+      let(:subject) { DynamicsCRM::Client.new(hostname: "customers.crm.psav.com")}
 
       it "authenticates with username and password" do
 
@@ -110,6 +110,30 @@ describe DynamicsCRM::Client do
       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
+
+    it "retrieves multiple entities by criteria using OR" do
+
+      allow(subject).to receive(:post).and_return(fixture("retrieve_multiple_result"))
+
+      result = subject.retrieve_multiple("account", ["name", "Equal", "Test Account"], columns=[], 'Or')
+
+      expect(result).to be_a(DynamicsCRM::Response::RetrieveMultipleResult)
+    end
+
+    it "retrieves multiple entities by QueryExpression" do
+      allow(subject).to receive(:post).and_return(fixture("retrieve_multiple_result"))
+
+      query = DynamicsCRM::XML::QueryExpression.new('account')
+      query.columns = %w(accountid name)
+      query.criteria.add_condition('name', 'Equal', 'Test Account')
+
+      result = subject.retrieve_multiple(query)
+
+      expect(result).to be_a(DynamicsCRM::Response::RetrieveMultipleResult)
+
+      expect(result['EntityName']).to eq('account')
+      expect(result.entities.size).to eq(3)
+    end
   end
 
   describe "#retrieve_attachments" do

data/spec/lib/xml/attributes_spec.rb

@@ -9,7 +9,9 @@ describe DynamicsCRM::XML::Attributes do
         "modifiedon" => Time.now,
         "donotemail" => true,
         "id" => "1bfa3886-df7e-468c-8435-b5adfb0441ed",
-        "reference" => {"Id" => "someid", "Name" => "entityname", "LogicalName" => "opportunity"}
+        "reference" => {"Id" => "someid", "Name" => "entityname", "LogicalName" => "opportunity"},
+        "expireson" => nil,
+        "address1_latitude" => DynamicsCRM::Metadata::Double.new(5.22123)
       }
     }
     subject {
@@ -32,6 +34,11 @@ describe DynamicsCRM::XML::Attributes do
       it { expect(subject.to_xml).to include("<c:key>telephone1</c:key>") }
       it { expect(subject.to_xml).to include("<c:key>donotemail</c:key>") }
       it { expect(subject.to_xml).to include("<c:key>modifiedon</c:key>") }
+      it { expect(subject.to_xml).to include('<c:value i:nil="true"></c:value>') }
+      it do
+        expect(subject.to_xml)
+          .to include('<c:value i:type="s:double" xmlns:s="http://www.w3.org/2001/XMLSchema">5.22123</c:value>')
+      end
     end
 
   end

data/spec/lib/xml/criteria_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe DynamicsCRM::XML::Criteria do
+  describe 'initialization' do
+    subject do
+      DynamicsCRM::XML::Criteria.new
+    end
+
+    it 'generates empty Criteria fragment' do
+      expected = %(<a:Criteria>
+        <a:Conditions>
+        </a:Conditions>
+        <a:FilterOperator>And</a:FilterOperator>
+      </a:Criteria>)
+
+      expect(subject.to_xml).to match_xml(expected)
+    end
+  end
+
+  describe 'single criteria' do
+    subject do
+      DynamicsCRM::XML::Criteria.new([['name', 'Equal', 'Test Opp']])
+    end
+    let(:expected) {
+      %(<a:Criteria>
+          <a:Conditions>
+            <a:ConditionExpression>
+              <a:AttributeName>name</a:AttributeName>
+              <a:Operator>Equal</a:Operator>
+              <a:Values xmlns:d="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
+                <d:anyType i:type="s:string" xmlns:s="http://www.w3.org/2001/XMLSchema">Test Opp</d:anyType>
+              </a:Values>
+            </a:ConditionExpression>
+          </a:Conditions>
+          <a:FilterOperator>And</a:FilterOperator>
+      </a:Criteria>)
+    }
+
+    it 'generates Criteria fragment with single ConditionExpression' do
+      expect(subject.to_xml).to match_xml expected
+    end
+
+    it 'set data type explicitly' do
+      # Supports optional fourth value for data type
+      subject = DynamicsCRM::XML::Criteria.new([['name', 'Equal', 'Test Opp', 'customstring']])
+
+      expect(subject.to_xml).to match_xml expected.gsub('s:string', 's:customstring')
+    end
+  end
+
+  describe 'multiple criteria' do
+    subject do
+      DynamicsCRM::XML::Criteria.new([
+        ['name', 'Equal', 'Test Opp'],
+        ['salesstage', 'In', [0, 1, 2]],
+      ])
+    end
+
+    it 'generates Criteria with multiple ConditionExpression(s)' do
+      expect(subject.to_xml).to match_xml %(<a:Criteria>
+          <a:Conditions>
+            <a:ConditionExpression>
+              <a:AttributeName>name</a:AttributeName>
+              <a:Operator>Equal</a:Operator>
+              <a:Values xmlns:d="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
+                <d:anyType i:type="s:string" xmlns:s="http://www.w3.org/2001/XMLSchema">Test Opp</d:anyType>
+              </a:Values>
+            </a:ConditionExpression>
+            <a:ConditionExpression>
+              <a:AttributeName>salesstage</a:AttributeName>
+              <a:Operator>In</a:Operator>
+              <a:Values xmlns:d="http://schemas.microsoft.com/2003/10/Serialization/Arrays">
+                <d:anyType i:type="s:int" xmlns:s="http://www.w3.org/2001/XMLSchema">0</d:anyType>
+                <d:anyType i:type="s:int" xmlns:s="http://www.w3.org/2001/XMLSchema">1</d:anyType>
+                <d:anyType i:type="s:int" xmlns:s="http://www.w3.org/2001/XMLSchema">2</d:anyType>
+              </a:Values>
+            </a:ConditionExpression>
+          </a:Conditions>
+          <a:FilterOperator>And</a:FilterOperator>
+      </a:Criteria>)
+    end
+  end
+end

data/spec/lib/xml/entity_spec.rb

@@ -60,4 +60,18 @@ describe DynamicsCRM::XML::Entity do
     end
   end
 
+  describe "entity with array" do
+    subject {
+      entity = DynamicsCRM::XML::Entity.new("activityparty")
+      entity.attributes = DynamicsCRM::XML::Attributes.new(
+          partyid: DynamicsCRM::XML::EntityReference.new("systemuser", "f36aa96c-e7a5-4c70-8254-47c8ba947561")
+      )
+      entity
+    }
+
+    context "#to_xml" do
+      it { expect(DynamicsCRM::XML::Attributes.new({to: [subject]}).to_xml).to include('<c:value i:type="a:ArrayOfEntity">') }
+    end
+  end
+
 end

data/spec/lib/xml/query_expression_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe DynamicsCRM::XML::QueryExpression do
+
+  describe 'initialization' do
+    subject {
+      DynamicsCRM::XML::QueryExpression.new('opportunity')
+    }
+
+    context "generate empty QueryExpression fragment" do
+      it { expect(subject.to_xml).to include("<b:ColumnSet ") }
+      it { expect(subject.to_xml).to match(/<b:Conditions>\s+<\/b:Conditions>/) }
+      it { expect(subject.to_xml).to include("<b:AllColumns>true</b:AllColumns>") }
+      it { expect(subject.to_xml).to include("<b:Distinct>false</b:Distinct>") }
+      it { expect(subject.to_xml).to include("<b:EntityName>opportunity</b:EntityName>") }
+      it { expect(subject.to_xml).to include("<b:FilterOperator>And</b:FilterOperator>").or(include("<b:FilterOperator>Or</b:FilterOperator>")) }
+    end
+  end
+
+  describe 'Criteria' do
+    subject {
+      query = DynamicsCRM::XML::QueryExpression.new('opportunity')
+      query.criteria = DynamicsCRM::XML::Criteria.new([["name", "Equal", "Test Opp"]])
+      query
+    }
+
+    context "generate QueryExpression fragment" do
+      it { expect(subject.to_xml).to include("<b:ColumnSet ") }
+      it { expect(subject.to_xml).to include("<b:ConditionExpression") }
+      it { expect(subject.to_xml).to include("AttributeName>name</") }
+      it { expect(subject.to_xml).to include("Operator>Equal</") }
+      it { expect(subject.to_xml).to include('<d:anyType i:type="s:string" xmlns:s="http://www.w3.org/2001/XMLSchema">Test Opp</d:anyType>') }
+      it { expect(subject.to_xml).to include("<b:AllColumns>true</b:AllColumns>") }
+      it { expect(subject.to_xml).to include("<b:Distinct>false</b:Distinct>") }
+      it { expect(subject.to_xml).to include("<b:EntityName>opportunity</b:EntityName>") }
+      it { expect(subject.to_xml).to include("<b:FilterOperator>And</b:FilterOperator>").or(include("<b:FilterOperator>Or</b:FilterOperator>")) }
+    end
+  end
+
+  describe 'PageInfo' do
+    subject {
+      query = DynamicsCRM::XML::QueryExpression.new('account')
+      query.columns = %w(accountid name)
+      query.criteria.add_condition('name', 'NotEqual', 'Test Account')
+      query.page_info = DynamicsCRM::XML::PageInfo.new(count: 5, page_number: 2, return_total_record_count: true)
+      query
+    }
+
+    context "generate empty QueryExpression fragment" do
+      it { expect(subject.to_xml).to include('<b:ColumnSet ') }
+      it { expect(subject.to_xml).to include('<b:ConditionExpression') }
+      it { expect(subject.to_xml).to include('AttributeName>name</') }
+      it { expect(subject.to_xml).to include('Operator>NotEqual</') }
+      it { expect(subject.to_xml).to include('<d:anyType i:type="s:string" xmlns:s="http://www.w3.org/2001/XMLSchema">Test Account</d:anyType>') }
+      it { expect(subject.to_xml).to include('<b:AllColumns>false</b:AllColumns>') }
+      it { expect(subject.to_xml).to include('<b:Columns') }
+      it { expect(subject.to_xml).to include('<b:EntityName>account</b:EntityName>') }
+      it { expect(subject.to_xml).to include('<b:PageInfo>') }
+      it { expect(subject.to_xml).to include('<b:Count>5</b:Count>') }
+      it { expect(subject.to_xml).to include('<b:PageNumber>2</b:PageNumber>') }
+      it { expect(subject.to_xml).to include('<b:ReturnTotalRecordCount>true</b:ReturnTotalRecordCount>') }
+    end
+  end
+end

data/spec/support/matchers/match_xml.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :match_xml do |expected|
+  match do |actual|
+    clean_xml(expected) == clean_xml(actual)
+  end
+
+  def clean_xml(str)
+    str.split("\n").map(&:strip).join('')
+  end
+end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dynamics_crm
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Joe Heth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +138,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
-description: Ruby API for integrating with MS Dynamics 2011/2013 SOAP API
+description: Ruby API for integrating with MS Dynamics SOAP API
 email:
 - joeheth@gmail.com
 executables: []
@@ -181,6 +161,7 @@ files:
 - lib/dynamics_crm/fetch_xml/link_entity.rb
 - lib/dynamics_crm/metadata/attribute_metadata.rb
 - lib/dynamics_crm/metadata/attribute_query_expression.rb
+- lib/dynamics_crm/metadata/double.rb
 - lib/dynamics_crm/metadata/entity_metadata.rb
 - lib/dynamics_crm/metadata/entity_query_expression.rb
 - lib/dynamics_crm/metadata/filter_expression.rb
@@ -202,6 +183,7 @@ files:
 - lib/dynamics_crm/version.rb
 - lib/dynamics_crm/xml/attributes.rb
 - lib/dynamics_crm/xml/column_set.rb
+- lib/dynamics_crm/xml/condition_expression.rb
 - lib/dynamics_crm/xml/criteria.rb
 - lib/dynamics_crm/xml/entity.rb
 - lib/dynamics_crm/xml/entity_collection.rb
@@ -213,11 +195,12 @@ files:
 - lib/dynamics_crm/xml/money.rb
 - lib/dynamics_crm/xml/orders.rb
 - lib/dynamics_crm/xml/page_info.rb
-- lib/dynamics_crm/xml/query.rb
+- lib/dynamics_crm/xml/query_expression.rb
 - spec/fixtures/associate_response.xml
 - spec/fixtures/create_response.xml
 - spec/fixtures/delete_response.xml
 - spec/fixtures/disassociate_response.xml
+- spec/fixtures/entity_array_response.xml
 - spec/fixtures/fetch_xml_response.xml
 - spec/fixtures/lose_opportunity_response.xml
 - spec/fixtures/receiver_fault.xml
@@ -248,18 +231,20 @@ files:
 - spec/lib/metadata/retrieve_metadata_changes_response_spec.rb
 - spec/lib/model/opportunity_spec.rb
 - spec/lib/response/execute_result_spec.rb
-- spec/lib/response/retrieve_multiple_spec.rb
+- spec/lib/response/retrieve_multiple_result_spec.rb
 - spec/lib/response/retrieve_result_spec.rb
 - spec/lib/xml/attributes_spec.rb
 - spec/lib/xml/column_set_spec.rb
+- spec/lib/xml/criteria_spec.rb
 - spec/lib/xml/entity_reference_spec.rb
 - spec/lib/xml/entity_spec.rb
 - spec/lib/xml/fault_spec.rb
 - spec/lib/xml/message_builder_spec.rb
 - spec/lib/xml/money_spec.rb
-- spec/lib/xml/query_spec.rb
+- spec/lib/xml/query_expression_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb
+- spec/support/matchers/match_xml.rb
 homepage: https://github.com/TinderBox/dynamics_crm
 licenses:
 - MIT
@@ -280,15 +265,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby gem for integrating with MS Dynamics 2011/2013 SOAP API
+summary: Ruby gem for integrating with MS Dynamics SOAP API
 test_files:
 - spec/fixtures/associate_response.xml
 - spec/fixtures/create_response.xml
 - spec/fixtures/delete_response.xml
 - spec/fixtures/disassociate_response.xml
+- spec/fixtures/entity_array_response.xml
 - spec/fixtures/fetch_xml_response.xml
 - spec/fixtures/lose_opportunity_response.xml
 - spec/fixtures/receiver_fault.xml
@@ -319,15 +305,17 @@ test_files:
 - spec/lib/metadata/retrieve_metadata_changes_response_spec.rb
 - spec/lib/model/opportunity_spec.rb
 - spec/lib/response/execute_result_spec.rb
-- spec/lib/response/retrieve_multiple_spec.rb
+- spec/lib/response/retrieve_multiple_result_spec.rb
 - spec/lib/response/retrieve_result_spec.rb
 - spec/lib/xml/attributes_spec.rb
 - spec/lib/xml/column_set_spec.rb
+- spec/lib/xml/criteria_spec.rb
 - spec/lib/xml/entity_reference_spec.rb
 - spec/lib/xml/entity_spec.rb
 - spec/lib/xml/fault_spec.rb
 - spec/lib/xml/message_builder_spec.rb
 - spec/lib/xml/money_spec.rb
-- spec/lib/xml/query_spec.rb
+- spec/lib/xml/query_expression_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb
+- spec/support/matchers/match_xml.rb

data/lib/dynamics_crm/xml/query.rb

@@ -1,38 +0,0 @@
-module DynamicsCRM
-  module XML
-    # Represents Query XML fragment.
-    class Query
-
-      attr_accessor :columns, :criteria, :entity_name
-
-      def initialize(entity_name)
-        @entity_name = entity_name
-      end
-
-      def to_xml(options={})
-        namespace = options[:namespace] ? options[:namespace] : "b"
-
-        column_set = ColumnSet.new(columns)
-        @criteria ||= Criteria.new
-
-        xml = %Q{
-            #{column_set.to_xml(namespace: namespace, camel_case: true)}
-            #{@criteria.to_xml(namespace: namespace)}
-            <#{namespace}:Distinct>false</#{namespace}:Distinct>
-            <#{namespace}:EntityName>#{entity_name}</#{namespace}:EntityName>
-            <#{namespace}:LinkEntities />
-            <#{namespace}:Orders />
-          }
-
-        if options[:exclude_root].nil?
-          xml = %Q{<query i:type="b:QueryExpression" xmlns:b="http://schemas.microsoft.com/xrm/2011/Contracts" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-              #{xml}
-          </query>}
-        end
-        return xml
-      end
-
-    end
-    # Query
-  end
-end

data/spec/lib/xml/query_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe DynamicsCRM::XML::Query do
-
-  describe 'initialization' do
-    subject {
-      DynamicsCRM::XML::Query.new('opportunity')
-    }
-
-    context "generate empty Query fragment" do
-      it { expect(subject.to_xml).to include("<b:ColumnSet ") }
-      it { expect(subject.to_xml).to match(/<b:Conditions>\s+<\/b:Conditions>/) }
-      it { expect(subject.to_xml).to include("<b:AllColumns>true</b:AllColumns>") }
-      it { expect(subject.to_xml).to include("<b:Distinct>false</b:Distinct>") }
-      it { expect(subject.to_xml).to include("<b:EntityName>opportunity</b:EntityName>") }
-      it { expect(subject.to_xml).to include("<b:FilterOperator>And</b:FilterOperator>") }
-    end
-
-  end
-
-
-  describe 'criteria' do
-    subject {
-      query = DynamicsCRM::XML::Query.new('opportunity')
-      query.criteria = DynamicsCRM::XML::Criteria.new([["name", "Equal", "Test Opp"]])
-      query
-    }
-
-    context "generate empty Query fragment" do
-      it { expect(subject.to_xml).to include("<b:ColumnSet ") }
-      it { expect(subject.to_xml).to include("<b:ConditionExpression") }
-      it { expect(subject.to_xml).to include("AttributeName>name</") }
-      it { expect(subject.to_xml).to include("Operator>Equal</") }
-      it { expect(subject.to_xml).to include('<d:anyType i:type="s:string" xmlns:s="http://www.w3.org/2001/XMLSchema">Test Opp</d:anyType>') }
-      it { expect(subject.to_xml).to include("<b:AllColumns>true</b:AllColumns>") }
-      it { expect(subject.to_xml).to include("<b:Distinct>false</b:Distinct>") }
-      it { expect(subject.to_xml).to include("<b:EntityName>opportunity</b:EntityName>") }
-      it { expect(subject.to_xml).to include("<b:FilterOperator>And</b:FilterOperator>") }
-    end
-
-  end
-
-end