hanami 1.0.0.beta3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35905305b2c9f5a20e639bf4de5ffc10c439732f
-  data.tar.gz: 86d99d157ea672bdddf8ecc338fe16abf833a099
+  metadata.gz: d641c75bc2d3fa71ec69ce912640eaf9fcbfe2ec
+  data.tar.gz: f10e7e393b8b5009053ee3dbd9fdd28ebf1f4bb1
 SHA512:
-  metadata.gz: 55642dce6b8a8548a92592f843573488f9da21c6d099ab27f29b667c9249a5c0f7ed4ff584447b7ddd10cdedbbc3a92da34e349c6107979bcd80fa6eded53e76
-  data.tar.gz: c6ef7285048eb156ebf594bf632d51ac3b1149f49c1ec8869eebce0feb215b87c5cfb7145b005004ba290766a1e2a8e28c7e37eb5dd279b8fcb4ef063f1bc822
+  metadata.gz: d7638c870f8b6262d1a811c3f9f276f11520e5e7ea6e977baada76a4f47aa46a0da46ad73acf8f4d965a851e7e255dcafaa7f9d6600a0b88dd9bf495fd3af64a
+  data.tar.gz: 51671a8629073a6fcdaa7952f4b180ef9d90b5e75feeb79d66872742b7570f96a4aa8f4deb9ffffde1ae33c2deb2a100efe1d3fbdabf6b7cbb2330c55e2fc67c

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Hanami
 The web, with simplicity.
 
+## v1.0.0.rc1 - 2017-03-31
+### Added
+- [Luca Guidi] Allow `logger` setting in `config/environment.rb` to accept arbitrary arguments to make `Hanami::Logger` to be compatible with Ruby's `Logger`. (eg. `logger 'daily', level: :info`)
+
+### Fixed
+- [Luca Guidi] Ensure code reloading don't misconfigure mailer settings (regression from v1.0.0.beta3)
+- [Luca Guidi] Ensure database disconnection to happen in the same thread of `Hanami.boot`
+- [Luca Guidi] Ensure `mailer` block in `config/environment.rb` to be evaluated multiple times, according to the current Hanami environment
+- [Luca Guidi] Ensure a Hanami project to require only once the code under `lib/`
+
 ## v1.0.0.beta3 - 2017-03-17
 ### Fixed
 - [Luca Guidi] Try to disconnect from database at the boot time. This is useful to prune stale connection during production deploys.

data/FEATURES.md

@@ -3,21 +3,27 @@
 
 ## Features
 
-## v1.0.0.beta3 - 2017-03-17
+### v1.0.0.rc1 - 2017-03-31
+
+- Logger rotation
+
+### v1.0.0.beta3 - 2017-03-17
+
+### v1.0.0.beta2 - 2017-03-02
 
-## v1.0.0.beta2 - 2017-03-02
 - Added: `Action#unsafe_send_file` to send files outside of the public directory
 
-## v1.0.0.beta1 - 2017-02-14
+### 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.2 - 2016-12-19
 
-## v0.9.1 - 2016-11-18
+### v0.9.1 - 2016-11-18
 
-## v0.9.0 - 2016-11-15
+### v0.9.0 - 2016-11-15
 
 - Experimental repositories associations (only "has many")
 - Database automapping for SQL databases
@@ -30,7 +36,7 @@
 - Native support for PostgreSQL types
 - CLI: `hanami secret` to generate and print a new session secret for a single Hanami app
 
-## v0.8.0 - 2016-07-22
+### v0.8.0 - 2016-07-22
 
 - New validation syntax based on predicates
 - Custom and shared predicates for validations
@@ -49,19 +55,19 @@
 - Experimental code reloading via `entr(1)`
 - CLI: `hanami new` can be used with `--template` argument to generate a new project with (`erb`/`haml`/`slim`) templates
 
-## v0.7.3 - 2016-05-23
+### v0.7.3 - 2016-05-23
 
-## v0.7.2 - 2016-02-09
+### v0.7.2 - 2016-02-09
 
-## v0.7.1 - 2016-02-05
+### v0.7.1 - 2016-02-05
 
-## v0.7.0 - 2016-01-22
+### v0.7.0 - 2016-01-22
 
 - Renamed from Lotus to Hanami
 
-## v0.6.1 - 2016-01-19
+### v0.6.1 - 2016-01-19
 
-## v0.6.0 - 2016-01-12
+### v0.6.0 - 2016-01-12
 
 - Assets preprocessors support (eg. Sass, ES6, Opal, Less, CoffeScript..)
 - Assets compressors (eg. YUI, UglifyJS2, Google Closure Compiler, Sass..)
@@ -82,16 +88,16 @@
 - Custom initializers (`apps/web/config/initializers`)
 - Rake tasks `:preload` and `:environment`
 
-## v0.5.0 - 2015-09-30
+### v0.5.0 - 2015-09-30
 
 - Mailers
 - CLI: `lotus generate mailer`
 - SQL joins
 - Custom coercers for data mapper
 
-## v0.4.1 - 2015-07-10
+### v0.4.1 - 2015-07-10
 
-## v0.4.0 - 2015-06-23
+### v0.4.0 - 2015-06-23
 
 - Application architecture
 - Database migrations
@@ -101,14 +107,14 @@
 - Force SSL
 - Number formatting helper
 
-## v0.3.2 - 2015-05-22
+### v0.3.2 - 2015-05-22
 
 - Automatic secure cookies
 - Routing helpers for actions
 - Send files from actions
 - `Lotus.root` returns top level directory of the project.
 
-## v0.3.1 - 2015-05-15
+### v0.3.1 - 2015-05-15
 
 - CLI: `lotus generate app admin` creates a new application (`apps/admin`).
 - CLI: `lotus generate model user`. It generates entity, repository and related unit test files.
@@ -119,7 +125,7 @@
 - Nested RESTful resource(s)
 - String pluralization and singularization
 
-## v0.3.0 - 2015-03-23
+### v0.3.0 - 2015-03-23
 
 - CLI: `lotus generate action web dashboard#index`. It generates an action, a view, a template, a route and related unit test files.
 - CLI: `lotus db console`. It starts a database REPL.
@@ -138,14 +144,14 @@
 - Interactors (aka Service Objects)
 - Database transactions
 
-## v0.2.1 - 2015-02-06
+### v0.2.1 - 2015-02-06
 
 - Allow entities to include validations.
 - `lotus new .` to generate a Lotus project for an existing code base (Eg. a gem that needs a web UI).
 - `lotus new` supports `--path` (for destination directory), `--test` (to generate Minitest or RSpec boilerplate).
 - Lotus logger
 
-## v0.2.0 - 2014-12-23
+### v0.2.0 - 2014-12-23
 
 - Support Minitest as default testing framework (`bundle exec rake` runs the entire test suite of an application).
 - Support for _Method Override_ technique.
@@ -171,7 +177,7 @@
 - JSON body parser for non-GET HTTP requests
 - Routes inspector for CLI
 
-## v0.1.0 - 2014-06-23
+### v0.1.0 - 2014-06-23
 
 - Run multiple Lotus applications in the same Ruby process
 - Serve static files

data/hanami.gemspec

@@ -6,8 +6,8 @@ require 'hanami/version'
 Gem::Specification.new do |spec|
   spec.name          = 'hanami'
   spec.version       = Hanami::VERSION
-  spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda Pompa']
-  spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
+  spec.authors       = ['Luca Guidi']
+  spec.email         = ['me@lucaguidi.com']
   spec.summary       = 'The web, with simplicity'
   spec.description   = 'Hanami is a web framework for Ruby'
   spec.homepage      = 'http://hanamirb.org'
@@ -21,14 +21,14 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency 'hanami-utils',       '~> 1.0.0.beta3'
-  spec.add_dependency 'hanami-validations', '~> 1.0.0.beta2'
-  spec.add_dependency 'hanami-router',      '~> 1.0.0.beta3'
-  spec.add_dependency 'hanami-controller',  '~> 1.0.0.beta3'
-  spec.add_dependency 'hanami-view',        '~> 1.0.0.beta2'
-  spec.add_dependency 'hanami-helpers',     '~> 1.0.0.beta2'
-  spec.add_dependency 'hanami-mailer',      '~> 1.0.0.beta2'
-  spec.add_dependency 'hanami-assets',      '~> 1.0.0.beta2'
+  spec.add_dependency 'hanami-utils',       '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-validations', '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-router',      '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-controller',  '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-view',        '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-helpers',     '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-mailer',      '~> 1.0.0.rc1'
+  spec.add_dependency 'hanami-assets',      '~> 1.0.0.rc1'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'thor',               '~> 0.19'
   spec.add_dependency 'bundler',            '~> 1.13'

data/lib/hanami.rb

@@ -88,6 +88,7 @@ module Hanami
   def self.boot
     Components.release if code_reloading?
     Components.resolve('all')
+    Hanami::Model.disconnect if defined?(Hanami::Model)
   end
 
   # Main application that mounts many Rack and/or Hanami applications.

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

@@ -6,6 +6,7 @@ require 'hanami/generators/test_framework'
 require 'hanami/generators/template_engine'
 require 'hanami/utils'
 require 'hanami/utils/hash'
+require 'hanami/utils/string'
 
 module Hanami
   # @api private
@@ -45,7 +46,7 @@ module Hanami
           assert_name!
           assert_architecture!
 
-          @hanami_model_version = '~> 1.0.0.beta3'
+          @hanami_model_version = '~> 1.0.0.rc1'
           @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])
@@ -99,6 +100,11 @@ module Hanami
           ApplicationName.new(real_project_name)
         end
 
+        # @api private
+        def project_module
+          Utils::String.new(project_name).classify
+        end
+
         # @api private
         def project_directory
           @name == '.' ? '.' : project_name

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

@@ -25,6 +25,7 @@ module Hanami
         def template_options
           {
             project_name:         project_name,
+            project_module:       project_module,
             hanami_head:          hanami_head?,
             code_reloading:       code_reloading?,
             test:                 test_framework.framework,

data/lib/hanami/components/components.rb

@@ -28,7 +28,7 @@ module Hanami
       end
 
       resolve do |configuration|
-        Hanami::Logger.new(Hanami.environment.project_name, configuration.logger) unless configuration.logger.nil?
+        Hanami::Logger.new(Hanami.environment.project_name, *configuration.logger) unless configuration.logger.nil?
       end
     end
 
@@ -78,10 +78,6 @@ module Hanami
     register 'model' do
       requires 'logger', 'model.configuration', 'model.sql'
 
-      prepare do
-        Hanami::Model.disconnect if Components['model.configuration']
-      end
-
       resolve do
         if Components['model.configuration']
           Hanami::Model.load!
@@ -182,9 +178,15 @@ module Hanami
       end
 
       resolve do |configuration|
-        unless configuration.mailer.nil?
-          Hanami::Mailer.configuration = Hanami::Mailer::Configuration.new if Hanami.code_reloading?
-          Hanami::Mailer.configure(&configuration.mailer)
+        unless configuration.mailer_settings.empty?
+          if Hanami.code_reloading? && !Hanami::Mailer.configuration.nil?
+            Hanami::Mailer.configuration = Hanami::Mailer.configuration.dup
+          end
+
+          configuration.mailer_settings.each do |settings|
+            Hanami::Mailer.configure(&settings)
+          end
+
           Hanami::Mailer.configuration
         end
       end

data/lib/hanami/configuration.rb

@@ -92,7 +92,13 @@ module Hanami
     #     # ...
     #   end
     def mailer(&blk)
-      settings.put_if_absent(:mailer, blk)
+      mailer_settings.push(blk) if block_given?
+    end
+
+    # @since next
+    # @api private
+    def mailer_settings
+      settings.fetch_or_store(:mailers, [])
     end
 
     # @since 0.9.0
@@ -113,12 +119,14 @@ module Hanami
     #
     # @since 1.0.0.beta1
     #
-    # @param options [Hash] a set of options
+    # @param options [Array] a set of options
     #
     # @see Hanami.logger
     # @see Hanami::Logger
     #
-    # @example
+    # @see http://hanamirb.org/guides/projects/logging/
+    #
+    # @example Basic Usage
     #   # config/environment.rb
     #   # ...
     #   Hanami.configure do
@@ -127,8 +135,18 @@ module Hanami
     #       logger level: :debug
     #     end
     #   end
-    def logger(options = nil)
-      if options.nil?
+    #
+    # @example Daily Rotation
+    #   # config/environment.rb
+    #   # ...
+    #   Hanami.configure do
+    #     # ...
+    #     environment :development do
+    #       logger 'daily', level: :debug
+    #     end
+    #   end
+    def logger(*options)
+      if options.empty?
         settings.fetch(:logger, nil)
       else
         settings[:logger] = options

data/lib/hanami/generators/application/container/lib/project.rb.tt

@@ -1 +1,2 @@
-Hanami::Utils.require!("#{__dir__}/<%= config[:project_name] %>")
+module <%= config[:project_module] %>
+end

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.0.0.beta3'.freeze
+    VERSION = '1.0.0.rc1'.freeze
 
     # @since 0.9.0
     # @api private

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Luca Guidi
-- Trung Lê
-- Alfonso Uceda Pompa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -18,112 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta3
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-view
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: hanami-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -225,8 +223,6 @@ dependencies:
 description: Hanami is a web framework for Ruby
 email:
 - me@lucaguidi.com
-- trung.le@ruby-journal.com
-- uceda73@gmail.com
 executables:
 - hanami
 extensions: []
@@ -400,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The web, with simplicity