prelaunch 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTI3ZjY3NzNlNzM2MzUwOGYxMjZlMTlmNDE4MjlmNzdlZTY0NGIwZg==
+    ZTMxMGRmMWZjZTYyODJhMzFkZmE1N2NiMmEzZTYxYzMyNjU2NGEzYQ==
   data.tar.gz: !binary |-
-    MTNhZTAxNGU5MzMzMmI1MzcxZWYzYTNkNzk2ZTg1NDU2MmI1NDhjNA==
+    YWEzYTA2Mjk0OWZjMDg1NjFhNWVlNzc2ODkzZjA4NGYwOGM1YWVlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDkxMTQ4ZGI1NGE5NGQyNWIwNGZmNDZlZjBjY2RjOTEzZWZiNjcxZDMwY2Nm
-    ZTllZWUxNGE2YTU0NTJmZjA1ZDYxNTU5NzZjNWM3ZjBjZmMzM2E0ZDgwMzVh
-    Nzk1NTZiMTE4MzhkZmUxY2Y4OTljYTA1MzFkNDE4M2U0NjQyOGM=
+    NDMxYjUyOTM3YzNjM2E4M2U2ODAyNmY4YmFlNmEwOTg5YWRlYWI1NmIwMzhk
+    N2I3M2QxMTk3N2M5ZDVkNTk5MTkyMDkyZTgxYTdmZmY1ODQyNWNmOGQ5MzZj
+    YWUyM2RlMGFkYWIxZTUwMDk4NTY4NjRmZmRjNzBmNzM5ODUzNDM=
   data.tar.gz: !binary |-
-    M2NiNjJiYTliNTMyYjUyZGFkZmE2MGE4MzJhNzUzNjkzZWIxNGZhMzEwYTFh
-    OTFiODU0YjExOWNhY2UwYzVkNzkzNjg3M2VmNTU3OTgwMDdhZWQ4MWJlZTEx
-    MGQ5ZTQ3YWYwMmJiZTdmYzkyMmYxZWE0MzllNWU4MDBjZWM1YjU=
+    MDM0ZmUxN2FmNTM4NTdlMmQ0MDYyMWE0MTYwNzJkODAxOGVkOWE2MmNjNjk3
+    NTA4NzM5ZjRiODgwMjJmMjhjOTIzNTA2YWNiZGViYjg2MDg5YjhkMTkyNWI4
+    OWRmYzc1YjRlZDhkYzhlZGRiYWY0YzFjNTM3OGNhMzdhYzViODY=

data/app/controllers/prelaunch/prelaunch_controller.rb

@@ -13,9 +13,7 @@ module Prelaunch
     end
 
     def verify
-      if Prelaunch::valid? params[:token]
-        session[:prelaunch_token] = params[:token]
-      end
+      session[:prelaunch_token] = params[:token]
 
       redirect_to '/'
     end

data/lib/prelaunch/constraints.rb

@@ -0,0 +1,18 @@
+module Prelaunch
+  class SessionConstraint
+    def matches? request
+      not Prelaunch::valid? request.session[:prelaunch_token]
+    end
+  end
+
+  class TokenConstraint
+    def matches? request
+      path  = Prelaunch::strip_slashes(Prelaunch.path)
+      match = request.fullpath.match(/^#{path}\/([A-Za-z0-9]*)([\/\?])?/)
+
+      return false if match.nil?
+
+      Prelaunch::valid? match[1]
+    end
+  end
+end

data/lib/prelaunch/functions.rb

@@ -0,0 +1,8 @@
+module Prelaunch
+  protected
+    def self.strip_slashes string
+      result = string.gsub(/^(\/|\\)+/, '').gsub(/(\/|\\)+$/, '')
+
+      result.length > 0 ? '/' + result : result
+    end
+end

data/lib/prelaunch/helpers.rb

@@ -3,7 +3,8 @@ module Prelaunch
     def prelaunch_logout_link name = nil, html_options = nil, &block
       return unless Prelaunch::valid_env?
 
-      url = "#{strip_slashes(Prelaunch.path)}/logout"
+      path = Prelaunch::strip_slashes(Prelaunch.path)
+      url  = "#{path}/logout"
 
       html_options = name if block_given?
       html_options ||= {}
@@ -12,12 +13,5 @@ module Prelaunch
 
       content_tag(:a, name || url, html_options, &block)
     end
-
-    private
-      def strip_slashes string
-        result = string.gsub(/^(\/|\\)+/, '').gsub(/(\/|\\)+$/, '')
-
-        result.length > 0 ? '/' + result : result
-      end
   end
 end

data/lib/prelaunch/routing.rb

@@ -3,10 +3,12 @@ module ActionDispatch::Routing
     def prelaunch_routes
       return unless Prelaunch.valid_env?
 
-      contraint = Prelaunch::Constraint.new
+      token = Prelaunch::TokenConstraint.new
 
       get "#{Prelaunch.path}/logout", to: 'prelaunch/prelaunch#logout', as: ''
-      get "#{Prelaunch.path}/:token", to: 'prelaunch/prelaunch#verify', constraints: contraint
+      get "#{Prelaunch.path}/:token", to: 'prelaunch/prelaunch#verify', constraints: token
+
+      contraint = Prelaunch::SessionConstraint.new
 
       get '*path', to: 'prelaunch/prelaunch#redirect', constraints: contraint
       get '/'    , to: 'prelaunch/prelaunch#index'   , constraints: contraint

data/lib/prelaunch/version.rb

@@ -1,3 +1,3 @@
 module Prelaunch
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/prelaunch.rb

@@ -1,6 +1,7 @@
-require 'prelaunch/routing'
-require 'prelaunch/constraint'
 require 'prelaunch/engine'
+require 'prelaunch/functions'
+require 'prelaunch/constraints'
+require 'prelaunch/routing'
 require 'prelaunch/helpers'
 
 module Prelaunch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prelaunch
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alexey Chernetsov
@@ -49,8 +49,9 @@ files:
 - lib/generators/prelaunch/view_generator.rb
 - lib/generators/templates/prelaunch.rb
 - lib/prelaunch.rb
-- lib/prelaunch/constraint.rb
+- lib/prelaunch/constraints.rb
 - lib/prelaunch/engine.rb
+- lib/prelaunch/functions.rb
 - lib/prelaunch/helpers.rb
 - lib/prelaunch/routing.rb
 - lib/prelaunch/version.rb

data/lib/prelaunch/constraint.rb

@@ -1,7 +0,0 @@
-module Prelaunch
-  class Constraint
-    def matches? request
-      not Prelaunch::valid? request.session[:prelaunch_token]
-    end
-  end
-end