dot_net_services 0.0.1 → 0.0.3

data/README

@@ -20,7 +20,7 @@ The library can be installed as a 'dot_net_services' gem, from RubyForge gem rep
 
 or downloaded as an archive from RubyForge [http://rubyforge.org/frs/?group_id=7155].
 
-<i>NOTE: Version number 0.1.0 tells you that the API will have backwards-incompatible changes in future, so
+<i>NOTE: Version number 0.3.0 tells you that the API will have backwards-incompatible changes in future, so
 Vendor Everything! [http://errtheblog.com/posts/50-vendor-everything]</i>
 
 == Documentation
@@ -49,4 +49,4 @@ BSD license. See [LICENSE].
 
 == Copyright
 
-(c) ThoughtWorks, Inc 2008
+(c) ThoughtWorks, Inc 2008

data/lib/dot_net_services/message_buffer.rb

@@ -179,8 +179,8 @@ module DotNetServices
     # .NET Services gets around this problem by making the client connection hang for some time, either until there
     # is a message, or a certain number of seconds has passed, and there is still no message. That number of seconds is
     # what the +timeout+ parameter specifies. Microsoft suggested that 10-20 seconds is reasonable for
-    # production purposes. #open_and_poll() loop uses 15.
-    def poll(timeout=nil)
+    # production purposes. Default value is 15 seconds.
+    def poll(timeout=15)
       response = @session.retrieve(:encoding => 'asreply', :timeout => timeout)
       case response
       when Net::HTTPNoContent
@@ -239,7 +239,14 @@ module DotNetServices
     #
     # HTTP messages sent to the +endpoint+ will be routed to this message buffer
     def subscribe(target_path)
-      subscription_endpoint_url = DotNetServices.root_url + "/" + target_path
+      # Changes for .Net Services March 2009 CTP release (M5)
+      tmpurl = @session.authenticator.username + "." + DotNetServices.root_url + "/" + target_path
+
+      # Replace unwanted slashes
+      tmpurl = tmpurl.gsub("\/\/\/", "\/")
+      tmpurl = tmpurl.gsub("\/\/", "\/")
+      subscription_endpoint_url = "http://" + tmpurl
+
       subscribe_response = @session.subscribe(:target => subscription_endpoint_url)
       case subscribe_response
       when Net::HTTPSuccess
@@ -257,7 +264,14 @@ module DotNetServices
 
     # Unsubscribe from an endpoint.
     def unsubscribe(target_path)
-      subscription_endpoint_url = DotNetServices.root_url + "/" + target_path
+      # Changes for .Net Services March 2009 CTP release (M5)
+      tmpurl = @session.authenticator.username + "." + DotNetServices.root_url + "/" + target_path
+
+      # Replace unwanted slashes
+      tmpurl = tmpurl.gsub("\/\/\/", "\/")
+      tmpurl = tmpurl.gsub("\/\/", "\/")
+      subscription_endpoint_url = "http://" + tmpurl
+
       unsubscribe_response = @session.unsubscribe(:target => subscription_endpoint_url)
       unless unsubscribe_response.is_a?(Net::HTTPSuccess)
         raise "X-UNSUBSCRIBE to VMB management endpoint failed. Response was #{subscribe_response.class}"

data/lib/dot_net_services/session.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'cgi'
 require 'net/http'
+require 'net/http/unsubscribe'
 
 module DotNetServices
   
@@ -90,6 +91,20 @@ module DotNetServices
       @authenticator = Authentication.setup(auth_data)
     end
 
+    def initialize(endpoint, auth_data=nil)
+      # Changes for .Net Services March 2009 CTP release (M5)
+      username = String.new
+      if auth_data.nil?
+      	elsif !auth_data.is_a? Hash
+      else
+      	auth_data_copy = auth_data.dup
+      	username = auth_data_copy.delete(:username)
+      end
+      
+      @endpoint_uri = setup_endpoint(endpoint, username)
+      @authenticator = Authentication.setup(auth_data)
+    end
+
     # See DotNetServices::Session.open.
     def open
       authenticate
@@ -246,18 +261,29 @@ module DotNetServices
     end
 
     def route_to_relay(request)
-      request['X-Process-At'] = 'http://schemas.microsoft.com/ws/2007/08/connect/roles/relay'
+      request['X-Process-At'] = 'http://schemas.microsoft.com/netservices/2009/05/servicebus/connect/roles/relay'
     end
 
-    def setup_endpoint(endpoint)
+    def setup_endpoint(endpoint, username)
       if endpoint !~ /^http(s?):\/\//
         endpoint = '/' + endpoint unless endpoint[0] == ?/
-        endpoint = DotNetServices.root_url + endpoint
+
+        # Changes for .Net Services March 2009 CTP release (M5)
+        if !username.empty?
+            tmpurl = username + "." + DotNetServices.root_url + "/" + endpoint
+
+            # Replace unnecessary slashes
+            tmpurl = tmpurl.gsub("\/\/\/", "\/")
+            tmpurl = tmpurl.gsub("\/\/", "\/")
+            endpoint = "http://" + tmpurl
+        else
+            raise "username must be provided to form the service bus endpoint."
+        end
       end
       endpoint += '/' unless endpoint[-1] == ?/
+      
       URI.parse(endpoint)
     end
-
     def setup_query_string(url, query_options)
       if url && !url.empty?
         uri = @endpoint_uri + url.to_s

data/lib/dot_net_services.rb

@@ -103,7 +103,9 @@ module DotNetServices
 
     # The root URL used for exposing services.
     def root_url
-      "http://#{relay_host}/services"
+      # Modified as per changes in enpoint URL naming conventions in
+      # .Net Services March 09 CTP release (M5)
+      "#{relay_host}/"
     end
 
     # Host and port of the bus endpoint.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dot_net_services
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - ThoughtWorks
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -06:00
+date: 2009-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dotnetsrv-ruby
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: .NET Services for Ruby