dynamics_crm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed0c1801ab9a78dba2eb01192f0806fdbf9bc4ab
-  data.tar.gz: 9bb310620e6a7fbdc950487a3a7cb1a57c3e2a9f
+  metadata.gz: e726f9c76ea10016d1fcc9de700cc4126c5894c1
+  data.tar.gz: 9693bc3f8691b6195c180e97adb21fbe2029b186
 SHA512:
-  metadata.gz: 83a6d261729864fd043f39ea3fb33c18c6c73d058d8672612e67b6a170de701184d1a957e04d229bec7c694f98b2f6abf8f9eff64bebc1dd515eb50df04fe221
-  data.tar.gz: a690903d49cdab46e248569539acc3a47afa9ce275e991b1b10039014bd3b70e764f973206c6be4f3ace790a230c00224013560a7ba6e3d4eec2673cb95ced99
+  metadata.gz: 39593d695f63ca92ee16d6b353de089af278bcec8126be15a80172cd238dfa63b491f72ed2137db91d99a6b205c92fa708a61f814d9c2b6cd053f2bef25548d7
+  data.tar.gz: a17258a4d2893e5c399b49f3fae697c8647ca912da234201b5219f95bc67d5a8793ab3e73fe18682852f9387be4fe9b1ef3bfde9e6cd75559cb8a127721534d5

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.0 (October 11, 2014)
+
+* Merge PR #12 - Adds support for Entity FormattedValues
+* Merge PR #14 - Fix invalid hash key lookup (return nil).
+
+## 0.2.0 (September 17, 2014)
+
+*  Merged PR #6 - Fix requires
+*  Merged PR #7 - Update README
+*  Merged PR #8 - Use Ruby Logger
+
 ## 0.1.2 (June 17, 2014)
 
 *   Fixes associate/disassociate requests

data/lib/dynamics_crm/client.rb

@@ -282,7 +282,7 @@ module DynamicsCRM
       logger.debug(title)
       doc = REXML::Document.new(xml)
       formatter.write(doc.root, logger)
-      logger.debug
+      logger.debug("\n")
     end
 
     def formatter

data/lib/dynamics_crm/response/retrieve_result.rb

@@ -2,6 +2,11 @@ module DynamicsCRM
   module Response
     class RetrieveResult < Result
 
+      # Returns RetrieveResult response body as an Entity object.
+      def entity
+        @entity ||= XML::Entity.from_xml(@result_response)
+      end
+
       protected
 
       # Invoked by Result constructor

data/lib/dynamics_crm/version.rb

@@ -1,3 +1,3 @@
 module DynamicsCRM
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/dynamics_crm/xml/attributes.rb

@@ -71,7 +71,7 @@ module DynamicsCRM
       end
 
       def to_s
-        self.to_xml
+        self.to_hash
       end
 
       def build_xml(key, value, type)
@@ -144,13 +144,19 @@ module DynamicsCRM
 
       def self.from_xml(xml_document)
         hash = MessageParser.parse_key_value_pairs(xml_document)
-        return Attributes.new(hash)
+        if xml_document.name == "FormattedValues"
+          return FormattedValues.new(hash)
+        elsif xml_document.name == "Parameters"
+          return Parameters.new(hash)
+        else
+          return Attributes.new(hash)
+        end
       end
 
       # Allows method-like access to the hash (OpenStruct)
       def method_missing(method_name, *args, &block)
         # Return local hash entry if any.
-        return self[method_name.to_s]
+        return self.key?(method_name.to_s) ? self[method_name.to_s] : nil
       end
 
       def respond_to_missing?(method_name, include_private = false)
@@ -160,6 +166,7 @@ module DynamicsCRM
     end
 
     class Parameters < Attributes; end
+    class FormattedValues < Attributes; end
   end
 
 end

data/lib/dynamics_crm/xml/entity.rb

@@ -14,7 +14,7 @@ module DynamicsCRM
       def to_xml(options={})
 
         inner_xml = %Q{
-          #{@attributes}
+          #{@attributes.is_a?(XML::Attributes) ? @attributes.to_xml : @attributes}
           <a:EntityState i:nil="true" />
           <a:FormattedValues xmlns:b="http://schemas.datacontract.org/2004/07/System.Collections.Generic" />
           <a:Id>#{@id}</a:Id>
@@ -33,9 +33,9 @@ module DynamicsCRM
 
       def to_hash
         {
-          :attributes => attributes.to_hash,
+          :attributes => @attributes.to_hash,
           :entity_state => entity_state,
-          :formatted_values => formatted_values,
+          :formatted_values => (@formatted_values ? @formatted_values.to_hash : nil),
           :id => @id,
           :logical_name => @logical_name,
           :related_entities => related_entities
@@ -52,6 +52,10 @@ module DynamicsCRM
             if entity.respond_to?(attr_name)
               if node.name == "Attributes"
                 entity.attributes = XML::Attributes.from_xml(node)
+              elsif node.name == "FormattedValues"
+                entity.formatted_values = XML::FormattedValues.from_xml(node)
+                # Reset to nil if no values were found.
+                entity.formatted_values = nil if entity.formatted_values.empty?
               else
                 entity.send("#{attr_name}=", node.text ? node.text.strip : nil)
               end

data/lib/dynamics_crm/xml/message_builder.rb

@@ -204,11 +204,11 @@ module DynamicsCRM
           ns_alias = 'a'
         end
 
-        parameters_xml = XML::Parameters.new(parameters)
+        parameters = XML::Parameters.new(parameters)
         build_envelope('Execute') do
           %Q{<Execute xmlns="http://schemas.microsoft.com/xrm/2011/Contracts/Services" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
             <request i:type="#{ns_alias}:#{action}Request" xmlns:a="http://schemas.microsoft.com/xrm/2011/Contracts" xmlns:b="http://schemas.microsoft.com/crm/2011/Contracts">
-             #{parameters_xml}
+             #{parameters.to_xml}
              <a:RequestId i:nil="true" />
              <a:RequestName>#{action}</a:RequestName>
             </request>

data/spec/lib/client_spec.rb

@@ -35,17 +35,31 @@ describe DynamicsCRM::Client do
   end
 
   describe "#retrieve" do
-    it "retrieves object by id" do
-
+    before(:each) do
       subject.stub(:post).and_return(fixture("retrieve_account_all_columns"))
+    end
 
-      result = subject.retrieve("account", "93f0325c-a592-e311-b7f3-6c3be5a8a0c8")
+    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)"
     end
+
+    it "exposes entity object" do
+      entity = result.entity
+
+      expect(entity).to be_a(DynamicsCRM::XML::Entity)
+      expect(entity.attributes).to be_a(DynamicsCRM::XML::Attributes)
+      expect(entity.attributes.merged).to eq(false)
+      expect(entity.attributes.nothing).to be_nil
+
+      expect(entity.formatted_values).to be_a(DynamicsCRM::XML::FormattedValues)
+      expect(entity.formatted_values.merged).to eq('No')
+      expect(entity.formatted_values.nothing).to be_nil
+    end
   end
 
   describe "#retrieve_multiple" do

data/spec/lib/xml/message_builder_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe DynamicsCRM::XML::MessageBuilder do
+
+  describe 'execute_request' do
+    let(:dummy_class) { Class.new.extend(DynamicsCRM::XML::MessageBuilder) }
+
+    context "who_am_i" do
+      it "generates WhoAmI XML request" do
+        xml = dummy_class.execute_request('WhoAmI')
+        expect(xml).to include('<request i:type="b:WhoAmIRequest"')
+        expect(xml).to include('<a:Parameters xmlns:c="http://schemas.datacontract.org/2004/07/System.Collections.Generic">')
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamics_crm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joe Heth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -183,6 +183,7 @@ files:
 - 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/query_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb
@@ -244,6 +245,7 @@ test_files:
 - 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/query_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helpers.rb