From 36955acae581d30d6d8a08f55e6d8e8dcd77e433 Mon Sep 17 00:00:00 2001 From: jiikko Date: Fri, 5 May 2023 20:07:42 +0900 Subject: [PATCH] Remove workaround for old Ruby versions --- Gemfile | 7 +++---- spec/spec_helper.rb | 7 ++----- spec/support/encoding.rb | 33 --------------------------------- 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 spec/support/encoding.rb diff --git a/Gemfile b/Gemfile index e69bbb8..6504f09 100644 --- a/Gemfile +++ b/Gemfile @@ -5,11 +5,10 @@ group :development do end group :development, :test do - if RUBY_VERSION >= "1.9.3" - gem 'guard' - gem 'guard-rspec' - end + gem 'guard' + gem 'guard-rspec' gem 'simplecov' + gem "pry" if RUBY_PLATFORM =~ /darwin/ gem "ruby_gntp" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e73c928..e257388 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,17 +11,14 @@ require 'gmo' require 'rspec' require 'vcr' +require 'pry' require 'support/config_loader' require 'support/factory' require 'support/vcr' -if RUBY_VERSION < '1.9.0' - require 'support/encoding' -end - RSpec.configure do |config| config.mock_with :rspec config.treat_symbols_as_metadata_keys_with_true_values = true config.filter_run :focus => true config.run_all_when_everything_filtered = true -end \ No newline at end of file +end diff --git a/spec/support/encoding.rb b/spec/support/encoding.rb deleted file mode 100644 index 0d0703a..0000000 --- a/spec/support/encoding.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'kconv' - -class String - @encoding = nil - - def encoding - if @encoding != nil then - return @encoding - else - case Kconv.guess(self) - when Kconv::JIS - return "ISO-2022-JP" - when Kconv::SJIS - return "Shift_JIS" - when Kconv::EUC - return "EUC-JP" - when Kconv::ASCII - return "ASCII" - when Kconv::UTF8 - return "UTF-8" - when Kconv::UTF16 - return "UTF-16BE" - when Kconv::UNKNOWN - return nil - when Kconv::BINARY - return nil - else - return nil - end - end - end - -end \ No newline at end of file