hanami 1.2.0 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb4696deb8823bdf6752db359ae52572413f8c70034a1da7fff69a985f5b2197
-  data.tar.gz: e1a7a701d91f583d88d3e08bbe41d62d1acbee8335cee5424299e63b0ea691e7
+  metadata.gz: f4e30a96ce43cea6ebf7eaffdafbc799a0c02152e0f373a752da8c56f937780b
+  data.tar.gz: d2633353af5f2d4f49283aac9a231ae08956b4c4bb49c7c48013d0e495c9faa3
 SHA512:
-  metadata.gz: e5ef911aefd5c8fc76f9d59aec36ffcbbaed3dabd0ed815c719ff2b7beb4e1e327ed7389d09da5074c47b8d4aab532d675a0773fc70c79ce9f7056da1eba5b2b
-  data.tar.gz: 10255439533478ad094430af917e7cda92d1a187a2e50e23b4e5c5abe39e60866fdf2bbb7b812f58c04af886d5bc41a3e5fd2ad96fd56bdb51cccf09e6d87e80
+  metadata.gz: b312e7fe93fc48c2d3ec11cfa5a3f508e238347727d5fe90e6e8cd91e6aefb42e2e805dc0ced0d23bd4c27fcc977eb3c1adf6903e7909dddb5669a7706b03186
+  data.tar.gz: 2c096428a5bc74542c902ac2de30ac5475c5507ab9f7a01220386d438673f05500c69a4ebbd5fb1212c2a9990cf7f3bbebda7549a71fe7d467b288b9530560dc

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Hanami
 The web, with simplicity.
 
+## v1.3.0.beta1 - 2018-08-08
+### Added
+- [Sean Collins] Generate new projects with RSpec as default testing framework
+- [Alfonso Uceda] Generate actions/views/mailers with nested module/class definition
+
+### Fixed
+- [Anton Davydov] Make possible to pass extra settings for custom logger instances (eg. `logger SemanticLogger.new, :foo, :bar`)
+- [graywolf] Ensure `hanami generate app` to work without `require_relative` entries in `config/enviroment.rb`
+- [Makoto Tajitsu & Luca Guidi] Fixed regression for `hanami new .` that used to generate a broken project
+
+### Fixed
+- [John Downey] Don't use thread unsafe `Dir.chdir` to serve static assets
+
 ## v1.2.0 - 2018-04-11
 
 ## v1.2.0.rc2 - 2018-04-06

data/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+reported by contacting the project team at *admin@hanamirb.org*. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/FEATURES.md

@@ -3,6 +3,8 @@
 
 ## Features
 
+## v1.3.0 (unreleased)
+
 ## v1.2.0 - 2018-04-11
 
 - HTTP/2 Early Hints

data/README.md

@@ -1,10 +1,3 @@
-[![Gem Version](https://badge.fury.io/rb/hanami.svg)](http://badge.fury.io/rb/hanami)
-[![Build Status](https://secure.travis-ci.org/hanami/hanami.svg?branch=master)](http://travis-ci.org/hanami/hanami?branch=master)
-[![Coverage](https://coveralls.io/repos/hanami/hanami/badge.svg?branch=master)](https://coveralls.io/r/hanami/hanami)
-[![Code Climate](https://codeclimate.com/github/hanami/hanami.svg)](https://codeclimate.com/github/hanami/hanami)
-[![Dependencies](https://gemnasium.com/hanami/hanami.svg)](https://gemnasium.com/hanami/hanami)
-[![Inline docs](http://inch-ci.org/github/hanami/hanami.svg)](http://inch-ci.org/github/hanami/hanami)
-
 # Hanami :cherry_blossom:
 
 The web, with simplicity.
@@ -30,7 +23,16 @@ which provides the glue that ties all the parts together:
 
 These components are designed to be used independently or together in a Hanami application.
 
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/hanami.svg)](https://badge.fury.io/rb/hanami)
+[![TravisCI](https://travis-ci.org/hanami/hanami.svg?branch=master)](https://travis-ci.org/hanami/hanami)
+[![Test Coverage](https://codecov.io/gh/hanami/hanami/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/hanami)
+[![Depfu](https://badges.depfu.com/badges/ba000e0f69e6ef1c44cd3038caaa1841/overview.svg)](https://depfu.com/github/hanami/hanami?project=Bundler)
+[![Inline Docs](http://inch-ci.org/github/hanami/hanami.svg)](http://inch-ci.org/github/hanami/hanami)
+
 ## Installation
+
 __Hanami__ supports Ruby (MRI) 2.3+
 
 ```shell

data/hanami.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency 'hanami-utils',       '~> 1.2'
-  spec.add_dependency 'hanami-validations', '~> 1.2'
-  spec.add_dependency 'hanami-router',      '~> 1.2'
-  spec.add_dependency 'hanami-controller',  '~> 1.2'
-  spec.add_dependency 'hanami-view',        '~> 1.2'
-  spec.add_dependency 'hanami-helpers',     '~> 1.2'
-  spec.add_dependency 'hanami-mailer',      '~> 1.2'
-  spec.add_dependency 'hanami-assets',      '~> 1.2'
-  spec.add_dependency 'hanami-cli',         '~> 0.2'
+  spec.add_dependency 'hanami-utils',       '~> 1.3.beta'
+  spec.add_dependency 'hanami-validations', '~> 1.3.beta'
+  spec.add_dependency 'hanami-router',      '~> 1.3.beta'
+  spec.add_dependency 'hanami-controller',  '~> 1.3.beta'
+  spec.add_dependency 'hanami-view',        '~> 1.3.beta'
+  spec.add_dependency 'hanami-helpers',     '~> 1.3.beta'
+  spec.add_dependency 'hanami-mailer',      '~> 1.3.beta'
+  spec.add_dependency 'hanami-assets',      '~> 1.3.beta'
+  spec.add_dependency 'hanami-cli',         '~> 0.3.beta'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'bundler'
 

data/lib/hanami/cli/commands/generate/action.rb

@@ -34,7 +34,11 @@ module Hanami
             classified_controller_name = classified_controller(controller)
             http_method                = route_http_method(action, options)
             context                    = Context.new(app: app, controller: controller, classified_controller_name: classified_controller_name, action: action, test: options.fetch(:test), http_method: http_method, options: options)
-            context                    = context.with(template: project.template(context))
+            context                    = context.with(template: project.template(context),
+                                                      action_class_definition: action_class_definition(context),
+                                                      view_class_definition: view_class_definition(context),
+                                                      beginning_module_definition: beginning_module_definition(context),
+                                                      ending_module_definition: ending_module_definition(context))
 
             assert_valid_app!(context)
             assert_valid_route_url!(context)
@@ -52,6 +56,82 @@ module Hanami
 
           private
 
+          # @since 1.3.0
+          # @api private
+          def beginning_module_definition(context)
+            length = context.classified_controller_name.split("::").size
+            first_indentation = " " * 4
+            indentation = first_indentation
+            beginning_module_definition = ""
+
+            context.classified_controller_name.split("::").each_with_index do |module_name, index|
+              beginning_module_definition += "module #{module_name}".prepend(indentation)
+              beginning_module_definition += "\n" unless length == index + 1
+              indentation += "  "
+            end
+            beginning_module_definition
+          end
+
+          # @since 1.3.0
+          # @api private
+          def ending_module_definition(context)
+            length = context.classified_controller_name.split("::").size
+            first_indentation = " " * 4
+            indentation = first_indentation + "  " * (length - 1)
+            ending_module_definition = ""
+
+            context.classified_controller_name.split("::").each_with_index do |_, index|
+              ending_module_definition += "end".prepend(indentation)
+              ending_module_definition += "\n" unless length == index + 1
+              indentation = " " * (indentation.size - 2)
+            end
+            ending_module_definition
+          end
+
+          # @since 1.3.0
+          # @api private
+          def action_class_definition(context)
+            body_line_position = 4
+            view_class = [
+              "class #{context.action.classify}",
+              "  include #{context.app.classify}::Action",
+              "",
+              "  def call(params)",
+              "  end",
+              "end"
+            ]
+            view_class.insert(body_line_position, "    self.body = 'OK'") if skip_view?(context)
+
+            add_indentation_to_class_definition(context, view_class)
+          end
+
+          # @since 1.3.0
+          # @api private
+          def view_class_definition(context)
+            view_class = [
+              "class #{context.action.classify}",
+              "  include #{context.app.classify}::View",
+              "end"
+            ]
+
+            add_indentation_to_class_definition(context, view_class)
+          end
+
+          # @since 1.3.0
+          # @api private
+          def add_indentation_to_class_definition(context, view_content)
+            length = context.classified_controller_name.split("::").size
+            first_indentation = " " * 4
+            indentation = first_indentation + " " * length * 2
+
+            content = ""
+            view_content.each do |line|
+              next content += "\n" if line.empty?
+              content += "#{line}\n".prepend(indentation)
+            end
+            content.chomp
+          end
+
           # @since 1.1.0
           # @api private
           def controller_and_action_name(name)

data/lib/hanami/cli/commands/generate/action/action.erb

@@ -1,8 +1,7 @@
-module <%= app.classify %>::Controllers::<%= classified_controller_name %>
-  class <%= action.classify %>
-    include <%= app.classify %>::Action
-
-    def call(params)
-    end
+module <%= app.classify %>
+  module Controllers
+<%= beginning_module_definition %>
+<%= action_class_definition %>
+<%= ending_module_definition %>
   end
 end

data/lib/hanami/cli/commands/generate/action/action_without_view.erb

@@ -1,9 +1,7 @@
-module <%= app.classify %>::Controllers::<%= classified_controller_name %>
-  class <%= action.classify %>
-    include <%= app.classify %>::Action
-
-    def call(params)
-      self.body = 'OK'
-    end
+module <%= app.classify %>
+  module Controllers
+<%= beginning_module_definition %>
+<%= action_class_definition %>
+<%= ending_module_definition %>
   end
 end

data/lib/hanami/cli/commands/generate/action/view.erb

@@ -1,5 +1,7 @@
-module <%= app.classify %>::Views::<%= classified_controller_name %>
-  class <%= action.classify %>
-    include <%= app.classify %>::View
+module <%= app.classify %>
+  module Views
+<%= beginning_module_definition %>
+<%= view_class_definition %>
+<%= ending_module_definition %>
   end
 end

data/lib/hanami/cli/commands/generate/app.rb

@@ -191,7 +191,17 @@ module Hanami
             content     = "require_relative '../apps/#{context.app}/application'"
             destination = project.environment(context)
 
-            files.inject_line_after(destination, /require_relative '\.\.\/lib\/.*'/, content)
+            req_regex = /^\s*require .*$/
+            rel_regex = /^\s*require_relative .*$/
+
+            case File.read(destination)
+            when rel_regex
+              files.inject_line_after_last(destination, rel_regex, content)
+            when req_regex
+              files.inject_line_after_last(destination, req_regex, content)
+            else
+              raise "No require found"
+            end
             say(:insert, destination)
           end
 
@@ -208,18 +218,20 @@ module Hanami
           # @since 1.1.0
           # @api private
           def append_development_http_session_secret(context)
-            content     = %(#{context.app.upcase}_SESSIONS_SECRET="#{project.app_sessions_secret}")
-            destination = project.env(context, "development")
-
-            files.append(destination, content)
-            say(:append, destination)
+            append_env_to_http_session_secret(context, "development")
           end
 
           # @since 1.1.0
           # @api private
           def append_test_http_session_secret(context)
+            append_env_to_http_session_secret(context, "test")
+          end
+
+          private
+
+          def append_env_to_http_session_secret(context, env)
             content     = %(#{context.app.upcase}_SESSIONS_SECRET="#{project.app_sessions_secret}")
-            destination = project.env(context, "test")
+            destination = project.env(context, env)
 
             files.append(destination, content)
             say(:append, destination)

data/lib/hanami/cli/commands/generate/mailer/mailer.erb

@@ -1,7 +1,9 @@
-class Mailers::<%= mailer.classify %>
-  include Hanami::Mailer
+module Mailers
+  class <%= mailer.classify %>
+    include Hanami::Mailer
 
-  from    '<%= from %>'
-  to      '<%= to %>'
-  subject '<%= subject %>'
+    from    '<%= from %>'
+    to      '<%= to %>'
+    subject '<%= subject %>'
+  end
 end

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

@@ -146,7 +146,7 @@ module Hanami
 
           # @since 1.1.0
           # @api private
-          VALID_FRAMEWORKS = [MINITEST, RSPEC].freeze
+          VALID_FRAMEWORKS = [RSPEC, MINITEST].freeze
 
           # @since 1.1.0
           # @api private
@@ -282,7 +282,9 @@ module Hanami
         # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/MethodLength
         def call(project:, **options)
-          project         = Utils::String.underscore(project)
+          project_name = project
+          pwd = ::File.basename(Dir.pwd) if project == "."
+          project         = Utils::String.underscore(pwd || project)
           database_config = DatabaseConfig.new(options[:database], project)
           test_framework  = TestFramework.new(hanamirc, options[:test])
           template_engine = TemplateEngine.new(hanamirc, options[:template])
@@ -299,7 +301,7 @@ module Hanami
             application_name: options.fetch(:application_name),
             application_base_url: options.fetch(:application_base_url),
             hanami_head: options.fetch(:hanami_head),
-            hanami_model_version: '~> 1.2',
+            hanami_model_version: '~> 1.3.beta',
             code_reloading: code_reloading?,
             hanami_version: hanami_version,
             project_module: Utils::String.classify(project),
@@ -308,7 +310,7 @@ module Hanami
 
           assert_project_name!(context)
 
-          directory = project_directory(project)
+          directory = project_directory(project_name, project)
           files.mkdir(directory)
 
           Dir.chdir(directory) do
@@ -532,8 +534,9 @@ module Hanami
 
         # @since 1.1.0
         # @api private
-        def project_directory(project)
-          @name == '.' ? '.' : project
+        def project_directory(project_name, project)
+          return Dir.pwd if project_name == '.'
+          project
         end
 
         # @since 1.1.0

data/lib/hanami/cli/commands/new/Gemfile.erb

@@ -41,7 +41,7 @@ end
 
 <%- end -%>
 group :test, :development do
-  gem 'dotenv', '~> 2.0'
+  gem 'dotenv', '~> 2.4'
 end
 
 group :test do

data/lib/hanami/components/component.rb

@@ -46,6 +46,12 @@ module Hanami
 
       private
 
+      # @since 1.3.0
+      # @api private
+      #
+      # @see Hanami::Component#logger_interface?
+      LOGGER_METHODS = %i[info warn debug]
+
       # Component name
       #
       # @return [String]
@@ -163,6 +169,14 @@ module Hanami
       def resolved(name, value = nil, &blk)
         Components.resolved(name, value, &blk)
       end
+
+      # Check that instance has logger interfaces (#info, #warn and #debug)
+      #
+      # @since 1.3.0
+      # @api private
+      def logger_interface?(instance)
+        LOGGER_METHODS.all? { |method| instance.respond_to?(method) }
+      end
     end
   end
 end

data/lib/hanami/components/components.rb

@@ -29,7 +29,7 @@ module Hanami
 
       resolve do |configuration|
         if configuration.logger.is_a?(Array)
-          if configuration.logger.first.is_a?(::Logger)
+          if logger_interface?(configuration.logger.first)
             configuration.logger.first
           else
             Hanami::Logger.new(Hanami.environment.project_name, *configuration.logger)

data/lib/hanami/hanamirc.rb

@@ -29,7 +29,7 @@ module Hanami
     # @api private
     #
     # @see Hanami::Hanamirc#default_options
-    DEFAULT_TEST_SUITE = 'minitest'.freeze
+    DEFAULT_TEST_SUITE = 'rspec'.freeze
 
     # Test suite key for writing the hanamirc file
     #

data/lib/hanami/static.rb

@@ -1,4 +1,6 @@
-require 'rack/static'
+# frozen_string_literal: true
+
+require "rack/static"
 
 module Hanami
   # Serve static assets in deployment environments (production, staging) where
@@ -30,11 +32,11 @@ module Hanami
 
     # @since 0.8.0
     # @api private
-    HEADER_RULES = [[:all, { 'Cache-Control' => "public, max-age=#{MAX_AGE}" }]].freeze
+    HEADER_RULES = [[:all, { "Cache-Control" => "public, max-age=#{MAX_AGE}" }]].freeze
 
     # @since 0.8.0
     # @api private
-    URL_PREFIX = '/'.freeze
+    URL_PREFIX = "/"
 
     # @since 0.6.0
     # @api private
@@ -49,10 +51,13 @@ module Hanami
     def _urls(root)
       return [] unless root.exist?
 
-      asset_files = Dir.chdir(root) do
-        Dir['**/*'].select { |path| File.file? path }
+      asset_files = Pathname.glob(root.join("**", "*"))
+                            .select(&:file?)
+
+      asset_files.each_with_object({}) do |path, result|
+        path = path.relative_path_from(root)
+        result["#{URL_PREFIX}#{path}"] = path
       end
-      Hash[asset_files.map { |entry| ["#{URL_PREFIX}#{entry}", entry] }]
     end
   end
 end

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0.beta1'.freeze
 
     # @since 0.9.0
     # @api private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,126 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-view
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.beta
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -385,12 +385,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The web, with simplicity