hanami 2.0.0.alpha1 → 2.0.0.alpha5

data/lib/hanami.rb

@@ -7,46 +7,32 @@
 # @see http://hanamirb.org
 module Hanami
   require "hanami/version"
-  require "hanami/frameworks"
-  require "hanami/container"
   require "hanami/application"
 
   @_mutex = Mutex.new
 
   def self.application
     @_mutex.synchronize do
-      raise "Hanami application not configured" unless defined?(@_application)
+      raise "Hanami.application not configured" unless defined?(@_application)
 
       @_application
     end
   end
 
-  def self.application=(app)
-    @_mutex.synchronize do
-      raise "Hanami application already configured" if defined?(@_application)
-
-      @_application = app unless app.name.nil?
-    end
-  end
-
-  def self.app
-    @_mutex.synchronize do
-      raise "Hanami.app not configured" unless defined?(@_app)
-
-      @_app
-    end
+  def self.application?
+    defined?(@_application)
   end
 
-  def self.app=(app)
+  def self.application=(klass)
     @_mutex.synchronize do
-      raise "Hanami.app already configured" if defined?(@_app)
+      raise "Hanami.application already configured" if defined?(@_application)
 
-      @_app = app
+      @_application = klass unless klass.name.nil?
     end
   end
 
-  def self.root
-    Container.root
+  def self.rack_app
+    application.rack_app
   end
 
   def self.env
@@ -58,18 +44,19 @@ module Hanami
   end
 
   def self.logger
-    Container[:logger]
+    application[:logger]
   end
 
-  def self.boot
-    @_mutex.synchronize do
-      raise "Hanami application already booted" if defined?(@_booted)
+  def self.init
+    application.init
+  end
 
-      @_booted = true
-    end
+  def self.boot
+    application.boot
+  end
 
-    Container.finalize!
-    self.app = application.new
+  def self.shutdown
+    application.shutdown
   end
 
   def self.bundler_groups

metadata

@@ -1,125 +1,165 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha1
+  version: 2.0.0.alpha5
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2022-01-12 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-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.alpha
+        version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
-  name: hanami-controller
+  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-cli
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.alpha
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.alpha
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: dry-system
+  name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.22'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.22'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - "<"
+        version: 2.0.alpha
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 2.0.alpha
+- !ruby/object:Gem::Dependency
+  name: hanami-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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 +194,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 +214,57 @@ 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/routes_helper.rb
+- lib/hanami/application/container/boot/settings.rb
+- lib/hanami/application/router.rb
+- lib/hanami/application/routes.rb
+- lib/hanami/application/routes_helper.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/routing/router.rb
+- lib/hanami/application/settings.rb
+- lib/hanami/application/settings/dotenv_store.rb
+- lib/hanami/assets/application_configuration.rb
+- lib/hanami/assets/configuration.rb
 - lib/hanami/boot.rb
+- lib/hanami/boot/source_dirs.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/logger.rb
 - lib/hanami/configuration/middleware.rb
-- lib/hanami/configuration/security.rb
+- lib/hanami/configuration/null_configuration.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/configuration/source_dirs.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 +272,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

data/lib/hanami/container.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/system/container"
-require "pathname"
-
-module Hanami
-  # Hanami private IoC
-  #
-  # @since 2.0.0
-  class Container < Dry::System::Container
-    configure do |config|
-      config.root = Pathname.new(Dir.pwd)
-    end
-
-    boot(:env) do |c|
-      init do
-        begin
-          require "dotenv"
-        rescue LoadError # rubocop:disable Lint/HandleExceptions
-        end
-
-        Dotenv.load(c.root.join(".env")) if defined?(Dotenv)
-      end
-    end
-
-    boot(:lib) do |c|
-      init do
-        $LOAD_PATH.unshift c.root.join("lib")
-        Hanami::Utils.require!(c.root.join("lib", "**", "*.rb"))
-      end
-    end
-
-    boot(:configuration) do |c|
-      init do
-        require c.root.join("config", "application").to_s
-      end
-
-      start do
-        register(:configuration, Hanami.application.configuration.finalize)
-      end
-    end
-
-    boot(:logger) do |c|
-      init do
-        require "hanami/logger"
-      end
-
-      start do
-        use :configuration
-        register(:logger, Hanami::Logger.new(c[:configuration].logger))
-      end
-    end
-
-    boot(:routes) do |c|
-      init do
-        require c.root.join("config", "routes").to_s
-      end
-
-      start do
-        register(:routes, Hanami.application.routes)
-      end
-    end
-
-    boot(:apps) do |c|
-      start do
-        use :routes
-
-        register(:apps, c[:routes].apps)
-      end
-    end
-
-    boot(:actions) do |c|
-      init do
-        use :configuration
-        use :apps
-
-        c[:apps].each do |app|
-          require c.root.join("apps", app.to_s, "action")
-
-          namespace = Utils::String.classify("#{app}::Actions")
-          namespace = Utils::Class.load!(namespace)
-
-          configuration = Controller::Configuration.new do |config|
-            config.cookies                 = c[:configuration].cookies.options
-            config.default_headers         = c[:configuration].security.to_hash
-            config.default_request_format  = c[:configuration].default_request_format
-            config.default_response_format = c[:configuration].default_response_format
-          end
-
-          register(:"apps.#{app}.actions.namespace", namespace)
-          register(:"apps.#{app}.actions.configuration", configuration)
-        end
-      end
-    end
-
-    boot(:code) do |c|
-      init do
-        use :configuration
-        use :apps
-        use :actions
-
-        apps = c[:apps].join(",")
-        Hanami::Utils.require!(c.root.join("apps", "{#{apps}}", "**", "*.rb"))
-      end
-    end
-  end
-end

data/lib/hanami/frameworks.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/utils"
-require "hanami/router"
-require "hanami/controller"
-require "hanami/utils/string"
-require "hanami/utils/class"
-
-# Hanami
-#
-# @since 0.1.0
-module Hanami
-  # Hanami::Router enhancements
-  #
-  # @since 2.0.0
-  class Router
-    # rubocop:disable Metrics/ParameterLists
-    def mount(app, at:, host: nil, container: Hanami::Container, **args, &blk)
-      super(app, at: at, host: host, **args, &blk) unless app.is_a?(Symbol)
-
-      namespace     = container["apps.#{app}.actions.namespace"]
-      configuration = container["apps.#{app}.actions.configuration"]
-
-      scope(at, namespace: namespace, configuration: configuration, &blk)
-    end
-    # rubocop:enable Metrics/ParameterLists
-  end
-end