jj-middleware 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8697c185d2706398041c54c46d161a3e2999046
-  data.tar.gz: f6d7107453964aaeb88c04fcb28e1e278c77478e
+  metadata.gz: 88329120265b2a27fec81e527eb6cdf265155272
+  data.tar.gz: 3447e129bdc1fc4238a355bb138f62de78d4b6d5
 SHA512:
-  metadata.gz: 32546eb6b323c6763e4fa35df331348f588b60e4a3a7c1eab648c26c5d91dc44ea3d6d63f0ae1bb48ba4667036aaf3e736678f01e2df139e53efc71bca560887
-  data.tar.gz: e045e771531b66e4ea970f8bf1d2afd4bb1a4af079bed7ade61c8781dc967c9016dfd4b310f8f4c505b158495ba22cadd3ba95c9fe823f7ace4b6d52dbb6ec4d
+  metadata.gz: 9166b5d94cf28d5a93f770c87952da7c852a1021bf72615b8a504f27debf0e9305da73f4f521e4b9ef8abdda0ab82a31c25d37a4d393ace46781a19427a5edfc
+  data.tar.gz: e85680d6052bbb939c8c6f5aed8af293bb4d6ca2d684c33e19bbf61967ebd5989faa3e9cc28c60840fb341dfeba483a9bb9db350bed4977fd507597c3ef83fa1

data/lib/jj/middleware.rb

@@ -1,5 +1,5 @@
 module JJ
   module Middleware
-    VERSION = '3.1.1'.freeze
+    VERSION = '3.1.2'.freeze
   end
 end

data/lib/jj/middleware/username_correction.rb

@@ -9,11 +9,13 @@ module JJ
       end
 
       def call(env)
-        request = Rack::Request.new(env)
+        request    = Rack::Request.new(env)
         host_parts = request.host.split('.')
         sub_domain = host_parts.shift
 
-        if on_profile_page?(sub_domain, request) || status_endpoint?(request)
+        if on_creator_subdomain?(sub_domain) ||
+           on_profile_page?(request) ||
+           status_endpoint?(request)
           @app.call(env)
         else
           redirect(generate_path(host_parts, request), 301)
@@ -24,19 +26,23 @@ module JJ
 
       CREATOR_SUB_DOMAIN = 'creator'
 
+      def on_creator_subdomain?(sub_domain)
+        sub_domain == CREATOR_SUB_DOMAIN
+      end
+
       def status_endpoint?(request)
         request.path == '/status'
       end
 
-      def on_profile_page?(sub_domain, request)
-        sub_domain != CREATOR_SUB_DOMAIN && request.path == '/'
+      def on_profile_page?(request)
+        request.path == '/'
       end
 
       def generate_path(parts, request)
         path_format = '%s://%s%s'
         path = parts.unshift(CREATOR_SUB_DOMAIN).join('.')
 
-        if ![80,443].include?(request.port)
+        if ![80, 443].include?(request.port)
           path << format(':%s', request.port)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jj-middleware
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - ''