diff options
author | dblock <dblock@dblock.org> | 2014-04-30 21:10:49 -0400 |
---|---|---|
committer | dblock <dblock@dblock.org> | 2014-04-30 21:10:49 -0400 |
commit | db2ae0bf26834f815976887e39cdd4857d2fb507 (patch) | |
tree | 9856a79d56439ef0e2b4281de373c6aff8e5c3b6 | |
parent | cb7b041d80df142be724850e214000d9524d3f40 (diff) | |
download | hashie-db2ae0bf26834f815976887e39cdd4857d2fb507.tar.gz |
Upgraded Rubocop, removed broken platforms from Travis.
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | hashie.gemspec | 14 | ||||
-rw-r--r-- | lib/hashie/extensions/coercion.rb | 2 | ||||
-rw-r--r-- | lib/hashie/rash.rb | 2 | ||||
-rw-r--r-- | spec/hashie/dash_spec.rb | 2 | ||||
-rw-r--r-- | spec/hashie/mash_spec.rb | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 42ef511..bd0b13d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: ruby + rvm: - ruby-head - 2.1.1 - - 2.1.0 - 2.0.0 - 1.9.3 - jruby-19mode - jruby-head - - rbx-2.1 - rbx-2.2 + matrix: allow_failures: - rvm: ruby-head @@ -8,4 +8,4 @@ end gemspec -gem 'rubocop', '0.20.0' +gem 'rubocop', '0.21.0' diff --git a/hashie.gemspec b/hashie.gemspec index 28b45b1..a698a53 100644 --- a/hashie.gemspec +++ b/hashie.gemspec @@ -1,19 +1,19 @@ require File.expand_path('../lib/hashie/version', __FILE__) Gem::Specification.new do |gem| - gem.authors = ["Michael Bleigh", "Jerry Cheung"] - gem.email = ["michael@intridea.com", "jollyjerry@gmail.com"] - gem.description = %q{Hashie is a collection of classes and mixins that make hashes more powerful.} - gem.summary = %q{Your friendly neighborhood hash library.} + gem.authors = ['Michael Bleigh', 'Jerry Cheung'] + gem.email = ['michael@intridea.com', 'jollyjerry@gmail.com'] + gem.description = 'Hashie is a collection of classes and mixins that make hashes more powerful.' + gem.summary = 'Your friendly neighborhood hash library.' gem.homepage = 'https://github.com/intridea/hashie' - gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) } gem.files = `git ls-files`.split("\n") gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") - gem.name = "hashie" + gem.name = 'hashie' gem.require_paths = ['lib'] gem.version = Hashie::VERSION - gem.license = "MIT" + gem.license = 'MIT' gem.add_development_dependency 'rake' gem.add_development_dependency 'rspec' diff --git a/lib/hashie/extensions/coercion.rb b/lib/hashie/extensions/coercion.rb index d4631d2..f335481 100644 --- a/lib/hashie/extensions/coercion.rb +++ b/lib/hashie/extensions/coercion.rb @@ -21,7 +21,7 @@ module Hashie super(key, value) end - def custom_writer(key, value, convert = true) + def custom_writer(key, value, _convert = true) self[key] = value end diff --git a/lib/hashie/rash.rb b/lib/hashie/rash.rb index d59de95..1caa4c6 100644 --- a/lib/hashie/rash.rb +++ b/lib/hashie/rash.rb @@ -111,7 +111,7 @@ module Hashie def optimize_if_necessary! if (@lookups += 1) >= @optimize_every - @regexes = @regex_counts.sort_by { |regex, count| -count }.map { |regex, count| regex } + @regexes = @regex_counts.sort_by { |_, count| -count }.map { |regex, _| regex } @lookups = 0 end end diff --git a/spec/hashie/dash_spec.rb b/spec/hashie/dash_spec.rb index d651eea..4a7ed90 100644 --- a/spec/hashie/dash_spec.rb +++ b/spec/hashie/dash_spec.rb @@ -139,7 +139,7 @@ describe DashTest do end it 'accepts block to define a global default' do - obj = described_class.new { |hash, key| key.to_s.upcase } + obj = described_class.new { |_, key| key.to_s.upcase } expect(obj.first_name).to eq 'FIRST_NAME' expect(obj.count).to be_zero end diff --git a/spec/hashie/mash_spec.rb b/spec/hashie/mash_spec.rb index 122953f..7e06f9c 100644 --- a/spec/hashie/mash_spec.rb +++ b/spec/hashie/mash_spec.rb @@ -176,7 +176,7 @@ describe Hashie::Mash do # http://www.ruby-doc.org/core-1.9.3/Hash.html#method-i-update it 'accepts a block' do - duped = subject.merge(details: { address: 'Pasadena CA' }) { |key, oldv, newv| [oldv, newv].join(', ') } + duped = subject.merge(details: { address: 'Pasadena CA' }) { |_, oldv, newv| [oldv, newv].join(', ') } expect(duped.details.address).to eq 'Nowhere road, Pasadena CA' end end @@ -434,7 +434,7 @@ describe Hashie::Mash do context 'with block given' do it 'returns default value' do - expect(mash.fetch(:two) do |key| + expect(mash.fetch(:two) do 'block default value' end).to eql('block default value') end |