hanami-controller 0.8.1 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94316cf20a120464d9314f31c0ea0774d8256847
-  data.tar.gz: 0d468b04cc1ae458ee3d2cb1188adfae48e63402
+  metadata.gz: 0f0fb43da2ad920ba9c799b41f4ccfc87eb5b438
+  data.tar.gz: 294e4ed9ebf6e18c13c52d560efb181f69ded99b
 SHA512:
-  metadata.gz: 68a1d9c7ae87c693fa7a9ac85ae15b0736bdd1de6dc02f21a9ef320a08f6f1f9b0fc3e99b88a92186c7e1ebc5ebf48cb52b914a400f655c1699b12bdb8bbe61b
-  data.tar.gz: b49bfaff6ee7d1150f1f1e99ea335948300d519c8522b200dc0b914ddc7a0d3f7ee9c9778fdc79abfa267998987aa65216f9f2488e09db2b9c1321bb5fc2b69b
+  metadata.gz: 6b7ce52381b3e383caf8a169f9c40af67e8a8a546503c89d0b3b7642fe8e36321ab3bf5bee8d844d9e26ace64d5c1c49f894f642b469dcac63c712d5025246b0
+  data.tar.gz: f6e6cfe2e117ce0d3946b308b2684dfd53ae31783510ec143f10cd9959e671338abe613bc70ef2070a2c5ecdd1383fbcffad76070cfd76e457ebf218be22759e

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v1.0.0beta1 - 2017-02-14
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.4
+
+### Fixed
+- [Marcello Rocha & Luca Guidi] Avoid MIME type conflicts for `Action#format` detection
+- [Matias H. Leidemer & Luca Guidi] Ensure `Flash` to return only fresh data
+- [Luca Guidi] Ensure `session` keys to be accessed as symbols in action unit tests
+
+### Changed
+- [Anton Davydov & Luca Guidi] Make it work only with Rack 2.0
+
 ## v0.8.1 - 2016-12-19
 ### Fixed
 - [Thorbjørn Hermansen] Don't pollute Rack env's `rack.exception` key if an exception is handled

data/README.md

@@ -282,7 +282,7 @@ class Show
   expose :article
 
   def call(params)
-    @article = ArticleRepository.find params[:id]
+    @article = ArticleRepository.new.find(params[:id])
   end
 end
 

data/hanami-controller.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency 'rack',         '~> 1.6', '>= 1.6.2'
-  spec.add_dependency 'hanami-utils', '~> 0.9'
+  spec.add_dependency 'rack',         '~> 2.0'
+  spec.add_dependency 'hanami-utils', '~> 1.0.0.beta1'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'rack-test', '~> 0.6'

data/lib/hanami/action/base_params.rb

@@ -15,6 +15,18 @@ module Hanami
       # @since 0.7.0
       ROUTER_PARAMS = 'router.params'.freeze
 
+      # The key that returns Rack session params from the Rack env
+      # Please note that this is used only when an action is unit tested.
+      #
+      # @since 1.0.0.beta1
+      # @api private
+      #
+      # @example
+      #   # action unit test
+      #   action.call('rack.session' => { 'foo' => 'bar' })
+      #   action.session[:foo] # => "bar"
+      RACK_SESSION = 'rack.session'.freeze
+
       # @attr_reader env [Hash] the Rack env
       #
       # @since 0.7.0
@@ -37,7 +49,7 @@ module Hanami
       def initialize(env)
         @env    = env
         @raw    = _extract_params
-        @params = Utils::Hash.new(@raw).deep_dup.symbolize!.to_h
+        @params = Utils::Hash.new(@raw).deep_dup.deep_symbolize!.to_h
         freeze
       end
 
@@ -143,7 +155,13 @@ module Hanami
       # @since 0.7.0
       # @api private
       def _router_params(fallback = {})
-        env.fetch(ROUTER_PARAMS, fallback)
+        env.fetch(ROUTER_PARAMS) do
+          if session = fallback.delete(RACK_SESSION) # rubocop:disable Lint/AssignmentInCondition
+            fallback[RACK_SESSION] = Utils::Hash.new(session).symbolize!.to_hash
+          end
+
+          fallback
+        end
       end
     end
   end

data/lib/hanami/action/cookie_jar.rb

@@ -55,7 +55,7 @@ module Hanami
       # @since 0.1.0
       def initialize(env, headers, default_options)
         @_headers        = headers
-        @cookies         = Utils::Hash.new(extract(env)).symbolize!
+        @cookies         = Utils::Hash.new(extract(env)).deep_symbolize!
         @default_options = default_options
       end
 

data/lib/hanami/action/flash.rb

@@ -142,7 +142,7 @@ module Hanami
       # @since 0.3.0
       # @api private
       def _values
-        flash.values
+        flash.select { |session_id, _| !delete?(session_id) }.values
       end
 
       # Determine if delete data from flash for the given Request ID

data/lib/hanami/action/glue.rb

@@ -59,7 +59,7 @@ module Hanami
       #
       # @since 0.4.3
       def sending_file?
-        @_body.is_a?(::Rack::File)
+        @_body.is_a?(::Rack::File::Iterator)
       end
     end
   end

data/lib/hanami/action/mime.rb

@@ -1,7 +1,6 @@
 require 'rack/utils'
 require 'hanami/utils'
 require 'hanami/utils/kernel'
-require 'hanami/utils/deprecation'
 
 module Hanami
   module Action
@@ -41,6 +40,64 @@ module Hanami
       # @api private
       DEFAULT_CHARSET = 'utf-8'.freeze
 
+      # Most commom mime types used for responses
+      #
+      # @since 1.0.0.beta1
+      # @api private
+      MIME_TYPES = {
+        txt: 'text/plain',
+        html: 'text/html',
+        json: 'application/json',
+        manifest: 'text/cache-manifest',
+        atom: 'application/atom+xml',
+        avi: 'video/x-msvideo',
+        bmp: 'image/bmp',
+        bz: 'application/x-bzip',
+        bz2: 'application/x-bzip2',
+        chm: 'application/vnd.ms-htmlhelp',
+        css: 'text/css',
+        csv: 'text/csv',
+        flv: 'video/x-flv',
+        gif: 'image/gif',
+        gz: 'application/x-gzip',
+        h264: 'video/h264',
+        ico: 'image/vnd.microsoft.icon',
+        ics: 'text/calendar',
+        jpg: 'image/jpeg',
+        js: 'application/javascript',
+        mp4: 'video/mp4',
+        mov: 'video/quicktime',
+        mp3: 'audio/mpeg',
+        mp4a: 'audio/mp4',
+        mpg: 'video/mpeg',
+        oga: 'audio/ogg',
+        ogg: 'application/ogg',
+        ogv: 'video/ogg',
+        pdf: 'application/pdf',
+        pgp: 'application/pgp-encrypted',
+        png: 'image/png',
+        psd: 'image/vnd.adobe.photoshop',
+        rtf: 'application/rtf',
+        sh: 'application/x-sh',
+        svg: 'image/svg+xml',
+        swf: 'application/x-shockwave-flash',
+        tar: 'application/x-tar',
+        torrent: 'application/x-bittorrent',
+        tsv: 'text/tab-separated-values',
+        uri: 'text/uri-list',
+        vcs: 'text/x-vcalendar',
+        wav: 'audio/x-wav',
+        webm: 'video/webm',
+        wmv: 'video/x-ms-wmv',
+        woff: 'application/font-woff',
+        woff2: 'application/font-woff2',
+        wsdl: 'application/wsdl+xml',
+        xhtml: 'application/xhtml+xml',
+        xml: 'application/xml',
+        xslt: 'application/xslt+xml',
+        yml: 'text/yaml',
+        zip: 'application/zip' }.freeze
+
       # Override Ruby's hook for modules.
       # It includes Mime types logic
       #
@@ -62,7 +119,7 @@ module Hanami
         # @api private
         def format_to_mime_type(format)
           configuration.mime_type_for(format) ||
-            ::Rack::Mime.mime_type(".#{ format }", nil) or
+            MIME_TYPES[format] or
             raise Hanami::Controller::UnknownFormatError.new(format)
         end
 
@@ -100,6 +157,8 @@ module Hanami
             format_to_mime_type(format)
           end
 
+          configuration.restrict_mime_types!(mime_types)
+
           before do
             unless mime_types.find {|mt| accept?(mt) }
               halt 406
@@ -298,12 +357,12 @@ module Hanami
       # When the format is set, the framework searches for a corresponding mime
       # type to be set as the `Content-Type` header of the response.
       # This lookup is performed first in the configuration, and then in
-      # `Rack::Mime::MIME_TYPES`. If the lookup fails, it raises an error.
+      # `Hanami::Action::Mime::MIME_TYPES`. If the lookup fails, it raises an error.
       #
       # PERFORMANCE: Because `Hanami::Controller::Configuration#formats` is
-      # smaller and looked up first than `Rack::Mime::MIME_TYPES`, we suggest to
-      # configure the most common mime types used by your application, **even
-      # if they are already present in that Rack constant**.
+      # smaller and looked up first than `Hanami::Action::Mime::MIME_TYPES`,
+      # we suggest to configure the most common mime types used by your
+      # application, **even if they are already present in that Rack constant**.
       #
       # @param format [#to_sym] the format
       #
@@ -482,8 +541,7 @@ module Hanami
       # @since 0.2.0
       # @api private
       def detect_format
-        configuration.format_for(content_type) ||
-          ::Rack::Mime::MIME_TYPES.key(content_type).gsub(/\A\./, '').to_sym
+        configuration.format_for(content_type) || MIME_TYPES.key(content_type)
       end
 
       # @since 0.3.0

data/lib/hanami/action/rack.rb

@@ -282,7 +282,7 @@ module Hanami
       #     end
       #   end
       def send_file(path)
-        result = File.new(path).call(@_env)
+        result = File.new(path, self.class.configuration.public_directory).call(@_env)
         headers.merge!(result[1])
         halt result[0], result[2]
       end

data/lib/hanami/action/rack/file.rb

@@ -10,20 +10,27 @@ module Hanami
       #
       # @see Hanami::Action::Rack#send_file
       class File
+
+        # The key that returns path info from the Rack env
+        #
+        # @since 1.0.0.beta1
+        # @api private
+        PATH_INFO = "PATH_INFO".freeze
+
         # @param path [String,Pathname] file path
         #
         # @since 0.4.3
         # @api private
-        def initialize(path)
-          @file = ::Rack::File.new(nil)
+        def initialize(path, root)
+          @file = ::Rack::File.new(root)
           @path = path
         end
 
         # @since 0.4.3
         # @api private
         def call(env)
-          @file.path = @path.to_s
-          @file.serving(env)
+          env[PATH_INFO] = @path
+          @file.get(env)
         rescue Errno::ENOENT
           [404, {}, nil]
         end

data/lib/hanami/controller/configuration.rb

@@ -26,6 +26,14 @@ module Hanami
       # @api private
       DEFAULT_ERROR_CODE = 500
 
+      # Default public directory
+      #
+      # It serves as base root for file downloads
+      #
+      # @since 1.0.0.beta1
+      # @api private
+      DEFAULT_PUBLIC_DIRECTORY = 'public'.freeze
+
       # Default Mime type to format mapping
       #
       # @since 0.2.0
@@ -212,7 +220,7 @@ module Hanami
       #
       # @param exception [Exception] an exception
       #
-      # @since x.x.x
+      # @since 1.0.0.beta1
       # @api private
       #
       # @see Hanami::Controller::Configuration#handle_exception
@@ -423,10 +431,22 @@ module Hanami
       def mime_types
         @mime_types ||= begin
                           ((@formats.keys - DEFAULT_FORMATS.keys) +
-                          ::Rack::Mime::MIME_TYPES.values).freeze
+                          Hanami::Action::Mime::MIME_TYPES.values).freeze
                         end
       end
 
+      # Restrict the MIME types set only to the given set
+      #
+      # @param mime_types [Array] the set of MIME types
+      #
+      # @since 1.0.0.beta1
+      # @api private
+      #
+      # @see Hanami::Action::Mime::ClassMethods#accept
+      def restrict_mime_types!(mime_types)
+        @mime_types = self.mime_types & mime_types
+      end
+
       # Set a format as default fallback for all the requests without a strict
       # requirement for the mime type.
       #
@@ -631,6 +651,14 @@ module Hanami
         @formats.key(format)
       end
 
+      def public_directory(value = nil)
+        if value.nil?
+          @public_directory
+        else
+          @public_directory = Pathname.new(Dir.pwd).join(value).to_s
+        end
+      end
+
       # Duplicate by copying the settings in a new instance.
       #
       # @return [Hanami::Controller::Configuration] a copy of the configuration
@@ -648,6 +676,7 @@ module Hanami
           c.default_response_format = default_response_format
           c.default_charset         = default_charset
           c.default_headers         = default_headers.dup
+          c.public_directory        = public_directory
           c.cookies = cookies.dup
         end
       end
@@ -677,6 +706,7 @@ module Hanami
         @default_charset         = nil
         @default_headers         = {}
         @cookies                 = {}
+        @public_directory        = ::File.join(Dir.pwd, "public")
         @action_module           = ::Hanami::Action
       end
 
@@ -722,6 +752,7 @@ module Hanami
       attr_writer :default_charset
       attr_writer :default_headers
       attr_writer :cookies
+      attr_writer :public_directory
     end
   end
 end

data/lib/hanami/controller/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -18,34 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -149,9 +143,9 @@ 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.6.8