de_rjs 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cb5070d80456eed3d309af1d97f7cc475017dfa
-  data.tar.gz: bff3f65ca263d976f3683c7ee7c211cb801cca5a
+  metadata.gz: 574697ee1e28df30923b0c2ccac6181b257f2485
+  data.tar.gz: e7f6b8cfba7c0bac2150ce265b95b3a4be4c3f43
 SHA512:
-  metadata.gz: 9e945e642672557ae3dec919b6be8817c0058a9e9f5e8b3ed35e11395bfea6d72971bc564335227fd8291dce10b4df025d45893efc8df71836699bd4fbc762d9
-  data.tar.gz: cb30b874cc9324e3c8223031755364f50a4e2c41fd2b75ec4c6e08a70e8500f6ad18d37b32f8323f72d5b6db31e96ff12a8759ee05e257b604f24dc53dbee2ee
+  metadata.gz: c49c29aa19cc77d5a84481fff423ca5a44ee30e426ee55f4ab04fdf6ede76aba4241f8d4bb24cbbc6fb02ba4db15f8d757944018bca01d64af27fbd228247dd2
+  data.tar.gz: 105cd7cb54f3081fa85e22f35fcfc130abf1c0e5cc9ce39dde749f21a59cfafa3e3fe8e4c91141c9306816aeace4b4bcbd79052c04d121a4c109ad23459b7d15

data/lib/de_rjs/rewriter/erbify.rb

@@ -96,10 +96,17 @@ module DeRjs
         array[0..1] == [nil, :dom_id] #&& array.size == 3
       end
 
+      # if Hash, render
+      # else assume it's a string
       def rewrite_options_for_render(arg_nodes)
         return if arg_nodes.size == 1 && arg_nodes.first.type == :str
-        insert_before arg_nodes.first.loc.expression, "%q{<%= escape_javascript(render("
-        insert_after  arg_nodes.last.loc.expression, ")) %>}"
+        if arg_nodes.first.type == :hash
+          insert_before arg_nodes.first.loc.expression, "%q{<%= escape_javascript(render("
+          insert_after  arg_nodes.last.loc.expression, ")) %>}"
+        else
+          insert_before arg_nodes.first.loc.expression, "%q{<%= escape_javascript("
+          insert_after  arg_nodes.last.loc.expression, ") %>}"
+        end
       end
 
       def rewrite_url_for(url_arg)

data/test/de_rjs_test.rb

@@ -41,12 +41,12 @@ class DeRjsTest < DeRjsBaseTest
   end
 
   def test_replace_html_with_string
-    assert_equal 'jQuery("#element").html("\\u003cp\\u003eThis is a test\\u003c/p\\u003e");',
+    assert_equal 'jQuery("#element").html("<p>This is a test</p>");',
       generate_js(%Q{ page.replace_html('element', '<p>This is a test</p>') })
   end
 
   def test_replace_element_with_string
-    assert_equal 'jQuery("#element").replaceWith("\\u003cdiv id=\"element\"\\u003e\\u003cp\\u003eThis is a test\\u003c/p\\u003e\\u003c/div\\u003e");',
+    assert_equal 'jQuery("#element").replaceWith("<div id=\"element\"><p>This is a test</p></div>");',
       generate_js(%Q{ page.replace('element', '<div id="element"><p>This is a test</p></div>') })
   end
 
@@ -55,11 +55,21 @@ class DeRjsTest < DeRjsBaseTest
       generate_js(%Q{ page.insert_html(:top, 'element', :partial => "post", :locals => {:ab => "cd"}) })
   end
 
+  def test_insert_html_with_var
+    assert_equal 'jQuery("#element").prepend("<%= escape_javascript(@var) %>");',
+      generate_js(%Q{ page.insert_html(:top, 'element', @var) })
+  end
+
   def test_replace_html_with_hash
     assert_equal 'jQuery("#element").html("<%= escape_javascript(render(:partial => "post", :locals => {:ab => "cd"})) %>");',
       generate_js(%Q{ page.replace_html('element', :partial => "post", :locals => {:ab => "cd"}) })
   end
 
+  def test_replace_html_with_var
+    assert_equal 'jQuery("#element").html("<%= escape_javascript(@var) %>");',
+      generate_js(%Q{ page.replace_html('element', @var) })
+  end
+
   def test_replace_element_with_hash
     assert_equal 'jQuery("#element").replaceWith("<%= escape_javascript(render(:partial => "post", :locals => {:ab => "cd"})) %>");',
       generate_js(%Q{ page.replace('element', :partial => "post", :locals => {:ab => "cd"}) })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: de_rjs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Thong Kuah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: de-RJS your application