js-routes 1.4.12 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87926593b4aa4a92ce85269fafd11238dbba0e8354bd4f4cffd03c56a765f519
-  data.tar.gz: ad3ee96de22c9b10c89ad38e96eede4ef1fa040051e37cb75e4697a4ecd366e4
+  metadata.gz: 597119aa17518bd0b078b80c99c5f2e2a4cb4f5fa58526872b8d960acb9b6102
+  data.tar.gz: 285c6f0aca0c140822e89b65afead328bbddc6eb3a08ef85944b68e8c3068515
 SHA512:
-  metadata.gz: 2a7309d0f38ab6a923d23571869da7206e0e1aa4541fff1354e15e8fffe3fe634001ee3959dc6033e30044010e63c7e9c910145fdea0f9c0a14f63b391314954
-  data.tar.gz: ca121924d248b98c5429c1b0a4e2052dd22d48b43eb97ca78b6d18caf29f79b2bb51b78a190c7cecbb2cdd20d2c772f3c137a0ddd11fe49cdd8f525ac9b087e0
+  metadata.gz: 501157d25557db0b0511acaa3226ca0fefbb3520bbec48ca9f1005e7300eb2dc0c115e9eae42ef085c17a78c8f2c0822c8b226cb8df639f20a81d9b62de6a421
+  data.tar.gz: fecba94667f0a316142d03b8c5b4ca3a95790278a65de6c2b247805d82c16adece41d1a5f395af38913dbd811cdd2c6ad4a8b80c3cae2b30ecc5eec96a27a1c3

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## master
 
-## v1.4.12
+## v1.4.13
 
 * Improve compatibility with node environment #269.
 * Change default file location configuration to Webpacker if both Webpacker and Sprockets are loaded

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.4.12"
+  VERSION = "1.4.13"
 end

data/lib/routes.js

@@ -4,12 +4,10 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
  */
 
 (function() {
-  var DeprecatedGlobbingBehavior, NodeTypes, ParameterMissing, ReservedOptions, SpecialOptionsKey, UriEncoderSegmentRegex, Utils, result, root,
+  var DeprecatedGlobbingBehavior, NodeTypes, ParameterMissing, ReservedOptions, SpecialOptionsKey, UriEncoderSegmentRegex, Utils, result,
     hasProp = {}.hasOwnProperty,
     slice = [].slice;
 
-  root = typeof exports !== "undefined" && exports !== null ? exports : this;
-
   ParameterMissing = function(message, fileName, lineNumber) {
     var instance;
     instance = new Error(message, fileName, lineNumber);
@@ -437,8 +435,8 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
       return this._classToTypeCache;
     },
     get_object_type: function(obj) {
-      if (root.jQuery && (root.jQuery.type != null)) {
-        return root.jQuery.type(obj);
+      if (this.jQuery && (this.jQuery.type != null)) {
+        return this.jQuery.type(obj);
       }
       if (obj == null) {
         return "" + obj;
@@ -500,7 +498,6 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
       routes.default_serializer = function(object, prefix) {
         return Utils.default_serializer(object, prefix);
       };
-      Utils.namespace(root, NAMESPACE, routes);
       return Object.assign({
         "default": routes
       }, routes);
@@ -513,6 +510,10 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
     define([], function() {
       return result;
     });
+  } else if (typeof module !== "undefined" && module !== null) {
+    module.exports = result;
+  } else {
+    Utils.namespace(this, NAMESPACE, result);
   }
 
   return result;

data/lib/routes.js.coffee

@@ -2,7 +2,6 @@
 File generated by js-routes GEM_VERSION
 Based on Rails RAILS_VERSION routes of APP_CLASS
 ###
-root = (exports ? this)
 
 ParameterMissing = (message, fileName, lineNumber) ->
   instance = new Error(message, fileName, lineNumber)
@@ -363,7 +362,7 @@ Utils =
       @_classToTypeCache["[object #{name}]"] = name.toLowerCase()
     @_classToTypeCache
   get_object_type: (obj) ->
-    return root.jQuery.type(obj) if root.jQuery and root.jQuery.type?
+    return this.jQuery.type(obj) if this.jQuery and this.jQuery.type?
     return "#{obj}" unless obj?
     (if typeof obj is "object" or typeof obj is "function" then @_classToType()[Object::toString.call(obj)] or "object" else typeof obj)
 
@@ -395,13 +394,19 @@ Utils =
     routes.config = -> Utils.config()
     routes.default_serializer = (object, prefix) ->
       Utils.default_serializer(object, prefix)
-    # Browser globals
-    Utils.namespace(root, NAMESPACE, routes)
     Object.assign({default: routes}, routes)
 
 result = Utils.make()
+
 # Set up Routes appropriately for the environment.
 if typeof define is "function" and define.amd
   # AMD
   define [], -> result
+else if module?
+  # CommonJS
+  module.exports = result
+else
+  # Browser globals
+  Utils.namespace(this, NAMESPACE, result)
+
 return result

data/spec/js_routes/amd_compatibility_spec.rb

@@ -27,14 +27,6 @@ EOF
     evaljs(JsRoutes.generate({}))
   end
 
-  it "should working from global scope" do
-    expect(evaljs("Routes.inboxes_path()")).to eq(test_routes.inboxes_path())
-  end
-
-  it "should working from define function" do
-    expect(evaljs("Routes.inboxes_path()")).to eq(evaljs("GlobalCheck['js-routes'].inboxes_path()"))
-  end
-
   it "should working from require" do
     expect(evaljs("require(['js-routes'], function(r){ return r.inboxes_path(); })")).to eq(test_routes.inboxes_path())
   end

data/spec/js_routes/common_js_compatibility_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+describe JsRoutes, "compatibility with CommonJS (node)"  do
+  before(:each) do
+    evaljs("module = { exports: null }")
+    evaljs(JsRoutes.generate({}))
+  end
+
+  it "should define module exports" do
+    expect(evaljs("module.exports.inboxes_path()")).to eq(test_routes.inboxes_path())
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.4.12
+  version: 1.4.13
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -176,6 +176,7 @@ files:
 - spec/dummy/app/assets/javascripts/.gitkeep
 - spec/dummy/config/routes.rb
 - spec/js_routes/amd_compatibility_spec.rb
+- spec/js_routes/common_js_compatibility_spec.rb
 - spec/js_routes/default_serializer_spec.rb
 - spec/js_routes/generated_javascript_spec.rb
 - spec/js_routes/options_spec.rb