From 8714b406c045471f951e619dade9bc042d4a9a4c Mon Sep 17 00:00:00 2001 From: Prakriti Gupta Date: Sat, 17 Feb 2018 00:35:28 +0530 Subject: [PATCH 1/2] Enabled RuboCop MethodLength in encapsulate_js_iruby method --- .../highcharts/layout_helper_iruby.rb | 58 +++++++++++-------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb b/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb index 6e6c021..8e6dfa9 100644 --- a/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb +++ b/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb @@ -22,41 +22,53 @@ def build_html_output_iruby(type, placeholder, object, &block) encapsulate_js_iruby core_js end - # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength + # rubocop:disable Metrics/PerceivedComplexity def encapsulate_js_iruby(core_js) js_output = if request_is_xhr? "#{js_start_iruby} #{core_js} #{js_end_iruby}" # Turbolinks.version < 5 elsif defined?(Turbolinks) && request_is_referrer? - <<-EOJS - #{js_start_iruby} - var f = function(){ - document.removeEventListener('page:load', f, true); - #{core_js} - }; - document.addEventListener('page:load', f, true); - #{js_end_iruby} - EOJS + to_s(page_load) elsif defined?(Turbolinks) && request_turbolinks_5_tureferrer? - <<-EOJS - #{js_start_iruby} - document.addEventListener("turbolinks:load", function() { - #{core_js} - }); - #{js_end_iruby} - EOJS + to_s(turbolinks_load) else - <<-EOJS - #{js_start_iruby} - #{core_js} - #{js_end_iruby} - EOJS + to_s(call_core_js) end defined?(raw) ? raw(js_output) : js_output end - # rubocop:enable Metrics/PerceivedComplexity, Metrics/MethodLength + # rubocop:enable Metrics/PerceivedComplexity + + def page_load + <<-EOJS + #{js_start_iruby} + var f = function(){ + document.removeEventListener('page:load', f, true); + #{core_js} + }; + document.addEventListener('page:load', f, true); + #{js_end_iruby} + EOJS + end + + def turbolinks_load + <<-EOJS + #{js_start_iruby} + document.addEventListener("turbolinks:load", function() { + #{core_js} + }); + #{js_end_iruby} + EOJS + end + + def call_core_js + <<-EOJS + #{js_start_iruby} + #{core_js} + #{js_end_iruby} + EOJS + end def js_start_iruby <<-EOJS From e19d20f1a0d3d4a09b5670c2775caae74687797e Mon Sep 17 00:00:00 2001 From: Prakriti Gupta Date: Sat, 17 Feb 2018 11:32:25 +0530 Subject: [PATCH 2/2] Change methods' name --- lib/daru/view/adapters/highcharts/layout_helper_iruby.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb b/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb index 8e6dfa9..52d368c 100644 --- a/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb +++ b/lib/daru/view/adapters/highcharts/layout_helper_iruby.rb @@ -29,9 +29,9 @@ def encapsulate_js_iruby(core_js) "#{js_start_iruby} #{core_js} #{js_end_iruby}" # Turbolinks.version < 5 elsif defined?(Turbolinks) && request_is_referrer? - to_s(page_load) + to_s(eventlistener_page_load) elsif defined?(Turbolinks) && request_turbolinks_5_tureferrer? - to_s(turbolinks_load) + to_s(eventlistener_turbolinks_load) else to_s(call_core_js) end @@ -40,7 +40,7 @@ def encapsulate_js_iruby(core_js) end # rubocop:enable Metrics/PerceivedComplexity - def page_load + def eventlistener_page_load <<-EOJS #{js_start_iruby} var f = function(){ @@ -52,7 +52,7 @@ def page_load EOJS end - def turbolinks_load + def eventlistener_turbolinks_load <<-EOJS #{js_start_iruby} document.addEventListener("turbolinks:load", function() {