de_rjs 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45fff0b7ea1479cbc72d621956f580b4a2eebae4
-  data.tar.gz: 385153d5782044994e2b5a13d0a408ba79b56205
+  metadata.gz: c2e9a07c8725690641007139a17dd1b6d817e658
+  data.tar.gz: a61b27b0601518e2891d0ba8e01829518b4dc0a2
 SHA512:
-  metadata.gz: 55edfb6f9ca26275582323852e7c009ae5d947455e38647e589b34e0256ed9c08de1773caff5a5004206399411d68956c007cc7e1376516812210647db48ec34
-  data.tar.gz: 3de4af5f9488338fbc93371a9f4929cc7da7ae78e13b5df8a1d1bf07f80a68d4f78b7b8560f565c940d1d2951c68488efd435d2dd3fd120f53758dd9bf2ee0c5
+  metadata.gz: 7d60e5bdba480b0395c4d861cbebf11c5ce6c23573d43e0ab900b356ba1d7fec37bec1bd9a4d6b52d87ac990e05ab644e3061ff893bd875ce7cb62f227c05710
+  data.tar.gz: d465e14b55b9a35a65def6cfa6086d258e8d3bdc4ac2a09c7fb646a13cb01ef3e8ced2fca40333a6bffe0da386d929a0a33030eb5293e5cf50aef58e5328041b

data/README.md

@@ -0,0 +1,32 @@
+Use this to de-RJS your application.
+
+Converts your .rjs code into js.erb compliant code
+
+# CAVEATS
+
+## dom_id_or_string
+
+`page[@record]`, where `@record` is a ActiveRecord object
+would translate to `$("<%= dom_id(@record)")` perfectly fine.
+
+However, if `@var` computes to a string, such as `@var = "fixed_id"`,
+then `dom_id(@var)` will result in an error. Hence for safety, I have decided to
+transcode `page[@var]` to :
+
+```
+$("<%= dom_id_or_string(@var) $>")
+```
+
+You can either choose to visually inspet the diff and manuall replace each occurence
+back to dom_id, or you can define the following method:
+
+```
+def dom_id_or_string(thing)
+  case thing
+  when String, Symbol, NilClass
+    thing
+  else
+    dom_id(thing)
+  end
+end
+```

data/lib/de_rjs/rewriter/erbify.rb

@@ -4,6 +4,10 @@ module DeRjs
       class MustTranslateManually < StandardError; end
 
       def on_send(node)
+        rewrite_page_calls(node)
+      end
+
+      def rewrite_page_calls(node)
         receiver_node, method_name, *arg_nodes = *node
 
         if receiver_node.to_a.last == :page
@@ -17,6 +21,9 @@ module DeRjs
           when :redirect_to
             rewrite_redirect_to(receiver_node, method_name, *arg_nodes)
 
+          when :visual_effect
+            rewrite_visual_effect(receiver_node, method_name, *arg_nodes)
+
           when :[]
             rewrite_square_bracket(receiver_node, method_name, *arg_nodes)
 
@@ -29,7 +36,6 @@ module DeRjs
             # page.replace
             # page.select
             # page.show
-            # page.visual_effect
             rewrite_all_args(receiver_node, method_name, *arg_nodes)
           end
         end
@@ -41,6 +47,12 @@ module DeRjs
         end
       end
 
+      protected
+      # name, id=nil, options
+      def rewrite_visual_effect(receiver_node, method_name, *arg_nodes)
+        rewrite_to_erb_unless_static(arg_nodes[1]) if arg_nodes[1]
+      end
+
       def rewrite_all_args(receiver_node, method_name, *arg_nodes)
         arg_nodes.each {|arg_node| rewrite_to_erb_unless_static(arg_node) }
       end
@@ -73,7 +85,6 @@ module DeRjs
         rewrite_options_for_render(arg_nodes)
       end
 
-      protected
       def rewrite_to_erb_unless_static(id_arg)
         return if [:str, :sym].include?(id_arg.type)
         insert_before id_arg.loc.expression, "%q{<%= "
@@ -86,7 +97,7 @@ module DeRjs
           insert_before id_arg.loc.expression, "%q{<%= "
           insert_after  id_arg.loc.expression, " %>}"
         else
-          insert_before id_arg.loc.expression, "%q{<%= dom_id("
+          insert_before id_arg.loc.expression, "%q{<%= dom_id_or_string("
           insert_after  id_arg.loc.expression, ") %>}"
         end
       end

data/test/de_rjs_test.rb

@@ -84,6 +84,10 @@ END
       generate_js(%q{ page.replace('element', :partial => "post", :locals => {:ab => "cd"}) })
   end
 
+  def test_square_element_replace_with_hash
+    assert_equal 'jQuery("#element").replaceWith("<%= escape_javascript(render(:partial => "post", :locals => {:ab => "cd"})) %>");',
+      generate_js(%q{ page['element'].replace(:partial => "post", :locals => {:ab => "cd"}) })
+  end
 
   def test_remove
     assert_equal 'jQuery("#foo").remove();',
@@ -134,8 +138,8 @@ END
   end
 
   def test_element_access_on_variable
-    assert_equal %(jQuery("#<%= dom_id(@var) %>");), generate_js(%q{ page[@var] })
-    assert_equal %(jQuery("#<%= dom_id(@var) %>").hide();), generate_js(%q{ page[@var].hide })
+    assert_equal %(jQuery("#<%= dom_id_or_string(@var) %>");), generate_js(%q{ page[@var] })
+    assert_equal %(jQuery("#<%= dom_id_or_string(@var) %>").hide();), generate_js(%q{ page[@var].hide })
   end
 
   def test_element_access_on_interpolated_string
@@ -144,15 +148,15 @@ END
   end
 
   def test_element_access_on_records
-    assert_equal %(jQuery("#<%= dom_id(Bunny.new(:id => 5)) %>");), generate_js(%q{ page[Bunny.new(:id => 5)] })
-    assert_equal %(jQuery("#<%= dom_id(Bunny.new) %>");), generate_js(%q{ page[Bunny.new] })
+    assert_equal %(jQuery("#<%= dom_id_or_string(Bunny.new(:id => 5)) %>");), generate_js(%q{ page[Bunny.new(:id => 5)] })
+    assert_equal %(jQuery("#<%= dom_id_or_string(Bunny.new) %>");), generate_js(%q{ page[Bunny.new] })
   end
 
   def test_element_access_on_dom_id
     assert_equal %(jQuery("#<%= dom_id(Bunny.new(:id => 5)) %>");), generate_js(%q{ page[dom_id(Bunny.new(:id => 5))] })
     assert_equal %(jQuery("#<%= dom_id(Bunny.new) %>");), generate_js(%q{ page[dom_id(Bunny.new)] })
 
-    assert_equal %(jQuery("#<%= dom_id(dom_id(Bunny.new) + evil) %>");), generate_js(%q{ page[dom_id(Bunny.new) + evil] })
+    assert_equal %(jQuery("#<%= dom_id_or_string(dom_id(Bunny.new) + evil) %>");), generate_js(%q{ page[dom_id(Bunny.new) + evil] })
   end
 
   def test_element_proxy_one_deep
@@ -202,6 +206,14 @@ END
       generate_js(%q{ page.visual_effect(:toggle_appear,"blah" + blah.id) })
   end
 
+  def test_visial_effect_with_options
+    assert_equal %(jQuery(\"#blah\").effect(\"highlight\",{endcolor:'#eeeeee', startcolor:'#ffffaa'});),
+      generate_js(%q{ page['blah'].visual_effect(:highlight, :startcolor => "#ffffaa", :endcolor => "#eeeeee") })
+
+    assert_equal %(jQuery(\"#blah\").effect(\"highlight\",{endcolor:'#eeeeee', startcolor:'#ffffaa'});),
+      generate_js(%q{ page.visual_effect(:highlight, 'blah', :startcolor => "#ffffaa", :endcolor => "#eeeeee") })
+  end
+
   def test_collection_first_and_last
     js = generate_js(%q{
     page.select('p.welcome b').first.hide()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: de_rjs
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Thong Kuah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,7 +72,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- README
+- README.md
 - Rakefile
 - bin/de_rjs
 - lib/de_rjs.rb

data/README

@@ -1,3 +0,0 @@
-Use this to de-RJS your application.
-
-Converts your .rjs code into js.erb compliant code