asset_pipeline_routes 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0aeb2674f4d71a276bdcddb8d548fd28170850
-  data.tar.gz: 1ab2d6146ded1c488fb782630eabc8c50430c360
+  metadata.gz: ae12a66e8ec65bbe232bbb057054e21b7ee9c219
+  data.tar.gz: cf3c727032a3fc1c052e9f65088153f144c961e0
 SHA512:
-  metadata.gz: 27200138ee83a6b432f4a8b32ac451227a9eac0ed609966f8d7f237e3a23f9e3f18af7449003e34483631071a08c75c9f6b40f5c3caf1d605bc08244319b8a15
-  data.tar.gz: 9eed93d8a24d642b349935912f194581d2c5daffa2a98a2dff19c2cf28fbe4dbc1776a76fb1c8091d48e4939a754ee4e1f1abf949629e0143784f7ae64bd2d75
+  metadata.gz: 87e847796f67c2e133f04713176e573cb9cb1689098cba6afc7a6343e8da007a49b601fd9dcf218f5fc9ccaeb8ce0a7be47f5c1255c00cd5c884ced07382cb91
+  data.tar.gz: 539976ab1266359444692807c92197201980497baf233b88da4863cd47eb6c4031d157fdad042a4a69894c7d73669cf799dfd24765b6a703e53f5f4ddcc6b249

data/README.md

@@ -1,6 +1,7 @@
 # asset\_pipeline\_routes
 
 [![Build Status](https://travis-ci.org/nicolai86/asset_pipeline_routes.png?branch=master)](https://travis-ci.org/nicolai86/asset_pipeline_routes)
+[![Gem Version](https://badge.fury.io/rb/asset_pipeline_routes.png)](http://badge.fury.io/rb/asset_pipeline_routes)
 
 `asset_pipeline_routes` defines a `r` shorthand function which you can use inside your javascript assets.
 

data/lib/asset_pipeline_routes/path_processor.rb

@@ -11,19 +11,27 @@ module AssetPipelineRoutes
     end
 
     def evaluate context, locals
-      data.gsub /[^[[:word:]]]r\(([[:word:]]+),?(.*)\)/ do |match|
-        parts = $2.split(',').map(&:strip).reject(&:blank?)
-        route = $1.to_sym
-
-        wrap = (match[0] == '(')
+      re = %r{
+        (?<=[^[[:word:]]])r(?<re>
+          \(
+            (?:
+              (?> [^()]+ )
+              |
+              \g<re>
+            )*
+          \)
+        )
+      }x
+      data.gsub re do |match|
+        str = match[2..-2]
+        parts = str.split(',').map(&:strip).reject(&:blank?)
+        route = parts.shift.to_sym
 
         expanded = if r.respond_to? route
           r.send route, *parts
         else
           "''"
         end
-
-        wrap ? "(#{expanded})" : expanded
       end
     end
   end

data/lib/asset_pipeline_routes/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module AssetPipelineRoutes
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fixtures/coffee_with_function_invocation.coffee

@@ -0,0 +1 @@
+console.log(r(project_ticket_path))

data/spec/fixtures/coffee_with_function_invocation_arguments.coffee

@@ -0,0 +1,2 @@
+x = 2
+console.log(r(project_ticket_path, 2, x))

data/spec/path_processor_spec.rb

@@ -26,15 +26,15 @@ describe AssetPipelineRoutes::PathProcessor do
   end
 
   it "replaces calls to r() with route" do
-    @env['simple_route.js'].to_s.should == "var Bar ='/users';\n"
+    @env['simple_route.js'].to_s.should == "var Bar = '/users';\n"
   end
 
   it "replaces calls with unknown route to ''" do
-    @env['unknown_route.js'].to_s.should == "var Bar ='';\n"
+    @env['unknown_route.js'].to_s.should == "var Bar = '';\n"
   end
 
   it "works with variables" do
-    @env['simple_route_with_variable.js'].to_s.should == "var x = 2;\nvar Bar ='/users/'+x+'';\n"
+    @env['simple_route_with_variable.js'].to_s.should == "var x = 2;\nvar Bar = '/users/'+x+'';\n"
   end
 
   it "works with coffeescript" do
@@ -42,11 +42,11 @@ describe AssetPipelineRoutes::PathProcessor do
   end
 
   it "works with unqualified routes" do
-    @env['unqualified_routes.js'].to_s.should == "var url ='/users/{{id}}';\n"
+    @env['unqualified_routes.js'].to_s.should == "var url = '/users/{{id}}';\n"
   end
 
   it "works with partially qualified nested routes" do
-    @env['nested_routes.js'].to_s.should == "var project_path ='/projects/'+2+'/tickets/{{id}}';\n"
+    @env['nested_routes.js'].to_s.should == "var project_path = '/projects/'+2+'/tickets/{{id}}';\n"
   end
 
   it "does not replace false positives" do
@@ -58,6 +58,14 @@ describe AssetPipelineRoutes::PathProcessor do
   end
 
   it "works with function argument" do
-    @env["argument_function.js"].to_s.should == "var url ='/users/'+fetchUserId()+'';\n"
+    @env["argument_function.js"].to_s.should == "var url = '/users/'+fetchUserId()+'';\n"
+  end
+
+  it "works with coffeescript method invocation" do
+    @env['coffee_with_function_invocation.js'].to_s.should == "(function() {\n  console.log('/projects/{{project_id}}/tickets/{{id}}');\n\n}).call(this);\n"
+  end
+
+  it "works with coffeescript method invocation" do
+    @env['coffee_with_function_invocation_arguments.js'].to_s.should == "(function() {\n  var x;\n\n  x = 2;\n\n  console.log('/projects/' + 2 + '/tickets/' + x + '');\n\n}).call(this);\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_pipeline_routes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Raphael Randschau
@@ -137,6 +137,8 @@ files:
 - lib/asset_pipeline_routes.rb
 - spec/asset_pipeline_routes_spec.rb
 - spec/fixtures/argument_function.js
+- spec/fixtures/coffee_with_function_invocation.coffee
+- spec/fixtures/coffee_with_function_invocation_arguments.coffee
 - spec/fixtures/false_positive.js
 - spec/fixtures/function_argument.js
 - spec/fixtures/nested_routes.js
@@ -150,8 +152,9 @@ files:
 - spec/spec_helper.rb
 - README.md
 - Rakefile
-homepage: ''
-licenses: []
+homepage: http://blog.nicolai86.eu
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []