rails_javascript_helpers 1.0 → 1.1

data/lib/rails_javascript_helpers/rails_javascript_helpers.rb

@@ -1,8 +1,10 @@
 module RailsJavaScriptHelpers
+
+  JS_ESCAPE_MAP = {"\""=>"\\\"", "\r"=>"\\n", "\\"=>"\\\\", "'"=>"\\'", "\r\n"=>"\\n", "</"=>"<\\/", "\n"=>"\\n"}
+
   # arg:: Object
   # Does a simple transition on types from Ruby to Javascript.
   def format_type_to_js(arg)
-  puts '&' * 400
     case arg
       when Array
         "[#{arg.map{|value| format_type_to_js(value)}.join(',')}]"
@@ -20,7 +22,7 @@ module RailsJavaScriptHelpers
       when NilClass
         'null'
       else
-        arg.to_s =~ %r{^\s*function\s*\(} ? "'#{escape_javascript(arg.to_s)}'" : "'#{escape_javascript(arg.to_s)}'"
+        arg.to_s =~ %r{^\s*function\s*\(} ? arg.to_s : "'#{custom_escape_javascript(arg.to_s)}'"
     end
   end
 
@@ -32,4 +34,15 @@ module RailsJavaScriptHelpers
   def format_id(id)
     id.to_s[0,1] =~ /[A-Za-z0-9]/ ? "##{id}" : id
   end
+
+  private
+
+  # Pulled from rails to keep consistency
+  def custom_escape_javascript(javascript)
+    if javascript
+      javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|part| JS_ESCAPE_MAP[part]}
+    else
+      ''
+    end
+  end
 end

data/lib/rails_javascript_helpers/version.rb

@@ -1,3 +1,3 @@
 module RailsJavaScriptHelpers
-  VERSION = '1.0'
+  VERSION = '1.1'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails_javascript_helpers
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Chris Roberts