rails_javascript_helpers 1.1 → 1.2

data/lib/rails_javascript_helpers/rails_javascript_helpers.rb

@@ -1,16 +1,17 @@
-module RailsJavaScriptHelpers
+require 'action_view/helpers/javascript_helper'
 
-  JS_ESCAPE_MAP = {"\""=>"\\\"", "\r"=>"\\n", "\\"=>"\\\\", "'"=>"\\'", "\r\n"=>"\\n", "</"=>"<\\/", "\n"=>"\\n"}
+module RailsJavaScriptHelpers
 
   # arg:: Object
   # Does a simple transition on types from Ruby to Javascript.
   def format_type_to_js(arg)
+    @klass ||= Class.new.extend(ActionView::Helpers::JavaScriptHelper)
     case arg
       when Array
         "[#{arg.map{|value| format_type_to_js(value)}.join(',')}]"
       when Hash
         "{#{arg.map{ |key, value|
-          k = key.is_a?(Symbol) ? key.to_s.camelize.sub(/^./, key.to_s[0,1].downcase) : key.to_s
+          k = key.is_a?(Symbol) ? key.to_s.camelize.sub(/^./, key.to_s[0,1].downcase) : format_type_to_js(key)
           "#{k}:#{format_type_to_js(value)}"
         }.join(',')}}"
       when Fixnum
@@ -22,7 +23,7 @@ module RailsJavaScriptHelpers
       when NilClass
         'null'
       else
-        arg.to_s =~ %r{^\s*function\s*\(} ? arg.to_s : "'#{custom_escape_javascript(arg.to_s)}'"
+        arg.to_s =~ %r{^\s*function\s*\(} ? arg.to_s : "'#{escape_javascript(arg.to_s)}'"
     end
   end
 
@@ -35,14 +36,4 @@ module RailsJavaScriptHelpers
     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.1'
+  VERSION = '1.2'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails_javascript_helpers
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 1
-  version: "1.1"
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Chris Roberts
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 -07:00
+date: 2011-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency