skypager 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c154a8bda0bf80d4c7646f32c6cdec217ebb7a
-  data.tar.gz: d1f3ba950aa3d496d91abd7ca8ea764b9215b88e
+  metadata.gz: c43ca74ddfecb4de61127287f5f14c6e2ca18145
+  data.tar.gz: 29eb227714e18fd39294ae82940a8e927cee8496
 SHA512:
-  metadata.gz: d4018f3661eae1cf6579eff94394f6056323465955fec50b6a395b230eb6c3052915d42a7cc2625845f2d9eb5f846716d96be635a85d9f7ee89c02823806397a
-  data.tar.gz: cfc34a307af6449d5b7be691d25e850ec9b7d3d27475fc19bb0a0e8c6000d960099f6d0cc75dd0e507940e85cb3be49358f349177b9c95c29a2fea3df81f0c29
+  metadata.gz: 96058ca42cfef710a4a0d7939319465f60a138fe328becdbae11b93741c54190c479c642597a0de5f668a800c6cb23a7fe0b822feddeeafd79916ec35e2d81ac
+  data.tar.gz: 7a973e4722f40ea57cd93634720e6d8a78838c2576f962004f7ddd9570d9e23589534d24493c12dbeae91fd3abca22824bf01bf59de1633e16bce538fa45f827

data/lib/skypager.rb

@@ -17,6 +17,8 @@ module Skypager
   end
 
   def self.protector(options={})
+    require 'skypager/protector'
+    require 'pry'
     Skypager::Protector.new(options)
   end
 

data/lib/skypager/protector.rb

@@ -4,7 +4,7 @@
 # It should either show a login page, or the requested path
 module Skypager
   class Protector
-    attr_accessor :validator, :options
+    attr_accessor :validator, :options, :app
 
     # Skypager::Protector.new(options) do |request|
     #   # validate request here
@@ -14,7 +14,8 @@ module Skypager
     #   - build_dir: defaults to ./build
     #   - login_path: defaults to /login/index.html
     #   - not_found_path: defaults to /not-found.html
-    def initialize(options={}, &validator)
+    def initialize(app, options={}, &validator)
+      @app = app
       @options = options
       @validator = validator
     end
@@ -32,16 +33,16 @@ module Skypager
       if file.exist?
         serve_file(file)
       else
-        serve_not_found_path
+        @app.call(env)
       end
     end
 
-    def serve_file(file)
+    def serve_file(file, status=200)
       mime_type = Rack::Mime.mime_type(Pathname(file).extname).to_s
       content   = Pathname(file).read.to_s
-      content_length = content.size.to_s
+      content_length = Rack::Utils.bytesize(content).to_s
 
-      [200, {"Content-Type" => mime_type,"Content-Length" => content_length}, [content]]
+      [status, {"Content-Type" => mime_type,"Content-Length" => content_length}, [content]]
     end
 
     def build_path
@@ -51,7 +52,7 @@ module Skypager
 
     def serve_not_found_path
       not_found_path = options.fetch(:not_found_path, "/not-found.html")
-      [404, {"Content-Type" => "text/html"}, [not_found_path.read]]
+      serve_file(not_found_path, 404)
     end
 
     def serve_login_path
@@ -60,8 +61,11 @@ module Skypager
     end
 
     def normalize_path(path)
-      if !path.to_s.match(/\.\w+/)
-        path = path.gsub(/\/$/,'') + path_extension
+      if path == "/"
+        path = "/index.html"
+      elsif !path.to_s.match(/\.\w+/)
+        path.gsub!(/\/$/,'')
+        path + path_extension
       end
 
       path.to_s.gsub(/^\//,'')

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skypager
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Jonathan Soeder