webpacker-routes 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347e51b5067401b0315a50953592a477b54ab588ba6405c5b9a281f19bb5abbb
-  data.tar.gz: f9aaa63022d82a3758bb3416ffc8888c2d14ee6f1fffd1e30ffcf0fec1bc1719
+  metadata.gz: 5194266884b788ff6ffd76ecf6408d7196fc8e4769381c6a63ef19ad49a30571
+  data.tar.gz: 3fc7761af1ec667dd6f9cb742dd5131439bd42e36e801bc1f21f4d1bfd44e7b8
 SHA512:
-  metadata.gz: 853dbe59e91370cc7d699d34d00de2803eb32f9130c72d65e77f772d37b3bd7d1712442c3653fa114b3241bd06cc272de188a50470d2cf7addc3ea5dbef58c6c
-  data.tar.gz: ec9ce0004b11fd5af8f0e1cc5fa9b57fb40cef8bee4a489b1a3b4416019836f13c148a9ee6db2003f1570240d6b2be4ee1e8e13df443dd195dc8c86d8ce33b7f
+  metadata.gz: df569079481a998bec69b845602ee4f9ec35d6589fab7a91248608c9bcfeaa53a37ad2f25b35061b4be65ee427a6d188f98c5691526fa26deeca9d285c31d0d5
+  data.tar.gz: acd55b6c961fa9372b311d96ff6ea9494213f8dbd83d1963f73b8b0b5b16d2f5a1134467ef4f5d3d4459de648e750219f76a7be4faa3950c41ccd916fb53c9bf

data/README.md

@@ -36,7 +36,6 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Todo
 
-- default_url_options (especially host for urls)
 - support all valid route names
 - relative_url_root
 - camelcase

data/lib/webpacker/routes.rb

@@ -10,27 +10,39 @@ module Webpacker
 
   module Routes
     JAVASCRIPT_VARIABLE_NAME_REGEX = /\A[_$a-z][_$a-z0-9]*\z/i
+    IGNORED_OPTIONS = %i[controller action]
 
-    def self.generate(route_set)
-      File.atomic_write(Webpacker.config.routes_path.join('index.js')) do |file|
-        file.write(<<-JAVASCRIPT.strip_heredoc)
-          import { urlFor, pathFor } from 'webpacker-routes'
-        JAVASCRIPT
-
-        route_set.named_routes.sort_by(&:first).each do |name, route|
-          raise `Invalid route name for javascript: ${name}` unless JAVASCRIPT_VARIABLE_NAME_REGEX =~ name
-
-          spec = route.path.spec.to_s.to_json
-          segment_keys = route.segment_keys.uniq.to_json
-          defaults = route.defaults.except(:controller, :action).to_json
+    class << self
+      def generate(route_set)
+        File.atomic_write(Webpacker.config.routes_path.join('index.js')) do |file|
+          default_url_options = js(route_set.default_url_options.except(*IGNORED_OPTIONS))
 
           file.write(<<-JAVASCRIPT.strip_heredoc)
-            const #{name}_spec = [#{spec}, #{segment_keys}, #{defaults}]
-            export const #{name}_url = (...args) => urlFor(#{name}_spec, ...args)
-            export const #{name}_path = (...args) => pathFor(#{name}_spec, ...args)
+            import { urlFor, pathFor } from 'webpacker-routes'
+            const default_url_options = #{default_url_options}
           JAVASCRIPT
+
+          route_set.named_routes.sort_by(&:first).each do |name, route|
+            raise `Invalid route name for javascript: ${name}` unless JAVASCRIPT_VARIABLE_NAME_REGEX =~ name
+
+            spec = js(route.path.spec.to_s)
+            segment_keys = js(route.segment_keys.uniq)
+            options = js(route.defaults.except(*IGNORED_OPTIONS))
+
+            file.write(<<-JAVASCRIPT.strip_heredoc)
+              const #{name}_spec = [#{spec}, #{segment_keys}, { ...default_url_options, ...#{options} }]
+              export const #{name}_url = (...args) => urlFor(#{name}_spec, ...args)
+              export const #{name}_path = (...args) => pathFor(#{name}_spec, ...args)
+            JAVASCRIPT
+          end
         end
       end
+
+    private
+
+      def js(obj)
+        ERB::Util.json_escape(obj.to_json)
+      end
     end
   end
 end

data/lib/webpacker/routes/version.rb

@@ -1,5 +1,5 @@
 module Webpacker
   module Routes
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpacker-routes
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails