azure 0.6.0 → 0.6.1

data/lib/azure/service_bus/auth/wrap_signer.rb

@@ -1,69 +1,69 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "uri"
-
-require "azure/core/auth/signer"
-require "azure/service_bus/auth/wrap_service"
-
-module Azure
-  module ServiceBus
-    module Auth
-      class WrapSigner < Azure::Core::Auth::Signer
-
-        def initialize
-          @tokens = {}
-          @wrap_service = Azure::ServiceBus::Auth::WrapService.new
-        end
-
-        attr_accessor :tokens
-
-        def name
-          "WRAP"
-        end
-
-        public
-        def sign(method, uri, headers)
-          access_token = get_access_token(create_scope_uri(uri))
-          'access_token="%s"' % access_token
-        end
-
-        private
-        def get_access_token(uri)
-          token = tokens[uri.to_s]
-          token = tokens[uri.to_s] = @wrap_service.get_access_token(uri) unless valid_token?(token)
-          token[:token]
-        end
-
-        private
-        def create_scope_uri(target_uri)
-          targetUriComponents = URI.parse(target_uri.to_s)
-
-          # ACS body and caching should be HTTP
-          targetUriComponents.scheme = 'http'
-
-          # ACS body and caching should not include query
-          targetUriComponents.query = nil
-
-          targetUriComponents
-        end
-
-        private
-        def valid_token?(token)
-          token and token[:expiration] > Time.now.to_i
-        end
-      end
-    end
-  end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "uri"
+
+require "azure/core/auth/signer"
+require "azure/service_bus/auth/wrap_service"
+
+module Azure
+  module ServiceBus
+    module Auth
+      class WrapSigner < Azure::Core::Auth::Signer
+
+        def initialize
+          @tokens = {}
+          @wrap_service = Azure::ServiceBus::Auth::WrapService.new
+        end
+
+        attr_accessor :tokens
+
+        def name
+          "WRAP"
+        end
+
+        public
+        def sign(method, uri, headers)
+          access_token = get_access_token(create_scope_uri(uri))
+          'access_token="%s"' % access_token
+        end
+
+        private
+        def get_access_token(uri)
+          token = tokens[uri.to_s]
+          token = tokens[uri.to_s] = @wrap_service.get_access_token(uri) unless valid_token?(token)
+          token[:token]
+        end
+
+        private
+        def create_scope_uri(target_uri)
+          targetUriComponents = URI.parse(target_uri.to_s)
+
+          # ACS body and caching should be HTTP
+          targetUriComponents.scheme = 'http'
+
+          # ACS body and caching should not include query
+          targetUriComponents.query = nil
+
+          targetUriComponents
+        end
+
+        private
+        def valid_token?(token)
+          token and token[:expiration] > Time.now.to_i
+        end
+      end
+    end
+  end
 end

data/lib/azure/service_bus/brokered_message.rb

@@ -1,124 +1,124 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-module Azure
-  module ServiceBus
-    class BrokeredMessage
-
-      # Please read http://msdn.microsoft.com/en-us/library/windowsazure/hh780742
-      # for more information on brokered message properties
-
-      # Public: Get/Set the ContentType of the message
-      #
-      # Returns a String
-      attr_accessor :content_type
-
-      # Public: Get/Set the CorrelationID of the message
-      #
-      # Returns a String
-      attr_accessor :correlation_id
-
-      # Public: Get/Set the SessionID of the message
-      #
-      # Returns a String
-      attr_accessor :session_id
-
-      # Public: Get/Set the DeliveryCount of the message
-      #
-      # Returns an Integer
-      attr_accessor :delivery_count
-
-      # Public: Get/Set the LockedUntilUtc for the message
-      #
-      # Returns a DateTime
-      attr_accessor :locked_until_utc
-
-      # Public: Get/Set the LockToken of the message 
-      #
-      # Returns a String (GUID)
-      attr_accessor :lock_token
-
-      # Public: Get/Set the MessageID of the message
-      #
-      # Returns a String
-      attr_accessor :message_id
-      alias_method :id, :message_id
-
-      # Public: Get/Set the Label for the message
-      #
-      # Returns a String
-      attr_accessor :label
-
-      # Public: Get/Set the ReplyTo for the message 
-      #
-      # Returns a String
-      attr_accessor :reply_to
-
-      # Public: Get/Set the EnqueuedTimeUtc for the message
-      #
-      # Returns a DateTime
-      attr_accessor :enqueued_time_utc
-
-      # Public: Get/Set the SequenceNumber for the message 
-      #
-      # Returns an Integer
-      attr_accessor :sequence_number
-
-      # Public: Get/Set the TimeToLive for the message 
-      #
-      # Returns an Integer
-      attr_accessor :time_to_live
-
-      # Public: Get/Set the To field for the message
-      #
-      # Returns a String
-      attr_accessor :to
-
-      # Public: Get/Set the ScheduledEnqueueTimeUtc for the message 
-      #
-      # Returns a DateTime
-      attr_accessor :scheduled_enqueue_time_utc
-
-      # Public: Get/Set the ReplyToSessionId for the message 
-      #
-      # Returns a String
-      attr_accessor :reply_to_session_id
-
-      # Public: Get/Set custom key-value properties of the message
-      #
-      # Returns a Hash
-      attr_accessor :properties
-
-      # Public: Get/Set the body of the message
-      #
-      # Returns a String
-      attr_accessor :body
-
-      # Public: Get/Set the URI of the locked message. This URI is needed to unlock or delete the message
-      #
-      # Returns an URI
-      attr_accessor :location
-
-      # Public: Constructor.
-      #
-      # body        - String. The body of the message
-      # properties  - Hash. The properties of the message (optional)
-      def initialize(body, properties={})
-        @body = body
-        @properties = properties
-        yield self if block_given?
-      end
-    end
-  end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+module Azure
+  module ServiceBus
+    class BrokeredMessage
+
+      # Please read http://msdn.microsoft.com/en-us/library/windowsazure/hh780742
+      # for more information on brokered message properties
+
+      # Public: Get/Set the ContentType of the message
+      #
+      # Returns a String
+      attr_accessor :content_type
+
+      # Public: Get/Set the CorrelationID of the message
+      #
+      # Returns a String
+      attr_accessor :correlation_id
+
+      # Public: Get/Set the SessionID of the message
+      #
+      # Returns a String
+      attr_accessor :session_id
+
+      # Public: Get/Set the DeliveryCount of the message
+      #
+      # Returns an Integer
+      attr_accessor :delivery_count
+
+      # Public: Get/Set the LockedUntilUtc for the message
+      #
+      # Returns a DateTime
+      attr_accessor :locked_until_utc
+
+      # Public: Get/Set the LockToken of the message 
+      #
+      # Returns a String (GUID)
+      attr_accessor :lock_token
+
+      # Public: Get/Set the MessageID of the message
+      #
+      # Returns a String
+      attr_accessor :message_id
+      alias_method :id, :message_id
+
+      # Public: Get/Set the Label for the message
+      #
+      # Returns a String
+      attr_accessor :label
+
+      # Public: Get/Set the ReplyTo for the message 
+      #
+      # Returns a String
+      attr_accessor :reply_to
+
+      # Public: Get/Set the EnqueuedTimeUtc for the message
+      #
+      # Returns a DateTime
+      attr_accessor :enqueued_time_utc
+
+      # Public: Get/Set the SequenceNumber for the message 
+      #
+      # Returns an Integer
+      attr_accessor :sequence_number
+
+      # Public: Get/Set the TimeToLive for the message 
+      #
+      # Returns an Integer
+      attr_accessor :time_to_live
+
+      # Public: Get/Set the To field for the message
+      #
+      # Returns a String
+      attr_accessor :to
+
+      # Public: Get/Set the ScheduledEnqueueTimeUtc for the message 
+      #
+      # Returns a DateTime
+      attr_accessor :scheduled_enqueue_time_utc
+
+      # Public: Get/Set the ReplyToSessionId for the message 
+      #
+      # Returns a String
+      attr_accessor :reply_to_session_id
+
+      # Public: Get/Set custom key-value properties of the message
+      #
+      # Returns a Hash
+      attr_accessor :properties
+
+      # Public: Get/Set the body of the message
+      #
+      # Returns a String
+      attr_accessor :body
+
+      # Public: Get/Set the URI of the locked message. This URI is needed to unlock or delete the message
+      #
+      # Returns an URI
+      attr_accessor :location
+
+      # Public: Constructor.
+      #
+      # body        - String. The body of the message
+      # properties  - Hash. The properties of the message (optional)
+      def initialize(body, properties={})
+        @body = body
+        @properties = properties
+        yield self if block_given?
+      end
+    end
+  end
 end

data/lib/azure/service_bus/brokered_message_serializer.rb

@@ -1,159 +1,159 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require 'rubygems'
-require 'json'
-require 'time'
-require 'uri'
-
-require 'azure/service_bus/brokered_message'
-
-module Azure
-  module ServiceBus
-    # BrokeredMessageSerializer
-    class BrokeredMessageSerializer
-      PROPERTIES = {
-        'ContentType'             => 'content_type',
-        'CorrelationId'           => 'correlation_id',
-        'SessionID'               => 'session_id',
-        'DeliveryCount'           => 'delivery_count',
-        'LockedUntilUtc'          => 'locked_until_utc',
-        'LockToken'               => 'lock_token',
-        'MessageId'               => 'message_id',
-        'Label'                   => 'label',
-        'ReplyTo'                 => 'reply_to',
-        'EnqueuedTimeUtc'         => 'enqueued_time_utc',
-        'SequenceNumber'          => 'sequence_number',
-        'TimeToLive'              => 'time_to_live',
-        'To'                      => 'to',
-        'ScheduledEnqueueTimeUtc' => 'scheduled_enqueue_time_utc',
-        'ReplyToSessionId'        => 'reply_to_session_id'
-      }.freeze
-
-      attr_reader :message
-
-      def initialize(msg)
-        @message = msg
-      end
-
-      def self.get_from_http_response(response)
-        props = JSON.parse(response.headers['brokerproperties'])
-        BrokeredMessage.new(response.body) do |m|
-          loc_header = response.headers['location']
-          m.location = URI(loc_header) unless loc_header.nil?
-          m.content_type = response.headers['content-type']
-
-          # String based properties
-          m.lock_token = props['LockToken']
-          m.message_id = props['MessageId']
-          m.label = props['Label']
-          m.to = props['To']
-          m.session_id = props['SessionID']
-          m.correlation_id = props['CorrelationId']
-          m.reply_to = props['ReplyTo']
-          m.reply_to = props['ReplyTo']
-          m.reply_to_session_id = props['ReplyToSessionId']
-
-          # Time based properties
-          utc_lock = props['LockedUntilUtc']
-          m.locked_until_utc = Time.parse(utc_lock) unless utc_lock.nil?
-
-          enqueued_time_utc = self.parse_dot_net_serialized_datetime(
-            props['EnqueuedTimeUtc']
-          ) unless props['EnqueuedTimeUtc'].nil?
-          m.enqueued_time_utc = enqueued_time_utc unless enqueued_time_utc.nil?
-
-          m.scheduled_enqueue_time_utc = Time.parse(
-            props['ScheduledEnqueueTimeUtc']
-          ) unless props['ScheduledEnqueueTimeUtc'].nil?
-
-          # Numeric based properties
-          m.delivery_count = props['DeliveryCount'].to_i
-          m.sequence_number = props['SequenceNumber'].to_i
-          m.time_to_live = props['TimeToLive'].to_f
-
-          # Custom Properties
-          header_names_black_list = %w(
-            brokerproperties
-            date
-            transfer-encoding
-            location
-            server
-            connection
-            content-type
-            content-length
-          )
-
-          props = response.headers.reject do |k, _|
-            header_names_black_list.include?(k.downcase)
-          end
-
-          props.each do |prop_name, value|
-            parsed = JSON.parse('{ "' + prop_name + '" : ' + value + '}')
-            m.properties[prop_name] = parsed[prop_name]
-          end
-        end
-      end
-
-      # Serialize the message's attributes to JSON
-      #
-      # Returns a JSON String
-      def to_json
-        hash = {}
-        PROPERTIES.each do |p, u|
-          attr_name = u.encode('UTF-8')
-          value = @message.send(attr_name)
-          hash[p] = value.to_s.encode('UTF-8') unless value.nil?
-        end
-        hash.to_json
-      end
-
-      # Build a hash based on message properties and ensure
-      # the values are in a valid format for HTTP headers
-      #
-      # Returns a Hash
-      def get_property_headers
-        hash = {}
-        @message.properties.each do |name, value|
-          value = value.httpdate if !value.nil? && value.class == Time
-
-          tmp = JSON.generate [value]
-          hash[name] = tmp[1..(tmp.length - 2)]
-        end
-        hash
-      end
-
-      private
-
-      # Take the .net json serialization of a DateTime (i.e. /Date(...)/)
-      # and return a time object
-      #
-      # Returns a Time instance
-      def self.parse_dot_net_serialized_datetime(datetime)
-        begin
-          Time.parse(datetime)
-        rescue
-          milliseconds_in_second = 1000
-          match = /\/Date\((\d+)\)\//.match(datetime)
-          if !match.nil?
-            ticks = match[1].to_i
-            Time.at(ticks / milliseconds_in_second)
-          else
-            nil
-          end
-        end
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require 'rubygems'
+require 'json'
+require 'time'
+require 'uri'
+
+require 'azure/service_bus/brokered_message'
+
+module Azure
+  module ServiceBus
+    # BrokeredMessageSerializer
+    class BrokeredMessageSerializer
+      PROPERTIES = {
+        'ContentType'             => 'content_type',
+        'CorrelationId'           => 'correlation_id',
+        'SessionID'               => 'session_id',
+        'DeliveryCount'           => 'delivery_count',
+        'LockedUntilUtc'          => 'locked_until_utc',
+        'LockToken'               => 'lock_token',
+        'MessageId'               => 'message_id',
+        'Label'                   => 'label',
+        'ReplyTo'                 => 'reply_to',
+        'EnqueuedTimeUtc'         => 'enqueued_time_utc',
+        'SequenceNumber'          => 'sequence_number',
+        'TimeToLive'              => 'time_to_live',
+        'To'                      => 'to',
+        'ScheduledEnqueueTimeUtc' => 'scheduled_enqueue_time_utc',
+        'ReplyToSessionId'        => 'reply_to_session_id'
+      }.freeze
+
+      attr_reader :message
+
+      def initialize(msg)
+        @message = msg
+      end
+
+      def self.get_from_http_response(response)
+        props = JSON.parse(response.headers['brokerproperties'])
+        BrokeredMessage.new(response.body) do |m|
+          loc_header = response.headers['location']
+          m.location = URI(loc_header) unless loc_header.nil?
+          m.content_type = response.headers['content-type']
+
+          # String based properties
+          m.lock_token = props['LockToken']
+          m.message_id = props['MessageId']
+          m.label = props['Label']
+          m.to = props['To']
+          m.session_id = props['SessionID']
+          m.correlation_id = props['CorrelationId']
+          m.reply_to = props['ReplyTo']
+          m.reply_to = props['ReplyTo']
+          m.reply_to_session_id = props['ReplyToSessionId']
+
+          # Time based properties
+          utc_lock = props['LockedUntilUtc']
+          m.locked_until_utc = Time.parse(utc_lock) unless utc_lock.nil?
+
+          enqueued_time_utc = self.parse_dot_net_serialized_datetime(
+            props['EnqueuedTimeUtc']
+          ) unless props['EnqueuedTimeUtc'].nil?
+          m.enqueued_time_utc = enqueued_time_utc unless enqueued_time_utc.nil?
+
+          m.scheduled_enqueue_time_utc = Time.parse(
+            props['ScheduledEnqueueTimeUtc']
+          ) unless props['ScheduledEnqueueTimeUtc'].nil?
+
+          # Numeric based properties
+          m.delivery_count = props['DeliveryCount'].to_i
+          m.sequence_number = props['SequenceNumber'].to_i
+          m.time_to_live = props['TimeToLive'].to_f
+
+          # Custom Properties
+          header_names_black_list = %w(
+            brokerproperties
+            date
+            transfer-encoding
+            location
+            server
+            connection
+            content-type
+            content-length
+          )
+
+          props = response.headers.reject do |k, _|
+            header_names_black_list.include?(k.downcase)
+          end
+
+          props.each do |prop_name, value|
+            parsed = JSON.parse('{ "' + prop_name + '" : ' + value + '}')
+            m.properties[prop_name] = parsed[prop_name]
+          end
+        end
+      end
+
+      # Serialize the message's attributes to JSON
+      #
+      # Returns a JSON String
+      def to_json
+        hash = {}
+        PROPERTIES.each do |p, u|
+          attr_name = u.encode('UTF-8')
+          value = @message.send(attr_name)
+          hash[p] = value.to_s.encode('UTF-8') unless value.nil?
+        end
+        hash.to_json
+      end
+
+      # Build a hash based on message properties and ensure
+      # the values are in a valid format for HTTP headers
+      #
+      # Returns a Hash
+      def get_property_headers
+        hash = {}
+        @message.properties.each do |name, value|
+          value = value.httpdate if !value.nil? && value.class == Time
+
+          tmp = JSON.generate [value]
+          hash[name] = tmp[1..(tmp.length - 2)]
+        end
+        hash
+      end
+
+      private
+
+      # Take the .net json serialization of a DateTime (i.e. /Date(...)/)
+      # and return a time object
+      #
+      # Returns a Time instance
+      def self.parse_dot_net_serialized_datetime(datetime)
+        begin
+          Time.parse(datetime)
+        rescue
+          milliseconds_in_second = 1000
+          match = /\/Date\((\d+)\)\//.match(datetime)
+          if !match.nil?
+            ticks = match[1].to_i
+            Time.at(ticks / milliseconds_in_second)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end