libwebsocket 0.1.6.1 → 0.1.7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.7 / 2012-11-29
+
+- Restore behaviour of LibWebSocket::OpeningHandshake::Client#url
+
 ## 0.1.6.1 / 2012-11-19
 
 - Fix `uninitialized constant LibWebSocket::OpeningHandshake::Forwardable` error

data/lib/libwebsocket.rb

@@ -4,7 +4,8 @@ require 'websocket'
 # or clients to provide WebSocket support.
 module LibWebSocket
 
-  autoload :Frame,         "#{File.dirname(__FILE__)}/libwebsocket/frame"
+  autoload :Frame,            "#{File.dirname(__FILE__)}/libwebsocket/frame"
   autoload :OpeningHandshake, "#{File.dirname(__FILE__)}/libwebsocket/opening_handshake"
+  autoload :URL,              "#{File.dirname(__FILE__)}/libwebsocket/url"
 
 end

data/lib/libwebsocket/opening_handshake/client.rb

@@ -34,12 +34,18 @@ module LibWebSocket
     #   h.done? # Returns true
     class Client < OpeningHandshake
 
-      def_delegator :controller, :uri, :url
+      def_delegator :controller, :uri
 
       def initialize(hash = {})
         @controller = ::WebSocket::Handshake::Client.new({:version => 76}.merge(hash))
       end
 
+      def url
+        lws_url = LibWebSocket::URL.new
+        lws_url.parse(uri)
+        lws_url
+      end
+
     end
   end
 end

data/lib/libwebsocket/url.rb

@@ -0,0 +1,68 @@
+require 'addressable/uri'
+
+module LibWebSocket
+  # Construct or parse a WebSocket URL.
+  class URL
+
+    attr_accessor :secure, :host, :port, :resource_name
+
+    def initialize(hash = {})
+      hash.each do |k,v|
+        instance_variable_set("@#{k}",v)
+      end
+
+      @secure ||= false
+    end
+
+    # Parse a WebSocket URL.
+    # @example Parse
+    #   url = LibWebSocket::URL.new
+    #   url.parse('wss://example.com:3000')
+    #   url.host   # => example.com
+    #   url.port   # => 3000
+    #   url.secure # => true
+    def parse(string)
+      return nil unless string.is_a?(String)
+
+      uri = Addressable::URI.parse(string)
+
+      scheme = uri.scheme
+      return nil unless scheme
+
+      self.secure = true if scheme.match(/ss\Z/m)
+
+      host = uri.host
+      host = '/' unless host && host != ''
+      self.host = host
+      self.port = uri.port.to_s if uri.port
+
+      request_uri = uri.path
+      request_uri = '/' unless request_uri && request_uri != ''
+      request_uri += "?" + uri.query if uri.query
+      self.resource_name = request_uri
+
+      return self
+    end
+
+    # Construct a WebSocket URL.
+    # @example Construct
+    #   url = LibWebSocket::URL.new
+    #   url.host = 'example.com'
+    #   url.port = '3000'
+    #   url.secure = true
+    #   url.to_s # => 'wss://example.com:3000'
+    def to_s
+      string = ''
+
+      string += 'ws'
+      string += 's' if self.secure
+      string += '://'
+      string += self.host
+      string += ':' + self.port.to_s if self.port
+      string += self.resource_name || '/'
+
+      return string
+    end
+
+  end
+end

data/lib/libwebsocket/version.rb

@@ -1,3 +1,3 @@
 module LibWebSocket
-  VERSION = '0.1.6.1'
+  VERSION = '0.1.7'
 end

data/libwebsocket.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Universal Ruby library to handle WebSocket protocol}
 
   s.add_dependency 'websocket'
+  s.add_dependency 'addressable'
   s.add_development_dependency 'rake'
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libwebsocket
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +79,7 @@ files:
 - lib/libwebsocket/opening_handshake.rb
 - lib/libwebsocket/opening_handshake/client.rb
 - lib/libwebsocket/opening_handshake/server.rb
+- lib/libwebsocket/url.rb
 - lib/libwebsocket/version.rb
 - libwebsocket.gemspec
 - test/libwebsocket/opening_handshake/test_client.rb
@@ -81,18 +98,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2175210411594514962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2175210411594514962
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24