hanami-controller 1.2.0 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa2474de61eb665874dbb5aac1bc97558bbdfd255de8aaa7f21e659f18adb61
-  data.tar.gz: e5fe8ce5a5bfae4768bb1c1966ddff3d6d2ace31e0996422520977ce4fdf0c8b
+  metadata.gz: 70d59d43ccadadc8779881bb8c2bbc9a324e5e68e84e9a68ac7ef994b6124ea6
+  data.tar.gz: fab5066f435669ac7dbf7d8d0b7b5d7ec4c52ea2aef4975985ab24542d073994
 SHA512:
-  metadata.gz: 0cb4a8984ac4a16991662ac5ab90063a31349590cd14358b2c745da2fe5c523c4a2cf2db5aa8196d87508e57ac25ef5e6c8ebaeb9378051c7ec53e9ddcfc3177
-  data.tar.gz: 8c7c414fbacbb6564df2ce58a1d512491e25ffda2a6e64c3779063c8e5791e3241b88bc451f8a048a913d1e292939acfdacb702f16dd2820b8b78c0ab4b981b1
+  metadata.gz: 40ebcfe48e2b61e4e45447cfa7d6c30a471dc949668895b0758a7519d0a6a1de810f4da6b73a42e2e7a69abc0fd759ce9da16d5a8633fafd473694d639347759
+  data.tar.gz: 6f1983a3efc8900850f5496b755d9cf769065bc60e3c2423ec97828cba619db5971b8af4a70d648588e858cda144aa761c5c7d63149d26f379e4ae70f2369c1e

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v1.3.0.beta1 - 2018-08-08
+### Added
+- [Luca Guidi] Official support for JRuby 9.2.0.0
+
+### Fixed
+- [Yuji Ueki] Ensure that if `If-None-Match` or `If-Modified-Since` response HTTP headers are missing, `Etag` or `Last-Modified` headers will be in response HTTP headers.
+- [Gustavo Caso] Don't show flash message for the request after a HTTP redirect.
+- [Gustavo Caso] Ensure `Hanami::Action::Flash#each`, `#map`, and `#empty?` to not reference stale flash data.
+
+### Deprecated
+- [Gustavo Caso] Deprecate `Hanami::Action#parsed_request_body`
+
 ## v1.2.0 - 2018-04-11
 
 ## v1.2.0.rc2 - 2018-04-06

data/README.md

@@ -4,12 +4,12 @@ Complete, fast and testable actions for Rack and [Hanami](http://hanamirb.org)
 
 ## Status
 
-[![Gem Version](https://badge.fury.io/rb/hanami-controller.png)](http://badge.fury.io/rb/hanami-controller)
-[![Build Status](https://secure.travis-ci.org/hanami/controller.png?branch=master)](http://travis-ci.org/hanami/controller?branch=master)
-[![Coverage](https://coveralls.io/repos/hanami/controller/badge.png?branch=master)](https://coveralls.io/r/hanami/controller)
-[![Code Climate](https://codeclimate.com/github/hanami/controller.png)](https://codeclimate.com/github/hanami/controller)
-[![Dependencies](https://gemnasium.com/hanami/controller.png)](https://gemnasium.com/hanami/controller)
-[![Inline docs](http://inch-ci.org/github/hanami/controller.png)](http://inch-ci.org/github/hanami/controller)
+[![Gem Version](https://badge.fury.io/rb/hanami-controller.svg)](https://badge.fury.io/rb/hanami-controller)
+[![TravisCI](https://travis-ci.org/hanami/controller.svg?branch=master)](https://travis-ci.org/hanami/controller)
+[![CircleCI](https://circleci.com/gh/hanami/controller/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/controller/tree/master)
+[![Test Coverage](https://codecov.io/gh/hanami/controller/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/controller)
+[![Depfu](https://badges.depfu.com/badges/7cd17419fba78b726be1353118fb01de/overview.svg)](https://depfu.com/github/hanami/controller?project=Bundler)
+[![Inline Docs](http://inch-ci.org/github/hanami/controller.svg)](http://inch-ci.org/github/hanami/controller)
 
 ## Contact
 

data/hanami-controller.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_dependency 'rack',         '~> 2.0'
-  spec.add_dependency 'hanami-utils', '~> 1.2'
+  spec.add_dependency 'hanami-utils', '~> 1.3.beta'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
-  spec.add_development_dependency 'rack-test', '~> 0.6'
+  spec.add_development_dependency 'rack-test', '~> 1.0'
   spec.add_development_dependency 'rake',      '~> 12'
   spec.add_development_dependency 'rspec',     '~> 3.7'
 end

data/lib/hanami/action/cache/conditional_get.rb

@@ -41,7 +41,7 @@ module Hanami
         # @since 0.3.0
         # @api private
         def header
-          { ETAG => @value } if none_match
+          { ETAG => @value } if @value
         end
 
         private
@@ -67,13 +67,13 @@ module Hanami
         # @since 0.3.0
         # @api private
         def fresh?
-          !Hanami::Utils::Blank.blank?(modified_since) && Time.httpdate(modified_since).to_i >= @value.to_i
+          !Hanami::Utils::Blank.blank?(modified_since) && Time.httpdate(modified_since).to_i >= @value.to_time.to_i
         end
 
         # @since 0.3.0
         # @api private
         def header
-          { LAST_MODIFIED => @value.httpdate } if modified_since
+          { LAST_MODIFIED => @value.httpdate } if @value && @value.respond_to?(:httpdate)
         end
 
         private

data/lib/hanami/action/flash.rb

@@ -12,29 +12,26 @@ module Hanami
       # @api private
       SESSION_KEY = :__flash
 
-      # Session key where the last request_id is stored
+      # Session key where keep data is store for redirect
       #
-      # @since 0.4.0
+      # @since 1.3.0
       # @api private
-      LAST_REQUEST_KEY = :__last_request_id
+      KEPT_KEY = :__kept_key
 
       # Initialize a new Flash instance
       #
       # @param session [Rack::Session::Abstract::SessionHash] the session
-      # @param request_id [String] the HTTP Request ID
       #
       # @return [Hanami::Action::Flash] the flash
       #
       # @see http://www.rubydoc.info/gems/rack/Rack/Session/Abstract/SessionHash
       # @see Hanami::Action::Rack#session_id
-      def initialize(session, request_id)
+      def initialize(session)
         @session         = session
-        @request_id      = request_id
-        @last_request_id = session[LAST_REQUEST_KEY]
-        @merged          = {}
+        @keep            = false
 
-        session[SESSION_KEY]             ||= {}
-        session[SESSION_KEY][request_id] ||= {}
+        session[KEPT_KEY] ||= []
+        session[SESSION_KEY] = {}
       end
 
       # Set the given value for the given key
@@ -45,7 +42,7 @@ module Hanami
       # @since 0.3.0
       # @api private
       def []=(key, value)
-        data[key] = value
+        _data[key] = value
       end
 
       # Get the value associated to the given key, if any
@@ -55,28 +52,26 @@ module Hanami
       # @since 0.3.0
       # @api private
       def [](key)
-        @merged.fetch(key) do
-          _values.find {|data| !data[key].nil? }
-        end
+        _data.fetch(key) { search_in_kept_data(key) }
       end
 
-      # Iterates through data
+      # Iterates through current request data and kept data
       #
       # @param blk [Proc]
       #
       # @since 1.2.0
       def each(&blk)
-        @merged.each(&blk)
+        _values.each(&blk)
       end
 
-      # Iterates through data
+      # Iterates through current request data and kept data
       #
       # @param blk [Proc]
       # @return [Array]
       #
       # @since 1.2.0
       def map(&blk)
-        @merged.map(&blk)
+        _values.map(&blk)
       end
 
       # Removes entirely the flash from the session if it has stale contents
@@ -91,11 +86,11 @@ module Hanami
         # this bug that I've found via a browser.
         #
         # It may happen that `#flash` is nil, and those two methods will fail
-        unless flash.nil?
-          expire_stale!
-          remove!
-          merge!
-          set_last_request_id!
+        unless _data.nil?
+          update_kept_request_count
+          keep_data if @keep
+          expire_kept
+          remove
         end
       end
 
@@ -107,112 +102,167 @@ module Hanami
       # @since 0.3.0
       # @api private
       def empty?
-        _values.all?(&:empty?)
+        _values.empty?
       end
 
       # @return [String]
       #
       # @since 1.0.0
       def inspect
-        "#<#{self.class}:#{'0x%x' % (__id__ << 1)} #{@merged.inspect}>"
+        "#<#{self.class}:#{'0x%x' % (__id__ << 1)} {:data=>#{_data.inspect}, :kept=>#{kept_data.inspect}} >"
+      end
+
+      # Set @keep to true, is use when triggering a redirect, and the content of _data is not empty.
+      # @return [TrueClass, NilClass]
+      #
+      # @since 1.3.0
+      # @api private
+      #
+      # @see Hanami::Action::Flash#empty?
+      def keep!
+        return if empty?
+        @keep = true
       end
 
       private
 
-      # The flash registry that holds the data for **all** the recent requests
+      # The flash registry that holds the data for the current requests
       #
       # @return [Hash] the flash
       #
       # @since 0.3.0
       # @api private
-      def flash
+      def _data
         @session[SESSION_KEY] || {}
       end
 
-      # The flash registry that holds the data **only for** the current request
+      # Remove the flash entirely from the session if empty.
       #
-      # @return [Hash] the flash for the current request
+      # @return [void]
       #
       # @since 0.3.0
       # @api private
-      def data
-        flash[@request_id] || {}
+      #
+      # @see Hanami::Action::Flash#empty?
+      def remove
+        if empty?
+          @session.delete(SESSION_KEY)
+          @session.delete(KEPT_KEY)
+        end
       end
 
-      # Expire the stale data from the previous request.
+      # Returns the values from current session and kept.
       #
-      # @return [void]
+      # @return [Hash]
       #
       # @since 0.3.0
       # @api private
-      def expire_stale!
-        flash.each do |request_id, _|
-          flash.delete(request_id) if delete?(request_id)
-        end
+      def _values
+        _data.merge(kept_data)
       end
 
-      # Remove the flash entirely from the session if empty.
+      # Get the kept request data
       #
-      # @return [void]
+      # @return [Array]
       #
-      # @since 0.3.0
+      # @since 1.3.0
       # @api private
-      #
-      # @see Hanami::Action::Flash#empty?
-      def remove!
-        @session.delete(SESSION_KEY) if empty?
+      def kept
+        @session[KEPT_KEY] || []
       end
 
-      # @since 1.0.0
-      # @api private
+      # Merge current data into KEPT_KEY hash
+      #
+      # @return [Hash] the current value of KEPT_KEY
       #
-      # @see Hanami::Action::Flash#[]
-      def merge!
-        @merged = last_request_flash.merge(data)
+      # @since 1.3.0
+      # @api private
+      def keep_data
+        new_kept_data = kept << JSON.generate({ count: 0, data: _data })
+
+        update_kept(new_kept_data)
       end
 
-      # Values from all the stored requests
+      # Removes from kept data those who have lived for more than two requests
       #
-      # @return [Array]
+      # @return [Hash] the current value of KEPT_KEY
       #
-      # @since 0.3.0
+      # @since 1.3.0
       # @api private
-      def _values
-        flash.select { |session_id, _| !delete?(session_id) }.values
+      def expire_kept
+        new_kept_data = kept.reject do |kept_data|
+          parsed = JSON.parse(kept_data)
+          parsed['count'] >= 2 if is_hash?(parsed) && parsed['count'].is_a?(Integer)
+        end
+
+        update_kept(new_kept_data)
       end
 
-      # Determine if delete data from flash for the given Request ID
+      # Update the count of request for each kept data
       #
-      # @return [TrueClass,FalseClass] the result of the check
+      # @return [Hash] the current value of KEPT_KEY
       #
-      # @since 0.4.0
+      # @since 1.3.0
       # @api private
+      def update_kept_request_count
+        new_kept_data = kept.map do |kept_data|
+          parsed = JSON.parse(kept_data)
+          parsed['count'] += 1 if is_hash?(parsed) && parsed['count'].is_a?(Integer)
+          JSON.generate(parsed)
+        end
+
+        update_kept(new_kept_data)
+      end
+
+      # Search in the kept data for a match on the key
       #
-      # @see Hanami::Action::Flash#expire_stale!
-      def delete?(request_id)
-        ![@request_id, @session[LAST_REQUEST_KEY]].include?(request_id)
+      # @param key [#to_s] the key
+      # @return [Object, NilClass]
+      #
+      # @since 1.3.0
+      # @api private
+      def search_in_kept_data(key)
+        string_key = key.to_s
+
+        data = kept.find do |kept_data|
+          parsed = JSON.parse(kept_data)
+          parsed['data'].fetch(string_key, nil) if is_hash?(parsed['data'])
+        end
+
+        JSON.parse(data)['data'][string_key] if data
       end
 
-      # Get the last request session flash
+      # Set the given new_kept_data to KEPT_KEY
       #
-      # @return [Hash] the flash of last request
+      # @param new_kept_data
+      # @return [Hash] the current value of KEPT_KEY
       #
-      # @since 0.4.0
+      # @since 1.3.0
       # @api private
-      def last_request_flash
-        flash[@last_request_id] || {}
+      def update_kept(new_kept_data)
+        @session[KEPT_KEY] = new_kept_data
       end
 
-      # Store the last request_id to create the next flash with its values
-      # is current flash is not empty.
+      # Values from kept
       #
-      # @return [void]
-      # @since 0.4.0
+      # @return [Hash]
+      #
+      # @since 1.3.0
       # @api private
-      def set_last_request_id!
-        @session[LAST_REQUEST_KEY] = @request_id if !empty?
+      def kept_data
+        kept.each_with_object({}) { |kept_data, result| result.merge!(JSON.parse(kept_data)['data']) }
       end
 
+      # Check if data is a hash
+      #
+      # @param data
+      # @return [TrueClass, FalseClass]
+      #
+      # @since 1.3.0
+      # @api private
+      def is_hash?(data)
+        data && data.is_a?(Hash)
+      end
     end
   end
 end

data/lib/hanami/action/rack.rb

@@ -3,6 +3,7 @@ require 'hanami/action/request'
 require 'hanami/action/base_params'
 require 'hanami/action/rack/callable'
 require 'hanami/action/rack/file'
+require 'hanami/utils/deprecation'
 
 module Hanami
   module Action
@@ -245,7 +246,10 @@ module Hanami
       end
 
       # Return parsed request body
+      #
+      # @deprecated
       def parsed_request_body
+        Hanami::Utils::Deprecation.new('#parsed_request_body is deprecated and it will be removed in future versions')
         @_env.fetch(ROUTER_PARSED_BODY, nil)
       end
 

data/lib/hanami/action/session.rb

@@ -83,7 +83,7 @@ module Hanami
       #
       # @see Hanami::Action::Flash
       def flash
-        @flash ||= Flash.new(session, request_id)
+        @flash ||= Flash.new(session)
       end
 
       # In case of validations errors, preserve those informations after a
@@ -134,7 +134,7 @@ module Hanami
         if params.respond_to?(:valid?)
           flash[ERRORS_KEY] = errors.to_a unless params.valid?
         end
-
+        flash.keep!
         super
       end
 

data/lib/hanami/controller/configuration.rb

@@ -96,8 +96,8 @@ module Hanami
       #   Hanami::Controller::Configuration.for(MyApp::Controllers::Dashboard)
       #     # => will duplicate from MyApp::Controller
       def self.for(base)
-        namespace = Utils::String.namespace(base)
-        framework = Utils::Class.load_from_pattern!("(#{namespace}|Hanami)::Controller")
+        namespace = Utils::String.namespace(base.name)
+        framework = Utils::Class.load("#{namespace}::Controller") || Utils::Class.load!('Hanami::Controller')
         framework.configuration.duplicate
       end
 

data/lib/hanami/controller/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 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: rack
@@ -30,14 +30,14 @@ 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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   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.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami