hanami 1.0.0 → 1.1.0.beta1

data/lib/hanami/cli/commands/routes.rb

@@ -0,0 +1,21 @@
+module Hanami
+  class CLI
+    module Commands
+      # @since 1.1.0
+      # @api private
+      class Routes < Command
+        requires "routes.inspector"
+
+        desc "Prints routes"
+
+        # @since 1.1.0
+        # @api private
+        def call(*)
+          puts requirements['routes.inspector'].inspect
+        end
+      end
+    end
+
+    register "routes", Commands::Routes
+  end
+end

data/lib/hanami/cli/commands/server.rb

@@ -0,0 +1,39 @@
+module Hanami
+  class CLI
+    module Commands
+      # @since 1.1.0
+      # @api private
+      class Server < Command
+        requires 'code_reloading'
+
+        desc "Start Hanami server (only for development)"
+
+        option :server,         desc: "Force a server engine (eg, webrick, puma, thin, etc..)"
+        option :host,           desc: "The host address to bind to"
+        option :port,           desc: "The port to run the server on", aliases: ["-p"]
+        option :debug,          desc: "Turn on debug output"
+        option :warn,           desc: "Turn on warnings"
+        option :daemonize,      desc: "Daemonize the server"
+        option :pid,            desc: "Path to write a pid file after daemonize"
+        option :code_reloading, desc: "Code reloading", type: :boolean, default: true
+
+        example [
+          "                    # Basic usage (it uses the bundled server engine)",
+          "--server=webrick    # Force `webrick` server engine",
+          "--host=0.0.0.0      # Bind to a host",
+          "--port=2306         # Bind to a port",
+          "--no-code-reloading # Disable code reloading"
+        ]
+
+        # @since 1.1.0
+        # @api private
+        def call(*)
+          require "hanami/server"
+          Hanami::Server.new.start
+        end
+      end
+    end
+
+    register "server", Commands::Server, aliases: ["s"]
+  end
+end

data/lib/hanami/cli/commands/templates.rb

@@ -0,0 +1,31 @@
+module Hanami
+  class CLI
+    module Commands
+      # @since 1.1.0
+      # @api private
+      class Templates
+        NAMESPACE = name.sub(Utils::String.demodulize(name), "").freeze
+
+        # @since 1.1.0
+        # @api private
+        def initialize(klass)
+          word = klass.name.sub(NAMESPACE, "").split("::").map(&:downcase)
+          @root = Pathname.new(File.join(__dir__, *word))
+          freeze
+        end
+
+        # @since 1.1.0
+        # @api private
+        def find(*names)
+          @root.join(*names)
+        end
+
+        private
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :root
+      end
+    end
+  end
+end

data/lib/hanami/cli/commands/version.rb

@@ -0,0 +1,19 @@
+module Hanami
+  class CLI
+    module Commands
+      # @since 1.1.0
+      # @api private
+      class Version < Command
+        desc "Print Hanami version"
+
+        # @since 1.1.0
+        # @api private
+        def call(*)
+          puts "v#{Hanami::VERSION}"
+        end
+      end
+    end
+
+    register "version", Commands::Version, aliases: ["v", "-v", "--version"]
+  end
+end

data/lib/hanami/common_logger.rb

@@ -34,11 +34,15 @@ module Hanami
 
     # @since 1.0.0
     # @api private
-    QUERY_STRING         = 'QUERY_STRING'.freeze
+    RACK_ERRORS          = 'rack.errors'.freeze
 
-    # @since 1.0.0
+    # @since x.x.x
     # @api private
-    RACK_ERRORS          = 'rack.errors'.freeze
+    QUERY_HASH           = 'rack.request.query_hash'.freeze
+
+    # @since x.x.x
+    # @api private
+    FORM_HASH            = 'rack.request.form_hash'.freeze
 
     # @since 1.0.0
     # @api private
@@ -55,8 +59,8 @@ module Hanami
         status:  status.to_s[0..3],
         ip:      env[HTTP_X_FORWARDED_FOR] || env[REMOTE_ADDR],
         path:    env[SCRIPT_NAME] + env[PATH_INFO],
-        query:   env[QUERY_STRING],
         length:  length,
+        params:  extract_params(env),
         elapsed: now - began_at
       ]
 
@@ -69,5 +73,11 @@ module Hanami
         logger.info(msg)
       end
     end
+
+    # @since 1.1.0
+    # @api private
+    def extract_params(env)
+      (env[QUERY_HASH] || {}).merge(env[FORM_HASH] || {})
+    end
   end
 end

data/lib/hanami/components.rb

@@ -8,6 +8,29 @@ module Hanami
   #
   # The implementation is thread-safe
   #
+  # @example
+  #   Hanami::Components.resolved('repo') { UserRepository.new }
+  #   Hanami::Components['repository.users'] # => #<UserRepository relations=[...]>
+  #
+  # Also you can use Hanami::Components with dry-auto_inject
+  #
+  # @example
+  #   Hanami::Components.resolved('repo') { UserRepository.new }
+  #   Hanami::Components['repository.users'] # => #<UserRepository relations=[...]>
+  #
+  #   HanamiImport = Dry::AutoInject(Hanami::Components)
+  #
+  #   class CreateUser
+  #     include HanamiImport['repository.users']
+  #
+  #     def call(payload)
+  #       users.create(payload)
+  #     end
+  #   end
+  #
+  #   CreateUser.new.call # => #<User:...>
+  #   CreateUser.new(users: MockRepository.new).call # => #<MockUser:...>
+  #
   # @since 0.9.0
   # @api private
   module Components
@@ -87,7 +110,13 @@ module Hanami
       end
     end
 
-    # Return the value of an already resolved component.
+    # Return the value of an already resolved component. Or raise error for not resolved component.
+    #
+    # @example
+    #   Hanami::Components.resolved('repository.users') { UserRepository.new }
+    #
+    #   Hanami::Components['repository.users'] # => #<UserRepository relations=[...]>
+    #   Hanami::Components['repository.other'] # => error
     #
     # @param name [String] the component name
     #
@@ -106,6 +135,15 @@ module Hanami
     #
     # NOTE: this MUST NOT be used unless you know what you're doing.
     #
+    # @example
+    #   Hanami::Components.resolved('repository.users') { UserRepository.new }
+    #   Hanami::Components['repository.users'] # => #<UserRepository relations=[...]>
+    #
+    #   Hanami::Components.release
+    #   Hanami::Components['repository.users']
+    #   # => ArgumentError: Component not resolved: `repo'.
+    #   # => Resolved components are: ...
+    #
     # @since 1.0.0
     # @api private
     def self.release

data/lib/hanami/components/components.rb

@@ -28,7 +28,13 @@ module Hanami
       end
 
       resolve do |configuration|
-        Hanami::Logger.new(Hanami.environment.project_name, *configuration.logger) unless configuration.logger.nil?
+        if configuration.logger.is_a?(Array)
+          if configuration.logger.first.is_a?(::Logger)
+            configuration.logger.first
+          else
+            Hanami::Logger.new(Hanami.environment.project_name, *configuration.logger)
+          end
+        end
       end
     end
 
@@ -111,6 +117,35 @@ module Hanami
       end
     end
 
+    # Tries to evaluate hanami-model configuration, if available for the project
+    # and it doesn't activate migrations logger
+    #
+    # @since 1.1.0
+    # @api private
+    #
+    # @example With hanami-model
+    #   Hanami::Components.resolve('model.configuration.no_logger')
+    #   Hanami::Components['model.configuration.no_logger'].class # => Hanami::Model::Configuration
+    #
+    # @example Without hanami-model
+    #   Hanami::Components.resolve('model.configuration.no_logger')
+    #   Hanami::Components['model.configuration.no_logger'].class # => NilClass
+    register 'model.configuration.no_logger' do
+      requires 'model.bundled'
+
+      prepare do
+        require 'stringio'
+      end
+
+      resolve do |configuration|
+        if Components['model.bundled']
+          Hanami::Model.configure(&configuration.model)
+          Hanami::Model.config.migrations_logger(StringIO.new)
+          Hanami::Model.configuration
+        end
+      end
+    end
+
     # Tries to load SQL support for hanami, if available for the project
     #
     # @since 0.9.0

data/lib/hanami/config/sessions.rb

@@ -58,7 +58,7 @@ module Hanami
       def middleware
         middleware = case @adapter
                      when Symbol
-                       RACK_NAMESPACE % Utils::String.new(@adapter).classify
+                       RACK_NAMESPACE % Utils::String.classify(@adapter)
                      else
                        @adapter
                      end

data/lib/hanami/environment.rb

@@ -110,19 +110,7 @@ module Hanami
 
     # @since 0.4.0
     # @api private
-    CONTAINER = 'container'.freeze
-
-    # @since 0.4.0
-    # @api private
-    CONTAINER_PATH = 'apps'.freeze
-
-    # @since 0.4.0
-    # @api private
-    APPLICATION = 'app'.freeze
-
-    # @since 0.4.0
-    # @api private
-    APPLICATION_PATH = 'app'.freeze
+    APPS_PATH = 'apps'.freeze
 
     # @since 0.4.0
     # @api private
@@ -140,12 +128,17 @@ module Hanami
     # When initialized, it sets standard `ENV` variables for Rack and Hanami,
     # such as `RACK_ENV` and `HANAMI_ENV`.
     #
-    # It also evaluates configuration from `.env` and `.env.<environment>`
+    # It evaluates configuration ONLY from `.env.<environment>` file
     # located under the config directory. All the settings in those files will
     # be exported as `ENV` variables.
     #
-    # The format of those `.env` files is compatible with `dotenv` and `foreman`
-    # gems.
+    # Master .env file is ignored to suggest clear separation of environment
+    # configurations and discourage putting sensitive information into source
+    # control.
+    #
+    # The format of those `.env.<environment>` files follows UNIX and UNIX-like
+    # operating system environment variable declaration format and compatible
+    # with `dotenv` and `foreman` gems.
     #
     # @param options [Hash] override default options for various environment
     #   attributes
@@ -164,10 +157,10 @@ module Hanami
     #   # % tree .
     #   #   .
     #   #   # ...
-    #   #   ├── .env
+    #   #   ├── .env.test
     #   #   └── .env.development
     #
-    #   # % cat .env
+    #   # % cat .env.test
     #   #   FOO="bar"
     #   #   XYZ="yes"
     #
@@ -188,14 +181,11 @@ module Hanami
     #
     #   # User defined ENV vars
     #   ENV['FOO']        # => "ok"
-    #   ENV['XYZ']        # => "yes"
-    #
-    #   # Hanami::Environment evaluates `.env` first as master configuration.
-    #   # Then it evaluates `.env.development` because the current environment
-    #   # is "development". The settings defined in this last file override
-    #   # the one defined in the parent (eg `FOO` is overwritten). All the
-    #   # other settings (eg `XYZ`) will be left untouched.
-    #   # Variables declared on `.env` and `.env.development` will not override
+    #   ENV['XYZ']        # => nil
+    #
+    #   # Hanami::Environment evaluates `.env.development` because the current
+    #   # environment is "development".
+    #   # Variables declared on `.env.development` will not override
     #   # any variable declared on the shell when calling a `hanami` command.
     #   # Eg. In `FOO="not ok" bundle exec hanami c` `FOO` will not be overwritten
     #   # to `"ok"`.
@@ -203,7 +193,7 @@ module Hanami
       opts     = options.to_h.dup
       @env     = Hanami::Env.new(env: opts.delete(:env) || ENV)
       @options = Hanami::Hanamirc.new(root).options
-      @options.merge! Utils::Hash.new(opts.clone).symbolize!
+      @options.merge! Utils::Hash.symbolize(opts.clone)
       LOCK.synchronize { set_env_vars! }
     end
 
@@ -389,7 +379,7 @@ module Hanami
     #
     # @see Hanami::Environment::DEFAULT_ENVIRONMENT_CONFIG
     def env_config
-      root.join(@options.fetch(:environment) { config.join(DEFAULT_ENVIRONMENT_CONFIG) })
+      root.join("config", "environment.rb")
     end
 
     alias project_environment_configuration env_config
@@ -430,21 +420,6 @@ module Hanami
       @options.fetch(:code_reloading) { !!CODE_RELOADING[environment] }
     end
 
-    # @since 0.4.0
-    # @api private
-    def architecture
-      @options.fetch(:architecture) do
-        puts "Cannot recognize Hanami architecture, please check `.hanamirc'"
-        exit 1
-      end
-    end
-
-    # @since 0.4.0
-    # @api private
-    def container?
-      architecture == CONTAINER
-    end
-
     # @since 0.6.0
     # @api private
     def serve_static_assets?
@@ -468,17 +443,12 @@ module Hanami
     # @since 0.4.0
     # @api private
     def apps_path
-      @options.fetch(:path) {
-        case architecture
-        when CONTAINER   then CONTAINER_PATH
-        when APPLICATION then APPLICATION_PATH
-        end
-      }
+      @options.fetch(:path, APPS_PATH)
     end
 
     # Serialize the most relevant settings into a Hash
     #
-    # @return [Hanami::Utils::Hash]
+    # @return [::Hash]
     #
     # @since 0.1.0
     # @api private

data/lib/hanami/hanamirc.rb

@@ -15,28 +15,6 @@ module Hanami
     # @see Hanami::Hanamirc#path_file
     FILE_NAME = '.hanamirc'.freeze
 
-    # Architecture default value
-    #
-    # @since 0.3.0
-    # @api private
-    #
-    # @see Hanami::Hanamirc#options
-    DEFAULT_ARCHITECTURE = 'container'.freeze
-
-    # Application architecture value
-    #
-    # @since 0.6.0
-    # @api private
-    APP_ARCHITECTURE = 'app'.freeze
-
-    # Architecture key for writing the hanamirc file
-    #
-    # @since 0.3.0
-    # @api private
-    #
-    # @see Hanami::Hanamirc#default_options
-    ARCHITECTURE_KEY = 'architecture'.freeze
-
     # Project name for writing the hanamirc file
     #
     # @since 0.8.0
@@ -94,16 +72,16 @@ module Hanami
 
     # Read hanamirc file (if exists) and parse it's values or return default.
     #
-    # @return [Hanami::Utils::Hash] parsed values
+    # @return [::Hash] parsed values
     #
     # @example Default values if file doesn't exist
     #   Hanami::Hanamirc.new(Pathname.new(Dir.pwd)).options
-    #    # => { architecture: 'container', test: 'minitest', template: 'erb' }
+    #    # => { test: 'minitest', template: 'erb' }
     #
     # @example Custom values if file doesn't exist
-    #   options = { architect: 'application', test: 'rspec', template: 'slim' }
+    #   options = { test: 'rspec', template: 'slim' }
     #   Hanami::Hanamirc.new(Pathname.new(Dir.pwd), options).options
-    #    # => { architecture: 'application', test: 'rspec', template: 'slim' }
+    #    # => { test: 'rspec', template: 'slim' }
     def options
       @options ||= symbolize(default_options.merge(file_options))
     end
@@ -115,12 +93,11 @@ module Hanami
     #
     # @see Hanami::Hanamirc#options
     def default_options
-      @default_options ||= Utils::Hash.new({
-                                           ARCHITECTURE_KEY => DEFAULT_ARCHITECTURE,
+      @default_options ||= Utils::Hash.symbolize({
                                            PROJECT_NAME     => project_name,
                                            TEST_KEY         => DEFAULT_TEST_SUITE,
                                            TEMPLATE_KEY     => DEFAULT_TEMPLATE
-                                         }).symbolize!.freeze
+                                         }).freeze
     end
 
     # Check if hanamirc file exists
@@ -137,7 +114,7 @@ module Hanami
 
     # @api private
     def symbolize(hash)
-      Utils::Hash.new(hash).symbolize!
+      Utils::Hash.symbolize(hash)
     end
 
     # @api private