de_rjs 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44960ac0f469ff1711cd967aac5329ddf0e5396
-  data.tar.gz: fea015c10bdea4828b694beba00315d0581d3e55
+  metadata.gz: da7377a69fb9bcc6c69b25e0972f8fdfa51af1d9
+  data.tar.gz: 6ea98789b3bb597dbdf98c457975f2002f77cdac
 SHA512:
-  metadata.gz: d96893c52e23fb62646b5067275f1834f0ef20202dd8f99ee0edffdcfba13fe16d85df388966f58a16dbf31f4c6420543e1d5b1462c2ee75dbca9ff1d8e5c5de
-  data.tar.gz: 91d27c2831e7cd3ca8efcfbb69c266b519b9d55a1fe2d55ea0e5d72ddf5f29d3b61d768c1b5ff5af27bae7b71f18611cb71030816391539ecda5bd9373ec2118
+  metadata.gz: 15564eabf6d2a638cfadab4da2671d9f6a5d915c02d0aee68f6dcf0959c0d782829b7cf1516631228bcf41dc8c42cfcb032d77d810bf114ec035832bd3e51fe0
+  data.tar.gz: 64264098fb4c161a45aaea42faa042ec8681f8085b039eaf4862d31c7f96f6afacacb960cf10e6dc460d349b6009930e0d11f99e2da5ffd87c4883d35498d4e2

data/lib/de_rjs/jquery_generator.rb

@@ -134,7 +134,7 @@ module DeRjs
         when String, Symbol, NilClass
           JavaScriptElementProxy.new(self, id)
         else
-          JavaScriptElementProxy.new(self, ActionController::RecordIdentifier.dom_id(id))
+          JavaScriptElementProxy.new(self, ActionView::RecordIdentifier.dom_id(id))
         end
       end
 

data/lib/de_rjs/rewriter/erbify.rb

@@ -64,16 +64,8 @@ module DeRjs
       end
 
       # e.g. page["sgfg"] or page["wat_#{@id}"]
-      #
-      # But this will raise when it encounters e.g. page[@var] or page[Bunny.new]
-      # While this is NOT accurate, throwing an error seems better than trying to evaluating
-      # a turing complete statement, and causing subtle failures downstream
       def rewrite_square_bracket(receiver_node, method_name, *arg_nodes)
-        unless [:str, :sym, :dstr].include?(arg_nodes.first.type)
-          raise MustTranslateManually, "Unable to compute type of expression statically:#{arg_nodes.first.inspect}\n -" \
-            "`def id[]` supports String, Symbol, NilClass or something that `dom_id` can understand"
-        end
-        rewrite_to_erb_unless_static(arg_nodes.shift)
+        rewrite_dom_id(arg_nodes.shift)
       end
 
       # *options_for_render
@@ -88,6 +80,22 @@ module DeRjs
         insert_after  id_arg.loc.expression, " %>}"
       end
 
+      def rewrite_dom_id(id_arg)
+        return if [:str, :sym].include?(id_arg.type)
+        if id_arg.type == :dstr || is_dom_id_call?(id_arg)
+          insert_before id_arg.loc.expression, "%q{<%= "
+          insert_after  id_arg.loc.expression, " %>}"
+        else
+          insert_before id_arg.loc.expression, "%q{<%= dom_id("
+          insert_after  id_arg.loc.expression, ") %>}"
+        end
+      end
+
+      def is_dom_id_call?(arg_node)
+        array = arg_node.to_a
+        array[0..1] == [nil, :dom_id] #&& array.size == 3
+      end
+
       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("

data/test/de_rjs_test.rb

@@ -151,23 +151,26 @@ jQuery("#baz").html("\\u003cp\\u003eThis is a test\\u003c/p\\u003e");
   end
 
   def test_element_access_on_variable
-    assert_raises DeRjs::Rewriter::Erbify::MustTranslateManually do
-      assert_equal %(jQuery("#<%= 'hello' + @var %>");), generate_js(%Q{ page['hello' + @var] })
-    end
-    assert_raises DeRjs::Rewriter::Erbify::MustTranslateManually do
-      assert_equal %(jQuery("#<%= 'hello' + @var %>").hide();), generate_js(%Q{ page['hello' + @var].hide })
-    end
+    assert_equal %(jQuery("#<%= dom_id(@var) %>");), generate_js(%Q{ page[@var] })
+    assert_equal %(jQuery("#<%= dom_id(@var) %>").hide();), generate_js(%Q{ page[@var].hide })
+  end
+
+  def test_element_access_on_interpolated_string
+    assert_equal %q(jQuery("#<%= "hello#{@var}" %>");), generate_js(%q{ page["hello#{@var}"] })
+    assert_equal %q(jQuery("#<%= "hello#{@var}" %>").hide();), generate_js(%q{page["hello#{@var}"].hide })
   end
 
   def test_element_access_on_records
-    assert_raises DeRjs::Rewriter::Erbify::MustTranslateManually do
-      assert_equal %(jQuery("#<%= Bunny.new(:id => 5) %>");), generate_js(%Q{ page[Bunny.new(:id => 5)] })
-    end
-    assert_raises DeRjs::Rewriter::Erbify::MustTranslateManually do
-      assert_equal %(jQuery("#<%= Bunny.new %>");), generate_js(%Q{ page[Bunny.new] })
-    end
+    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] })
   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] })
+  end
 
   def test_element_proxy_one_deep
     assert_equal %(jQuery("#hello").hide();), generate_js(%Q{ page['hello'].hide })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: de_rjs
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Thong Kuah
@@ -83,7 +83,8 @@ files:
 - test/abstract_unit.rb
 - test/de_rjs_test.rb
 homepage: http://github.com/kuahyeow/de_rjs
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []