hanami 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08756b65d8071b4c2f4c22049f5d9ddf3e9af66f'
-  data.tar.gz: 9df6b02aaf3564abaea00f5e03d8b7d504f8390c
+SHA256:
+  metadata.gz: d87fe440f006e096c96ad18f1c20428ba4a279df2ee1dbce4ee122cf9ff59b12
+  data.tar.gz: 8f40361860a2eef0fdbf9eea31cc88588cc3caa2bcc509b1fa40d6817060b951
 SHA512:
-  metadata.gz: 47165021aa4418cfbefcd15c9eaaa0f4b2913fecc42f587faae3402ac42d93193393edc25c3ddc011ad70724580bf2efd047d1860701ef0159d105d1558473c4
-  data.tar.gz: b251d2791a24e9e9e03fb15be5b4473aecc6aae43d946397938cbce710064461d8b4f4dfb43405e2e548d05d555ae23753e39a703d78294dca0cb73239facc31
+  metadata.gz: 3228003ed57778a29753c440948cc82b2b4a93f9f201ec5836372bf33a3ca8af1535acd36d4ca94eb55c227df3c2503409e2ac9c8972809184e7eafa1e3f855e
+  data.tar.gz: b57b87929454289abc9ce08d8ddcb35ab57ece912b12fd66791e486785187a222fa36a425d89853589c63e0e40950b6afca3a73f93a80f0cf5f6d540d6690c43

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami
 The web, with simplicity.
 
+## v1.1.1 - 2018-02-27
+### Added
+- [Luca Guidi] Official support for Ruby MRI 2.5+
+
+### Fixed
+- [Alfonso Uceda] Fixed regression for mailer generator: when using options like `--from` and `--to` the generated Ruby code isn't valid as it was missing string quotes.
+- [Luca Guidi] Generate tests for views including `:format` in `exposures`. This fixes view unit tests when the associated template renders a partial.
+
 ## v1.1.0 - 2017-10-25
 ### Fixed
 - [Luca Guidi] Ensure `hanami db rollback` steps to be a positive integer

data/FEATURES.md

@@ -3,7 +3,9 @@
 
 ## Features
 
-## v1.1.0 (unreleased)
+## v1.1.1 - 2018-02-27
+
+## v1.1.0 - 2017-10-25
 
 - One-To-Many association (aka `belongs_to`)
 - One-To-One association (aka `has_one`)

data/README.md

@@ -91,7 +91,7 @@ If you want to test Hanami's HEAD to try a new feature or to test a bug fix, her
 ```
 git clone https://github.com/hanami/hanami.git
 cd hanami && bundle
-bundle exec hanami new --hanami-head=true bookshelf
+bundle exec hanami new bookshelf --hanami-head
 cd bookshelf
 vim Gemfile # edit with: gem 'hanami', path: '..'
 bundle

data/lib/hanami/application_configuration.rb

@@ -40,10 +40,11 @@ module Hanami
     # @since 0.1.0
     # @api private
     def initialize(namespace, configurations, path_prefix, env: Environment.new)
-      @namespace      = namespace
-      @configurations = configurations
-      @path_prefix    = path_prefix
-      @env            = env
+      @namespace         = namespace
+      @configurations    = configurations
+      @path_prefix       = path_prefix
+      @env               = env
+      @handle_exceptions = true
 
       evaluate_configurations!
     end

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

@@ -1,15 +1,12 @@
 require_relative '../../../spec_helper'
 
 describe <%= app.classify %>::Views::<%= classified_controller_name %>::<%= action.classify %> do
-  let(:exposures) { Hash[foo: 'bar'] }
+  let(:exposures) { Hash[format: :html] }
   let(:template)  { Hanami::View::Template.new('<%= template %>') }
   let(:view)      { <%= app.classify %>::Views::<%= classified_controller_name %>::<%= action.classify %>.new(template, exposures) }
   let(:rendered)  { view.render }
 
-  it 'exposes #foo' do
-    skip 'This is an auto-generated test. Edit it and add your own tests.'
-
-    # Example
-    view.foo.must_equal exposures.fetch(:foo)
+  it 'exposes #format' do
+    view.format.must_equal exposures.fetch(:format)
   end
 end

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

@@ -1,13 +1,10 @@
 RSpec.describe <%= app.classify %>::Views::<%= classified_controller_name %>::<%= action.classify %>, type: :view do
-  let(:exposures) { Hash[foo: 'bar'] }
+  let(:exposures) { Hash[format: :html] }
   let(:template)  { Hanami::View::Template.new('<%= template %>') }
   let(:view)      { described_class.new(template, exposures) }
   let(:rendered)  { view.render }
 
-  it 'exposes #foo' do
-    pending 'This is an auto-generated test. Edit it and add your own tests.'
-
-    # Example
-    expect(view.foo).to eq exposures.fetch(:foo)
+  it 'exposes #format' do
+    expect(view.format).to eq exposures.fetch(:format)
   end
 end

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

@@ -25,9 +25,9 @@ module Hanami
           # @since 1.1.0
           # @api private
           def call(mailer:, **options)
-            from    = options.fetch(:from,    DEFAULT_FROM)
-            to      = options.fetch(:to,      DEFAULT_TO)
-            subject = options.fetch(:subject, DEFAULT_SUBJECT)
+            from    = clean_option(options.fetch(:from,    DEFAULT_FROM))
+            to      = clean_option(options.fetch(:to,      DEFAULT_TO))
+            subject = clean_option(options.fetch(:subject, DEFAULT_SUBJECT))
             context = Context.new(mailer: mailer, test: options.fetch(:test), from: from, to: to, subject: subject, options: options)
 
             generate_mailer(context)
@@ -40,15 +40,19 @@ module Hanami
 
           # @since 1.1.0
           # @api private
-          DEFAULT_FROM = "'<from>'".freeze
+          DEFAULT_FROM = "<from>".freeze
 
           # @since 1.1.0
           # @api private
-          DEFAULT_TO = "'<to>'".freeze
+          DEFAULT_TO = "<to>".freeze
 
           # @since 1.1.0
           # @api private
-          DEFAULT_SUBJECT = "'Hello'".freeze
+          DEFAULT_SUBJECT = "Hello".freeze
+
+          # @sice x.x.x
+          # @api private
+          QUOTES_REGEX = /^("|')|("|')$/
 
           # @since 1.1.0
           # @api private
@@ -87,6 +91,12 @@ module Hanami
             files.touch(destination)
             say(:create, destination)
           end
+
+          # @since x.x.x
+          # @api private
+          def clean_option(option)
+            option.gsub(QUOTES_REGEX, '')
+          end
         end
       end
     end

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

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

data/lib/hanami/cli/commands/new/README.md.erb

@@ -30,4 +30,4 @@ How to prepare (create and migrate) DB for `development` and `test` environments
 % HANAMI_ENV=test bundle exec hanami db prepare
 ```
 
-Explore Hanami [guides](http://hanamirb.org/guides/), [API docs](http://hanamirb.org/docs/1.0.0/), or jump in [chat](http://chat.hanamirb.org) for help. Enjoy! 🌸
+Explore Hanami [guides](http://hanamirb.org/guides/), [API docs](http://docs.hanamirb.org/<%= Hanami::VERSION %>/), or jump in [chat](http://chat.hanamirb.org) for help. Enjoy! 🌸

data/lib/hanami/rendering_policy.rb

@@ -24,13 +24,13 @@ module Hanami
     SUCCESSFUL_STATUSES = (200..201).freeze
     # @api private
     RENDERABLE_FORMATS = [:all, :html].freeze
+    # @api private
+    ERROR_STATUS = 500
 
     # @api private
     def initialize(configuration)
       @controller_pattern = %r{#{ configuration.controller_pattern.gsub(/\%\{(controller|action)\}/) { "(?<#{ $1 }>(.*))" } }}
-      @view_pattern       = configuration.view_pattern
-      @namespace          = configuration.namespace
-      @templates          = configuration.templates
+      @configuration = configuration
     end
 
     # @api private
@@ -56,16 +56,19 @@ module Hanami
         view_for(action, response).render(
           action.exposures
         )
-      rescue => e
+      rescue StandardError => e
         env[RACK_EXCEPTION] = e
-        raise e
+        raise e unless @configuration.handle_exceptions
+
+        response[STATUS] = ERROR_STATUS
+        false
       end
     end
 
     # @api private
     def _render_status_page(action, response)
       if render_status_page?(action, response)
-        Hanami::Views::Default.render(@templates, response[STATUS], response: response, format: :html)
+        Hanami::Views::Default.render(@configuration.templates, response[STATUS], response: response, format: :html)
       end
     end
 
@@ -83,7 +86,7 @@ module Hanami
     def view_for(action, response)
       view = if response[BODY].respond_to?(:empty?) && response[BODY].empty?
         captures = @controller_pattern.match(action.class.name)
-        Utils::Class.load(@view_pattern % { controller: captures[:controller], action: captures[:action] }, @namespace)
+        Utils::Class.load(@configuration.view_pattern % { controller: captures[:controller], action: captures[:action] }, @configuration.namespace)
       end
 
       view || Views::NullView.new

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: The web, with simplicity