Download as
Browse Code »

Commit 926d20740fd1a3d7901cdca33aa04d8b9e2043cb

Authored by renansoares
1 parent 6293cb38
Exists in master and in 1 other branch v2

trying to fix websocket and callback error

Showing 3 changed files with 10 additions and 5 deletions   Show diff stats
@@ -87,3 +87,5 @@ group :test do @@ -87,3 +87,5 @@ group :test do
87 end 87 end
88 88
89 gem 'puma' 89 gem 'puma'
  90 +
  91 +gem 'faye-websocket', '0.10.0'
@@ -142,7 +142,7 @@ GEM @@ -142,7 +142,7 @@ GEM
142 eventmachine (>= 0.12.9) 142 eventmachine (>= 0.12.9)
143 http_parser.rb (~> 0.6.0) 143 http_parser.rb (~> 0.6.0)
144 erubis (2.7.0) 144 erubis (2.7.0)
145 - eventmachine (1.0.3) 145 + eventmachine (1.2.0.1)
146 execjs (2.0.2) 146 execjs (2.0.2)
147 factory_girl (4.4.0) 147 factory_girl (4.4.0)
148 activesupport (>= 3.0.0) 148 activesupport (>= 3.0.0)
@@ -151,9 +151,9 @@ GEM @@ -151,9 +151,9 @@ GEM
151 railties (>= 3.0.0) 151 railties (>= 3.0.0)
152 faker (1.3.0) 152 faker (1.3.0)
153 i18n (~> 0.5) 153 i18n (~> 0.5)
154 - faye-websocket (0.7.3) 154 + faye-websocket (0.10.0)
155 eventmachine (>= 0.12.0) 155 eventmachine (>= 0.12.0)
156 - websocket-driver (>= 0.3.1) 156 + websocket-driver (>= 0.5.1)
157 ffi (1.9.3) 157 ffi (1.9.3)
158 foreman (0.66.0) 158 foreman (0.66.0)
159 dotenv (~> 0.7.0) 159 dotenv (~> 0.7.0)
@@ -407,7 +407,9 @@ GEM @@ -407,7 +407,9 @@ GEM
407 warden (1.2.3) 407 warden (1.2.3)
408 rack (>= 1.0) 408 rack (>= 1.0)
409 websocket (1.0.7) 409 websocket (1.0.7)
410 - websocket-driver (0.3.3) 410 + websocket-driver (0.6.3)
  411 + websocket-extensions (>= 0.1.0)
  412 + websocket-extensions (0.1.2)
411 websocket-rails (0.7.0) 413 websocket-rails (0.7.0)
412 em-synchrony 414 em-synchrony
413 faye-websocket 415 faye-websocket
@@ -445,6 +447,7 @@ DEPENDENCIES @@ -445,6 +447,7 @@ DEPENDENCIES
445 dotenv-rails 447 dotenv-rails
446 factory_girl_rails 448 factory_girl_rails
447 faker 449 faker
  450 + faye-websocket (= 0.10.0)
448 foreman 451 foreman
449 guard-bundler 452 guard-bundler
450 guard-livereload 453 guard-livereload
lib/api_client/client.rb
  Diff comments   View file @926d207
@@ -34,7 +34,7 @@ module ApiClient::Client @@ -34,7 +34,7 @@ module ApiClient::Client
34 def self.process_params(request, files) 34 def self.process_params(request, files)
35 options = { query: request.params.clone } 35 options = { query: request.params.clone }
36 options[:query].merge!(:servico => request.service_type) 36 options[:query].merge!(:servico => request.service_type)
37 - options[:query].merge!(:callback => "http://#{ENV['DOMAIN_NAME']}/v_libras/requests/callback?request_id=#{request.id}") 37 + options[:query].merge!(:callback => "http://150.165.204.80/v_libras/requests/callback?request_id=#{request.id}")
38 38
39 options[:query].merge!(:video => files[:video].file.to_file) 39 options[:query].merge!(:video => files[:video].file.to_file)
40 40