Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove only routing parameters from @params hash #1569

Merged
merged 1 commit into from
Oct 26, 2019

Conversation

jkowens
Copy link
Member

@jkowens jkowens commented Oct 6, 2019

Changes to the @params hash were being lost if routing params were
supplied because the whole hash was being reset after processing the
route. Resolves #1567.

Changes to the @params hash were being lost if routing params were
supplied because the whole hash was being reset after processing the
route.
@jkowens jkowens merged commit 04a02ac into sinatra:master Oct 26, 2019
@namusyaka
Copy link
Member

Sorry for the late reply.

The behavior was not a bug, but expected. This new change seems to break the backward compatibility.
Could you revert this?

@jkowens
Copy link
Member Author

jkowens commented Oct 27, 2019

@namusyaka yes I can revert, but I don't really understand why this would be expected behavior? Why would routes with named parameters behave differently than other routes, particularly when it comes to explicitly setting params?

@namusyaka
Copy link
Member

@jkowens The ideal behavior is different from the actual behavior.
I thought there is a possibility that software depending on sinatra might have relied on this inappropriate behavior.

Originally, this change is what I want to include in minor version upgrades. The patch version should basically be limited to bug fixes (not including breaking change even if it's a potential one) only.

@namusyaka
Copy link
Member

But I'm going to include this in v2.0.8 as this can be counted as very potential change on the behavior.

netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Mar 20, 2020
Update ruby-sinatra to 2.0.8.1.


## 2.0.8.1 / 2020-01-02

* Allow multiple hashes to be passed in `merge` and `merge!` for `Sinatra::IndifferentHash` [#1572](sinatra/sinatra#1572) by Shota Iguchi

## 2.0.8 / 2020-01-01

* Lookup Tilt class for template engine without loading files [#1558](sinatra/sinatra#1558). Fixes [#1172](sinatra/sinatra#1172) by Jordan Owens

* Add request info in NotFound exception [#1566](sinatra/sinatra#1566) by Stefan Sundin

* Add `.yaml` support in `Sinatra::Contrib::ConfigFile` [#1564](sinatra/sinatra#1564). Fixes [#1563](sinatra/sinatra#1563) by Emerson Manabu Araki

* Remove only routing parameters from @params hash [#1569](sinatra/sinatra#1569). Fixes [#1567](sinatra/sinatra#1567) by Jordan Owens, Horacio

* Support `capture` and `content_for` with Hamlit [#1580](sinatra/sinatra#1580) by Takashi Kokubun

* Eliminate warnings of keyword parameter for Ruby 2.7.0 [#1581](sinatra/sinatra#1581) by Osamtimizer

## 2.0.7 / 2019-08-22

* Fix a regression [#1560](sinatra/sinatra#1560) by Kunpei Sakai

## 2.0.6 / 2019-08-21

* Fix an issue setting environment from command line option [#1547](sinatra/sinatra#1547), [#1554](sinatra/sinatra#1554) by Jordan Owens, Kunpei Sakai

* Support pandoc as a new markdown renderer [#1533](sinatra/sinatra#1533) by Vasiliy

* Remove outdated code for tilt 1.x [#1532](sinatra/sinatra#1532) by Vasiliy

* Remove an extra logic for `force_encoding` [#1527](sinatra/sinatra#1527) by Jordan Owens

* Avoid multiple errors even if `params` contains special values [#1526](sinatra/sinatra#1527) by Kunpei Sakai

* Support `bundler/inline` with `require 'sinatra'` integration [#1520](sinatra/sinatra#1520) by Kunpei Sakai

* Avoid `TypeError` when params contain a key without a value on Ruby < 2.4 [#1516](sinatra/sinatra#1516) by Samuel Giddins

* Improve development support and documentation and source code by  Olle Jonsson, Basavanagowda Kanur, Yuki MINAMIYA
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

@params are reset to pre-filter state if there are parameters in the filter's path pattern
2 participants