hanami 1.3.5 → 2.0.0.alpha1

data/lib/hanami/routes.rb

@@ -1,219 +1,31 @@
-require 'hanami/utils/escape'
+# frozen_string_literal: true
 
 module Hanami
-  # Routes factory
+  # Hanami application routes
   #
-  # A Hanami application has this factory instantiated by default and associated
-  # to the `Routes` constant, under the application namespace.
-  #
-  # @since 0.1.0
-  # @api private
+  # @since 2.0.0
   class Routes
-    # Initialize the factory
-    #
-    # @param routes [Hanami::Router] a routes set
-    #
-    # @return [Hanami::Routes] the factory
-    #
-    # @since 0.1.0
-    # @api private
-    def initialize(routes)
-      @routes = routes
-    end
+    attr_reader :apps
 
-    # Return a relative path for the given route name
-    #
-    # @param name [Symbol] the route name
-    # @param args [Array,nil] an optional set of arguments that is passed down
-    #   to the wrapped route set.
-    #
-    # @return [Hanami::Utils::Escape::SafeString] the corresponding relative URL
-    #
-    # @raise Hanami::Routing::InvalidRouteException
-    #
-    # @since 0.1.0
-    #
-    # @see http://rdoc.info/gems/hanami-router/Hanami/Router#path-instance_method
-    #
-    # @example Basic example
-    #   require 'hanami'
-    #
-    #   module Web
-    #     class Application < Hanami::Application
-    #       configure do
-    #         routes do
-    #           get '/login', to: 'sessions#new', as: :login
-    #         end
-    #       end
-    #     end
-    #   end
-    #
-    #   Web.routes.path(:login)
-    #     # => '/login'
-    #
-    #   Web.routes.path(:login, return_to: '/dashboard')
-    #     # => '/login?return_to=%2Fdashboard'
-    #
-    # @example Dynamic finders
-    #   require 'hanami'
-    #
-    #   module Web
-    #     class Application < Hanami::Application
-    #       configure do
-    #         routes do
-    #           get '/login', to: 'sessions#new', as: :login
-    #         end
-    #       end
-    #     end
-    #   end
-    #
-    #   Web.routes.login_path
-    #     # => '/login'
-    #
-    #   Web.routes.login_path(return_to: '/dashboard')
-    #     # => '/login?return_to=%2Fdashboard'
-    def path(name, *args)
-      Utils::Escape::SafeString.new(@routes.path(name, *args))
+    def initialize(&blk)
+      @blk = blk
+      @apps = []
+      instance_eval(&blk)
     end
 
-    # Return an absolute path for the given route name
-    #
-    # @param name [Symbol] the route name
-    # @param args [Array,nil] an optional set of arguments that is passed down
-    #   to the wrapped route set.
-    #
-    # @return [Hanami::Utils::Escape::SafeString] the corresponding absolute URL
-    #
-    # @raise Hanami::Routing::InvalidRouteException
-    #
-    # @since 0.1.0
-    #
-    # @see http://rdoc.info/gems/hanami-router/Hanami/Router#url-instance_method
-    #
-    # @example Basic example
-    #   require 'hanami'
-    #
-    #   module Web
-    #     class Application < Hanami::Application
-    #       configure do
-    #         routes do
-    #           scheme 'https'
-    #           host   'bookshelf.org'
-    #
-    #           get '/login', to: 'sessions#new', as: :login
-    #         end
-    #       end
-    #     end
-    #   end
-    #
-    #   Web.routes.url(:login)
-    #     # => 'https://bookshelf.org/login'
-    #
-    #   Web.routes.url(:login, return_to: '/dashboard')
-    #     # => 'https://bookshelf.org/login?return_to=%2Fdashboard'
-    #
-    # @example Dynamic finders
-    #   require 'hanami'
-    #
-    #   module Web
-    #     class Application < Hanami::Application
-    #       configure do
-    #         routes do
-    #           scheme 'https'
-    #           host   'bookshelf.org'
-    #
-    #           get '/login', to: 'sessions#new', as: :login
-    #         end
-    #       end
-    #     end
-    #   end
-    #
-    #   Web.routes.login_url
-    #     # => 'https://bookshelf.org/login'
-    #
-    #   Web.routes.login_url(return_to: '/dashboard')
-    #     # => 'https://bookshelf.org/login?return_to=%2Fdashboard'
-    def url(name, *args)
-      Utils::Escape::SafeString.new(@routes.url(name, *args))
+    def to_proc
+      @blk
     end
 
-    # Recognize a route from a Rack env.
-    #
-    # This method is designed for testing purposes
-    #
-    # @param env [Hash] a Rack env
-    #
-    # @return [Hanami::Routing::RecognizedRoute] the recognized route
-    #
-    # @since 0.8.0
-    #
-    # @see https://guides.hanamirb.org/routing/testing
-    #
-    # @example Path Generation
-    #   # spec/web/routes_spec.rb
-    #   RSpec.describe Web::Routes do
-    #     it 'generates "/"' do
-    #       actual = described_class.path(:root)
-    #       expect(actual).to eq '/'
-    #     end
-    #
-    #     it 'generates "/books/23"' do
-    #       actual = described_class.path(:book, id: 23)
-    #       expect(actual).to eq '/books/23'
-    #     end
-    #   end
-    #
-    # @example Route Recognition
-    #   # spec/web/routes_spec.rb
-    #   RSpec.describe Web::Routes do
-    #
-    #     # ...
-    #
-    #     it 'recognizes "GET /"' do
-    #       env   = Rack::MockRequest.env_for('/')
-    #       route = described_class.recognize(env)
-    #
-    #       expect(route).to be_routable
-    #
-    #       expect(route.path).to   eq '/'
-    #       expect(route.verb).to   eq 'GET'
-    #       expect(route.params).to eq({})
-    #     end
-    #
-    #     it 'recognizes "PATCH /books/23"' do
-    #       env   = Rack::MockRequest.env_for('/books/23', method: 'PATCH')
-    #       route = described_class.recognize(env)
-    #
-    #       expect(route).to be_routable
-    #
-    #       expect(route.path).to   eq '/books/23'
-    #       expect(route.verb).to   eq 'PATCH'
-    #       expect(route.params).to eq(id: '23')
-    #     end
-    #
-    #     it 'does not recognize unknown route' do
-    #       env   = Rack::MockRequest.env_for('/foo')
-    #       route = described_class.recognize(env)
-    #
-    #       expect(route).to_not be_routable
-    #     end
-    #   end
-    def recognize(env)
-      @routes.recognize(env)
+    def mount(app, **)
+      @apps << app if app.is_a?(Symbol)
     end
 
-    protected
-
-    # @since 0.3.0
-    # @api private
-    def method_missing(m, *args)
-      named_route, type = m.to_s.split(/\_(path|url)\z/)
-
-      if type
-        public_send(type, named_route.to_sym, *args)
-      else
-        super
-      end
+    # rubocop:disable Style/MethodMissingSuper
+    # rubocop:disable Style/MissingRespondToMissing
+    def method_missing(*)
     end
+    # rubocop:enable Style/MissingRespondToMissing
+    # rubocop:enable Style/MethodMissingSuper
   end
 end

data/lib/hanami/server.rb

@@ -1,4 +1,7 @@
-require 'rack'
+# frozen_string_literal: true
+
+require "hanami"
+require "rack"
 
 module Hanami
   # Rack compatible server.
@@ -13,81 +16,14 @@ module Hanami
   # @since 0.8.0
   # @api private
   class Server < ::Rack::Server
-    # @api private
-    attr_reader :options
-
-    # @since 0.8.0
-    # @api private
-    #
-    # @see Hanami::Environment#initialize
-    def initialize
-      @options = _extract_options
-      setup
-    end
-
     # Primarily this removes the ::Rack::Chunked middleware
     # which is the cause of Safari content-length bugs.
     #
     # @since 0.8.0
     def middleware
-      mw = Hash.new { |e, m| e[m] = [] }
+      mw = ::Hash.new { |e, m| e[m] = [] }
       mw["development"].concat([::Rack::ShowExceptions, ::Rack::Lint])
-      require 'hanami/assets/static'
-      mw["development"].push(::Hanami::Assets::Static)
       mw
     end
-
-    # @api private
-    def start
-      preload
-      super
-    end
-
-    private
-
-    # @api private
-    def setup
-      return unless code_reloading?
-      @app = Shotgun::Loader.new(rackup)
-    end
-
-    # @api private
-    def environment
-      Components['environment']
-    end
-
-    # @since 0.8.0
-    # @api private
-    def code_reloading?
-      Hanami.code_reloading?
-    end
-
-    # @api private
-    def rackup
-      environment.rackup.to_s
-    end
-
-    # @api private
-    def preload
-      if code_reloading?
-        Shotgun.enable_copy_on_write
-        Shotgun.preload
-      else
-        Hanami.boot
-      end
-    end
-
-    # Options for Rack::Server superclass
-    #
-    # @since 0.8.0
-    # @api private
-    def _extract_options
-      environment.to_options.merge(
-        config:      rackup,
-        Host:        environment.host,
-        Port:        environment.port,
-        AccessLog:   []
-      )
-    end
   end
 end

data/lib/hanami/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   # Hanami version
   #
@@ -6,7 +8,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.3.5'.freeze
+    VERSION = "2.0.0.alpha1"
 
     # @since 0.9.0
     # @api private

data/lib/hanami.rb

@@ -1,4 +1,4 @@
-require 'thread'
+# frozen_string_literal: true
 
 # A complete web framework for Ruby
 #
@@ -6,277 +6,73 @@ require 'thread'
 #
 # @see http://hanamirb.org
 module Hanami
-  require 'hanami/version'
-  require 'hanami/frameworks'
-  require 'hanami/environment'
-  require 'hanami/app'
-  require 'hanami/application'
-  require 'hanami/components'
-  require 'hanami/configuration'
+  require "hanami/version"
+  require "hanami/frameworks"
+  require "hanami/container"
+  require "hanami/application"
 
-  # @api private
-  # @since 0.6.0
-  DEFAULT_PUBLIC_DIRECTORY = 'public'.freeze
-
-  # @api private
-  # @since 0.9.0
   @_mutex = Mutex.new
-  @_plugins = Concurrent::Array.new
 
-  # Configure Hanami project
-  #
-  # Please note that the code for this method is generated by `hanami new`.
-  #
-  # @param blk [Proc] the configuration block
-  #
-  # @since 0.9.0
-  #
-  # @example
-  #   # config/environment.rb
-  #
-  #   # ...
-  #
-  #   Hanami.configure do
-  #     mount Admin::Application, at: "/admin"
-  #     mount Web::Application,   at: "/"
-  #
-  #     model do
-  #       adapter :sql, ENV['DATABASE_URL']
-  #
-  #       migrations "db/migrations"
-  #       schema     "db/schema.sql"
-  #     end
-  #
-  #     mailer do
-  #       root "lib/bookshelf/mailers"
-  #
-  #       delivery do
-  #         development :test
-  #         test        :test
-  #         # production :smtp, address: ENV['SMTP_HOST'], port: ENV['SMTP_PORT']
-  #       end
-  #     end
-  #   end
-  def self.configure(&blk)
+  def self.application
     @_mutex.synchronize do
-      @_configuration = Hanami::Configuration.new(&blk)
-    end
-  end
+      raise "Hanami application not configured" unless defined?(@_application)
 
-  # Hanami configuration
-  #
-  # @return [Hanami::Configuration] the configuration
-  #
-  # @see Hanami.configure
-  #
-  # @since 0.9.0
-  # @api private
-  def self.configuration
-    @_mutex.synchronize do
-      raise "Hanami not configured" unless defined?(@_configuration)
-      @_configuration
+      @_application
     end
   end
 
-  # Configure a plugin
-  #
-  # @see Hanami.configure
-  #
-  # @since 1.2.0
-  def self.plugin(&blk)
-    @_plugins << blk
-  end
-
-  # Plugins registry
-  #
-  # NOTE: We can't use `Components` registry.
-  #
-  # Plugins are loaded when Bundler requires `Gemfile` gems.
-  # During this phase the `Components` that we can resolve are erased by the
-  # first incoming request in development.
-  # They are erased by a workaround that we had to put in place in `Hanami.boot`.
-  # This workaround is `Components.release` and it was introduced because
-  # `shotgun` failed to reload components, so we have to release for each
-  # incoming request.
-  # After the `Components` registry is cleared up, Hanami is able to resolve all
-  # the components from scratch.
-  #
-  # When we'll switch to `hanami-reloader` for development, we can remove
-  # `Components.release` and we'll be able to store plugins in `Components` and
-  # remove `Hanami.plugins` as well.
-  #
-  # @since 1.2.0
-  # @api private
-  def self.plugins
-    @_plugins
-  end
+  def self.application=(app)
+    @_mutex.synchronize do
+      raise "Hanami application already configured" if defined?(@_application)
 
-  # Boot your Hanami project
-  #
-  # NOTE: In case this is invoked many times, it guarantees that the boot
-  #   process happens only once.
-  #
-  # NOTE: This MUST NOT be wrapped by a Mutex, because it would cause a deadlock.
-  #
-  # @return [NilClass]
-  #
-  # @since 0.9.0
-  def self.boot
-    Components.release if code_reloading?
-    Components.resolve('all')
-    Hanami::Model.disconnect if defined?(Hanami::Model)
-    nil
+      @_application = app unless app.name.nil?
+    end
   end
 
-  # Main application that mounts many Rack and/or Hanami applications.
-  #
-  # This is used as integration point for:
-  #
-  #   * `config.ru` (`run Hanami.app`)
-  #   * Feature tests (`Capybara.app = Hanami.app`)
-  #
-  #
-  #
-  # It lazily loads your Hanami project, in case it wasn't booted on before.
-  # This is the case when `hanami server` isn't invoked, but we use different
-  # ways to run the project (eg. `rackup`).
-  #
-  # @return [Hanami::App] the app
-  #
-  # @since 0.9.0
-  # @api private
-  #
-  # @see Hanami.boot
   def self.app
-    boot
-    App.new(configuration, environment)
+    @_mutex.synchronize do
+      raise "Hanami.app not configured" unless defined?(@_app)
+
+      @_app
+    end
   end
 
-  # Check if an application is allowed to load.
-  #
-  # The list of applications to be loaded can be set via the `HANAMI_APPS`
-  # env variable. If the HANAMI_APPS env variable is not set, it defaults
-  # to loading all applications.
-  #
-  # @return [TrueClass,FalseClass] the result of the check
-  #
-  # @since 1.1.0
-  #
-  # @example
-  #
-  #   # Mount hanami app for specific app
-  #   Hanami.configure do
-  #     if Hanami.app?(:web)
-  #       require_relative '../apps/web/application'
-  #       mount Web::Application, at: '/'
-  #     end
-  #   end
-  #
-  def self.app?(app)
-    return true unless ENV.key?('HANAMI_APPS')
+  def self.app=(app)
+    @_mutex.synchronize do
+      raise "Hanami.app already configured" if defined?(@_app)
 
-    allowed_apps = ENV['HANAMI_APPS'].to_s.split(',')
-    allowed_apps.include?(app.to_s.downcase)
+      @_app = app
+    end
   end
 
-  # Return root of the project (top level directory).
-  #
-  # @return [Pathname] root path
-  #
-  # @since 0.3.2
-  #
-  # @example
-  #   Hanami.root # => #<Pathname:/Users/luca/Code/bookshelf>
   def self.root
-    environment.root
-  end
-
-  # Project public directory
-  #
-  # @return [Pathname] public directory
-  #
-  # @since 0.6.0
-  #
-  # @example
-  #   Hanami.public_directory # => #<Pathname:/Users/luca/Code/bookshelf/public>
-  def self.public_directory
-    root.join(DEFAULT_PUBLIC_DIRECTORY)
+    Container.root
   end
 
-  # Return the current environment
-  #
-  # @return [String] the current environment
-  #
-  # @since 0.3.1
-  #
-  # @see Hanami::Environment#environment
-  #
-  # @example
-  #   Hanami.env => "development"
   def self.env
-    environment.environment
+    (ENV["HANAMI_ENV"] || "development").to_sym
   end
 
-  # Check to see if specified environment(s) matches the current environment.
-  #
-  # If multiple names are given, it returns true, if at least one of them
-  # matches the current environment.
-  #
-  # @return [TrueClass,FalseClass] the result of the check
-  #
-  # @since 0.3.1
-  #
-  # @see Hanami.env
-  #
-  # @example Single name
-  #   puts ENV['HANAMI_ENV'] # => "development"
-  #
-  #   Hanami.env?(:development)  # => true
-  #   Hanami.env?('development') # => true
-  #
-  #   Hanami.env?(:production)   # => false
-  #
-  # @example Multiple names
-  #   puts ENV['HANAMI_ENV'] # => "development"
-  #
-  #   Hanami.env?(:development, :test)   # => true
-  #   Hanami.env?(:production, :staging) # => false
   def self.env?(*names)
-    environment.environment?(*names)
+    names.map(&:to_sym).include?(env)
   end
 
-  # Current environment
-  #
-  # @return [Hanami::Environment] environment
-  #
-  # @api private
-  # @since 0.3.2
-  def self.environment
-    Components.resolved('environment') do
-      Environment.new
-    end
+  def self.logger
+    Container[:logger]
   end
 
-  # Check if code reloading is enabled.
-  #
-  # @return [TrueClass,FalseClass] the result of the check
-  #
-  # @since 1.0.0
-  # @api private
-  #
-  # @see https://guides.hanamirb.org/projects/code-reloading
-  def self.code_reloading?
-    environment
-    Components.resolve('code_reloading')
-    Components['code_reloading']
+  def self.boot
+    @_mutex.synchronize do
+      raise "Hanami application already booted" if defined?(@_booted)
+
+      @_booted = true
+    end
+
+    Container.finalize!
+    self.app = application.new
   end
 
-  # Project logger
-  #
-  # @return [Hanami::Logger] the logger
-  #
-  # @since 1.0.0
-  def self.logger
-    Components['logger']
+  def self.bundler_groups
+    [:plugins]
   end
 end