Websocket-rails

Move js files to right path Videos#delete

Websocket-rails
Move js files to right path Videos#delete
Fernando Brito
1 parent f8418da0
Showing 22 changed files with 195 additions and 61 deletions Show diff stats
Gemfile
Gemfile.lock
app/admin/v_libras_video.rb
app/assets/javascripts/application.js
app/assets/javascripts/static/v_libras/rapid.js
app/assets/javascripts/v_libras/requests/rapid.js
app/assets/javascripts/v_libras/videos/index.js
app/assets/stylesheets/bootstrap_overrides.css.scss
app/controllers/v_libras/videos_controller.rb
app/helpers/application_helper.rb
app/models/v_libras/request.rb
app/models/v_libras/video.rb
app/views/layouts/application.html.erb
app/views/v_libras/requests/rapid.haml
app/views/v_libras/videos/index.haml
config/environments/development.rb
config/events.rb
config/initializers/assets.rb
config/initializers/websocket_rails.rb
config/routes.rb
@@ -18,6 +18,8 @@ gem &#39;uglifier&#39;, &#39;&gt;= 1.3.0&#39;
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
 gem 'therubyracer', :platform => :ruby
+gem 'websocket-rails'
+
 # gem 'turbolinks'
 gem 'devise'
@@ -117,6 +117,8 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     dotenv (0.7.0)
+    em-synchrony (1.0.3)
+      eventmachine (>= 1.0.0.beta.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -130,6 +132,9 @@ GEM
       railties (>= 3.0.0)
     faker (1.3.0)
       i18n (~> 0.5)
+    faye-websocket (0.7.3)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.3.1)
     ffi (1.9.3)
     foreman (0.66.0)
       dotenv (~> 0.7.0)
@@ -166,6 +171,7 @@ GEM
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
     hike (1.2.3)
+    hiredis (0.5.2)
     hpricot (0.8.6)
     html2haml (1.0.1)
       erubis (~> 2.7.0)
@@ -276,6 +282,9 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.4)
       ffi (>= 0.5.0)
+    redis (3.0.7)
+    redis-objects (0.9.1)
+      redis (>= 3.0.2)
     responders (1.0.0)
       railties (>= 3.2, < 5)
     rolify (3.4.0)
@@ -363,6 +372,16 @@ GEM
     warden (1.2.3)
       rack (>= 1.0)
     websocket (1.0.7)
+    websocket-driver (0.3.3)
+    websocket-rails (0.7.0)
+      em-synchrony
+      faye-websocket
+      hiredis
+      rack
+      rails
+      redis
+      redis-objects
+      thin
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -419,3 +438,4 @@ DEPENDENCIES
   thin
   twitter-bootstrap-rails
   uglifier (>= 1.3.0)
+  websocket-rails
 ActiveAdmin.register VLibras::Video do
   menu :priority => 15
-  
-  # See permitted parameters documentation:
-  # https://github.com/gregbell/active_admin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
-  #
-  # permit_params :list, :of, :attributes, :on, :model
-  #
-  # or
-  #
-  # permit_params do
-  #  permitted = [:permitted, :attributes]
-  #  permitted << :other if resource.something?
-  #  permitted
-  # end
-  
+
+  permit_params :url, :request_id
 end
@@ -13,4 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require twitter/bootstrap
-//= require_tree .
+//= require websocket_rails/main
+
@@ -1,26 +0,0 @@
-$(function() {
-    $("#service-video").click(function() {
-        console.log($(this).prop('defaultChecked'));
-
-        $("#url").show('slow');
-        $("#legend").hide('slow');
-    });
-
-    $("#service-video-subtitle").click(function() {
-        console.log($(this).prop('defaultChecked'));
-
-        $("#url").show('slow');
-        $("#legend").show('slow');
-    });
-
-    /* When user press "Back" on the browser */
-    if ($("#service-video-subtitle")[0].checked) {
-        console.log('b');
-        $("#service-video-subtitle").click();
-    }
-
-    if ($("#service-video")[0].checked) {
-        console.log('a');
-        $("#service-video").click();
-    }
-});
 \ No newline at end of file
@@ -0,0 +1,20 @@
+$(function() {
+    $("#service-video").click(function() {
+        $("#url").show('slow');
+        $("#legend").hide('slow');
+    });
+
+    $("#service-video-subtitle").click(function() {
+        $("#url").show('slow');
+        $("#legend").show('slow');
+    });
+
+    /* When user press "Back" on the browser */
+    if ($("#service-video-subtitle")[0].checked) {
+        $("#service-video-subtitle").click();
+    }
+
+    if ($("#service-video")[0].checked) {
+        $("#service-video").click();
+    }
+});
 \ No newline at end of file
@@ -0,0 +1,16 @@
+$(function() {
+    $("a.badge").tooltip();
+
+    // connect to server like normal
+    // FIXME: how to get the right address
+    var dispatcher = new WebSocketRails('localhost:3000/websocket');
+
+    // subscribe to the channel
+    var channel = dispatcher.subscribe('requests_update');
+
+    // bind to a channel event
+    channel.bind('update', function(data) {
+        alert("channel updated");
+        location.reload();
+    });
+});
 \ No newline at end of file
@@ -43,4 +43,9 @@
 }
 .breadcrumb .active a {
   color: #333333;
+}
+
+.login {
+  padding: 3% 5%;
+  margin: 10px 35% 30px;
 }
 \ No newline at end of file
-class VLibras::VideosController < ApplicationController
+class VLibras::VideosController < InheritedResources::Base
+  actions :destroy
+
   before_filter :check_vlibras_api_status, :only => [ :index ]
   def index
     @videos = current_user.videos
-    @requests = current_user.requests.limit(10)
+    @requests = current_user.requests.limit(6)
   end
 end
@@ -27,20 +27,23 @@ module ApplicationHelper
     end
   end
-  def request_status_label(status)
-    classes = [ 'label' ]
+  def request_status_label(request)
+    classes = [ 'badge' ]
+
+    status = request.status
     case status
       when 'created'
       when 'processing'
-        classes << 'label-warning'
+        classes << 'badge-warning'
       when 'error'
-        classes << 'label-important'
+        classes << 'badge-important'
       when 'success'
-        classes << 'label-success'
+        classes << 'badge-success'
     end
-    content_tag(:div, t(status, scope: 'status'), :class => classes)
+    content_tag(:a, t(status, scope: 'status'), :class => classes,
+                :data => { 'toggle' => "tooltip" }, :title => request.response)
   end
 end
@@ -19,7 +19,7 @@ class VLibras::Request &lt; ActiveRecord::Base
   belongs_to :owner, :class => User
-  has_one :video, :class => VLibras::Video
+  has_one :video, :class => VLibras::Video, :dependent => :destroy
   validates :service_type,
               presence: true,
@@ -10,5 +10,5 @@
 #
 class VLibras::Video < ActiveRecord::Base
-  belongs_to :request, :class => VLibras::Request
+  belongs_to :request, :class => VLibras::Request, :dependent => :delete
 end
@@ -4,6 +4,7 @@
   <title>GTAaaS</title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
+  <%= yield :js %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-= javascript_include_tag "static/v_libras/rapid"
+- content_for :js do
+  = javascript_include_tag "v_libras/requests/rapid"
 .login
   %h2
+- content_for :js do
+  = javascript_include_tag "v_libras/videos/index"
+
 .breadcrumb
   %h3= t('videos.list')
@@ -7,7 +10,8 @@
       = link_to image_tag("avatar.png"), video.url
       %p
         = link_to t('videos.show'),  video_path(video), class: "btn btn-success"
-        = link_to t('videos.delete'),  video_path(video), confirm: t('shared.confirm_delete'), method: :delete, class: "btn btn-danger"
+        = link_to t('videos.delete'),  v_libras_video_path(video), method: :delete,
+          class: "btn btn-danger", data: { confirm: t('shared.confirm_delete') }
 .breadcrumb.requests
   %h4= t('requests.list')
@@ -22,7 +26,7 @@
     - @requests.each do |request|
       %tr
-        %td.span2= request_status_label(request.status)
+        %td.span2= request_status_label(request)
         %td.span5= request.video_filename
         %td.span5= time_ago_in_words(request.created_at)
@@ -56,4 +56,7 @@ Rails.application.configure do
   config.action_view.raise_on_missing_translations = true
   config.middleware.use Rack::LiveReload
+
+  # websocket-rails
+  config.middleware.delete Rack::Lock
 end
@@ -0,0 +1,14 @@
+WebsocketRails::EventMap.describe do
+  # You can use this file to map incoming events to controller actions.
+  # One event can be mapped to any number of controller actions. The
+  # actions will be executed in the order they were subscribed.
+  #
+  # Uncomment and edit the next line to handle the client connected event:
+  #   subscribe :client_connected, :to => Controller, :with_method => :method_name
+  #
+  # Here is an example of mapping namespaced events:
+  #   namespace :product do
+  #     subscribe :new, :to => ProductController, :with_method => :new_product
+  #   end
+  # The above will handle an event triggered on the client like `product.new`.
+end
-Rails.application.config.assets.precompile += %w( static/v_libras/rapid.js )
 \ No newline at end of file
+Rails.application.config.assets.precompile += %w( v_libras/requests/rapid.js )
+Rails.application.config.assets.precompile += %w( v_libras/videos/index.js )
 \ No newline at end of file
@@ -0,0 +1,63 @@
+WebsocketRails.setup do |config|
+
+  # Uncomment to override the default log level. The log level can be
+  # any of the standard Logger log levels. By default it will mirror the
+  # current Rails environment log level.
+  config.log_level = :debug
+
+  # Uncomment to change the default log file path.
+  # config.log_path = "#{Rails.root}/log/websocket_rails.log"
+
+  # Set to true if you wish to log the internal websocket_rails events
+  # such as the keepalive `websocket_rails.ping` event.
+  # config.log_internal_events = false
+
+  # Change to true to enable standalone server mode
+  # Start the standalone server with rake websocket_rails:start_server
+  # * Requires Redis
+  config.standalone = false
+
+  # Change to true to enable channel synchronization between
+  # multiple server instances.
+  # * Requires Redis.
+  config.synchronize = false
+
+  # Prevent Thin from daemonizing (default is true)
+  # config.daemonize = false
+
+  # Uncomment and edit to point to a different redis instance.
+  # Will not be used unless standalone or synchronization mode
+  # is enabled.
+  # config.redis_options = {:host => 'localhost', :port => '6379'}
+
+  # By default, all subscribers in to a channel will be removed
+  # when that channel is made private. If you don't wish active
+  # subscribers to be removed from a previously public channel
+  # when making it private, set the following to true.
+  # config.keep_subscribers_when_private = false
+
+  # Set to true if you wish to broadcast channel subscriber_join and
+  # subscriber_part events. All subscribers of a channel will be 
+  # notified when other clients join and part the channel. If you are
+  # using the UserManager, the current_user object will be sent along
+  # with the event.
+  # config.broadcast_subscriber_events = true
+
+  # Used as the key for the WebsocketRails.users Hash. This method
+  # will be called on the `current_user` object in your controller
+  # if one exists. If `current_user` does not exist or does not
+  # respond to the identifier, the key will default to `connection.id`
+  # config.user_identifier = :id
+
+  # Uncomment and change this option to override the class associated
+  # with your `current_user` object. This class will be used when
+  # synchronization is enabled and you trigger events from background
+  # jobs using the WebsocketRails.users UserManager.
+  # config.user_class = User
+
+  # Supporting HTTP streaming on Internet Explorer versions 8 & 9
+  # requires CORS to be enabled for GET "/websocket" request.
+  # List here the origin domains allowed to perform the request.
+  # config.allowed_origins = ['http://localhost:3000']
+
+end
@@ -17,7 +17,7 @@ Rails.application.routes.draw do
       post 'callback', on: :collection
     end
-    resources :videos, :only => [ :index ]
+    resources :videos, :only => [ :index, :destroy ]
   end
 class ApiClient::CallbackProcessor
   def self.process(params)
     request = VLibras::Request.find(params[:request_id])
-    request.update(:status => 'success')
-    request.create_video(:url => params['response'])
+
+    if params['error']
+      Rails.logger.debug "[VLibras::Callback]: Error #{params}"
+
+      request.update!(:status => 'error', :response => params['error'])
+    else
+      Rails.logger.debug "[VLibras::Callback] OK: #{params}"
+
+      request.update!(:status => 'success')
+      request.create_video(:url => params['response'])
+    end
+
+    Rails.logger.debug "[VLibras::Callback] Notifying websocket channel"
+    WebsocketRails[:requests_update].trigger(:update, {a: :b, c: :d})
   end
 end
 \ No newline at end of file
@@ -7,7 +7,7 @@ module ApiClient::Client
   def self.submit(request, files)
     o = { query: request.params.clone }
     o[:query].merge!({ :servico => request.service_type })
-    o[:query].merge!({ :callback => "http://150.165.205.192:3000/v_libras/requests/callback?request_id=#{request.id}" })
+    o[:query].merge!({ :callback => "http://150.165.205.166:3000/v_libras/requests/callback?request_id=#{request.id}" })
     o[:query].merge!({ :video => files[:video].file.to_file })
@@ -27,8 +27,12 @@ module ApiClient::Client
     else
       request.update!(:response => response.body, :status => 'error')
     end
-  rescue
-
+  rescue => e
+    request.update!(:status => 'error', :response => e)
+  ensure
+    # FIXME: Running on another thread. Websocket not working :(
+    Delayed::Worker.logger.debug "[VLibras::Request] Sending message to websocket channel"
+    WebsocketRails[:requests_update].trigger(:update, {a: :b, c: :d})
   end
 private
	@@ -117,6 +117,8 @@ GEM		@@ -117,6 +117,8 @@ GEM
117	warden (~> 1.2.3)	117	warden (~> 1.2.3)
118	diff-lcs (1.2.5)	118	diff-lcs (1.2.5)
119	dotenv (0.7.0)	119	dotenv (0.7.0)
		120	+ em-synchrony (1.0.3)
		121	+ eventmachine (>= 1.0.0.beta.1)
120	em-websocket (0.5.1)	122	em-websocket (0.5.1)
121	eventmachine (>= 0.12.9)	123	eventmachine (>= 0.12.9)
122	http_parser.rb (~> 0.6.0)	124	http_parser.rb (~> 0.6.0)
	@@ -130,6 +132,9 @@ GEM		@@ -130,6 +132,9 @@ GEM
130	railties (>= 3.0.0)	132	railties (>= 3.0.0)
131	faker (1.3.0)	133	faker (1.3.0)
132	i18n (~> 0.5)	134	i18n (~> 0.5)
		135	+ faye-websocket (0.7.3)
		136	+ eventmachine (>= 0.12.0)
		137	+ websocket-driver (>= 0.3.1)
133	ffi (1.9.3)	138	ffi (1.9.3)
134	foreman (0.66.0)	139	foreman (0.66.0)
135	dotenv (~> 0.7.0)	140	dotenv (~> 0.7.0)
	@@ -166,6 +171,7 @@ GEM		@@ -166,6 +171,7 @@ GEM
166	actionpack (>= 3.2, < 5)	171	actionpack (>= 3.2, < 5)
167	activesupport (>= 3.2, < 5)	172	activesupport (>= 3.2, < 5)
168	hike (1.2.3)	173	hike (1.2.3)
		174	+ hiredis (0.5.2)
169	hpricot (0.8.6)	175	hpricot (0.8.6)
170	html2haml (1.0.1)	176	html2haml (1.0.1)
171	erubis (~> 2.7.0)	177	erubis (~> 2.7.0)
	@@ -276,6 +282,9 @@ GEM		@@ -276,6 +282,9 @@ GEM
276	rb-fsevent (0.9.4)	282	rb-fsevent (0.9.4)
277	rb-inotify (0.9.4)	283	rb-inotify (0.9.4)
278	ffi (>= 0.5.0)	284	ffi (>= 0.5.0)
		285	+ redis (3.0.7)
		286	+ redis-objects (0.9.1)
		287	+ redis (>= 3.0.2)
279	responders (1.0.0)	288	responders (1.0.0)
280	railties (>= 3.2, < 5)	289	railties (>= 3.2, < 5)
281	rolify (3.4.0)	290	rolify (3.4.0)
	@@ -363,6 +372,16 @@ GEM		@@ -363,6 +372,16 @@ GEM
363	warden (1.2.3)	372	warden (1.2.3)
364	rack (>= 1.0)	373	rack (>= 1.0)
365	websocket (1.0.7)	374	websocket (1.0.7)
		375	+ websocket-driver (0.3.3)
		376	+ websocket-rails (0.7.0)
		377	+ em-synchrony
		378	+ faye-websocket
		379	+ hiredis
		380	+ rack
		381	+ rails
		382	+ redis
		383	+ redis-objects
		384	+ thin
366	xpath (2.0.0)	385	xpath (2.0.0)
367	nokogiri (~> 1.3)	386	nokogiri (~> 1.3)
368		387
	@@ -419,3 +438,4 @@ DEPENDENCIES		@@ -419,3 +438,4 @@ DEPENDENCIES
419	thin	438	thin
420	twitter-bootstrap-rails	439	twitter-bootstrap-rails
421	uglifier (>= 1.3.0)	440	uglifier (>= 1.3.0)
		441	+ websocket-rails
1	ActiveAdmin.register VLibras::Video do	1	ActiveAdmin.register VLibras::Video do
2	menu :priority => 15	2	menu :priority => 15
3	-
4	- # See permitted parameters documentation:
5	- # https://github.com/gregbell/active_admin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
6	- #
7	- # permit_params :list, :of, :attributes, :on, :model
8	- #
9	- # or
10	- #
11	- # permit_params do
12	- # permitted = [:permitted, :attributes]
13	- # permitted << :other if resource.something?
14	- # permitted
15	- # end
16	-	3	+
		4	+ permit_params :url, :request_id
17	end	5	end
	@@ -13,4 +13,5 @@		@@ -13,4 +13,5 @@
13	//= require jquery	13	//= require jquery
14	//= require jquery_ujs	14	//= require jquery_ujs
15	//= require twitter/bootstrap	15	//= require twitter/bootstrap
16	-//= require_tree .	16	+//= require websocket_rails/main
		17	+
	@@ -1,26 +0,0 @@		@@ -1,26 +0,0 @@
1	-$(function() {
2	- $("#service-video").click(function() {
3	- console.log($(this).prop('defaultChecked'));
4	-
5	- $("#url").show('slow');
6	- $("#legend").hide('slow');
7	- });
8	-
9	- $("#service-video-subtitle").click(function() {
10	- console.log($(this).prop('defaultChecked'));
11	-
12	- $("#url").show('slow');
13	- $("#legend").show('slow');
14	- });
15	-
16	- /* When user press "Back" on the browser */
17	- if ($("#service-video-subtitle")[0].checked) {
18	- console.log('b');
19	- $("#service-video-subtitle").click();
20	- }
21	-
22	- if ($("#service-video")[0].checked) {
23	- console.log('a');
24	- $("#service-video").click();
25	- }
26	-});
27	\ No newline at end of file	0	\ No newline at end of file
	@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
		1	+$(function() {
		2	+ $("#service-video").click(function() {
		3	+ $("#url").show('slow');
		4	+ $("#legend").hide('slow');
		5	+ });
		6	+
		7	+ $("#service-video-subtitle").click(function() {
		8	+ $("#url").show('slow');
		9	+ $("#legend").show('slow');
		10	+ });
		11	+
		12	+ /* When user press "Back" on the browser */
		13	+ if ($("#service-video-subtitle")[0].checked) {
		14	+ $("#service-video-subtitle").click();
		15	+ }
		16	+
		17	+ if ($("#service-video")[0].checked) {
		18	+ $("#service-video").click();
		19	+ }
		20	+});
0	\ No newline at end of file	21	\ No newline at end of file
	@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
		1	+$(function() {
		2	+ $("a.badge").tooltip();
		3	+
		4	+ // connect to server like normal
		5	+ // FIXME: how to get the right address
		6	+ var dispatcher = new WebSocketRails('localhost:3000/websocket');
		7	+
		8	+ // subscribe to the channel
		9	+ var channel = dispatcher.subscribe('requests_update');
		10	+
		11	+ // bind to a channel event
		12	+ channel.bind('update', function(data) {
		13	+ alert("channel updated");
		14	+ location.reload();
		15	+ });
		16	+});
0	\ No newline at end of file	17	\ No newline at end of file
	@@ -43,4 +43,9 @@		@@ -43,4 +43,9 @@
43	}	43	}
44	.breadcrumb .active a {	44	.breadcrumb .active a {
45	color: #333333;	45	color: #333333;
		46	+}
		47	+
		48	+.login {
		49	+ padding: 3% 5%;
		50	+ margin: 10px 35% 30px;
46	}	51	}
47	\ No newline at end of file	52	\ No newline at end of file
	@@ -19,7 +19,7 @@ class VLibras::Request < ActiveRecord::Base		@@ -19,7 +19,7 @@ class VLibras::Request < ActiveRecord::Base
19		19
20	belongs_to :owner, :class => User	20	belongs_to :owner, :class => User
21		21
22	- has_one :video, :class => VLibras::Video	22	+ has_one :video, :class => VLibras::Video, :dependent => :destroy
23		23
24	validates :service_type,	24	validates :service_type,
25	presence: true,	25	presence: true,
	@@ -10,5 +10,5 @@		@@ -10,5 +10,5 @@
10	#	10	#
11		11
12	class VLibras::Video < ActiveRecord::Base	12	class VLibras::Video < ActiveRecord::Base
13	- belongs_to :request, :class => VLibras::Request	13	+ belongs_to :request, :class => VLibras::Request, :dependent => :delete
14	end	14	end
1	-= javascript_include_tag "static/v_libras/rapid"	1	+- content_for :js do
		2	+ = javascript_include_tag "v_libras/requests/rapid"
2		3
3	.login	4	.login
4	%h2	5	%h2