hanami 0.9.2 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dac74bd1407b2a277b071bfd1c678d561b5d1385
-  data.tar.gz: df791585b6be2709032db1ac7d492ab5d165da3e
+  metadata.gz: f3cd82f3f62f3ac1ec9c0fdd9bbcf07acad469b5
+  data.tar.gz: 130099379546f16fa1bc40db4bc902617f9aa7d2
 SHA512:
-  metadata.gz: '00007885789a92bc354914bdaf4a35330b33bdf066d01bccc438f35e5ddc606fe7464284893a49cbab28225a0d590d84265acc5ccb3ef88044c3d82082140968'
-  data.tar.gz: 0b9bfe9ec4eb0924f44a43dc053cadaf86fdf6b30dc9f393e4806710845ed2e254424719b3e4d657f6e20808f5cd2f228b1d4535b312e4eb40f0c6332f01e390
+  metadata.gz: 68533ad169554fa89c2375a54b98f10fd2f6bb7b999ff943b3196e53e535286a4b44cd7bbe55384c6badfcc99fe4c8d8d52190bfc4e1dced51ac126e1a8d89e5
+  data.tar.gz: 4ec5c3a0b46abdacd53f4fe7b853933eb851a957d667c9932eb329e0d51a798aa4f196c8c724d9e6d869fca9a8d707a6ce0ff6ad5f067a9f728cec067794c3bd

data/CHANGELOG.md

@@ -1,6 +1,32 @@
 # Hanami
 The web, with simplicity.
 
+## v1.0.0.beta1 - 2017-02-14
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.4
+- [yjukaku] CLI: `hanami generate model` now also generates a migration
+- [Luca Guidi] Generate `config/boot.rb` for new Hanami projects.
+- [Luca Guidi] Introduced `Hanami.logger` as project logger
+- [Luca Guidi] Automatic logging of HTTP requests, migrations, and SQL queries
+- [Luca Guidi] Introduced `environment` for env specific settings in `config/environment.rb`
+
+### Fixed
+- [Marcello Rocha] Fix Hanami::Mailer loading
+- [Kai Kuchenbecker] Serve only existing assets with `Hanami::Static`
+- [Gabriel Gizotti] Ensure inline ENV vars to not be overwritten by `.env.*` files
+- [Adrian Madrid] Ensure new Hanami projects to have the right `jdbc` prefix for JRuby
+- [Luca Guidi] Fixed code reloading for objects under `lib/`
+- [Semyon Pupkov] Ensure generated mailer to respect the project name under `lib/`
+- [Semyon Pupkov] Fixed generation of mailer settings for new projects
+- [Victor Franco] Fixed CLI subcommands help output
+
+### Changed
+- [Ozawa Sakuro] Don't include `bundler` as a dependency `Gemfile` for new Hanami projects
+- [Luca Guidi] Make compatible with Rack 2.0 only
+- [Luca Guidi] Removed `logger` settings from Hanami applications
+- [Luca Guidi] Removed logger for Hanami applications (eg `Web.logger`)
+- [Luca Guidi] Changed mailer syntax in `config/enviroment.rb`
+
 ## v0.9.2 - 2016-12-19
 ## Added
 - [The Crab] Mark unit tests/specs as pending for generated actions and views

data/FEATURES.md

@@ -3,6 +3,11 @@
 
 ## Features
 
+## v1.0.0.beta1 - 2017-02-14
+- CLI: `hanami generate model` now also generates a migration
+- Project logger `Hanami.logger`
+- Automatic logging of HTTP requests, migrations, and SQL queries
+
 ## v0.9.2 - 2016-12-19
 
 ## v0.9.1 - 2016-11-18

data/hanami.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency 'hanami-utils',       '~> 0.9'
-  spec.add_dependency 'hanami-validations', '~> 0.7'
-  spec.add_dependency 'hanami-router',      '~> 0.8', '>= 0.8.1'
-  spec.add_dependency 'hanami-controller',  '~> 0.8'
-  spec.add_dependency 'hanami-view',        '~> 0.8'
-  spec.add_dependency 'hanami-helpers',     '~> 0.5'
-  spec.add_dependency 'hanami-mailer',      '~> 0.4'
-  spec.add_dependency 'hanami-assets',      '~> 0.4'
+  spec.add_dependency 'hanami-utils',       '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-validations', '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-router',      '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-controller',  '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-view',        '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-helpers',     '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-mailer',      '~> 1.0.0.beta1'
+  spec.add_dependency 'hanami-assets',      '~> 1.0.0.beta1'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'thor',               '~> 0.19'
   spec.add_dependency 'bundler',            '~> 1.13'

data/lib/hanami.rb

@@ -52,7 +52,7 @@ module Hanami
   #       delivery do
   #         development :test
   #         test        :test
-  #         # production :smtp, address: ENV['SMTP_HOST'], port: 1025
+  #         # production :smtp, address: ENV['SMTP_HOST'], port: ENV['SMTP_PORT']
   #       end
   #     end
   #   end
@@ -90,6 +90,7 @@ module Hanami
   # @since 0.9.0
   # @api private
   def self.boot
+    Components.release if code_reloading?
     Components.resolve('all')
   end
 
@@ -195,4 +196,27 @@ module Hanami
       Environment.new
     end
   end
+
+  # Check if code reloading is enabled.
+  #
+  # @return [TrueClass,FalseClass] the result of the check
+  #
+  # @since 1.0.0.beta1
+  # @api private
+  #
+  # @see http://hanamirb.org/guides/projects/code-reloading/
+  def self.code_reloading?
+    environment
+    Components.resolve('code_reloading')
+    Components['code_reloading']
+  end
+
+  # Project logger
+  #
+  # @return [Hanami::Logger] the logger
+  #
+  # @since 1.0.0.beta1
+  def self.logger
+    Components['logger']
+  end
 end

data/lib/hanami/app.rb

@@ -2,6 +2,7 @@ require 'rack'
 require 'rack/builder'
 require 'hanami/router'
 require 'hanami/components'
+require 'hanami/common_logger'
 
 module Hanami
   # Main application that mounts many Rack and/or Hanami applications.
@@ -62,6 +63,9 @@ module Hanami
     # @since 0.9.0
     # @api private
     def middleware(environment)
+      builder.use Hanami::CommonLogger, Hanami.logger
+      builder.use Rack::ContentLength
+
       if middleware = environment.static_assets_middleware # rubocop:disable Lint/AssignmentInCondition
         builder.use middleware
       end

data/lib/hanami/application.rb

@@ -31,19 +31,6 @@ module Hanami
       base.extend(ClassMethods)
       base.namespace.module_eval do
         class << self
-          # Logger for this application
-          #
-          # @return [Hanami::Logger] the logger for this Hanami application
-          #
-          # @since 0.9.0
-          # @api public
-          #
-          # @example
-          #
-          #   Web.logger
-          #   Admin.logger
-          attr_accessor :logger
-
           # Routes for this application
           #
           # @return [Hanami::Routes] the routes for this Hanami application
@@ -124,7 +111,7 @@ module Hanami
       # @api private
       def configuration=(configuration)
         @_lock.synchronize do
-          raise "Can't assign configuration more than once (#{app_name})" unless @configuration.nil?
+          # raise "Can't assign configuration more than once (#{app_name})" unless @configuration.nil?
           @configuration = configuration
         end
       end

data/lib/hanami/application_configuration.rb

@@ -5,7 +5,6 @@ require 'hanami/middleware'
 require 'hanami/config/cookies'
 require 'hanami/config/framework_configuration'
 require 'hanami/config/load_paths'
-require 'hanami/config/logger'
 require 'hanami/config/routes'
 require 'hanami/config/security'
 require 'hanami/config/sessions'
@@ -21,7 +20,7 @@ module Hanami
     # @see Hanami::Configuration#ssl?
     SSL_SCHEME = 'https'.freeze
 
-    # @since x.x.x
+    # @since 1.0.0.beta1
     # @api private
     DEFAULT_SSL_PORT = 443
 
@@ -1398,7 +1397,7 @@ module Hanami
     #   module Bookshelf
     #     class Application < Hanami::Application
     #       configure do
-    #         adapter       :sql, 'postgres://localhost/database'
+    #         adapter       :sql, 'postgresql://localhost/database'
     #         model.adapter :sql, 'sqlite://db/bookshelf_development'
     #       end
     #     end
@@ -1495,40 +1494,6 @@ module Hanami
       @view ||= Config::FrameworkConfiguration.new
     end
 
-    # Defines a Config::Logger instance to the logger configuration.
-    #
-    # This instance will be used to generate the hanami logger available on application module.
-    #
-    # @return [Config::Logger] Configure logger instance
-    #
-    # @since 0.5.0
-    #
-    # @example Define a logger
-    #   require 'hanami'
-    #
-    #   module Bookshelf
-    #     class Application < Hanami::Application
-    #       configure do
-    #         logger.stream 'path/to/log/file'
-    #       end
-    #       load!
-    #     end
-    #
-    #     module Controllers::Error
-    #       class Index
-    #         include Bookshelf::Action
-    #
-    #         def call(params)
-    #           Bookshelf::Logger.info "Logging to STDOUT"
-    #         end
-    #       end
-    #     end
-    #   end
-    #
-    def logger
-      @logger ||= Config::Logger.new
-    end
-
     # @since 0.9.0
     # @api private
     def app_name

data/lib/hanami/cli_base.rb

@@ -27,5 +27,20 @@ module Hanami
     def define_commands(&blk)
       class_eval(&blk) if block_given?
     end
+
+    def banner(command, nspace = true, subcommand = false)
+      super(command, nspace, namespace != 'hanami:cli')
+    end
+
+    def handle_argument_error(command, error, args, arity)
+      name = [(namespace == 'hanami:cli' ? nil : namespace), command.name].compact.join(" ")
+
+      msg = "ERROR: \"#{basename} #{name}\" was called with "
+      msg << "no arguments"               if     args.empty?
+      msg << "arguments " << args.inspect unless args.empty?
+      msg << "\nUsage: #{banner(command).inspect}"
+
+      raise Thor::InvocationError, msg
+    end
   end
 end

data/lib/hanami/cli_sub_commands/destroy.rb

@@ -28,7 +28,7 @@ module Hanami
       def actions(application_name = nil, controller_and_action_name)
         if Hanami::Environment.new(options).container? && application_name.nil?
           msg = "ERROR: \"hanami destroy action\" was called with arguments [\"#{controller_and_action_name}\"]\n" \
-                "Usage: \"hanami action APPLICATION_NAME CONTROLLER_NAME#ACTION_NAME\""
+                "Usage: \"hanami destroy action APPLICATION_NAME CONTROLLER_NAME#ACTION_NAME\""
           fail Error, msg
         end
 
@@ -60,7 +60,7 @@ module Hanami
         `hanami destroy model` will destroy an entity along with repository
         and corresponding tests
 
-        > $ hanami generate model car
+        > $ hanami destroy model car
       EOS
 
       def model(name)

data/lib/hanami/cli_sub_commands/generate.rb

@@ -40,7 +40,7 @@ module Hanami
       def actions(application_name = nil, controller_and_action_name)
         if Hanami::Environment.new(options).container? && application_name.nil?
           msg = "ERROR: \"hanami generate action\" was called with arguments [\"#{controller_and_action_name}\"]\n" \
-                "Usage: \"hanami action APPLICATION_NAME CONTROLLER_NAME#ACTION_NAME\""
+                "Usage: \"hanami generate action APPLICATION_NAME CONTROLLER_NAME#ACTION_NAME\""
           fail Error, msg
         end
 
@@ -77,6 +77,7 @@ module Hanami
         > $ hanami generate model vehicles/car
       EOS
       method_option :test, desc: 'Defines the testing Framework to be used. Default is defined through your .hanamirc file.'
+      method_option :skip_migration, desc: 'Skips the generation of a migration to create the model\'s table', default: false, type: :boolean
       def model(name)
         if options[:help]
           invoke :help, ['model']

data/lib/hanami/commands/generate/abstract.rb

@@ -53,6 +53,11 @@ module Hanami
           end
         end
 
+        # @since 1.0.0.beta1
+        # @api private
+        def project_name
+          Utils::String.new(Hanami::Environment.new.project_name).underscore
+        end
       end
     end
   end

data/lib/hanami/commands/generate/mailer.rb

@@ -50,7 +50,7 @@ module Hanami
         # @since 0.x.x
         # @api private
         def map_templates
-          add_mapping("mailer_spec.rb.tt", mailer_spec_path)
+          add_mapping("mailer_spec.rb.#{test_framework.framework}.tt", mailer_spec_path)
           add_mapping("mailer.rb.tt", mailer_path)
           add_mapping("template.txt.tt", txt_template_path)
           add_mapping("template.html.tt", html_template_path)
@@ -110,7 +110,7 @@ module Hanami
         end
 
         def core_root
-          Pathname.new("lib").join(::File.basename(Dir.getwd))
+          Pathname.new("lib").join(project_name)
         end
       end
     end

data/lib/hanami/commands/generate/model.rb

@@ -1,16 +1,22 @@
 require 'hanami/commands/generate/abstract'
+require 'hanami/commands/generate/migration'
 
 module Hanami
   module Commands
     class Generate
       class Model < Abstract
 
-        attr_reader :input, :model_name
+        attr_reader :input, :model_name, :table_name
 
         def initialize(options, model_name)
           super(options)
           @input      = Utils::String.new(model_name).underscore
           @model_name = Utils::String.new(@input).classify
+          @table_name = Utils::String.new(@input).pluralize
+
+          unless skip_migration?
+            Components.resolve('model.configuration')
+          end
 
           assert_model_name!
         end
@@ -18,13 +24,17 @@ module Hanami
         def map_templates
           add_mapping('entity.rb.tt', entity_path)
           add_mapping('repository.rb.tt', repository_path)
+          unless skip_migration?
+            add_mapping('migration.rb.tt', migration_path)
+          end
           add_mapping("entity_spec.#{ test_framework.framework }.tt", entity_spec_path,)
           add_mapping("repository_spec.#{ test_framework.framework }.tt", repository_spec_path)
         end
 
         def template_options
           {
-            model_name: model_name
+            model_name: model_name,
+            table_name: table_name
           }
         end
 
@@ -57,6 +67,10 @@ module Hanami
           end
         end
 
+        def skip_migration?
+          options.fetch(:skip_migration, false)
+        end
+
         def model_root
           Pathname.new('lib').join(project_name)
         end
@@ -73,6 +87,14 @@ module Hanami
           model_root.join('repositories', "#{ model_name_underscored }_repository.rb").to_s
         end
 
+        # @since 0.9.1
+        # @api private
+        def migration_path
+          timestamp = Time.now.utc.strftime(Migration::TIMESTAMP_FORMAT)
+          filename = Migration::FILENAME_PATTERN % { timestamp: timestamp, name: "create_#{table_name}"}
+          Hanami::Model.configuration.migrations.join(filename)
+        end
+
         # @since 0.5.0
         # @api private
         def entity_spec_path
@@ -91,12 +113,6 @@ module Hanami
         def model_name_underscored
           input
         end
-
-        # @since 0.8.0
-        # @api private
-        def project_name
-          Utils::String.new(Hanami::Environment.new.project_name).underscore
-        end
       end
     end
   end

data/lib/hanami/commands/new/abstract.rb

@@ -29,7 +29,7 @@ module Hanami
           assert_name!
           assert_architecture!
 
-          @hanami_model_version = '~> 0.7'
+          @hanami_model_version = '~> 1.0.0.beta1'
           @database_config = Hanami::Generators::DatabaseConfig.new(options[:database], project_name)
           @test_framework = Hanami::Generators::TestFramework.new(hanamirc, @options[:test])
           @template_engine = Hanami::Generators::TemplateEngine.new(hanamirc, @options[:template])

data/lib/hanami/commands/new/container.rb

@@ -43,6 +43,7 @@ module Hanami
           add_mapping('.env.test.tt', '.env.test')
           add_mapping('Gemfile.tt', 'Gemfile')
           add_mapping('config.ru.tt', 'config.ru')
+          add_mapping('config/boot.rb.tt', 'config/boot.rb')
           add_mapping('config/environment.rb.tt', 'config/environment.rb')
           add_mapping('lib/project.rb.tt', "lib/#{ project_name }.rb")
         end

data/lib/hanami/common_logger.rb

@@ -0,0 +1,73 @@
+require 'rack/common_logger'
+
+module Hanami
+  # Rack logger for Hanami.app
+  #
+  # @since 1.0.0.beta1
+  # @api private
+  class CommonLogger < Rack::CommonLogger
+    private
+
+    # @since 1.0.0.beta1
+    # @api private
+    HTTP_VERSION         = 'HTTP_VERSION'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    REQUEST_METHOD       = 'REQUEST_METHOD'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    HTTP_X_FORWARDED_FOR = 'HTTP_X_FORWARDED_FOR'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    REMOTE_ADDR          = 'REMOTE_ADDR'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    SCRIPT_NAME          = 'SCRIPT_NAME'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    PATH_INFO            = 'PATH_INFO'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    QUERY_STRING         = 'QUERY_STRING'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    RACK_ERRORS          = 'rack.errors'.freeze
+
+    # @since 1.0.0.beta1
+    # @api private
+    #
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
+    def log(env, status, header, began_at)
+      now    = Time.now
+      length = extract_content_length(header)
+
+      msg = Hash[
+        http:    env[HTTP_VERSION],
+        verb:    env[REQUEST_METHOD],
+        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,
+        elapsed: now - began_at
+      ]
+
+      logger = @logger || env[RACK_ERRORS]
+      # Standard library logger doesn't support write but it supports << which actually
+      # calls to write on the log device without formatting
+      if logger.respond_to?(:write)
+        logger.write(msg)
+      else
+        logger.info(msg)
+      end
+    end
+  end
+end