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

Fix typos in changelog, readme and code comments #2006

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

* Fix issue with passed routes and provides Fixes [#1095](https://github.com/sinatra/sinatra/pull/1095) [#1606](https://github.com/sinatra/sinatra/pull/1606) by Mike Pastore, Jordan Owens

* Add QuietLogger that excludes pathes from Rack::CommonLogger [1250](https://github.com/sinatra/sinatra/pull/1250) by Christoph Wagner
* Add QuietLogger that excludes paths from Rack::CommonLogger [1250](https://github.com/sinatra/sinatra/pull/1250) by Christoph Wagner

* Sinatra::Contrib dependency updates. Fixes [#1207](https://github.com/sinatra/sinatra/pull/1207) [#1411](https://github.com/sinatra/sinatra/pull/1411) by Mike Pastore

Expand Down Expand Up @@ -1609,7 +1609,7 @@ the 1.0 release:
Hash structure. e.g., "post[title]=Hello&post[body]=World" yields
params: {'post' => {'title' => 'Hello', 'body' => 'World'}}.

* Regular expressions may now be used in route pattens; captures are
* Regular expressions may now be used in route patterns; captures are
available at "params[:captures]".

* New ":provides" route condition takes an array of mime types and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
expect(session[:foo]).to eq(:bar)

get '/', {}, 'rack.session' => session, 'HTTP_FOO' => 'BAR'
# wont be empty if the remote_token middleware runs after session_hijacking
# won't be empty if the remote_token middleware runs after session_hijacking
# why we run the mock app without remote_token
expect(session).to be_empty
end
Expand Down
2 changes: 1 addition & 1 deletion sinatra-contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ consider using an alternative like [rerun](https://github.com/alexch/rerun) or
* [`sinatra/test_helpers`][sinatra-test-helpers]: Helper methods to ease testing your Sinatra
application. Partly extracted from Sinatra. Testing framework agnostic

* `sinatra/quiet_logger`: Extension to exclude specific pathes from access log.
* `sinatra/quiet_logger`: Extension to exclude specific paths from access log.
It works by patching Rack::CommonLogger

## Installation
Expand Down
2 changes: 1 addition & 1 deletion sinatra-contrib/ideas.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
end

* `sinatra-smart-cache`: update cache header only if arguments are more
restrictive than curent value, set caching headers that way for most helper
restrictive than current value, set caching headers that way for most helper
methods (i.e. `send_file`)

* Some verbose logging extension: Log what filters, routes, error handlers,
Expand Down
4 changes: 2 additions & 2 deletions sinatra-contrib/lib/sinatra/reloader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,12 @@ def dont_reload(*glob)
# attr_reader :register_path warn on -w (private attribute)
def register_path; @register_path ||= nil; end

# Indicates an extesion is being registered.
# Indicates an extension is being registered.
def start_registering_extension
@register_path = caller_files[2]
end

# Indicates the extesion has already been registered.
# Indicates the extension has already been registered.
def stop_registering_extension
@register_path = nil
end
Expand Down
2 changes: 1 addition & 1 deletion sinatra-contrib/lib/sinatra/webdav.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module Sinatra
# end
# end
#
# You can use it in classic application just by requring the extension:
# You can use it in classic application just by requiring the extension:
#
# require 'sinatra'
# require 'sinatra/webdav'
Expand Down
2 changes: 1 addition & 1 deletion sinatra-contrib/spec/cookies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ def cookies(*set_cookies)
end

describe :merge do
it 'is mergable with a hash' do
it 'is mergeable with a hash' do
expect(cookies('foo=bar').merge(:bar => :baz)).to eq({"foo" => "bar", :bar => :baz})
end

Expand Down
4 changes: 2 additions & 2 deletions test/middleware_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ def call(env)
get '/'
end

class KeywordArgumentIntializationMiddleware < MockMiddleware
class KeywordArgumentInitializationMiddleware < MockMiddleware
def initialize(app, **)
super app
end
end

it "handles keyword arguments" do
@app.use KeywordArgumentIntializationMiddleware, argument: "argument"
@app.use KeywordArgumentInitializationMiddleware, argument: "argument"
get '/'
end
end
2 changes: 1 addition & 1 deletion test/settings_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def foo=(value)
assert body.include?("<code>show_exceptions</code> setting")
end

it 'does not attempt to show unparseable query parameters' do
it 'does not attempt to show unparsable query parameters' do
klass = Sinatra.new(Sinatra::Application)
mock_app(klass) {
enable :show_exceptions
Expand Down