diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 18e0d48..39ed945 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -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 diff --git a/Gemfile b/Gemfile index 8125372..e253242 100644 --- a/Gemfile +++ b/Gemfile @@ -63,6 +63,9 @@ gem 'google-analytics-rails', '~> 0.0.6' # 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' diff --git a/Gemfile.lock b/Gemfile.lock index eccdd56..d7aa513 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3160b6e..bda22cf 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,5 +18,6 @@ //= require modules //= require repository //= require Chart +//= require js-routes //= require_tree . //= require colorpicker diff --git a/app/assets/javascripts/module/graphic.js.coffee b/app/assets/javascripts/module/graphic.js.coffee index ab2604e..071f83e 100644 --- a/app/assets/javascripts/module/graphic.js.coffee +++ b/app/assets/javascripts/module/graphic.js.coffee @@ -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 diff --git a/app/assets/javascripts/module/tree.js.coffee b/app/assets/javascripts/module/tree.js.coffee index 7654dcb..49a5421 100644 --- a/app/assets/javascripts/module/tree.js.coffee +++ b/app/assets/javascripts/module/tree.js.coffee @@ -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) diff --git a/app/assets/javascripts/repository/branch.js.coffee b/app/assets/javascripts/repository/branch.js.coffee index 3dc373d..f24d6b1 100644 --- a/app/assets/javascripts/repository/branch.js.coffee +++ b/app/assets/javascripts/repository/branch.js.coffee @@ -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"] diff --git a/app/assets/javascripts/repository/state.js.coffee b/app/assets/javascripts/repository/state.js.coffee index 9e3d2df..7e96a78 100644 --- a/app/assets/javascripts/repository/state.js.coffee +++ b/app/assets/javascripts/repository/state.js.coffee @@ -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) -> diff --git a/config/initializers/jsroutes.rb b/config/initializers/jsroutes.rb new file mode 100644 index 0000000..2ca9d5d --- /dev/null +++ b/config/initializers/jsroutes.rb @@ -0,0 +1,3 @@ +JsRoutes.setup do |config| + config.prefix = Mezuro::Application.config.relative_url_root +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 366480f..5a9ebfe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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' diff --git a/spec/javascripts/spec_helper.js.coffee b/spec/javascripts/spec_helper.js.coffee index 61800f7..a0fdcec 100644 --- a/spec/javascripts/spec_helper.js.coffee +++ b/spec/javascripts/spec_helper.js.coffee @@ -1,5 +1,6 @@ #= require jquery #= require sinon +#= require js-routes #= require modules #= require repository \ No newline at end of file -- libgit2 0.21.2