js_rails_routes 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca0f6f4f31f67057a1ae5f4d839b98564d323dfa
-  data.tar.gz: 9966df2ec91cc5f7ec03dd6ca082a01a3c73f4d4
+  metadata.gz: aba31712b8f2349a61d9905e490c794f12aaf364
+  data.tar.gz: dd77a182d347b01babd5ff79711416e611b11d4e
 SHA512:
-  metadata.gz: 08885b9714f50b48795aab6d79f5ce0e8e32de2ce1c245865a158c14011be5b38024a4d99f7024574b0c431f11907aee16fb5cfc73c34499cc9c845a939ed322
-  data.tar.gz: 2143f80a2c1090ce16b4493ccb196a62d0c889930ff1ec5e6fe2ad6fb149b2491e7d4a716f3843f3b5e93285d2cf779a48843f56dc75fbbaeb7441722c48bc6b
+  metadata.gz: 29ce55b6233855a315b6ff410c26367fc633efc5d0fcb37222d6931537f1949a0713326176d10fa43e54b22852538cea1d57538ceea9c225ebe46fa3876c528a
+  data.tar.gz: 0ae2281dcca1288f0af67bdd80169bf46e6b4adfe33d6b35bfd2f786455ca82fafda0ae402ed44639c78c9a8bf690d4f7b618ae99ae6e36cac1c08723be7b03b

data/.rubocop.yml

@@ -11,6 +11,9 @@ Metrics/BlockLength:
 Style/Documentation:
   Enabled: false
 
+Style/IndentHeredoc:
+  Enabled: false
+
 Style/SymbolArray:
   Enabled: false
 

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This change log adheres to [keepachangelog.com](http://keepachangelog.com).
 
+## [0.5.0] - 2017-04-08
+### Added
+- Support additional parameters
+
 ## [0.4.0] - 2017-04-05
 ### Added
 - Add `include_names` and `exclude_names` option
@@ -31,6 +35,7 @@ This change log adheres to [keepachangelog.com](http://keepachangelog.com).
 ### Added
 - Implement "js:rails:routes" task
 
+[0.5.0]: https://github.com/yuku-t/js_rails_routes/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/yuku-t/js_rails_routes/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/yuku-t/js_rails_routes/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/yuku-t/js_rails_routes/compare/v0.2.0...v0.2.1

data/README.md

@@ -37,10 +37,20 @@ then `rake js:routes` generates "app/assets/javascripts/rails-routes.js" as:
 
 ```js
 // Don't edit manually. `rake js:routes` generates this file.
-export function article_path(params) { return '/articles/' + params.id + ''; }
-export function articles_path(params) { return '/articles'; }
-export function edit_article_path(params) { return '/articles/' + params.id + '/edit'; }
-export function new_article_path(params) { return '/articles/new'; }
+function process(route, params, keys) {
+  var query = [];
+  for (var param in params) if (params.hasOwnProperty(param)) {
+    if (keys.indexOf(param) === -1) {
+      query.push(param + "=" + encodeURIComponent(params[param]));
+    }
+  }
+  return query.length ? route + "?" + query.join("&") : route;
+}
+
+export function article_path(params) { return process('/articles/' + params.id + '', params, ['id']); }
+export function articles_path(params) { return process('/articles', params, []); }
+export function edit_article_path(params) { return process('/articles/' + params.id + '/edit', params, ['id']); }
+export function new_article_path(params) { return process('/articles/new', params, []); }
 ```
 
 ## VS.

data/lib/js_rails_routes/generator.rb

@@ -4,6 +4,18 @@ module JSRailsRoutes
   class Generator
     COMPARE_REGEXP = %r{:(.*?)(/|$)}
 
+    PROCESS_FUNC = <<-JAVASCRIPT.freeze
+function process(route, params, keys) {
+  var query = [];
+  for (var param in params) if (params.hasOwnProperty(param)) {
+    if (keys.indexOf(param) === -1) {
+      query.push(param + "=" + encodeURIComponent(params[param]));
+    }
+  }
+  return query.length ? route + "?" + query.join("&") : route;
+}
+    JAVASCRIPT
+
     include Singleton
 
     attr_accessor :include_paths, :exclude_paths, :include_names, :exclude_names, :path
@@ -18,7 +30,7 @@ module JSRailsRoutes
     end
 
     def generate(task)
-      lines = ["// Don't edit manually. `rake #{task}` generates this file."]
+      lines = ["// Don't edit manually. `rake #{task}` generates this file.", PROCESS_FUNC]
       lines += routes.map do |route_name, route_path|
         handle_route(route_name, route_path) if match?(route_name, route_path)
       end.compact
@@ -37,8 +49,12 @@ module JSRailsRoutes
     end
 
     def handle_route(route_name, route_path)
-      route_path.sub!(COMPARE_REGEXP, "' + params.#{$1} + '#{$2}") while route_path =~ COMPARE_REGEXP
-      "export function #{route_name}_path(params) { return '#{route_path}'; }"
+      keys = []
+      while route_path =~ COMPARE_REGEXP
+        keys.push("'#{$1}'")
+        route_path.sub!(COMPARE_REGEXP, "' + params.#{$1} + '#{$2}")
+      end
+      "export function #{route_name}_path(params) { return process('#{route_path}', params, [#{keys.join(',')}]); }"
     end
 
     def routes

data/lib/js_rails_routes/version.rb

@@ -1,3 +1,3 @@
 module JSRailsRoutes
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/spec/js_rails_routes/generator_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe JSRailsRoutes::Generator do
 
       it 'writes paths matching with the parameter' do
         expect(generator).to receive(:write).with(a_kind_of(String)) do |arg|
-          paths = arg.split("\n")[1..-1]
+          paths = arg.split("\n")[(2 + described_class::PROCESS_FUNC.split("\n").size)..-1]
           expect(paths).not_to be_empty
           expect(paths).to all(match(include_paths))
         end
@@ -49,7 +49,7 @@ RSpec.describe JSRailsRoutes::Generator do
 
       it 'writes paths not matching with the parameter' do
         expect(generator).to receive(:write).with(a_kind_of(String)) do |arg|
-          paths = arg.split("\n")[1..-1]
+          paths = arg.split("\n")[(2 + described_class::PROCESS_FUNC.split("\n").size)..-1]
           expect(paths).not_to be_empty
           paths.each do |path|
             expect(path).to_not match(exclude_paths)
@@ -70,7 +70,7 @@ RSpec.describe JSRailsRoutes::Generator do
 
       it 'writes paths matching with the parameter' do
         expect(generator).to receive(:write).with(a_kind_of(String)) do |arg|
-          paths = arg.split("\n")[1..-1]
+          paths = arg.split("\n")[(2 + described_class::PROCESS_FUNC.split("\n").size)..-1]
           expect(paths).not_to be_empty
           expect(paths).to all(match(include_names))
         end
@@ -89,7 +89,7 @@ RSpec.describe JSRailsRoutes::Generator do
 
       it 'writes paths not matching with the parameter' do
         expect(generator).to receive(:write).with(a_kind_of(String)) do |arg|
-          paths = arg.split("\n")[1..-1]
+          paths = arg.split("\n")[(2 + described_class::PROCESS_FUNC.split("\n").size)..-1]
           expect(paths).not_to be_empty
           paths.each do |path|
             expect(path).to_not match(exclude_names)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js_rails_routes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails