Skip to content

Business intelligence made simple

Moved blazer_json_escape to helper

Andrew Kane1687c52f1ff6
diff --git a/app/helpers/blazer/base_helper.rb b/app/helpers/blazer/base_helper.rb
index 5a16deea..70052f82 100644
--- a/app/helpers/blazer/base_helper.rb
+++ b/app/helpers/blazer/base_helper.rb
@@ -1,7 +1,5 @@
module Blazer
module BaseHelper
- include BlazerJsonEscape
-
def title(title = nil)
if title
content_for(:title) { title }
@@ -21,5 +19,19 @@ module Blazer
def blazer_maps?
ENV["MAPBOX_ACCESS_TOKEN"].present?
end
+
+ JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }
+ JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u
+
+ # Prior to version 4.1 of rails double quotes were inadventently removed in json_escape.
+ # This adds the correct json_escape functionality to rails versions < 4.1
+ def blazer_json_escape(s)
+ if Rails::VERSION::STRING < "4.1"
+ result = s.to_s.gsub(JSON_ESCAPE_REGEXP, JSON_ESCAPE)
+ s.html_safe? ? result.html_safe : result
+ else
+ json_escape(s)
+ end
+ end
end
end
diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erb
index cc899e04..bc8ba288 100644
--- a/app/views/blazer/queries/run.html.erb
+++ b/app/views/blazer/queries/run.html.erb
@@ -39,7 +39,7 @@
<script>
L.mapbox.accessToken = '<%= ENV["MAPBOX_ACCESS_TOKEN"] %>';
var map = L.mapbox.map('map', 'ankane.ioo8nki0');
- var markers = <%= json_escape(@markers.to_json).html_safe %>;
+ var markers = <%= blazer_json_escape(@markers.to_json).html_safe %>;
var featureLayer = L.mapbox.featureLayer().addTo(map);
var geojson = [];
for (var i = 0; i < markers.length; i++) {
diff --git a/lib/blazer.rb b/lib/blazer.rb
index 7aca023b..6b65200b 100644
--- a/lib/blazer.rb
+++ b/lib/blazer.rb
@@ -4,7 +4,6 @@ require "blazer/version"
require "blazer/data_source"
require "blazer/engine"
require "blazer/tasks"
-require "rails_extensions/blazer_json_escape"
module Blazer
class << self
diff --git a/lib/rails_extensions/blazer_json_escape.rb b/lib/rails_extensions/blazer_json_escape.rb
deleted file mode 100644
index 31093dd0..00000000
--- a/lib/rails_extensions/blazer_json_escape.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module BlazerJsonEscape
- JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }
- JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u
-
- # Prior to version 4.1 of rails double quotes were inadventently removed in json_escape.
- # This adds the correct json_escape functionality to rails versions < 4.1
- def blazer_json_escape(s)
- if Rails::VERSION::STRING < "4.1"
- result = s.to_s.gsub(JSON_ESCAPE_REGEXP, JSON_ESCAPE)
- s.html_safe? ? result.html_safe : result
- else
- json_escape(s)
- end
- end
-end