js-routes 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f1f7818deadc1efdc9737ec8a149e42c22ae25b32c441e2a72617cd62725611
-  data.tar.gz: 2a9bb8fe0e342c6ff6601b0bd3addcdf909aa9221e0b0c5712ef7ce757f5fcd5
+  metadata.gz: 2fb822322b2dc899d084e7562fb8208f490cfa466acb560faa624391e5c08d78
+  data.tar.gz: 5b8ef3ebf451d7b6a3ea519c84d63c9360a63b80422756a60f4de76f68207cfe
 SHA512:
-  metadata.gz: 141847fb1eb1fb8c70392a8ab54a094a5a3b2a3d0ec3dcfeb86e9bae416c4ac4311ab5395c3f295b0d527d7ecd23c35585354a62eda2befa5f12fa3a3e3514eb
-  data.tar.gz: 57e2939986d82f88c4ed48be556c06e611cc8f6f0f03c232bc7ba2146d7ba3f417cb891b5c50cc97046eb02300233316ad00236c71712790fa5c377c6e9c6f3e
+  metadata.gz: c62cf998ca3b96ce493a94bba20cbaf5b0980c29c2e3f4320f5633f4ea1336f0eaa4309658bb941be393184b332cb7f2eb2437a13b95351ff71b67c368d1a629
+  data.tar.gz: f008e5cc545deb0e8fb389de0111b796af4cc66f3fccaed002e1c2107b2ed61955ab2c12502b0c87d6f39f4b4106a958cdc742830b3df0e12181bfc3a5b0732e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v1.4.8
+
+* Allow to specify null namespace and receive routes as an object without assigning it anywhere #247
+
 ## v1.4.7
 
 * Fix a LocalJumpError on secondary initialization of the app #248

data/lib/js_routes.rb

@@ -118,18 +118,18 @@ class JsRoutes
     end
 
     {
-      "GEM_VERSION"         => JsRoutes::VERSION,
-      "ROUTES"              => js_routes,
-      "NODE_TYPES"          => json(NODE_TYPES),
-      "RAILS_VERSION"       => ActionPack.version,
-      "DEPRECATED_GLOBBING_BEHAVIOR" => ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR == 0,
-
-      "APP_CLASS"           => application.class.to_s,
-      "NAMESPACE"           => json(@configuration.namespace),
-      "DEFAULT_URL_OPTIONS" => json(@configuration.default_url_options),
-      "PREFIX"              => json(@configuration.prefix),
-      "SPECIAL_OPTIONS_KEY" => json(@configuration.special_options_key),
-      "SERIALIZER"          => @configuration.serializer || json(nil),
+      'GEM_VERSION'         => JsRoutes::VERSION,
+      'ROUTES'              => js_routes,
+      'NODE_TYPES'          => json(NODE_TYPES),
+      'RAILS_VERSION'       => ActionPack.version,
+      'DEPRECATED_GLOBBING_BEHAVIOR' => ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR == 0,
+
+      'APP_CLASS'           => application.class.to_s,
+      'NAMESPACE'           => json(@configuration.namespace),
+      'DEFAULT_URL_OPTIONS' => json(@configuration.default_url_options),
+      'PREFIX'              => json(@configuration.prefix),
+      'SPECIAL_OPTIONS_KEY' => json(@configuration.special_options_key),
+      'SERIALIZER'          => @configuration.serializer || json(nil),
     }.inject(File.read(File.dirname(__FILE__) + "/routes.js")) do |js, (key, value)|
       js.gsub!(key, value.to_s)
     end
@@ -173,7 +173,8 @@ class JsRoutes
 
   def mounted_app_routes(route)
     rails_engine_app = get_app_from_route(route)
-    if rails_engine_app.respond_to?(:superclass) && rails_engine_app.superclass == Rails::Engine && !route.path.anchored
+    if rails_engine_app.respond_to?(:superclass) &&
+       rails_engine_app.superclass == Rails::Engine && !route.path.anchored
       rails_engine_app.routes.named_routes.map do |_, engine_route|
         build_route_if_match(engine_route, route)
       end
@@ -183,7 +184,8 @@ class JsRoutes
   end
 
   def get_app_from_route(route)
-    # rails engine in Rails 4.2 use additional ActionDispatch::Routing::Mapper::Constraints, which contain app
+    # rails engine in Rails 4.2 use additional
+    # ActionDispatch::Routing::Mapper::Constraints, which contain app
     if route.app.respond_to?(:app) && route.app.respond_to?(:constraints)
       route.app.app
     else
@@ -191,8 +193,9 @@ class JsRoutes
     end
   end
 
-  def build_route_if_match(route, parent_route=nil)
-    if any_match?(route, parent_route, @configuration[:exclude]) || !any_match?(route, parent_route, @configuration[:include])
+  def build_route_if_match(route, parent_route = nil)
+    if any_match?(route, parent_route, @configuration[:exclude]) ||
+       !any_match?(route, parent_route, @configuration[:include])
       nil
     else
       build_js(route, parent_route)
@@ -203,7 +206,7 @@ class JsRoutes
     full_route = [parent_route.try(:name), route.name].compact.join('_')
 
     matchers = Array(matchers)
-    matchers.any? {|regex| full_route =~ regex}
+    matchers.any? { |regex| full_route =~ regex }
   end
 
   def build_js(route, parent_route)
@@ -211,7 +214,7 @@ class JsRoutes
     route_name = generate_route_name(name, (:path unless @configuration[:compact]))
     parent_spec = parent_route.try(:path).try(:spec)
     route_arguments = route_js_arguments(route, parent_spec)
-    url_link = generate_url_link(name, route_name, route_arguments, route)
+    url_link = generate_url_link(name, route_arguments)
     _ = <<-JS.strip!
   // #{name.join('.')} => #{parent_spec}#{route.path.spec}
   // function(#{build_params(route.required_parts)})
@@ -225,7 +228,8 @@ class JsRoutes
       hash[part] = required_parts.include?(part)
     end
     default_options = route.defaults.select do |part, _|
-      FILTERED_DEFAULT_PARTS.exclude?(part) && URL_OPTIONS.include?(part) || parts_table[part]
+      FILTERED_DEFAULT_PARTS.exclude?(part) &&
+        URL_OPTIONS.include?(part) || parts_table[part]
     end
     [
       # JS objects don't preserve the order of properties which is crucial,
@@ -235,19 +239,19 @@ class JsRoutes
       serialize(route.path.spec, parent_spec)
     ].map do |argument|
       json(argument)
-    end.join(", ")
+    end.join(', ')
   end
 
-  def generate_url_link(name, route_name, route_arguments, route)
-    return "" unless @configuration[:url_links]
+  def generate_url_link(name, route_arguments)
+    return '' unless @configuration[:url_links]
+
     <<-JS.strip!
     #{generate_route_name(name, :url)}: Utils.route(#{route_arguments}, true)
     JS
   end
 
-  def generate_route_name(name, suffix)
-    route_name = name.join('_')
-    route_name << "_#{ suffix }" if suffix
+  def generate_route_name(*parts)
+    route_name = parts.compact.join('_')
     @configuration[:camel_case] ? route_name.camelize(:lower) : route_name
   end
 
@@ -257,7 +261,7 @@ class JsRoutes
 
   def build_params(required_parts)
     params = required_parts + [LAST_OPTIONS_KEY]
-    params.join(", ")
+    params.join(', ')
   end
 
   # This function serializes Journey route into JSON structure
@@ -266,7 +270,9 @@ class JsRoutes
   # Routes.js file will be smaller.
   def serialize(spec, parent_spec=nil)
     return nil unless spec
-    return spec.tr(':', '') if spec.is_a?(String)
+    # Rails 4 globbing requires * removal
+    return spec.tr(':*', '') if spec.is_a?(String)
+
     result = serialize_spec(spec, parent_spec)
     if parent_spec && result[1].is_a?(String)
       result = [
@@ -280,7 +286,7 @@ class JsRoutes
     result
   end
 
-  def serialize_spec(spec, parent_spec=nil)
+  def serialize_spec(spec, parent_spec = nil)
     [
       NODE_TYPES[spec.type],
       serialize(spec.left, parent_spec),
@@ -288,4 +294,3 @@ class JsRoutes
     ]
   end
 end
-

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.4.7"
+  VERSION = "1.4.8"
 end

data/lib/routes.js

@@ -336,9 +336,6 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
     visit_globbing: function(route, parameters, optional) {
       var left, right, type, value;
       type = route[0], left = route[1], right = route[2];
-      if (left.replace(/^\*/i, "") !== left) {
-        route[1] = left = left.replace(/^\*/i, "");
-      }
       value = parameters[left];
       delete parameters[left];
       if (value == null) {
@@ -472,7 +469,7 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
     },
     namespace: function(root, namespace, routes) {
       var index, j, len, part, parts;
-      parts = namespace.split(".");
+      parts = namespace ? namespace.split(".") : [];
       if (parts.length === 0) {
         return routes;
       }
@@ -518,7 +515,7 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
       return Utils.make();
     });
   } else {
-    Utils.make();
+    return Utils.make();
   }
 
 }).call(this);

data/lib/routes.js.coffee

@@ -258,8 +258,6 @@ Utils =
   #
   visit_globbing: (route, parameters, optional) ->
     [type, left, right] = route
-    # fix for rails 4 globbing
-    route[1] = left = left.replace(/^\*/i, "") if left.replace(/^\*/i, "") isnt left
     value = parameters[left]
     delete parameters[left]
     return @visit(route, parameters, optional) unless value?
@@ -377,7 +375,7 @@ Utils =
     result
 
   namespace: (root, namespace, routes) ->
-    parts = namespace.split(".")
+    parts = if namespace then namespace.split(".") else []
     return routes if parts.length == 0
     for part, index in parts
       if index < parts.length - 1
@@ -402,6 +400,7 @@ Utils =
 
     routes.default_serializer = (object, prefix) ->
       Utils.default_serializer(object, prefix)
+    # Browser globals
     Utils.namespace(root, NAMESPACE, routes)
 
 # Set up Routes appropriately for the environment.
@@ -409,5 +408,4 @@ if typeof define is "function" and define.amd
   # AMD
   define [], -> Utils.make()
 else
-  # Browser globals
-  Utils.make()
+  return Utils.make()

data/spec/js_routes/options_spec.rb

@@ -167,36 +167,46 @@ describe JsRoutes, "options" do
     expect(evaljs("Routes.no_format_path({format: 'json'})")).to eq(test_routes.no_format_path(format: 'json'))
   end
 
-  describe "when namespace option is specified" do
+  describe "namespace option" do
     let(:_options) { {:namespace => "PHM"} }
     it "should use this namespace for routing" do
       expect(evaljs("window.Routes")).to be_nil
       expect(evaljs("PHM.inbox_path")).not_to be_nil
     end
-  end
 
-  describe "when nested namespace option is specified" do
-    context "and defined on client" do
-      let(:_presetup) { "window.PHM = {}" }
-      let(:_options) { {:namespace => "PHM.Routes"} }
+    context "is nil" do
+      let(:_options) { {:namespace => nil} }
       it "should use this namespace for routing" do
-        expect(evaljs("PHM.Routes.inbox_path")).not_to be_nil
+        evaljs("window.zz = #{JsRoutes.generate(namespace: nil)}")
+        expect(evaljs("window.Routes")).to be_nil
+        expect(evaljs("window.zz.inbox_path")).not_to be_nil
       end
+
     end
 
-    context "but undefined on client" do
-      let(:_options) { {:namespace => "PHM.Routes"} }
-      it "should initialize namespace" do
-        expect(evaljs("window.PHM.Routes.inbox_path")).not_to be_nil
+    describe "is nested" do
+      context "and defined on client" do
+        let(:_presetup) { "window.PHM = {}" }
+        let(:_options) { {:namespace => "PHM.Routes"} }
+        it "should use this namespace for routing" do
+          expect(evaljs("PHM.Routes.inbox_path")).not_to be_nil
+        end
       end
-    end
 
-    context "and some parts are defined" do
-      let(:_presetup) { "window.PHM = { Utils: {} };" }
-      let(:_options) { {:namespace => "PHM.Routes"} }
-      it "should not overwrite existing parts" do
-        expect(evaljs("window.PHM.Utils")).not_to be_nil
-        expect(evaljs("window.PHM.Routes.inbox_path")).not_to be_nil
+      context "but undefined on client" do
+        let(:_options) { {:namespace => "PHM.Routes"} }
+        it "should initialize namespace" do
+          expect(evaljs("window.PHM.Routes.inbox_path")).not_to be_nil
+        end
+      end
+
+      context "and some parts are defined" do
+        let(:_presetup) { "window.PHM = { Utils: {} };" }
+        let(:_options) { {:namespace => "PHM.Routes"} }
+        it "should not overwrite existing parts" do
+          expect(evaljs("window.PHM.Utils")).not_to be_nil
+          expect(evaljs("window.PHM.Routes.inbox_path")).not_to be_nil
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -95,11 +95,11 @@ RSpec.configure do |config|
 
     if defined?(JRUBY_VERSION)
       jscontext[:log] = lambda do |context, value|
-        puts value
+        puts value.inspect
       end
     else
       jscontext.attach("log", proc do |value|
-        puts value
+        puts value.inspect
       end)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties