JS routes are now generated insted of being harcoded

If set, RAILS_RELATIVE_URL_ROOT would break all the AJAX requests.

JS routes are now generated insted of being harcoded
If set, RAILS_RELATIVE_URL_ROOT would break all the AJAX requests.
Rafael Manzo
1 parent d9a9294a
Showing 11 changed files with 20 additions and 7 deletions Show diff stats
CHANGELOG.rdoc
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/module/graphic.js.coffee
app/assets/javascripts/module/tree.js.coffee
app/assets/javascripts/repository/branch.js.coffee
app/assets/javascripts/repository/state.js.coffee
config/initializers/jsroutes.rb
config/routes.rb
spec/javascripts/spec_helper.js.coffee
@@ -4,6 +4,7 @@ Prezento is the web interface for Mezuro.
  
 == Unreleased
  
+Fixed hardcoded routes on JS files by using generated ones
  
 == v0.8.1 - 01/09/2015
  
@@ -63,6 +63,9 @@ gem &#39;google-analytics-rails&#39;, &#39;~&gt; 0.0.6&#39;
 # Browser language detection
 gem 'http_accept_language'
  
+# Routes for JS files
+gem 'js-routes', '~> 1.1.0'
+
 group :test do
   # Easier test writing
   gem "shoulda-matchers", '~> 2.8.0'
@@ -154,6 +154,9 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
+    js-routes (1.1.0)
+      railties (>= 3.2)
+      sprockets-rails
     json (1.8.3)
     kalibro_client (1.3.0)
       activesupport (>= 2.2.1)
@@ -351,6 +354,7 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   jquery-ui-rails (~> 5.0.0)
+  js-routes (~> 1.1.0)
   kalibro_client (~> 1.3.0)
   konacha
   mocha
@@ -375,4 +379,4 @@ DEPENDENCIES
   web-console (~> 2.0.0)
  
 BUNDLED WITH
-   1.10.5
+   1.10.6
@@ -18,5 +18,6 @@
 //= require modules
 //= require repository
 //= require Chart
+//= require js-routes
 //= require_tree .
 //= require colorpicker
@@ -8,7 +8,7 @@ class Module.Graphic
       drawer.slideUp('slow')
  
   load: ->
-    $.post '/modules/' + @module_id + '/metric_history',
+    $.post Routes.module_metric_history_path(@module_id),
           {
             metric_name: @metric_name,
             container: @container
@@ -2,4 +2,4 @@ class Module.Tree
   @load: (loading_html, module_id) ->
     $('div#module_tree').html(loading_html)
     $('div#metric_results').html(loading_html)
-    $.post '/modules/'+module_id+'/tree'
 \ No newline at end of file
+    $.post Routes.module_tree_path(module_id)
@@ -47,7 +47,7 @@ class Repository.Branch
     scm_type = $("#repository_scm_type").val()
  
     context = this
-    @request = $.get '/repository_branches',
+    @request = $.get Routes.repository_branches_path(),
       {'url': address, 'scm_type': scm_type},
       (data) ->
         unless data["errors"]
@@ -2,7 +2,7 @@ class Repository.State
   constructor: (@repository_id) ->
  
   poll_state: (last_state) ->
-    $.get('/repositories/' + @repository_id + '/state',
+    $.get(Routes.repository_state_path(@repository_id),
            last_state: last_state)
  
   schedule_poll_state: (last_state) ->
@@ -0,0 +1,3 @@
+JsRoutes.setup do |config|
+  config.prefix = Mezuro::Application.config.relative_url_root
+end
 \ No newline at end of file
@@ -37,8 +37,8 @@ Rails.application.routes.draw do
     end
  
     # Modules
-    post '/modules/:id/metric_history' => 'modules#metric_history'
-    post '/modules/:id/tree' => 'modules#load_module_tree'
+    post '/modules/:id/metric_history' => 'modules#metric_history', as: 'module_metric_history'
+    post '/modules/:id/tree' => 'modules#load_module_tree', as: 'module_tree'
  
     # Tutorials
     get '/tutorials/:name' => 'tutorials#view', as: 'tutorials'
 #= require jquery
 #= require sinon
+#= require js-routes
  
 #= require modules
 #= require repository
 \ No newline at end of file
...	...	@@ -4,6 +4,7 @@ Prezento is the web interface for Mezuro.
4	4
5	5	== Unreleased
6	6
	7	+Fixed hardcoded routes on JS files by using generated ones
7	8
8	9	== v0.8.1 - 01/09/2015
9	10
...	...
...	...	@@ -63,6 +63,9 @@ gem 'google-analytics-rails', '~> 0.0.6'
63	63	# Browser language detection
64	64	gem 'http_accept_language'
65	65
	66	+# Routes for JS files
	67	+gem 'js-routes', '~> 1.1.0'
	68	+
66	69	group :test do
67	70	# Easier test writing
68	71	gem "shoulda-matchers", '~> 2.8.0'
...	...
...	...	@@ -154,6 +154,9 @@ GEM
154	154	thor (>= 0.14, < 2.0)
155	155	jquery-ui-rails (5.0.5)
156	156	railties (>= 3.2.16)
	157	+ js-routes (1.1.0)
	158	+ railties (>= 3.2)
	159	+ sprockets-rails
157	160	json (1.8.3)
158	161	kalibro_client (1.3.0)
159	162	activesupport (>= 2.2.1)
...	...	@@ -351,6 +354,7 @@ DEPENDENCIES
351	354	jbuilder (~> 2.0)
352	355	jquery-rails
353	356	jquery-ui-rails (~> 5.0.0)
	357	+ js-routes (~> 1.1.0)
354	358	kalibro_client (~> 1.3.0)
355	359	konacha
356	360	mocha
...	...	@@ -375,4 +379,4 @@ DEPENDENCIES
375	379	web-console (~> 2.0.0)
376	380
377	381	BUNDLED WITH
378		- 1.10.5
	382	+ 1.10.6
...	...
...	...	@@ -18,5 +18,6 @@
18	18	//= require modules
19	19	//= require repository
20	20	//= require Chart
	21	+//= require js-routes
21	22	//= require_tree .
22	23	//= require colorpicker
...	...
...	...	@@ -8,7 +8,7 @@ class Module.Graphic
8	8	drawer.slideUp('slow')
9	9
10	10	load: ->
11		- $.post '/modules/' + @module_id + '/metric_history',
	11	+ $.post Routes.module_metric_history_path(@module_id),
12	12	{
13	13	metric_name: @metric_name,
14	14	container: @container
...	...
...	...	@@ -2,4 +2,4 @@ class Module.Tree
2	2	@load: (loading_html, module_id) ->
3	3	$('div#module_tree').html(loading_html)
4	4	$('div#metric_results').html(loading_html)
5		- $.post '/modules/'+module_id+'/tree'
6	5	\ No newline at end of file
	6	+ $.post Routes.module_tree_path(module_id)
...	...
...	...	@@ -47,7 +47,7 @@ class Repository.Branch
47	47	scm_type = $("#repository_scm_type").val()
48	48
49	49	context = this
50		- @request = $.get '/repository_branches',
	50	+ @request = $.get Routes.repository_branches_path(),
51	51	{'url': address, 'scm_type': scm_type},
52	52	(data) ->
53	53	unless data["errors"]
...	...
...	...	@@ -2,7 +2,7 @@ class Repository.State
2	2	constructor: (@repository_id) ->
3	3
4	4	poll_state: (last_state) ->
5		- $.get('/repositories/' + @repository_id + '/state',
	5	+ $.get(Routes.repository_state_path(@repository_id),
6	6	last_state: last_state)
7	7
8	8	schedule_poll_state: (last_state) ->
...	...
...	...	@@ -0,0 +1,3 @@
	1	+JsRoutes.setup do \|config\|
	2	+ config.prefix = Mezuro::Application.config.relative_url_root
	3	+end
0	4	\ No newline at end of file
...	...
...	...	@@ -37,8 +37,8 @@ Rails.application.routes.draw do
37	37	end
38	38
39	39	# Modules
40		- post '/modules/:id/metric_history' => 'modules#metric_history'
41		- post '/modules/:id/tree' => 'modules#load_module_tree'
	40	+ post '/modules/:id/metric_history' => 'modules#metric_history', as: 'module_metric_history'
	41	+ post '/modules/:id/tree' => 'modules#load_module_tree', as: 'module_tree'
42	42
43	43	# Tutorials
44	44	get '/tutorials/:name' => 'tutorials#view', as: 'tutorials'
...	...