skypager 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a0178617de54fe4335a9e4e649008090ca6e757
-  data.tar.gz: c22ee17fcb1b22837fe4a2bf05667f4d48fa9c01
+  metadata.gz: 2b58af966708284b603f3b068b4ab53a189a26f0
+  data.tar.gz: d6b27bfb6058d82621d9049ef13e8cbef4d307d4
 SHA512:
-  metadata.gz: e9fea307a876c552064fa0f4c3c79b48ac5f5869cdc64a7c7472fa78beacad8520baae07c2f68e76814b2f7840d6cd246b4211435809345dedcdf4c5735bdb70
-  data.tar.gz: 65377e519d6595076664adcc301a70e83f96ebc8b9c444822e83b839af4303bc7abfbaa84d9ddcd35d6372b0d43818df361d5541136f51a5a5a7a4ab6747b0af
+  metadata.gz: 2a0045b02510e64763469763600d4c5cc2b74abd714c60657a3cd40a9870caf282d01c47e1f62705126673492c4e23ba5424b87bc5c2a56df12a8a80ad0f787d
+  data.tar.gz: 420e672d05b052513ce0bed3afd1e7a40eef7ac3247fc4abc696cadfcb2e7d4cc9670a988d08cad3810fb1f30f6c194f4821b69476464c429d2ba0facd533f8a

data/lib/skypager.rb

@@ -12,9 +12,14 @@ require 'active_support/core_ext/string'
 
 module Skypager
   def self.router(app, options={})
+    require 'skypager/router'
     @router ||= Skypager::Router.new(app, options)
   end
 
+  def self.protector(options={})
+    Skypager::Protector.new(options)
+  end
+
   def self.proxy(options={})
     if options.is_a?(String)
       options = {bucket: options}

data/lib/skypager/protector.rb

@@ -0,0 +1,87 @@
+# This app should check for the presence of certain
+# cookies, and optionally validate their values.
+#
+# It should either show a login page, or the requested path
+module Skypager
+  class Protector
+    attr_accessor :validator, :options
+
+    # Skypager::Protector.new(options) do |request|
+    #   # validate request here
+    # end
+    #
+    # Valid options are:
+    #   - build_dir: defaults to ./build
+    #   - login_path: defaults to /login/index.html
+    #   - not_found_path: defaults to /not-found.html
+    def initialize(options={}, &validator)
+      @options = options
+      @validator = validator
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+
+      if !validate(request)
+        serve_login_path
+      end
+
+      path = normalize_path(request.path)
+      file = build_path.join(path)
+
+      binding.pry
+
+      if file.exist?
+        serve_file(file)
+      else
+        serve_not_found_path
+      end
+    end
+
+    def serve_file(file)
+      mime_type = Rack::Mime.mime_type(Pathname(file).extname).to_s
+      content   = Pathname(file).read.to_s
+      content_length = content.size.to_s
+
+      [200, {"Content-Type" => mime_type,"Content-Length" => content_length}, [content]]
+    end
+
+    def build_path
+      build_dir =  options.fetch(:build_dir) { Pathname(Dir.pwd).join('build') }
+      Pathname(build_dir)
+    end
+
+    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]]
+    end
+
+    def serve_login_path
+      login_path = options.fetch(:login_path, "/login.html")
+      [302, {"Content-Type" => "text/html", "Location" =>  login_path}, ["302 You've been redirected"]]
+    end
+
+    def normalize_path(path)
+      if !path.to_s.match(/\.\w+/)
+        path = path.gsub(/\/$/,'') + path_extension
+      end
+
+      path.to_s.gsub(/^\//,'')
+    end
+
+    def path_extension
+      options.fetch(:path_extension ) do
+        options[:directory_indexes] ? "/index.html" : ".html"
+      end
+    end
+    def validate(request)
+      return true if validator.nil? || !validator.respond_to?(:call)
+
+      validator.call({
+        cookies: request.cookies,
+        params: request.params,
+        env: request.env
+      })
+    end
+  end
+end

data/lib/skypager/proxy.rb

@@ -1,8 +1,5 @@
 # Based on the s3_proxy gem
-
-require 'aws-sdk-core'
-require 'stringio'
-
+require 'rack/proxy'
 module Skypager
   class Proxy
 
@@ -14,8 +11,6 @@ module Skypager
     def initialize(options={})
       @options            = options
       @bucket             = options[:bucket]
-      @access_key_id      = options.fetch(:access_key_id) { Skypager.config.aws_access_key_id }
-      @secret_access_key  = options.fetch(:secret_access_key) { Skypager.config.aws_secret_access_key }
     end
 
     def call(env)
@@ -31,7 +26,7 @@ module Skypager
     end
 
     def s3
-      @s3 ||= Aws::S3.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: "us-east-1")
+      Datapimp::Sync.amazon.storage
     end
 
     def request_proxy
@@ -41,12 +36,12 @@ module Skypager
 
     def s3_call(env)
       return Errors.method_not_allowed unless %w(GET HEAD).include?(env['REQUEST_METHOD'])
-      return Errors.not_found if env['PATH_INFO'].empty?
+      return Errors.not_found('path_info') if env['PATH_INFO'].empty?
 
       rack_request = Rack::Request.new(env)
       key = "#{rack_request.path}".without_leading_slash
 
-      return Errors.not_found unless bucket && key
+      return Errors.not_found('no-bucket-no-key') unless bucket && key
 
       path = key.without_leading_slash
       last = path.split("/").last
@@ -55,14 +50,18 @@ module Skypager
 
       req[:key]                   = "index.html" if req[:key].to_s.length == 0
 
-      req[:if_match]              = env['HTTP_IF_MATCH'] if env['HTTP_IF_MATCH']
-      req[:if_none_match]         = env['HTTP_IF_NONE_MATCH'] if env['HTTP_IF_NONE_MATCH']
-      req[:if_modified_since]     = env['HTTP_IF_MODIFIED_SINCE'] if env['HTTP_IF_MODIFIED_SINCE']
-      req[:if_unmodified_since]   = env['HTTP_IF_UNMODIFIED_SINCE'] if env['HTTP_UNMODIFIED_SINCE']
+      req['If-Match']              = env['HTTP_IF_MATCH'] if env['HTTP_IF_MATCH']
+      req['If-None-Match']         = env['HTTP_IF_NONE_MATCH'] if env['HTTP_IF_NONE_MATCH']
+      req['If-Modified-Since']     = env['HTTP_IF_MODIFIED_SINCE'] if env['HTTP_IF_MODIFIED_SINCE']
+      req['If-Unmodified-Since']   = env['HTTP_IF_UNMODIFIED_SINCE'] if env['HTTP_UNMODIFIED_SINCE']
 
-      head = s3.head_object(req)
+      begin
+        head = s3.head_object(bucket, key, req)
+      rescue => e
+        return Errors.not_found('could not head ' + bucket.to_s + ' ' + key.to_s + ' ' + e.message)
+      end
 
-      return Errors.not_found unless head
+      return Errors.not_found('no-head') unless head
 
       case env['REQUEST_METHOD']
       when 'HEAD'
@@ -75,13 +74,13 @@ module Skypager
         end
       end
 
-    rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NotFound
-      return Errors.not_found
+    rescue Excon::Errors::NotFound
+      return Errors.not_found('rescue')
 
-    rescue Aws::S3::Errors::NotModified
+    rescue Excon::Errors::NotModified
       return Errors.not_modified
 
-    rescue Aws::S3::Errors::PreconditionFailed
+    rescue Excon::Errors::PreconditionFailed
       return Errors.precondition_failed
 
     rescue NameError => e
@@ -101,10 +100,10 @@ module Skypager
         io.write "HTTP/1.1 200 OK\r\n"
         io.write "Status: 200\r\n"
         io.write "Connection: close\r\n"
-        io.write "Content-Type: #{head.content_type}\r\n"
-        io.write "Content-Length: #{head.content_length}\r\n"
-        io.write "ETag: #{head.etag}\r\n"
-        io.write "Last-Modified: #{head.last_modified}\r\n"
+        io.write "Content-Type: #{head.headers['Content-Type']}\r\n"
+        io.write "Content-Length: #{head.headers['Content-Length']}\r\n"
+        io.write "ETag: #{head.headers['ETag']}\r\n"
+        io.write "Last-Modified: #{head.headers['Last-Modified']}\r\n"
         io.write "\r\n"
         io.flush
 
@@ -119,7 +118,7 @@ module Skypager
       case env['REQUEST_METHOD']
       when 'GET'
         fiber = Fiber.new do
-          s3.get_object(request) do |chunk|
+          s3.get_object(request[:bucket], request[:key], request) do |chunk|
             Fiber.yield(chunk)
           end
           Fiber.yield(nil)
@@ -135,10 +134,10 @@ module Skypager
       end
 
       headers = {
-        'Content-Type' => head.content_type.to_s,
-        'Content-Length' => head.content_length.to_s,
-        'Last-Modified' => head.last_modified.to_s,
-        'ETag' => head.etag.to_s,
+        'Content-Type' => head.headers['Content-Type'].to_s,
+        'Content-Length' => head.headers['Content-Length'].to_s,
+        'Last-Modified' => head.headers['Last-Modified'].to_s,
+        'ETag' => head.headers['ETag'].to_s,
       }
 
       [200, headers, body]
@@ -150,8 +149,8 @@ module Skypager
           [405, {'Content-Type' => 'text/plain'}, ["method not allowed"]]
         end
 
-        def not_found
-          [404, {'Content-Type' => 'text/plain'}, ["not found"]]
+        def not_found(reason="not found man")
+          [404, {'Content-Type' => 'text/plain'}, [reason.to_s]]
         end
 
         def forbidden

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "2.1.0"
+  VERSION = "2.1.2"
 end

data/skypager.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 3.0.0'
   spec.add_dependency 'uri_template'
   spec.add_dependency 'rack-proxy'
+  spec.add_dependency 'datapimp', '>= 1.1.1'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", '~> 0'

data/spec/interface/protector_spec.rb

@@ -0,0 +1,6 @@
+require "spec_helper"
+
+describe "The Protector Interface" do
+  it "shows a login page if you don't have the cookies" do
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skypager
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: datapimp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -215,12 +229,15 @@ files:
 - lib/skypager/cli/config.rb
 - lib/skypager/configuration.rb
 - lib/skypager/core_ext.rb
+- lib/skypager/protector.rb
 - lib/skypager/proxy.rb
 - lib/skypager/router.rb
 - lib/skypager/site.rb
 - lib/skypager/tar.rb
 - lib/skypager/version.rb
 - skypager.gemspec
+- spec/interface/protector_spec.rb
+- spec/spec_helper.rb
 homepage: http://skypager.io
 licenses:
 - MIT
@@ -246,5 +263,7 @@ signing_key:
 specification_version: 4
 summary: Skypager lets people collaborate on advanced, dynamic sites using simple
   familiar tools
-test_files: []
+test_files:
+- spec/interface/protector_spec.rb
+- spec/spec_helper.rb
 has_rdoc: