js-routes 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2b764ad8b2e830d272dae6c27c5d5ffd7d62ff
-  data.tar.gz: 0919ef9b1b2b835badcfc149ef2c98b5e9cff8f4
+  metadata.gz: e2c1645c670a1b3417f9bac488213b59772d6e8a
+  data.tar.gz: c24fc47bafda9d30316f217cc056c40a06400b25
 SHA512:
-  metadata.gz: 91aec6308159d5b88096a57ab461bd0f5db939778d3deffc915f846da1deb17e3506837119f8f77eab6d21270f50167da9809ebf6b9183357b7a666fd6bda523
-  data.tar.gz: 0492743727d0493de6ea1480255659f7cd53efcd289d3a4c78e9d1781c95123afe700d57bb2acda76f6f953a60b5580ae3b65944e4b05e3d08837f2659123aca
+  metadata.gz: fae588fedc1ead98cd02f9bee3157d33044f788486137ae261195121bd020169f765fa82d14aced99db170a97c78b54c918f000a369c20f881b928acece283f5
+  data.tar.gz: e19c02689bb0c08eaa4ce6a47fb480020f2e00d1fb09daef4ff82593ef7a831fecda97999d817443b42bab8397f50985f239fc693822a0721032ec95621f2540

data/Rakefile

@@ -22,6 +22,7 @@ task :default => :spec
 
 
 namespace :spec do
+  desc "Print all routes defined in test env"
   task :routes do
     require './spec/spec_helper'
     require 'action_dispatch/routing/inspector'

data/Readme.md

@@ -53,7 +53,7 @@ Available options:
 
 * `default_url_options` - default parameters used when generating URLs
   * Option is configurable at JS level with `Routes.configure()`
-  * Example: {:format => "json", :trailing\_slash => true, :protocol => "https", :host => "example.com", :port => 3000}
+  * Example: {:format => "json", :trailing\_slash => true, :protocol => "https", :subdomain => "api", :host => "example.com", :port => 3000}
   * Default: {}
 * `exclude` - Array of regexps to exclude from js routes.
   * Default: []

data/lib/js_routes.rb

@@ -37,7 +37,7 @@ class JsRoutes
   }
 
   LAST_OPTIONS_KEY = "options".freeze
-  FILTERED_DEFAULT_PARTS = [:controller, :action, :subdomain]
+  FILTERED_DEFAULT_PARTS = [:controller, :action]
   URL_OPTIONS = [:protocol, :domain, :host, :port, :subdomain]
 
   class Configuration < Struct.new(*DEFAULTS.keys)

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/routes.js

@@ -22,7 +22,7 @@ Based on Rails routes of APP_CLASS
 
   DeprecatedBehavior = DEPRECATED_BEHAVIOR;
 
-  ReservedOptions = ['anchor', 'trailing_slash', 'host', 'port', 'protocol'];
+  ReservedOptions = ['anchor', 'trailing_slash', 'subdomain', 'host', 'port', 'protocol'];
 
   Utils = {
     configuration: {
@@ -352,7 +352,7 @@ Based on Rails routes of APP_CLASS
       return path_fn;
     },
     route_url: function(route_defaults) {
-      var hostname, port, protocol;
+      var hostname, port, protocol, subdomain;
       if (typeof route_defaults === 'string') {
         return route_defaults;
       }
@@ -360,10 +360,11 @@ Based on Rails routes of APP_CLASS
       if (!hostname) {
         return '';
       }
+      subdomain = route_defaults.subdomain ? route_defaults.subdomain + '.' : '';
       protocol = route_defaults.protocol || Utils.current_protocol();
       port = route_defaults.port || (!route_defaults.host ? Utils.current_port() : void 0);
       port = port ? ":" + port : '';
-      return protocol + "://" + hostname + port;
+      return protocol + "://" + subdomain + hostname + port;
     },
     has_location: function() {
       return (typeof window !== "undefined" && window !== null ? window.location : void 0) != null;

data/lib/routes.js.coffee

@@ -15,6 +15,7 @@ DeprecatedBehavior = DEPRECATED_BEHAVIOR
 ReservedOptions = [
   'anchor'
   'trailing_slash'
+  'subdomain'
   'host'
   'port'
   'protocol'
@@ -281,11 +282,12 @@ Utils =
 
     return '' unless hostname
 
+    subdomain = if route_defaults.subdomain then route_defaults.subdomain + '.' else ''
     protocol = route_defaults.protocol || Utils.current_protocol()
     port = route_defaults.port || (Utils.current_port() unless route_defaults.host)
     port = if port then ":#{port}" else ''
 
-    protocol + "://" + hostname + port
+    protocol + "://" + subdomain + hostname + port
 
   has_location: -> window?.location?
 

data/spec/js_routes/options_spec.rb

@@ -349,8 +349,8 @@ describe JsRoutes, "options" do
           expect(evaljs("Routes.sso_url()")).to eq("http://sso.example.com:3000" + test_routes.sso_path)
         end
 
-        it "does not override port when specified in route" do
-          expect(evaljs("Routes.portals_url()")).to eq("http://example.com:8080#{test_routes.portals_path}")
+        it "does not override parts when specified in route" do
+          expect(evaljs("Routes.secret_root_url()")).to eq(test_routes.secret_root_url)
         end
       end
 
@@ -358,9 +358,6 @@ describe JsRoutes, "options" do
         let(:_options) { { :camel_case => true, :url_links => true, :default_url_options => {:host => "example.com"} } }
         it "should generate path and url links" do
           expect(evaljs("Routes.inboxUrl(1)")).to eq("http://example.com#{test_routes.inbox_path(1)}")
-          expect(evaljs("Routes.newSessionUrl()")).to eq("https://example.com#{test_routes.new_session_path}")
-          expect(evaljs("Routes.ssoUrl()")).to eq(test_routes.sso_url)
-          expect(evaljs("Routes.portalsUrl()")).to eq("http://example.com:8080#{test_routes.portals_path}")
         end
       end
 
@@ -368,9 +365,6 @@ describe JsRoutes, "options" do
         let(:_options) { { :prefix => "/api", :url_links => true, :default_url_options => {:host => 'example.com'} } }
         it "should generate path and url links" do
           expect(evaljs("Routes.inbox_url(1)")).to eq("http://example.com/api#{test_routes.inbox_path(1)}")
-          expect(evaljs("Routes.new_session_url()")).to eq("https://example.com/api#{test_routes.new_session_path}")
-          expect(evaljs("Routes.sso_url()")).to eq("http://sso.example.com/api#{test_routes.sso_path}")
-          expect(evaljs("Routes.portals_url()")).to eq("http://example.com:8080/api#{test_routes.portals_path}")
         end
       end
 
@@ -378,9 +372,6 @@ describe JsRoutes, "options" do
         let(:_options) { { :compact => true, :url_links => true, :default_url_options => {:host => 'example.com'} } }
         it "does not affect url helpers" do
           expect(evaljs("Routes.inbox_url(1)")).to eq("http://example.com#{test_routes.inbox_path(1)}")
-          expect(evaljs("Routes.new_session_url()")).to eq("https://example.com#{test_routes.new_session_path}")
-          expect(evaljs("Routes.sso_url()")).to eq(test_routes.sso_url)
-          expect(evaljs("Routes.portals_url()")).to eq("http://example.com:8080#{test_routes.portals_path}")
         end
       end
     end
@@ -408,20 +399,27 @@ describe JsRoutes, "options" do
           expect(evaljs("Routes.inbox_url(1)")).to eq("http://current.example.com#{test_routes.inbox_path(1)}")
           expect(evaljs("Routes.inbox_url(1, { test_key: \"test_val\" })")).to eq("http://current.example.com#{test_routes.inbox_path(1, :test_key => "test_val")}")
           expect(evaljs("Routes.new_session_url()")).to eq("https://current.example.com#{test_routes.new_session_path}")
-          expect(evaljs("Routes.sso_url()")).to eq("http://sso.example.com#{test_routes.sso_path}")
 
         end
 
+        it "doesn't use current when specified in the route" do
+          expect(evaljs("Routes.sso_url()")).to eq(test_routes.sso_url)
+        end
+
         it "uses host option as an argument" do
-          expect(evaljs("Routes.portals_url({host: 'another.com'})")).to eq(test_routes.portals_url(host: 'another.com'))
+          expect(evaljs("Routes.secret_root_url({host: 'another.com'})")).to eq(test_routes.secret_root_url(host: 'another.com'))
         end
 
         it "uses port option as an argument" do
-          expect(evaljs("Routes.portals_url({host: 'localhost', port: 8080})")).to eq(test_routes.portals_url(host: 'localhost', port: 8080))
+          expect(evaljs("Routes.secret_root_url({host: 'localhost', port: 8080})")).to eq(test_routes.secret_root_url(host: 'localhost', port: 8080))
         end
 
         it "uses protocol option as an argument" do
-          expect(evaljs("Routes.portals_url({host: 'localhost', protocol: 'https'})")).to eq(test_routes.portals_url(protocol: 'https', host: 'localhost'))
+          expect(evaljs("Routes.secret_root_url({host: 'localhost', protocol: 'https'})")).to eq(test_routes.secret_root_url(protocol: 'https', host: 'localhost'))
+        end
+
+        it "uses subdomain option as an argument" do
+          expect(evaljs("Routes.secret_root_url({subdomain: 'custom'})")).to eq(test_routes.secret_root_url(subdomain: 'custom'))
         end
       end
     end

data/spec/spec_helper.rb

@@ -107,7 +107,7 @@ RSpec.configure do |config|
         value.to_h.map do |k,v|
           [k, inspectify(v)]
         end.to_h
-      when String, nil, Fixnum, FalseClass, TrueClass
+      when String, nil, Integer, FalseClass, TrueClass
         value
       else
         raise "wtf #{value.class}?"

data/spec/support/routes.rb

@@ -8,25 +8,24 @@ def draw_routes
 
     get 'support(/page/:page)', to: BlogEngine::Engine, as: 'support'
 
-    resources :inboxes do
-      resources :messages do
-        resources :attachments
+    resources :inboxes, only: [:index, :show] do
+      resources :messages, only: [:index, :show] do
+        resources :attachments, only: [:new, :show]
       end
     end
 
     root :to => "inboxes#index"
 
     namespace :admin do
-      resources :users
+      resources :users, only: [:index]
     end
 
     scope "/returns/:return" do
-      resources :objects
+      resources :objects, only: [:show]
     end
-    resources :returns
 
     scope "(/optional/:optional_id)" do
-      resources :things
+      resources :things, only: [:show, :index]
     end
 
     get "(/sep1/:first_optional)/sep2/:second_required/sep3/:third_required(/:forth_optional)",
@@ -51,11 +50,11 @@ def draw_routes
     get '/привет' => "foo#foo", :as => :hello
     get '(/o/:organization)/search/:q' => "foo#foo", as: :search
 
-    resources :sessions, :only => [:new, :create, :destroy], :protocol => 'https'
-
+    resources :sessions, :only => [:new, :create], :protocol => 'https'
     get '/' => 'sso#login', host: 'sso.example.com', as: :sso
+    get "/" => "a#b", subdomain: 'www', host: 'example.com', port: 88, as: :secret_root
 
-    resources :portals, :port => 8080
+    resources :portals, :port => 8080, only: [:index]
 
     get '/with_defaults' => 'foo#foo', defaults: { bar: 'tested', format: :json }, format: :true
 
@@ -63,7 +62,7 @@ def draw_routes
       get "/purchases" => "purchases#index"
     end
 
-    resources :budgies do
+    resources :budgies, only: [:show, :index] do
       get "descendents"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Brings Rails named routes to javascript