jj-middleware 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ddac0f6c59a12d3d877ef45218ffbed2cbef94d
-  data.tar.gz: 7183a18286a9c1a71a5ab68394e922668f2a3240
+  metadata.gz: e972d093a7be26e5746d753ca4df5efbd450044f
+  data.tar.gz: cc02197f544e446abda319824afddff3b9d66952
 SHA512:
-  metadata.gz: 56085af19906726369333841eeef7f281db07c819efbd1bb602d1076a8f58310151314c930302c619ba8bfe45d6a77f7d5b05c66f967ca5c1a8a4412f0c34b41
-  data.tar.gz: b0836c282e3102fe087ec1968d37584627384bdd51396559fb24b4fd2f40a1b8386db9b3cb7bff06b2566e0670f5b40a1bfd0635c1fad51a14a37d32dcb29bda
+  metadata.gz: 35b16bc35278be173cb01e96637a438c74a94814e14f28d3e6221a1516f1aa57dc9268fb518707767741c737e0046091009e6d977037ef155d59e6b0a3221d59
+  data.tar.gz: 467590c24da14c2643c4547592855f3c5d42999620a11920cccb482ca7937e502b6fee8e69d27f18528c553b60885ebbb3a003053d4f6f3f36eca6f146cdea3f

data/jj-middleware.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rack", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 

data/lib/jj/middleware.rb

@@ -1,5 +1,5 @@
 module JJ
   module Middleware
-    VERSION = "1.0.0".freeze
+    VERSION = "2.0.0".freeze
   end
 end

data/lib/jj/middleware/auth.rb

@@ -9,31 +9,37 @@ module JJ
       end
 
       def call(env)
-        sess = Session.new(env)
-        logged_in?(sess) ? @app.call(env) : redirect("/login")
+        session = Session.new(env)
+        logged_in?(session) ? @app.call(env) : redirect("/login")
       end
 
       private
 
-      def logged_in?(sess)
-        unless sess.exist?
-          log.warn("[JJ::Auth] Session does not exist.")
+      def logged_in?(session)
+        unless session.exist?
+          warn("Session does not exist")
           return false
         end
 
-        user = sess.fetch("user")
+        user = session.fetch("user")
         if user.nil?
-          log.warn("[JJ::Auth] User key doesn't exist in session.")
+          warn("User key doesn't exist in session")
           return false
         end
 
         unless user.id && user.email
-          log.warn("[JJ::Auth] User ID/Email doesn't exist in session.")
+          warn("User ID/Email doesn't exist in session")
           return false
         end
 
         true
       end
+
+      def warn(msg)
+        log.warn(
+          format("[JJ::Auth] %s.", msg)
+        )
+      end
     end
   end
 end

data/lib/jj/middleware/base.rb

@@ -6,12 +6,27 @@ module JJ
       protected
 
       def log
-        @log ||= ::Logger.new STDOUT
+        logger = test? ? ::Logger.new("/dev/null") : ::Logger.new(STDOUT)
+        logger.formatter = logging_formatter
+        @log ||= logger
       end
 
       def redirect(path, code = 302)
         [code, { "Location" => path, "Content-Type" => "text/html" }, []]
       end
+
+      private
+
+      def logging_formatter
+        proc do |severity, datetime, _, msg|
+          time = datetime.strftime("%Y/%m/%d %H:%M:%S")
+          format("%s %s - %s\n", severity, time, msg)
+        end
+      end
+
+      def test?
+        ENV["APP_ENV"] == "test"
+      end
     end
   end
 end

data/lib/jj/middleware/onboarding.rb

@@ -10,13 +10,13 @@ module JJ
       end
 
       def call(env)
-        sess = Session.new(env)
-        user = sess.fetch("user")
-        
+        session = Session.new(env)
+        user = session.fetch("user")
+
         unless user_exist?(user)
           log.info("[JJ::Onboarding] User record not yet created.")
           record = create_user!(user.id)
-          sess.set_model(record)
+          session.update_user_model(record)
           return redirect("/onboarding")
         end
 

data/lib/jj/middleware/session.rb

@@ -1,22 +1,33 @@
+require "rack/request"
+
 module JJ
   module Middleware
     class Session
       def initialize(env)
-        @env = env
+        raise(ArgumentError, "'env' must be Hash") unless env.is_a?(Hash)
+        @request = Rack::Request.new(env)
       end
 
       def exist?
-        @env.key?("rack.session")
+        !@request.session.nil?
       end
 
       def fetch(key = nil)
-        @env["rack.session"].to_hash.tap do |s|
+        validate_fetch_key!(key)
+        @request.session.tap do |s|
           return s[key] unless key.nil?
         end
       end
 
-      def set_model(record)
-        @env["rack.session"].to_hash["user"].model = record
+      def update_user_model(record)
+        fetch("user").model = record
+      end
+
+      private
+
+      def validate_fetch_key!(k)
+        return if k.nil? || k.is_a?(String)
+        raise(ArgumentError, "'key' must be String/nil")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jj-middleware
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement