hanami 2.0.0.alpha1 → 2.0.0.alpha2

data/lib/hanami/version.rb

@@ -8,7 +8,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = "2.0.0.alpha1"
+    VERSION = "2.0.0.alpha2"
 
     # @since 0.9.0
     # @api private

data/lib/hanami/web/rack_logger.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require "json"
+require "rack/request"
+require "hanami/utils/hash"
+
+module Hanami
+  module Web
+    # Rack logger for Hanami applications
+    class RackLogger
+      attr_reader :logger
+      attr_reader :filter_params
+
+      def initialize(logger, filter_params: [])
+        @logger = logger
+        @filter_params = filter_params
+      end
+
+      def attach(rack_monitor)
+        rack_monitor.on :stop do |event|
+          log_request event[:env], event[:status], event[:time]
+        end
+
+        rack_monitor.on :error do |event|
+          log_exception event[:exception]
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def log_request(env, status, time)
+        data = {
+          http: env[HTTP_VERSION],
+          verb: env[REQUEST_METHOD],
+          status: status,
+          ip: env[HTTP_X_FORWARDED_FOR] || env[REMOTE_ADDR],
+          path: env[SCRIPT_NAME] + env[PATH_INFO].to_s,
+          length: extract_content_length(env),
+          params: extract_params(env),
+          elapsed: time,
+        }
+
+        logger.info JSON.generate(data)
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def log_exception(exception)
+        logger.error exception.message
+        logger.error exception.backtrace.join("\n")
+      end
+
+      private
+
+      HTTP_VERSION = "HTTP_VERSION"
+      REQUEST_METHOD = "REQUEST_METHOD"
+      HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR"
+      REMOTE_ADDR = "REMOTE_ADDR"
+      SCRIPT_NAME = "SCRIPT_NAME"
+      PATH_INFO = "PATH_INFO"
+      RACK_ERRORS = "rack.errors"
+      QUERY_HASH = "rack.request.query_hash"
+      FORM_HASH = "rack.request.form_hash"
+      ROUTER_PARAMS = "router.params"
+      CONTENT_LENGTH = "Content-Length"
+
+      def extract_content_length(env)
+        value = env[CONTENT_LENGTH]
+        !value || value.to_s == "0" ? "-" : value
+      end
+
+      def extract_params(env)
+        result = env.fetch(QUERY_HASH, {})
+        result.merge!(env.fetch(FORM_HASH, {}))
+        result.merge!(Hanami::Utils::Hash.deep_stringify(env.fetch(ROUTER_PARAMS, {})))
+        result
+      end
+
+      FILTERED = "[FILTERED]"
+
+      # rubocop:disable Metrics/MethodLength
+      def filter(params)
+        params.each_with_object({}) do |(k, v), h|
+          if filter_params.include?(k)
+            h.update(k => FILTERED)
+          elsif v.is_a?(Hash)
+            h.update(k => filter(v))
+          elsif v.is_a?(Array)
+            h.update(k => v.map { |m| m.is_a?(Hash) ? filter(m) : m })
+          else
+            h[k] = v
+          end
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

metadata

@@ -1,125 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha1
+  version: 2.0.0.alpha2
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hanami-utils
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: hanami-router
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: hanami-controller
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: hanami-cli
+  name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.alpha
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.alpha
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.0.alpha
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+        version: 2.0.alpha
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -154,19 +174,18 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: Hanami is a web framework for Ruby
 email:
 - me@lucaguidi.com
-executables:
-- hanami
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -175,30 +194,49 @@ files:
 - FEATURES.md
 - LICENSE.md
 - README.md
-- bin/hanami
 - hanami.gemspec
 - lib/hanami.rb
 - lib/hanami/application.rb
+- lib/hanami/application/autoloader/inflector_adapter.rb
+- lib/hanami/application/container/boot/inflector.rb
+- lib/hanami/application/container/boot/logger.rb
+- lib/hanami/application/container/boot/rack_logger.rb
+- lib/hanami/application/container/boot/rack_monitor.rb
+- lib/hanami/application/container/boot/settings.rb
+- lib/hanami/application/router.rb
+- lib/hanami/application/routing/middleware/stack.rb
+- lib/hanami/application/routing/resolver.rb
+- lib/hanami/application/routing/resolver/node.rb
+- lib/hanami/application/routing/resolver/trie.rb
+- lib/hanami/application/settings.rb
+- lib/hanami/application/settings/definition.rb
+- lib/hanami/application/settings/loader.rb
+- lib/hanami/application/settings/struct.rb
 - lib/hanami/boot.rb
+- lib/hanami/cli/application/cli.rb
+- lib/hanami/cli/application/command.rb
+- lib/hanami/cli/application/commands.rb
+- lib/hanami/cli/application/commands/console.rb
+- lib/hanami/cli/base_command.rb
 - lib/hanami/cli/commands.rb
 - lib/hanami/cli/commands/command.rb
 - lib/hanami/cli/commands/server.rb
 - lib/hanami/configuration.rb
-- lib/hanami/configuration/cookies.rb
 - lib/hanami/configuration/middleware.rb
-- lib/hanami/configuration/security.rb
+- lib/hanami/configuration/router.rb
 - lib/hanami/configuration/sessions.rb
-- lib/hanami/container.rb
-- lib/hanami/frameworks.rb
-- lib/hanami/routes.rb
+- lib/hanami/init.rb
 - lib/hanami/server.rb
+- lib/hanami/setup.rb
+- lib/hanami/slice.rb
 - lib/hanami/version.rb
+- lib/hanami/web/rack_logger.rb
 homepage: http://hanamirb.org
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,15 +244,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: The web, with simplicity
 test_files: []

data/bin/hanami

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler"
-require "hanami/cli/commands"
-
-Bundler.require(*Hanami.bundler_groups) if File.exist?(ENV["BUNDLE_GEMFILE"] || "Gemfile")
-Hanami::CLI.new(Hanami::CLI::Commands).call

data/lib/hanami/configuration/cookies.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Hanami
-  class Configuration
-    # Hanami configuration for HTTP cookies
-    #
-    # @since 2.0.0
-    class Cookies
-      def self.null
-        { null: true }
-      end
-
-      attr_reader :options
-
-      def initialize(options)
-        @options = options
-      end
-
-      def enabled?
-        options != self.class.null
-      end
-    end
-  end
-end

data/lib/hanami/configuration/security.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-require "concurrent/hash"
-require "hanami/utils/string"
-
-module Hanami
-  class Configuration
-    # Hanami configuration security settings
-    #
-    # @since 2.0.0
-    class Security
-      def initialize
-        @settings = Concurrent::Hash.new
-        settings[:x_frame_options]         = Setting.new(HEADER_X_FRAME_OPTIONS, DEFAULT_X_FRAME_OPTIONS)
-        settings[:x_content_type_options]  = Setting.new(HEADER_X_CONTENT_TYPE_OPTIONS, DEFAULT_X_CONTENT_TYPE_OPTIONS)
-        settings[:x_xss_protection]        = Setting.new(HEADER_X_XSS_PROTECTION, DEFAULT_X_XSS_PROTECTION)
-        settings[:content_security_policy] = ContentSecurityPolicy.new(HEADER_CONTENT_SECURITY_POLICY, DEFAULT_CONTENT_SECURITY_POLICY.dup)
-      end
-
-      def x_frame_options=(value)
-        settings[:x_frame_options].value = value
-      end
-
-      def x_frame_options
-        settings.fetch(:x_frame_options)
-      end
-
-      def x_content_type_options=(value)
-        settings[:x_content_type_options].value = value
-      end
-
-      def x_content_type_options
-        settings.fetch(:x_content_type_options)
-      end
-
-      def x_xss_protection=(value)
-        settings[:x_xss_protection].value = value
-      end
-
-      def x_xss_protection
-        settings.fetch(:x_xss_protection)
-      end
-
-      def content_security_policy=(options)
-        settings[:content_security_policy].value = options
-      end
-
-      def content_security_policy
-        settings.fetch(:content_security_policy)
-      end
-
-      def to_hash
-        settings.each_with_object({}) do |(_, v), result|
-          next if v.value.nil?
-
-          result[v.header] = v.value
-        end
-      end
-
-      private
-
-      # X-Frame-Options
-      HEADER_X_FRAME_OPTIONS = "X-Frame-Options"
-      private_constant :HEADER_X_FRAME_OPTIONS
-
-      DEFAULT_X_FRAME_OPTIONS = "DENY"
-      private_constant :DEFAULT_X_FRAME_OPTIONS
-
-      # X-Content-Type-Optionx
-      HEADER_X_CONTENT_TYPE_OPTIONS = "X-Content-Type-Options"
-      private_constant :HEADER_X_CONTENT_TYPE_OPTIONS
-
-      DEFAULT_X_CONTENT_TYPE_OPTIONS = "nosniff"
-      private_constant :DEFAULT_X_CONTENT_TYPE_OPTIONS
-
-      # X-XSS-Protection
-      HEADER_X_XSS_PROTECTION = "X-XSS-Protection"
-      private_constant :HEADER_X_XSS_PROTECTION
-
-      DEFAULT_X_XSS_PROTECTION = "1; mode=block"
-      private_constant :DEFAULT_X_XSS_PROTECTION
-
-      # Content-Security-Policy
-      HEADER_CONTENT_SECURITY_POLICY = "Content-Security-Policy"
-      private_constant :HEADER_CONTENT_SECURITY_POLICY
-
-      DEFAULT_CONTENT_SECURITY_POLICY = {
-        form_action: "'self'",
-        frame_ancestors: "'self'",
-        base_uri: "'self'",
-        default_src: "'none'",
-        script_src: "'self'",
-        connect_src: "'self'",
-        img_src: "'self' https: data:",
-        style_src: "'self' 'unsafe-inline' https:",
-        font_src: "'self'",
-        object_src: "'none'",
-        plugin_types: "application/pdf",
-        child_src: "'self'",
-        frame_src: "'self'",
-        media_src: "'self'"
-      }.freeze
-      private_constant :DEFAULT_CONTENT_SECURITY_POLICY
-
-      # Security setting
-      #
-      # @api private
-      # @since 2.0.0
-      class Setting
-        attr_accessor :header, :value
-
-        def initialize(header, value)
-          @header = header.freeze
-          @value = value
-        end
-      end
-
-      # Content security policy settings
-      #
-      # @api private
-      # @since 2.0.0
-      class ContentSecurityPolicy < Setting
-        def value
-          @value.map do |k, v|
-            "#{Utils::String.dasherize(k)} #{v}" unless v.nil?
-          end.compact.join("; ")
-        end
-
-        def [](key)
-          @value[key]
-        end
-
-        def []=(key, value)
-          @value[key] = value
-        end
-      end
-
-      attr_reader :settings
-    end
-  end
-end