faye 1.3.0 → 1.4.1

data/lib/faye/protocol/dispatcher.rb

@@ -16,7 +16,8 @@ module Faye
     def_delegators :@transport, :connection_type
 
     attr_accessor :client_id, :timeout
-    attr_reader   :cookies, :endpoint, :headers, :max_request_size, :proxy, :retry, :transports, :ws_extensions
+    attr_reader   :endpoint, :tls, :headers, :cookies, :proxy, :retry
+    attr_reader   :max_request_size, :transports, :ws_extensions
 
     def initialize(client, endpoint, options)
       super()
@@ -42,6 +43,8 @@ module Faye
         add_websocket_extension(extension)
       end
 
+      @tls = { :verify_peer => true }.merge(options[:tls] || {})
+
       @alternates.each do |type, url|
         @alternates[type] = URI(url)
       end

data/lib/faye/transport/http.rb

@@ -29,15 +29,15 @@ module Faye
   private
 
     def build_params(content)
+      headers = {
+        'Content-Length' => content.bytesize,
+        'Content-Type'   => 'application/json',
+        'Host'           => @endpoint.host + (@endpoint.port ? ":#{ @endpoint.port }" : '')
+      }
+
       params = {
-        :head => {
-          'Content-Length' => content.bytesize,
-          'Content-Type'   => 'application/json',
-          'Host'           => @endpoint.host + (@endpoint.port ? ":#{ @endpoint.port }" : '')
-        }.merge(@dispatcher.headers),
-
-        :body    => content,
-        :timeout => -1  # for em-http-request < 1.0
+        :head => headers.merge(@dispatcher.headers),
+        :body => content
       }
 
       cookie = get_cookies
@@ -47,10 +47,9 @@ module Faye
     end
 
     def create_request(params)
-      version = EventMachine::HttpRequest::VERSION.split('.')[0].to_i
       options = {
         :inactivity_timeout => 0,
-        :tls => { :sni_hostname => @endpoint.hostname }
+        :tls => @dispatcher.tls
       }
 
       if @proxy[:origin]
@@ -61,12 +60,7 @@ module Faye
         end
       end
 
-      if version >= 1
-        client = EventMachine::HttpRequest.new(@endpoint.to_s, options)
-      else
-        client = EventMachine::HttpRequest.new(@endpoint.to_s)
-      end
-
+      client = EventMachine::HttpRequest.new(@endpoint.to_s, options)
       client.post(params)
     end
 

data/lib/faye/transport/web_socket.rb

@@ -72,7 +72,7 @@ module Faye
         :extensions => extensions,
         :headers    => headers,
         :proxy      => @proxy,
-        :tls        => { :sni_hostname => url.hostname }
+        :tls        => @dispatcher.tls
       }
 
       socket = Faye::WebSocket::Client.new(url.to_s, [], options)

data/lib/faye.rb

@@ -14,7 +14,7 @@ require 'time'
 require 'uri'
 
 module Faye
-  VERSION = '1.3.0'
+  VERSION = '1.4.1'
 
   ROOT = File.expand_path(File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: faye
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - James Coglan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cookiejar
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +345,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-description:
 email: jcoglan@gmail.com
 executables: []
 extensions: []
@@ -390,7 +388,6 @@ homepage: https://faye.jcoglan.com
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -409,8 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Simple pub/sub messaging for the web
 test_files: []