rews 0.5.1 → 0.5.3

data/Rakefile

@@ -10,11 +10,11 @@ begin
     gem.email = "craig@trampolinesystems.com"
     gem.homepage = "http://github.com/trampoline/rews"
     gem.authors = ["Trampoline Systems Ltd"]
-    gem.add_dependency "savon", ">= 0.8.6"
-    gem.add_dependency "ntlm-http", ">= 0.1.2"
-    gem.add_dependency "fetch_in", ">= 0.2.0"
-    gem.add_runtime_dependency "rsxml", ">= 0.1.4"
-    gem.add_development_dependency "httpclient", ">= 2.1.7"
+    gem.add_runtime_dependency "savon", "= 0.9.1"
+    gem.add_runtime_dependency "httpclient", ">= 2.2.0.2"
+    gem.add_runtime_dependency "pyu-ntlm-http", ">= 0.1.3"
+    gem.add_runtime_dependency "fetch_in", ">= 0.2.0"
+    gem.add_runtime_dependency "rsxml", ">= 0.3.0"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "rr", ">= 0.10.5"
     gem.add_development_dependency "nokogiri", ">= 1.4.4"

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.3

data/lib/rews.rb

@@ -1,5 +1,7 @@
 $: << File.expand_path("..", __FILE__)
 
+require 'date'
+require 'time'
 require 'net/ntlm'
 # require 'httpclient' # don't need httpclient now ntlm-http is fixed too
 require 'savon'

data/lib/rews/util.rb

@@ -55,7 +55,11 @@ module Rews
 
     # camel-case a +String+
     def camelize(s)
-      s.split('_').map(&:capitalize).join
+      if s.is_a?(Symbol)
+        s.to_s.split('_').map(&:capitalize).join.to_sym
+      else
+        s.split('_').map(&:capitalize).join
+      end
     end
 
     # camel-case the keys of a +Hash+
@@ -63,14 +67,38 @@ module Rews
       Hash[h.map{|k,v| [camelize(k.to_s), v]}]
     end
 
-    # convert rsxml to xml, transforming tags to CamelCase and prefixing with
-    # the t: namespace prefix
+    # given an exploded qname, apply a given namespace and uri if the qname
+    # has no namespace already
+    def apply_namespace(qname, apply_prefix, apply_uri)
+      local_part, prefix, uri = qname
+      
+      if !prefix
+        prefix = apply_prefix
+        uri = apply_uri
+      end
+
+      [local_part, prefix, uri].compact
+    end
+
+    # given an exploded qname, camelize the local_part
+    def camelize_qname(qname)
+      local_part, prefix, uri = qname
+      [camelize(local_part), prefix, uri].compact
+    end
+
+    # convert rsxml to xml, transforming local_parts of QNames to CamelCase and prefixing with
+    # the t: namespace prefix if no namespace is already applied
     def rsxml_to_xml(sexp)
-      Rsxml.to_xml(sexp) do |tag, attrs|
-        ttag = "t:#{camelize(tag.to_s)}"
-        tattrs = Hash[attrs.map{|k,v| [camelize(k.to_s), v]}]
-        [ttag, tattrs]
+      # visit the rsxml, prefix the element tags with "t" namespace prefix, and camelcase
+      # all QName local_parts
+      transform_visitor = Rsxml::Visitor::BuildRsxmlVisitor.new() do |context, element_name, attrs|
+        t_element_name = camelize_qname(apply_namespace(element_name, "t", Rews::SCHEMA_TYPES))
+        t_attrs = Hash[attrs.map{|attr_name,v| [camelize_qname(attr_name), v]}]
+        [t_element_name, t_attrs]
       end
+
+      xrsxml = Rsxml::Sexp.traverse(sexp, transform_visitor).sexp
+      Rsxml.to_xml(xrsxml, :ns=>{"t"=>Rews::SCHEMA_TYPES, "wsdl"=>Rews::SCHEMA_MESSAGES})
     end
 
     # check the response codes of an Exchange Web Services request.

data/spec/rews/client_spec.rb

@@ -35,8 +35,8 @@ module Rews
       it "should create a CreateItem request and render the Items to the body" do
         client = Client.new("https://foo/EWS/Exchange.asmx", :ntlm, "EXCHDOM\\foo", "password")
         test_create_item(client, [[:suppress_read_receipt, [:reference_item_id, {:id=>"abc", :change_key=>"def"}]]]) do |body|
-          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"})
-          rsxml.should == ["wsdl:Items",{"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types"},
+          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"}, :style=>:xml)
+          rsxml.should == ["wsdl:Items",
                            ["t:SuppressReadReceipt",
                             ["t:ReferenceItemId", {"Id"=>"abc", "ChangeKey"=>"def"}]]]
         end
@@ -61,8 +61,8 @@ module Rews
         client = Client.new("https://foo/EWS/Exchange.asmx", :ntlm, "EXCHDOM\\foo", "password")
         test_suppress_read_receipt(client, [Item::ItemId.new(client, {:id=>"abc", :change_key=>"def"}),
                                              Item::ItemId.new(client, {:id=>"ghi", :change_key=>"jkl"})]) do |body|
-          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"})
-          rsxml.should ==  ["wsdl:Items", {"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types"},
+          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"}, :style=>:xml)
+          rsxml.should ==  ["wsdl:Items",
                             ["t:SuppressReadReceipt",
                              ["t:ReferenceItemId", {"Id"=>"abc", "ChangeKey"=>"def"}]],
                             ["t:SuppressReadReceipt",
@@ -74,8 +74,8 @@ module Rews
         client = Client.new("https://foo/EWS/Exchange.asmx", :ntlm, "EXCHDOM\\foo", "password")
         test_suppress_read_receipt(client, [Item::Item.new(client, 'Message', {:item_id=>{:id=>'abc', :change_key=>'def'}}),
                                              Item::Item.new(client, 'Message', {:item_id=>{:id=>'ghi', :change_key=>'jkl'}})]) do |body|
-          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"})
-          rsxml.should ==  ["wsdl:Items", {"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types"},
+          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"}, :style=>:xml)
+          rsxml.should ==  ["wsdl:Items",
                             ["t:SuppressReadReceipt",
                              ["t:ReferenceItemId", {"Id"=>"abc", "ChangeKey"=>"def"}]],
                             ["t:SuppressReadReceipt",
@@ -88,8 +88,8 @@ module Rews
         fr = Folder::FindResult.new({}){[Item::Item.new(client, 'Message', {:item_id=>{:id=>'abc', :change_key=>'def'}}),
                                          Item::Item.new(client, 'Message', {:item_id=>{:id=>'ghi', :change_key=>'jkl'}})]}
         test_suppress_read_receipt(client, fr) do |body|
-          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"})
-          rsxml.should ==  ["wsdl:Items", {"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types"},
+          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"}, :style=>:xml)
+          rsxml.should ==  ["wsdl:Items",
                             ["t:SuppressReadReceipt",
                              ["t:ReferenceItemId", {"Id"=>"abc", "ChangeKey"=>"def"}]],
                             ["t:SuppressReadReceipt",
@@ -108,8 +108,8 @@ module Rews
                                                             'Message',
                                                             {:item_id=>{:id=>'mno', :change_key=>'pqr'},
                                                               :is_read_receipt_requested=>false})]) do |body|
-          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"})
-          rsxml.should == ["wsdl:Items", {"xmlns:wsdl"=>"ews_wsdl", "xmlns:t"=>"ews_types"},
+          rsxml = Rsxml.to_rsxml(body, :ns=>{"wsdl"=>"ews_wsdl", "t"=>"ews_types"}, :style=>:xml)
+          rsxml.should == ["wsdl:Items",
                            ["t:SuppressReadReceipt",
                             ["t:ReferenceItemId", {"Id"=>"ghi", "ChangeKey"=>"jkl"}]]]
         end
@@ -233,8 +233,8 @@ module Rews
                            SetItemField.new("message:IsRead", [:message, [:is_read, "true"]]),
                            [Item::ItemId.new(client, :id=>"abc", :change_key=>"def")]) 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"},
+            rsxml = Rsxml.to_rsxml(body, :ns=>{:wsdl=>"ews_wsdl", :t=>"ews_types", ""=>"ews_wsdl"}, :style=>:xml)
+            Rsxml.compare(rsxml, ["wsdl:ItemChanges",
                                   ["t:ItemChange",
                                    ["t:ItemId", {"Id"=>"abc", "ChangeKey"=>"def"}],
                                    ["t:Updates",
@@ -252,8 +252,8 @@ module Rews
                            [Item::ItemId.new(client, :id=>"abc", :change_key=>"def"),
                             Item::ItemId.new(client, :id=>"ghi", :change_key=>"jkl")]) 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"},
+            rsxml = Rsxml.to_rsxml(body, :ns=>{:wsdl=>"ews_wsdl", :t=>"ews_types", ""=>"ews_wsdl"}, :style=>:xml)
+            Rsxml.compare(rsxml, ["wsdl:ItemChanges",
                                   ["t:ItemChange",
                                    ["t:ItemId", {"Id"=>"abc", "ChangeKey"=>"def"}],
                                    ["t:Updates",

data/spec/rews/item_spec.rb

@@ -201,8 +201,8 @@ module Rews
           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"},
+            rsxml = Rsxml.to_rsxml(body, :ns=>{:wsdl=>"ews_wsdl", :t=>"ews_types"}, :style=>:xml)
+            rsxml.should == ["wsdl:ItemChanges",
                              ["t:ItemChange",
                               ["t:ItemId", {"Id"=>"abc", "ChangeKey"=>"def"}],
                               ["t:Updates", "blahblah"]]]
@@ -246,8 +246,8 @@ module Rews
         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"},
+            rsxml = Rsxml.to_rsxml(body, :ns=>{:wsdl=>"ews_wsdl", :t=>"ews_types", ""=>"ews_wsdl"}, :style=>:xml)
+            Rsxml.compare(rsxml, ["wsdl:ItemChanges",
                                   ["t:ItemChange",
                                    ["t:ItemId", {"Id"=>"abc", "ChangeKey"=>"def"}],
                                    ["t:Updates",

data/spec/rews/update_spec.rb

@@ -9,9 +9,9 @@ module Rews
                               [:is_read, "true"]]).to_xml
 
 
-      rsxml = Rsxml.to_rsxml(xml, :ns=>{"t"=>"ews_types"})
+      rsxml = Rsxml.to_rsxml(xml, :ns=>{"t"=>"ews_types"}, :style=>:xml)
 
-      rsxml.should == ["t:SetItemField", {"xmlns:t"=>"ews_types"},
+      rsxml.should == ["t:SetItemField",
                        ["t:FieldURI", {"FieldURI"=>"message:IsRead"}],
                        ["t:Message", ["t:IsRead", "true"]]]
     end

data/spec/rews/util_spec.rb

@@ -16,6 +16,10 @@ module Rews
       it "should camelize a String" do
         Util.camelize("foo_bar").should == "FooBar"
       end
+
+      it "should camelize a Symbol" do
+        Util.camelize(:foo_bar).should == :FooBar
+      end
     end
 
     describe "camel_keys" do
@@ -26,12 +30,16 @@ module Rews
     end
 
     describe "rsxml_to_xml" do
-      it "should camelize tags and attribute names, and prefix tags with t:" do
+      it "should camelize tags and attribute names, and give un-namespaced tags 't' prefix" 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
+
+      it "should not prefix tags which are already namespaced" do
+        Util.rsxml_to_xml([[:foo, "f", "http://f.com/f"]]).should == '<f:Foo xmlns:f="http://f.com/f"></f:Foo>'
+      end
     end
 
     describe "with_error_check" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rews
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Trampoline Systems Ltd
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +01:00
+date: 2011-06-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,79 +24,80 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 57
         segments: 
         - 0
-        - 8
-        - 6
-        version: 0.8.6
+        - 9
+        - 1
+        version: 0.9.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ntlm-http
+  name: httpclient
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 123
         segments: 
+        - 2
+        - 2
         - 0
-        - 1
         - 2
-        version: 0.1.2
+        version: 2.2.0.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: fetch_in
+  name: pyu-ntlm-http
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 29
         segments: 
         - 0
-        - 2
-        - 0
-        version: 0.2.0
+        - 1
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rsxml
+  name: fetch_in
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: httpclient
+  name: rsxml
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 19
         segments: 
-        - 2
-        - 1
-        - 7
-        version: 2.1.7
-  type: :development
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec