Skip to content

Commit

Permalink
Use double quotes for strings and prefer .() over .call
Browse files Browse the repository at this point in the history
  • Loading branch information
waiting-for-dev committed Oct 26, 2023
1 parent 357a6ab commit 4a6ebfd
Show file tree
Hide file tree
Showing 82 changed files with 943 additions and 942 deletions.
6 changes: 6 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ Naming/AccessorMethodName:

Style/HashConversion:
Enabled: false

Style/StringLiterals:
EnforcedStyle: double_quotes

Style/LambdaCall:
EnforcedStyle: braces
28 changes: 14 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"

git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

# Specify your gem's dependencies in web_pipe.gemspec
gemspec

group :development do
gem 'dry-schema', '~> 1.0'
gem 'dry-transformer', '~> 0.1'
gem 'pry-byebug'
gem 'rack-flash3', '~> 1.0'
gem 'rack-test', '~> 1.1'
gem 'rake', '~> 12.3', '>= 12.3.3'
gem 'redcarpet', '~> 3.4'
gem 'rspec', '~> 3.0'
gem 'rubocop', '~> 1.8'
gem 'rubocop-rspec', '~> 2.1'
gem 'yard', '~> 0.9', '>= 0.9.20'
gem "dry-schema", "~> 1.0"
gem "dry-transformer", "~> 0.1"
gem "pry-byebug"
gem "rack-flash3", "~> 1.0"
gem "rack-test", "~> 1.1"
gem "rake", "~> 12.3", ">= 12.3.3"
gem "redcarpet", "~> 3.4"
gem "rspec", "~> 3.0"
gem "rubocop", "~> 1.8"
gem "rubocop-rspec", "~> 2.1"
gem "yard", "~> 0.9", ">= 0.9.20"
# TODO: Move to gemspec when hanami-view 2.0 is available
gem 'hanami-view', github: 'hanami/view', tag: 'v2.1.0.beta2'
gem "hanami-view", github: "hanami/view", tag: "v2.1.0.beta2"
end

group :test do
gem 'simplecov', require: false
gem "simplecov", require: false
end
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# frozen_string_literal: true

require 'bundler/gem_tasks'
require 'rspec/core/rake_task'
require 'rubocop/rake_task'
require "bundler/gem_tasks"
require "rspec/core/rake_task"
require "rubocop/rake_task"

RSpec::Core::RakeTask.new(:spec)
RuboCop::RakeTask.new

desc 'Run code quality checks'
desc "Run code quality checks"
task lint: %i[rubocop]

task default: %i[lint spec]
6 changes: 3 additions & 3 deletions bin/console
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

require 'bundler/setup'
require 'web_pipe'
require "bundler/setup"
require "web_pipe"

# You can add fixtures and/or initialization code here to make experimenting
# with your gem easier. You can also use a different console, if you like.
Expand All @@ -11,5 +11,5 @@ require 'web_pipe'
# require "pry"
# Pry.start

require 'pry'
require "pry"
Pry.start
30 changes: 15 additions & 15 deletions lib/web_pipe.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'dry/core/extensions'
require 'web_pipe/dsl/builder'
require "dry/core/extensions"
require "web_pipe/dsl/builder"

# Entry-point for the DSL layer.
#
Expand Down Expand Up @@ -75,51 +75,51 @@ def self.call(**opts)
end

register_extension :container do
require 'web_pipe/extensions/container/container'
require "web_pipe/extensions/container/container"
end

register_extension :cookies do
require 'web_pipe/extensions/cookies/cookies'
require "web_pipe/extensions/cookies/cookies"
end

register_extension :dry_schema do
require 'web_pipe/extensions/dry_schema/dry_schema'
require 'web_pipe/extensions/dry_schema/plugs/sanitize_params'
require "web_pipe/extensions/dry_schema/dry_schema"
require "web_pipe/extensions/dry_schema/plugs/sanitize_params"
end

register_extension :flash do
require 'web_pipe/extensions/flash/flash'
require "web_pipe/extensions/flash/flash"
end

register_extension :hanami_view do
require 'web_pipe/extensions/hanami_view/hanami_view'
require "web_pipe/extensions/hanami_view/hanami_view"
end

register_extension :not_found do
require 'web_pipe/extensions/not_found/not_found'
require "web_pipe/extensions/not_found/not_found"
end

register_extension :params do
require 'web_pipe/extensions/params/params'
require "web_pipe/extensions/params/params"
end

register_extension :rails do
require 'web_pipe/extensions/rails/rails'
require "web_pipe/extensions/rails/rails"
end

register_extension :redirect do
require 'web_pipe/extensions/redirect/redirect'
require "web_pipe/extensions/redirect/redirect"
end

register_extension :router_params do
require 'web_pipe/extensions/router_params/router_params'
require "web_pipe/extensions/router_params/router_params"
end

register_extension :session do
require 'web_pipe/extensions/session/session'
require "web_pipe/extensions/session/session"
end

register_extension :url do
require 'web_pipe/extensions/url/url'
require "web_pipe/extensions/url/url"
end
end
10 changes: 5 additions & 5 deletions lib/web_pipe/app.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# frozen_string_literal: true

require 'web_pipe/conn'
require 'web_pipe/conn_support/builder'
require 'web_pipe/conn_support/composition'
require "web_pipe/conn"
require "web_pipe/conn_support/builder"
require "web_pipe/conn_support/composition"

module WebPipe
# Rack app built from a chain of functions that take and return a
Expand Down Expand Up @@ -54,11 +54,11 @@ def call(env)
private

def conn_from_env(env)
ConnSupport::Builder.call(env)
ConnSupport::Builder.(env)
end

def apply_operations(conn)
ConnSupport::Composition.new(operations).call(conn)
ConnSupport::Composition.new(operations).(conn)
end

def extract_rack_response(conn)
Expand Down
8 changes: 4 additions & 4 deletions lib/web_pipe/conn.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# frozen_string_literal: true

require 'dry/struct'
require 'web_pipe/conn_support/types'
require 'web_pipe/conn_support/errors'
require 'web_pipe/conn_support/headers'
require "dry/struct"
require "web_pipe/conn_support/types"
require "web_pipe/conn_support/errors"
require "web_pipe/conn_support/headers"

module WebPipe
# Struct and methods about web request and response data.
Expand Down
6 changes: 3 additions & 3 deletions lib/web_pipe/conn_support/builder.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# frozen_string_literal: true

require 'rack'
require 'web_pipe/conn'
require 'web_pipe/conn_support/headers'
require "rack"
require "web_pipe/conn"
require "web_pipe/conn_support/headers"

module WebPipe
module ConnSupport
Expand Down
6 changes: 3 additions & 3 deletions lib/web_pipe/conn_support/composition.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'dry/monads'
require 'web_pipe/conn'
require "dry/monads"
require "web_pipe/conn"

module WebPipe
module ConnSupport
Expand Down Expand Up @@ -45,7 +45,7 @@ def apply_operations(conn)
end

def apply_operation(conn, operation)
result = operation.call(conn)
result = operation.(conn)
case result
when Conn::Ongoing
Success(result)
Expand Down
4 changes: 2 additions & 2 deletions lib/web_pipe/conn_support/headers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module Headers
def self.extract(env)
Hash[
env
.select { |k, _v| k.start_with?('HTTP_') }
.select { |k, _v| k.start_with?("HTTP_") }
.map { |k, v| pair(k[5..], v) }
.concat(
env
Expand Down Expand Up @@ -46,7 +46,7 @@ def self.pair(key, value)
#
# See https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
def self.normalize_key(key)
key.downcase.gsub('_', '-').split('-').map(&:capitalize).join('-')
key.downcase.gsub("_", "-").split("-").map(&:capitalize).join("-")
end

def self.normalize(headers)
Expand Down
6 changes: 3 additions & 3 deletions lib/web_pipe/conn_support/types.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'dry/types'
require 'rack/request'
require "dry/types"
require "rack/request"

module WebPipe
module ConnSupport
Expand Down Expand Up @@ -30,7 +30,7 @@ module Types
Status = Strict::Integer
.default(200)
.constrained(gteq: 100, lteq: 599)
ResponseBody = Interface(:each).default { [''] }
ResponseBody = Interface(:each).default { [""] }

Headers = Strict::Hash
.map(Strict::String, Strict::String)
Expand Down
6 changes: 3 additions & 3 deletions lib/web_pipe/dsl/builder.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# frozen_string_literal: true

require 'web_pipe/dsl/class_context'
require 'web_pipe/dsl/instance_context'
require 'web_pipe/pipe'
require "web_pipe/dsl/class_context"
require "web_pipe/dsl/instance_context"
require "web_pipe/pipe"

module WebPipe
module DSL
Expand Down
2 changes: 1 addition & 1 deletion lib/web_pipe/dsl/instance_context.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'web_pipe/pipe'
require "web_pipe/pipe"

module WebPipe
module DSL
Expand Down
2 changes: 1 addition & 1 deletion lib/web_pipe/extensions/container/container.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'web_pipe'
require "web_pipe"

# :nodoc:
module WebPipe
Expand Down
4 changes: 2 additions & 2 deletions lib/web_pipe/extensions/cookies/cookies.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'web_pipe'
require 'rack/utils'
require "web_pipe"
require "rack/utils"

# :nodoc:
module WebPipe
Expand Down
2 changes: 1 addition & 1 deletion lib/web_pipe/extensions/dry_schema/dry_schema.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'web_pipe'
require "web_pipe"

WebPipe.load_extensions(:params)

Expand Down
8 changes: 4 additions & 4 deletions lib/web_pipe/extensions/dry_schema/plugs/sanitize_params.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'web_pipe/types'
require 'web_pipe/extensions/dry_schema/dry_schema'
require "web_pipe/types"
require "web_pipe/extensions/dry_schema/dry_schema"

module WebPipe
module Plugs
Expand All @@ -20,11 +20,11 @@ module SanitizeParams
# @return [ConnSupport::Composition::Operation[], Types::Undefined]
def self.call(schema, handler = Types::Undefined)
lambda do |conn|
result = schema.call(conn.params)
result = schema.(conn.params)
if result.success?
conn.add_config(DrySchema::SANITIZED_PARAMS_KEY, result.output)
else
get_handler(conn, handler).call(conn, result)
get_handler(conn, handler).(conn, result)
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions lib/web_pipe/extensions/flash/flash.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# frozen_string_literal: true

require 'web_pipe/conn'
require 'web_pipe/conn_support/errors'
require "web_pipe/conn"
require "web_pipe/conn_support/errors"

# :nodoc:
module WebPipe
# See the docs for the extension linked from the README.
module Flash
RACK_FLASH_KEY = 'x-rack.flash'
RACK_FLASH_KEY = "x-rack.flash"

# Returns the flash bag.
#
Expand All @@ -18,7 +18,7 @@ module Flash
def flash
env.fetch(RACK_FLASH_KEY) do
raise ConnSupport::MissingMiddlewareError.new(
'flash', 'Rack::Flash', 'https://rubygems.org/gems/rack-flash3'
"flash", "Rack::Flash", "https://rubygems.org/gems/rack-flash3"
)
end
end
Expand Down
Loading

0 comments on commit 4a6ebfd

Please sign in to comment.