hanami-controller 1.1.1 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dec60bc59285348cfcf6fc743dbc586d8bd7356bfb02197db37bc18fe0131fcd
-  data.tar.gz: c8b851ca2730d18b886dcb4300fdcd28c31c12cf03df5505c995bd4a3819ef28
+  metadata.gz: 5044ea5ed0faca05bc15bf6b9deeb1ba48dd973d2d54ce26adc4279f2876a3b0
+  data.tar.gz: f451bf0b3f4065aa31b03085f9869058615c8a9bc81314071d17a052efff3f99
 SHA512:
-  metadata.gz: a0bdc218188b3f71d5bd22bd11e81fae44089dad09191ed31ea5a1da742e4ea007df521e899469bbe01e3fd8d28d9652ec032589e83e817733a53144860a8582
-  data.tar.gz: f0f04ea096539c67c1413dc1a527b68aa258a155389324601c9cbf419c1423f0eb6fcf8a23cce67f49cf4d1109a98dd3f068f6a88dcff5b8d337fd2dba66fd91
+  metadata.gz: e81ba4a549949b0fd85f3143d96620bc319028ef73b6130a1f6f93df31ec32b3b2db838cdd56b62346c61d290c75e169aee41ecfe521048e9072fcc170941cf3
+  data.tar.gz: 33b3a4861eac4269633b1fe7343ffc3c8c011dbb9cde772f13cdc4fb72ab34a781231d903accfaa15c8755950b3e18f16123955cc1db43fb6028d071abd22456

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v1.2.0.beta1 - 2018-02-28
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.5
+- [Sergey Fedorov] Introduce `Hanami::Action.content_type` to accept/reject requests according to their `Content-Type` header.
+
+### Fixed
+- [wheresmyjetpack] Raise meaningful exception when trying to access `session` or `flash` and `Hanami::Action::Session` wasn't included.
+
 ## v1.1.1 - 2017-11-22
 ### Fixed
 - [Luca Guidi] Ensure `Hanami::Action#send_file` and `#unsafe_send_file` to run `after` action callbacks

data/hanami-controller.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_dependency 'rack',         '~> 2.0'
-  spec.add_dependency 'hanami-utils', '~> 1.1'
+  spec.add_dependency 'hanami-utils', '1.2.0.beta1'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'rack-test', '~> 0.6'

data/lib/hanami/action.rb

@@ -66,6 +66,28 @@ module Hanami
 
     private
 
+    # Raise error when `Hanami::Action::Session` isn't included.
+    #
+    # To use `session`, include `Hanami::Action::Session`.
+    #
+    # @raise [Hanami::Controller::MissingSessionError]
+    #
+    # @since 1.2.0
+    def session
+      raise Hanami::Controller::MissingSessionError.new(:session)
+    end
+
+    # Raise error when `Hanami::Action::Session` isn't included.
+    #
+    # To use `flash`, include `Hanami::Action::Session`.
+    #
+    # @raise [Hanami::Controller::MissingSessionError]
+    #
+    # @since 1.2.0
+    def flash
+      raise Hanami::Controller::MissingSessionError.new(:flash)
+    end
+
     # Finalize the response
     #
     # This method is abstract and COULD be implemented by included modules in

data/lib/hanami/action/mime.rb

@@ -16,6 +16,12 @@ module Hanami
       # @api private
       HTTP_ACCEPT          = 'HTTP_ACCEPT'.freeze
 
+      # The key that returns content mime type from the Rack env
+      #
+      # @since 1.2.0
+      # @api private
+      HTTP_CONTENT_TYPE    = 'CONTENT_TYPE'.freeze
+
       # The header key to set the mime type of the response
       #
       # @since 0.1.0
@@ -165,6 +171,38 @@ module Hanami
             end
           end
         end
+
+        # Restrict the payload type to the specified mime type symbols.
+        #
+        # @param formats[Array<Symbol>] one or more symbols representing mime type(s)
+        #
+        # @since 1.2.0
+        #
+        # @example
+        #   require 'hanami/controller'
+        #
+        #   class Upload
+        #     include Hanami::Action
+        #     content_type :json
+        #
+        #     def call(params)
+        #       # ...
+        #     end
+        #   end
+        #
+        #   # When called with "text/html"        => 415
+        #   # When called with "application/json" => 200
+        def content_type(*formats)
+          mime_types = formats.map { |format| format_to_mime_type(format) }
+
+          before do
+            mime_type = @_env[HTTP_CONTENT_TYPE] || default_content_type || DEFAULT_CONTENT_TYPE
+
+            if mime_types.none? {|mt| ::Rack::Mime.match?(mime_type, mt) }
+              halt 415
+            end
+          end
+        end
       end
 
       # @since 0.7.0

data/lib/hanami/controller.rb

@@ -47,6 +47,22 @@ module Hanami
       end
     end
 
+    # Missing session error
+    #
+    # This error is raised when an action sends either `session` or `flash` to
+    # itself and it does not include `Hanami::Action::Session`.
+    #
+    # @since 1.2.0
+    #
+    # @see Hanami::Action::Session
+    # @see Hanami::Action#session
+    # @see Hanami::Action#flash
+    class MissingSessionError < Hanami::Controller::Error
+      def initialize(session_method)
+        super("To use `#{session_method}', add `include Hanami::Action::Session`.")
+      end
+    end
+
     include Utils::ClassAttribute
 
     # Framework configuration

data/lib/hanami/controller/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.2.0.beta1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,16 +28,16 @@ dependencies:
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,12 +153,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.1
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami