diff --git a/.rubocop.yml b/.rubocop.yml index f6d5d06..b9466cc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -45,9 +45,6 @@ Style/EachWithObject: Style/Encoding: Enabled: false -Style/HashSyntax: - EnforcedStyle: hash_rockets - Style/Lambda: Enabled: false diff --git a/Gemfile b/Gemfile index d86ec37..c6dc900 100644 --- a/Gemfile +++ b/Gemfile @@ -3,10 +3,10 @@ source 'https://rubygems.org' gem 'rake' gem 'yard' -gem 'libxml-ruby', :require => nil, :platforms => :ruby -gem 'nokogiri', :require => nil -gem 'oga', '>= 2.3', :require => nil -gem 'ox', :require => nil, :platforms => :ruby +gem 'libxml-ruby', require: nil, platforms: :ruby +gem 'nokogiri', require: nil +gem 'oga', '>= 2.3', require: nil +gem 'ox', require: nil, platforms: :ruby group :development do gem 'kramdown' diff --git a/Rakefile b/Rakefile index d52e584..93277bc 100644 --- a/Rakefile +++ b/Rakefile @@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) -task :test => :spec +task test: :spec require 'rubocop/rake_task' RuboCop::RakeTask.new @@ -30,4 +30,4 @@ Yardstick::Rake::Verify.new do |verify| verify.threshold = 48.8 end -task :default => [:spec, :rubocop, :verify_measurements] +task default: [:spec, :rubocop, :verify_measurements] diff --git a/lib/multi_xml.rb b/lib/multi_xml.rb index d2865f9..2e9ebeb 100644 --- a/lib/multi_xml.rb +++ b/lib/multi_xml.rb @@ -67,9 +67,9 @@ def initialize(type) DISALLOWED_XML_TYPES = %w(symbol yaml).freeze DEFAULT_OPTIONS = { - :typecast_xml_value => true, - :disallowed_types => DISALLOWED_XML_TYPES, - :symbolize_keys => false, + typecast_xml_value: true, + disallowed_types: DISALLOWED_XML_TYPES, + symbolize_keys: false, }.freeze class << self diff --git a/lib/multi_xml/parsers/ox.rb b/lib/multi_xml/parsers/ox.rb index 9589cd2..74a6640 100644 --- a/lib/multi_xml/parsers/ox.rb +++ b/lib/multi_xml/parsers/ox.rb @@ -29,7 +29,7 @@ def parse_error def parse(io) handler = Handler.new - ::Ox.sax_parse(handler, io, :convert_special => true) + ::Ox.sax_parse(handler, io, convert_special: true) handler.doc end diff --git a/lib/multi_xml/version.rb b/lib/multi_xml/version.rb index 10f916d..823f9a9 100644 --- a/lib/multi_xml/version.rb +++ b/lib/multi_xml/version.rb @@ -25,10 +25,10 @@ def pre # @return [Hash] def to_h { - :major => major, - :minor => minor, - :patch => patch, - :pre => pre, + major: major, + minor: minor, + patch: patch, + pre: pre, } end diff --git a/spec/parser_shared_example.rb b/spec/parser_shared_example.rb index ce017b4..837dfb0 100644 --- a/spec/parser_shared_example.rb +++ b/spec/parser_shared_example.rb @@ -138,7 +138,7 @@ context 'with :typecast_xml_value => false' do before do - @setting = MultiXml.parse(@xml, :typecast_xml_value => false)['global_settings']['group']['setting'] + @setting = MultiXml.parse(@xml, typecast_xml_value: false)['global_settings']['group']['setting'] end it { expect(@setting).to eq('type' => 'string', 'description' => {'__content__' => 'Test'}) } @@ -151,7 +151,7 @@ end it 'symbolizes keys' do - expect(MultiXml.parse(@xml, :symbolize_keys => true)).to eq(:users => {:user => [{:name => 'Erik Michaels-Ober'}, {:name => 'Wynn Netherland'}]}) + expect(MultiXml.parse(@xml, symbolize_keys: true)).to eq(users: {user: [{name: 'Erik Michaels-Ober'}, {name: 'Wynn Netherland'}]}) end end @@ -332,7 +332,7 @@ end it 'returns the correctly parsed YAML when the type is allowed' do - expect(MultiXml.parse(@xml, :disallowed_types => [])['tag']).to eq(:message => 'Have a nice day', 1 => 'returns an integer', 'array' => [{'has-dashes' => true, 'has_underscores' => true}]) + expect(MultiXml.parse(@xml, disallowed_types: [])['tag']).to eq(:message => 'Have a nice day', 1 => 'returns an integer', 'array' => [{'has-dashes' => true, 'has_underscores' => true}]) end end @@ -346,7 +346,7 @@ end it 'returns the correctly parsed Symbol when the type is allowed' do - expect(MultiXml.parse(@xml, :disallowed_types => [])['tag']).to eq(:my_symbol) + expect(MultiXml.parse(@xml, disallowed_types: [])['tag']).to eq(:my_symbol) end end @@ -459,7 +459,7 @@ end it 'returns nil when the type is allowed' do - expect(MultiXml.parse(@xml, :disallowed_types => [])['tag']).to be nil + expect(MultiXml.parse(@xml, disallowed_types: [])['tag']).to be nil end end end