From acbab799c3f0b2d59db9ab613ef08134ba990547 Mon Sep 17 00:00:00 2001 From: Piotr Solnica Date: Sat, 12 Dec 2020 07:43:26 +0100 Subject: [PATCH] rubocop -a --only Style/StringLiterals --- Gemfile | 20 +++++----- Rakefile | 14 +++---- benchmarks/hash_schemas.rb | 30 +++++++-------- benchmarks/lax_schema.rb | 12 +++--- benchmarks/profile_invalid_input.rb | 4 +- benchmarks/profile_lax_schema_valid.rb | 10 ++--- benchmarks/profile_valid_input.rb | 6 +-- benchmarks/schema_valid_vs_invalid.rb | 12 +++--- benchmarks/setup.rb | 18 ++++----- lib/dry-types.rb | 2 +- lib/dry/types.rb | 52 +++++++++++++------------- spec/spec_helper.rb | 24 ++++++------ 12 files changed, 102 insertions(+), 102 deletions(-) diff --git a/Gemfile b/Gemfile index abd5b6f..4276aec 100644 --- a/Gemfile +++ b/Gemfile @@ -1,27 +1,27 @@ # frozen_string_literal: true -source 'https://rubygems.org' +source "https://rubygems.org" -eval_gemfile 'Gemfile.devtools' +eval_gemfile "Gemfile.devtools" gemspec -gem 'dry-logic', github: 'dry-rb/dry-logic', branch: 'master' if ENV['DRY_LOGIC_FROM_MASTER'].eql?('true') +gem "dry-logic", github: "dry-rb/dry-logic", branch: "master" if ENV["DRY_LOGIC_FROM_MASTER"].eql?("true") group :test do - gem 'dry-struct' + gem "dry-struct" end group :tools do - gem 'pry-byebug', platform: :mri + gem "pry-byebug", platform: :mri end group :benchmarks do platform :mri do - gem 'attrio' - gem 'benchmark-ips' - gem 'fast_attributes' - gem 'hotch' - gem 'virtus' + gem "attrio" + gem "benchmark-ips" + gem "fast_attributes" + gem "hotch" + gem "virtus" end end diff --git a/Rakefile b/Rakefile index f299d2b..8f42b56 100644 --- a/Rakefile +++ b/Rakefile @@ -1,22 +1,22 @@ # frozen_string_literal: true -require 'bundler/gem_tasks' -require 'rspec/core/rake_task' +require "bundler/gem_tasks" +require "rspec/core/rake_task" task :run_specs do - require 'rspec/core' + require "rspec/core" - types_result = RSpec::Core::Runner.run(['spec/dry']) + types_result = RSpec::Core::Runner.run(["spec/dry"]) RSpec.clear_examples Dry::Types.load_extensions(:maybe) - ext_result = RSpec::Core::Runner.run(['spec']) + ext_result = RSpec::Core::Runner.run(["spec"]) exit [types_result, ext_result].max end task default: :run_specs -require 'yard' -require 'yard/rake/yardoc_task' +require "yard" +require "yard/rake/yardoc_task" YARD::Rake::YardocTask.new(:doc) diff --git a/benchmarks/hash_schemas.rb b/benchmarks/hash_schemas.rb index 7412650..339abfc 100644 --- a/benchmarks/hash_schemas.rb +++ b/benchmarks/hash_schemas.rb @@ -1,21 +1,21 @@ # frozen_string_literal: true -$LOAD_PATH.unshift('lib') +$LOAD_PATH.unshift("lib") -require 'bundler/setup' -require 'dry-types' +require "bundler/setup" +require "dry-types" module SchemaBench def self.hash_schema(type) - Dry::Types['nominal.hash'].public_send( + Dry::Types["nominal.hash"].public_send( type, - email: Dry::Types['nominal.string'], - age: Dry::Types['params.integer'], - admin: Dry::Types['params.bool'], - address: Dry::Types['nominal.hash'].public_send( + email: Dry::Types["nominal.string"], + age: Dry::Types["params.integer"], + admin: Dry::Types["params.bool"], + address: Dry::Types["nominal.hash"].public_send( type, - city: Dry::Types['nominal.string'], - street: Dry::Types['nominal.string'] + city: Dry::Types["nominal.string"], + street: Dry::Types["nominal.string"] ) ) end @@ -29,14 +29,14 @@ module SchemaBench .to_h INPUT = { - email: 'jane@doe.org', - age: '20', - admin: '1', - address: { city: 'NYC', street: 'Street 1/2' } + email: "jane@doe.org", + age: "20", + admin: "1", + address: { city: "NYC", street: "Street 1/2" } }.freeze end -require 'benchmark/ips' +require "benchmark/ips" Benchmark.ips do |x| SchemaBench::SCHEMAS.each do |schema_type, schema| diff --git a/benchmarks/lax_schema.rb b/benchmarks/lax_schema.rb index 2932568..9246616 100644 --- a/benchmarks/lax_schema.rb +++ b/benchmarks/lax_schema.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require_relative 'setup' +require_relative "setup" -schema = Dry::Types['params.hash'].schema( - email?: 'string', - age?: 'params.integer' +schema = Dry::Types["params.hash"].schema( + email?: "string", + age?: "params.integer" ).lax -params = { email: 'jane@doe.org', age: '19' } +params = { email: "jane@doe.org", age: "19" } Benchmark.ips do |x| - x.report('valid input') { schema.(params) } + x.report("valid input") { schema.(params) } x.compare! end diff --git a/benchmarks/profile_invalid_input.rb b/benchmarks/profile_invalid_input.rb index 3ffbee3..42e4c54 100644 --- a/benchmarks/profile_invalid_input.rb +++ b/benchmarks/profile_invalid_input.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -require_relative 'setup' +require_relative "setup" INVALID_INPUT = { name: :John, - age: '20', + age: "20", email: nil }.freeze diff --git a/benchmarks/profile_lax_schema_valid.rb b/benchmarks/profile_lax_schema_valid.rb index 4c40b3c..5d04216 100644 --- a/benchmarks/profile_lax_schema_valid.rb +++ b/benchmarks/profile_lax_schema_valid.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require_relative 'setup' +require_relative "setup" -Schema = Dry::Types['params.hash'].schema( - email?: 'string', - age?: 'coercible.integer' +Schema = Dry::Types["params.hash"].schema( + email?: "string", + age?: "coercible.integer" ).lax -ValidInput = { email: 'jane@doe.org', age: '19' }.freeze +ValidInput = { email: "jane@doe.org", age: "19" }.freeze profile do 10_000.times do diff --git a/benchmarks/profile_valid_input.rb b/benchmarks/profile_valid_input.rb index 615a231..5483af6 100644 --- a/benchmarks/profile_valid_input.rb +++ b/benchmarks/profile_valid_input.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true -require_relative 'setup' +require_relative "setup" VALID_INPUT = { - name: 'John', + name: "John", age: 20, - email: 'john@doe.com' + email: "john@doe.com" }.freeze profile do diff --git a/benchmarks/schema_valid_vs_invalid.rb b/benchmarks/schema_valid_vs_invalid.rb index 29b3141..8514a99 100644 --- a/benchmarks/schema_valid_vs_invalid.rb +++ b/benchmarks/schema_valid_vs_invalid.rb @@ -1,21 +1,21 @@ # frozen_string_literal: true -require_relative 'setup' +require_relative "setup" VALID_INPUT = { - name: 'John', + name: "John", age: 20, - email: 'john@doe.com' + email: "john@doe.com" } INVALID_INPUT = { name: :John, - age: '20', + age: "20", email: nil } Benchmark.ips do |x| - x.report('valid input') { PersonSchema.(VALID_INPUT) } - x.report('invalid input') { PersonSchema.(INVALID_INPUT) } + x.report("valid input") { PersonSchema.(VALID_INPUT) } + x.report("invalid input") { PersonSchema.(INVALID_INPUT) } x.compare! end diff --git a/benchmarks/setup.rb b/benchmarks/setup.rb index 243b564..d17e7c4 100644 --- a/benchmarks/setup.rb +++ b/benchmarks/setup.rb @@ -1,17 +1,17 @@ # frozen_string_literal: true -require 'benchmark/ips' -require 'hotch' -ENV['HOTCH_VIEWER'] ||= 'open' +require "benchmark/ips" +require "hotch" +ENV["HOTCH_VIEWER"] ||= "open" -require 'dry/types' +require "dry/types" -PersonSchema = Dry::Types['hash'].schema( - name: 'string', - age: 'integer', - email: 'string' +PersonSchema = Dry::Types["hash"].schema( + name: "string", + age: "integer", + email: "string" ).lax def profile(&block) - Hotch(filter: 'Dry', &block) + Hotch(filter: "Dry", &block) end diff --git a/lib/dry-types.rb b/lib/dry-types.rb index 4ea1e03..85f2b97 100644 --- a/lib/dry-types.rb +++ b/lib/dry-types.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true -require 'dry/types' +require "dry/types" diff --git a/lib/dry/types.rb b/lib/dry/types.rb index 89cfad5..9c0e672 100644 --- a/lib/dry/types.rb +++ b/lib/dry/types.rb @@ -1,27 +1,27 @@ # frozen_string_literal: true -require 'bigdecimal' -require 'date' -require 'set' +require "bigdecimal" +require "date" +require "set" -require 'concurrent/map' +require "concurrent/map" -require 'dry-container' -require 'dry-equalizer' -require 'dry/core/extensions' -require 'dry/core/constants' -require 'dry/core/class_attributes' +require "dry-container" +require "dry-equalizer" +require "dry/core/extensions" +require "dry/core/constants" +require "dry/core/class_attributes" -require 'dry/types/version' -require 'dry/types/container' -require 'dry/types/inflector' -require 'dry/types/type' -require 'dry/types/printable' -require 'dry/types/nominal' -require 'dry/types/constructor' -require 'dry/types/module' +require "dry/types/version" +require "dry/types/container" +require "dry/types/inflector" +require "dry/types/type" +require "dry/types/printable" +require "dry/types/nominal" +require "dry/types/constructor" +require "dry/types/module" -require 'dry/types/errors' +require "dry/types/errors" module Dry # Main library namespace @@ -45,7 +45,7 @@ module Dry # @api private def self.included(*) - raise 'Import Dry.Types, not Dry::Types' + raise "Import Dry.Types, not Dry::Types" end # Return container with registered built-in type objects @@ -121,7 +121,7 @@ module Dry # # @return [String] def self.identifier(klass) - Inflector.underscore(klass).tr('/', '.') + Inflector.underscore(klass).tr("/", ".") end # Cached type map @@ -137,11 +137,11 @@ module Dry def self.const_missing(const) underscored = Inflector.underscore(const) - if container.keys.any? { |key| key.split('.')[0] == underscored } + if container.keys.any? { |key| key.split(".")[0] == underscored } raise NameError, - 'dry-types does not define constants for default types. '\ + "dry-types does not define constants for default types. "\ 'You can access the predefined types with [], e.g. Dry::Types["integer"] '\ - 'or generate a module with types using Dry.Types()' + "or generate a module with types using Dry.Types()" else super end @@ -204,6 +204,6 @@ module Dry # rubocop:enable Naming/MethodName end -require 'dry/types/core' # load built-in types -require 'dry/types/extensions' -require 'dry/types/printer' +require "dry/types/core" # load built-in types +require "dry/types/extensions" +require "dry/types/printer" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a886272..16a5153 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,25 +1,25 @@ # frozen_string_literal: true -require_relative 'support/coverage' -require_relative 'support/warnings' -require_relative 'support/rspec_options' +require_relative "support/coverage" +require_relative "support/warnings" +require_relative "support/rspec_options" -require 'pathname' +require "pathname" SPEC_ROOT = Pathname(__FILE__).dirname -require 'dry-types' +require "dry-types" begin - require 'pry-byebug' + require "pry-byebug" rescue LoadError; end -Dir[Pathname(__dir__).join('shared/*.rb')].each(&method(:require)) -require 'dry/types/spec/types' +Dir[Pathname(__dir__).join("shared/*.rb")].each(&method(:require)) +require "dry/types/spec/types" Undefined = Dry::Core::Constants::Undefined -require 'dry/core/deprecations' -Dry::Core::Deprecations.set_logger!(SPEC_ROOT.join('../log/deprecations.log')) +require "dry/core/deprecations" +Dry::Core::Deprecations.set_logger!(SPEC_ROOT.join("../log/deprecations.log")) RSpec.configure do |config| config.before(:example, :maybe) do @@ -30,9 +30,9 @@ RSpec.configure do |config| @types = Dry::Types.container._container.keys end - config.before { stub_const('Test', Module.new) } + config.before { stub_const("Test", Module.new) } - config.order = 'random' + config.order = "random" end srand RSpec.configuration.seed