rews 0.2.12 → 0.5.0

data/spec/rews/item_spec.rb

@@ -2,15 +2,19 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 module Rews
   describe Item do
+    def client
+      Object.new
+    end
+
     describe "read_items" do
       it "should parse a list of zero items correctly" do
-        c = Object.new
+        c = client
         items = Item.read_items(c, nil)
         items.should == []
       end
 
       it "should parse a list of one items correctly" do
-        c = Object.new
+        c = client
         items = Item.read_items(c, {:message=>{:item_id=>{:id=>"abc", :change_key=>"def"}}})
         items.length.should == 1
         item = items.first
@@ -19,9 +23,9 @@ module Rews
       end
 
       it "should parse a list of more than one item correctly" do
-        c = Object.new
+        c = client
         items = Item.read_items(c, {:message=>[{:item_id=>{:id=>"abc", :change_key=>"def"}},
-                                            {:item_id=>{:id=>"ghi", :change_key=>"jkl"}}]})
+                                               {:item_id=>{:id=>"ghi", :change_key=>"jkl"}}]})
         items.length.should == 2
         item1 = items.first
         item1.item_id.should == Item::ItemId.new(c, {:id=>"abc", :change_key=>"def"})
@@ -34,13 +38,13 @@ module Rews
 
     describe "read_get_item_response_messages" do
       it "should parse a list of zero items correctly" do
-        c = Object.new
+        c = client
         items = Item.read_get_item_response_messages(c, {:items=>nil})
         items.should == []
       end
       
       it "should parse a list of one items correctly" do
-        c = Object.new
+        c = client
         items = Item.read_get_item_response_messages(c, {:items=>{:message=>{:item_id=>{:id=>"abc", :change_key=>"def"}}}})
         items.length.should == 1
         item = items.first
@@ -49,7 +53,7 @@ module Rews
       end
 
       it "should parse a list of more than one items correctly" do
-        c = Object.new
+        c = client
         items = Item.read_get_item_response_messages(c, {:items=>{:message=>[{:item_id=>{:id=>"abc", :change_key=>"def"}},
                                                                              {:item_id=>{:id=>"ghi", :change_key=>"jkl"}}]}})
         items.length.should == 2
@@ -64,13 +68,13 @@ module Rews
 
     describe Item::Item do
       it "should parse the item_id and attributes from the XML hash" do
-        client = Object.new
+        c = client
 
-        i = Item::Item.new(client, 'Message', {:item_id=>{:id=>'1234', :change_key=>'abcd'}, :foo=>100})
+        i = Item::Item.new(c, 'Message', {:item_id=>{:id=>'1234', :change_key=>'abcd'}, :foo=>100})
 
-        i.client.should == client
+        i.client.should == c
         i.item_class.should == 'Message'
-        i.item_id.should == Item::ItemId.new(client, {:id=>'1234', :change_key=>'abcd'})
+        i.item_id.should == Item::ItemId.new(c, {:id=>'1234', :change_key=>'abcd'})
 
         i[:foo].should == 100
       end
@@ -80,8 +84,8 @@ module Rews
 
       describe "to_xml" do
         it "should generate an ItemId with change_key by default" do
-          client = Object.new
-          xml = Item::ItemId.new(client, {:id=>"abc", :change_key=>"def"}).to_xml
+          c = client
+          xml = Item::ItemId.new(c, {:id=>"abc", :change_key=>"def"}).to_xml
           doc = Nokogiri::XML(xml)
           id=doc.children.first
           id.name.should == "ItemId"
@@ -90,8 +94,8 @@ module Rews
         end
 
         it "should generate an ItemId without change_key if requested" do
-          client = Object.new
-          xml = Item::ItemId.new(client, {:id=>"abc", :change_key=>"def"}).to_xml(true)
+          c = client
+          xml = Item::ItemId.new(c, {:id=>"abc", :change_key=>"def"}).to_xml(true)
           doc = Nokogiri::XML(xml)
           id=doc.children.first
           id.name.should == "ItemId"
@@ -100,23 +104,6 @@ module Rews
         end
       end
 
-      def mock_request(client, action, attrs, response)
-        # deal with different call arity
-        mock(client).savon_client.mock!.request(*[:wsdl, action, attrs].compact) do |*args|
-          block = args.last # block is the last arg
-
-          ctx = RequestProxy.new()
-          mock(ctx.http).headers.mock!["SOAPAction"]="\"#{SCHEMA_MESSAGES}/#{action}\""
-          ns = Object.new
-          mock(ctx.soap).namespaces{ns}
-          mock(ns)["xmlns:t"]=Rews::SCHEMA_TYPES
-          mock(ctx.soap).body=(anything)
-          
-          ctx.eval_with_delegation(&block)
-          response
-        end
-      end
-
       describe "get_item" do
         def test_get_item(client, item_shape, ignore_change_keys, result)
           shape = Object.new
@@ -129,7 +116,7 @@ module Rews
           response = Object.new
           mock(response).to_hash{{:get_item_response=>{:response_messages=>{:get_item_response_message=>{:response_class=>"Success", :items=>result}}}}}
 
-          mock_request(client, "GetItem", nil, response)
+          RequestProxy.mock_request(self, client, "GetItem", nil, response)
 
           opts={}
           opts[:item_shape]=item_shape if item_shape
@@ -138,23 +125,23 @@ module Rews
         end
 
         it "should generate the BaseShape and ItemId xml and parse the response" do
-          client = Object.new
-          msg = test_get_item(client,
+          c = client
+          msg = test_get_item(c,
                               {:base_shape=>:IdOnly}, 
                               nil, 
                               {:message=>{:item_id=>{:id=>"abc", :change_key=>"def"}}})
           msg.item_class.should == :message
-          msg.item_id.should == Item::ItemId.new(client, :id=>"abc", :change_key=>"def")
+          msg.item_id.should == Item::ItemId.new(c, :id=>"abc", :change_key=>"def")
         end
 
         it "should generate a request with no change_key if specified" do
-          client = Object.new
-          msg = test_get_item(client,
+          c = client
+          msg = test_get_item(c,
                               {:base_shape=>:Default}, 
                               true, 
                               {:message=>{:item_id=>{:id=>"abc", :change_key=>"def"}}})
           msg.item_class.should == :message
-          msg.item_id.should == Item::ItemId.new(client, :id=>"abc", :change_key=>"def")
+          msg.item_id.should == Item::ItemId.new(c, :id=>"abc", :change_key=>"def")
         end
 
       end
@@ -167,7 +154,7 @@ module Rews
           response = Object.new
           mock(response).to_hash{{:delete_item_response=>{:response_messages=>{:delete_item_response_message=>{:response_class=>"Success"}}}}}
 
-          mock_request(client, "DeleteItem", {:DeleteType=>delete_type}, response)
+          RequestProxy.mock_request(self, client, "DeleteItem", {:DeleteType=>delete_type}, response)
 
           opts={}
           opts[:ignore_change_keys]=ignore_change_keys if ignore_change_keys
@@ -176,8 +163,99 @@ module Rews
         end
 
         it "should generate the ItemId xml and parse the response" do
-          client = Object.new
-          msg = test_delete_item(client, true, :HardDelete)
+          c = client
+          msg = test_delete_item(c, true, :HardDelete)
+        end
+      end
+
+      describe "update_item" do
+        def test_update_item(client, 
+                             conflict_resolution,
+                             message_disposition, 
+                             ignore_change_keys,
+                             updates,
+                             &validate_block)
+
+          iid = Item::ItemId.new(client, {:id=>"abc", :change_key=>"def"})
+          mock.proxy(iid).to_xml(ignore_change_keys)
+
+          response = Object.new
+          mock(response).to_hash{{:update_item_response=>{:response_messages=>{:update_item_response_message=>{:response_class=>"Success"}}}}}
+
+          RequestProxy.mock_request(self, client, "UpdateItem", 
+                       { :ConflictResolution=>conflict_resolution,
+                         :MessageDisposition=>message_disposition},
+                       response,
+                       &validate_block)
+
+          opts={}
+          opts[:conflict_resolution]=conflict_resolution if conflict_resolution
+          opts[:message_disposition]=message_disposition if message_disposition
+          opts[:ignore_change_keys]=ignore_change_keys if !ignore_change_keys.nil?
+          opts[:updates]=updates
+          iid.update_item(opts)
+        end
+
+        it "should generate the body xml and parse the response" do
+          c = client
+          update=Object.new
+          stub(update).to_xml{"blahblah"}
+          msg = test_update_item(c, "AutoResolve", "SaveOnly", false, update) do |body|
+            rsxml = Rsxml.to_rsxml(body, :ns=>{:wsdl=>"ews_wsdl", :t=>"ews_types"})
+            rsxml.should == ["wsdl:ItemChanges", {"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types"},
+                             ["t:ItemChange",
+                              ["t:ItemId", {"Id"=>"abc", "ChangeKey"=>"def"}],
+                              ["t:Updates", "blahblah"]]]
+          end
+        end
+
+        it "should raise an exception if no updates are given" do
+          c = client
+          iid = Item::ItemId.new(c, {:id=>"abc", :change_key=>"def"})
+
+          lambda {
+            iid.update_item({})
+          }.should raise_error(/no updates/)
+        end
+
+      end
+
+      describe "suppress_receipts" do
+        def test_set_is_read(client, 
+                             is_read,
+                             &validate_block)
+
+          iid = Item::ItemId.new(client, {:id=>"abc", :change_key=>"def"})
+          mock.proxy(iid).to_xml(nil)
+
+          response = Object.new
+          mock(response).to_hash{{:update_item_response=>{:response_messages=>{:update_item_response_message=>{:response_class=>"Success"}}}}}
+
+          RequestProxy.mock_request(self, client, "UpdateItem", 
+                       { :ConflictResolution=>"AlwaysOverwrite",
+                         :MessageDisposition=>"SaveOnly"},
+                       response,
+                       &validate_block)
+
+          opts={}
+          opts[:conflict_resolution]="AlwaysOverwrite"
+          opts[:message_disposition]="SaveOnly"
+          iid.set_is_read(is_read)
+        end
+
+        it "should generate the body xml and parse the response" do
+          c = client
+          test_set_is_read(c, true) do |body|
+            rsxml = Rsxml.to_rsxml(body, :ns=>{:wsdl=>"ews_wsdl", :t=>"ews_types", ""=>"ews_wsdl"})
+            Rsxml.compare(rsxml, ["wsdl:ItemChanges", {"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types", "xmlns"=>"ews_wsdl"},
+                                  ["t:ItemChange",
+                                   ["t:ItemId", {"Id"=>"abc", "ChangeKey"=>"def"}],
+                                   ["t:Updates",
+                                    ["t:SetItemField",
+                                     ["t:FieldURI", {"FieldURI"=>"message:IsRead"}],
+                                     ["t:Message", ["t:IsRead", "true"]]]]]]).should == true
+          end
+          
         end
       end
     end

data/spec/rews/update_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+module Rews
+
+  describe SetItemField do
+    it "should write Update xml" do
+      xml = SetItemField.new("message:IsRead", 
+                             [:message, 
+                              [:is_read, "true"]]).to_xml
+
+
+      rsxml = Rsxml.to_rsxml(xml, :ns=>{"t"=>"ews_types"})
+
+      rsxml.should == ["t:SetItemField", {"xmlns:t"=>"ews_types"},
+                       ["t:FieldURI", {"FieldURI"=>"message:IsRead"}],
+                       ["t:Message", ["t:IsRead", "true"]]]
+    end
+  end
+
+end

data/spec/rews/util_spec.rb

@@ -25,6 +25,15 @@ module Rews
       end
     end
 
+    describe "rsxml_to_xml" do
+      it "should camelize tags and attribute names, and prefix tags with t:" do
+        Util.rsxml_to_xml([:foo]).should == "<t:Foo></t:Foo>"
+        Util.rsxml_to_xml([:foo_foo, {:bar_bar=>"blah"}]).should == '<t:FooFoo BarBar="blah"></t:FooFoo>'
+        Util.rsxml_to_xml([:foo_foo, {:bar_bar=>"blah"}, "foofoo", [:baz_baz, {:boo_hoo=>"10"}, "bazbaz"]]).should ==
+          '<t:FooFoo BarBar="blah">foofoo<t:BazBaz BooHoo="10">bazbaz</t:BazBaz></t:FooFoo>'
+      end
+    end
+
     describe "with_error_check" do
       it "should yield, convert the response to a hash and fetch_in the status" do
         client = Object.new
@@ -51,7 +60,7 @@ module Rews
       it "should log any unexpected exceptions and tag with the savon response" do
         client = Object.new
         exception = RuntimeError.new("boo")
-        mock(client).log do |block|
+        mock(Rews).log do |block|
           logger = Object.new
           mock(logger).warn(exception)
           block.call(logger)
@@ -82,7 +91,7 @@ module Rews
       it "should log a warning and return if the response_class is Warning" do
         client = Object.new
         status = {:response_class=>"Warning", :message_text=>"boo", :response_code=>"BooWarning"}
-        mock(client).log() do |p|
+        mock(Rews).log() do |p|
           logger = Object.new
           mock(logger).warn("BooWarning - boo")
           p.call(logger)

data/spec/rews_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path("../spec_helper", __FILE__)
+
+module Rews
+  describe "log" do
+    it "should log to a logger if set" do
+      logger = Object.new
+      stub(Rews).logger{logger}
+      mock(logger).warn("boo")
+
+      Rews.log{|l| l.warn("boo")}.should == nil
+    end
+
+    it "should do nothing if no logger set" do
+      stub(Rews).logger{nil}
+      lambda {
+        Rews.log{|l| raise "boo"}.should == nil
+      }.should_not raise_error
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'spec'
 require 'spec/autorun'
 require 'rr'
 require 'nokogiri'
+require 'rsxml'
 require 'request_proxy'
 
 Spec::Runner.configure do |config|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rews
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 12
-  version: 0.2.12
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Trampoline Systems Ltd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +01:00
+date: 2011-05-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,9 +67,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: httpclient
+  name: rsxml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +97,11 @@ dependencies:
         - 7
         version: 2.1.7
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +113,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +129,11 @@ dependencies:
         - 5
         version: 0.10.5
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,7 +145,7 @@ dependencies:
         - 4
         version: 1.4.4
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: an email focussed Ruby client for Exchange Web Services atop Savon
 email: craig@trampolinesystems.com
 executables: []
@@ -152,6 +168,7 @@ files:
 - lib/rews/restriction.rb
 - lib/rews/shape.rb
 - lib/rews/sort_order.rb
+- lib/rews/update.rb
 - lib/rews/util.rb
 - lib/rews/view.rb
 - spec/request_proxy.rb
@@ -161,8 +178,10 @@ files:
 - spec/rews/restriction_spec.rb
 - spec/rews/shape_spec.rb
 - spec/rews/sort_order_spec.rb
+- spec/rews/update_spec.rb
 - spec/rews/util_spec.rb
 - spec/rews/view_spec.rb
+- spec/rews_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -207,6 +226,8 @@ test_files:
 - spec/rews/restriction_spec.rb
 - spec/rews/shape_spec.rb
 - spec/rews/sort_order_spec.rb
+- spec/rews/update_spec.rb
 - spec/rews/util_spec.rb
 - spec/rews/view_spec.rb
+- spec/rews_spec.rb
 - spec/spec_helper.rb