diff options
author | dblock <dblock@dblock.org> | 2014-11-18 09:12:45 -0500 |
---|---|---|
committer | dblock <dblock@dblock.org> | 2014-11-18 09:38:46 -0500 |
commit | 5e9a4c8e3bb16077344c5f1e6aae8bcbc8e968ab (patch) | |
tree | 189cc156e6cdc17c42ff6211cb3a83fb1ef7d767 | |
parent | b190536f34bdddc17891151eadb228d9b1d97fad (diff) | |
download | hashie-5e9a4c8e3bb16077344c5f1e6aae8bcbc8e968ab.tar.gz |
Locked version of RuboCop.
-rw-r--r-- | .rubocop.yml | 29 | ||||
-rw-r--r-- | .rubocop_todo.yml | 45 | ||||
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | lib/hashie/extensions/indifferent_access.rb | 8 |
6 files changed, 54 insertions, 34 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index a86496e..005556b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,31 +4,4 @@ AllCops: - bin/** - vendor/** -Style/CaseEquality: - Enabled: false - -Style/Documentation: - # don't require classes to be documented - Enabled: false - -Style/DoubleNegation: - Enabled: false - -Style/Encoding: - # no need to always specify encoding - Enabled: false - -Metrics/ClassLength: - Enabled: false - -Metrics/CyclomaticComplexity: - Enabled: false - -Metrics/LineLength: - Enabled: false - -Metrics/MethodLength: - Enabled: false - -Metrics/PerceivedComplexity: - Max: 10 +inherit_from: .rubocop_todo.yml diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 0000000..ae8b17f --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,45 @@ +# This configuration was generated by `rubocop --auto-gen-config` +# on 2014-11-18 09:12:11 -0500 using RuboCop version 0.27.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 10 +Metrics/AbcSize: + Max: 37 + +# Offense count: 2 +# Configuration parameters: CountComments. +Metrics/ClassLength: + Max: 165 + +# Offense count: 8 +Metrics/CyclomaticComplexity: + Max: 11 + +# Offense count: 159 +# Configuration parameters: AllowURI, URISchemes. +Metrics/LineLength: + Max: 170 + +# Offense count: 15 +# Configuration parameters: CountComments. +Metrics/MethodLength: + Max: 28 + +# Offense count: 7 +Metrics/PerceivedComplexity: + Max: 10 + +# Offense count: 7 +Style/CaseEquality: + Enabled: false + +# Offense count: 80 +Style/Documentation: + Enabled: false + +# Offense count: 6 +Style/DoubleNegation: + Enabled: false diff --git a/.travis.yml b/.travis.yml index 7daf4a5..cb9c489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: false + language: ruby rvm: diff --git a/CHANGELOG.md b/CHANGELOG.md index e85090f..9a02b28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ ## Next Release -* Your contribution here. * [#233](https://github.com/intridea/hashie/pull/233): Custom error messages for required properties in Hashie::Dash subclasses - [@joss](https://github.com/joss). * [#231](https://github.com/intridea/hashie/pull/231): Added support for coercion on class type that inherit from Hash - [@gregory](https://github.com/gregory). * [#228](https://github.com/intridea/hashie/pull/228): Made Hashie::Extensions::Parsers::YamlErbParser pass template filename to ERB - [@jperville](https://github.com/jperville). * [#224](https://github.com/intridea/hashie/pull/224): Merging Hashie::Mash now correctly only calls the block on duplicate values - [@amysutedja](https://github.com/amysutedja). * [#221](https://github.com/intridea/hashie/pull/221): Reduce amount of allocated objects on calls with suffixes in Hashie::Mash - [@kubum](https://github.com/kubum). +* Your contribution here. ## 3.3.1 (8/26/2014) @@ -9,7 +9,7 @@ end group :development do gem 'pry' gem 'pry-stack_explorer', platforms: [:ruby_19, :ruby_20, :ruby_21] - gem 'rubocop', '~> 0.26' + gem 'rubocop', '0.27.1' gem 'guard', '~> 2.6.1' gem 'guard-rspec', '~> 4.3.1', require: false end diff --git a/lib/hashie/extensions/indifferent_access.rb b/lib/hashie/extensions/indifferent_access.rb index 4b58ace..1862009 100644 --- a/lib/hashie/extensions/indifferent_access.rb +++ b/lib/hashie/extensions/indifferent_access.rb @@ -137,14 +137,14 @@ module Hashie def hash_lacking_indifference?(other) other.is_a?(::Hash) && - !(other.respond_to?(:indifferent_access?) && - other.indifferent_access?) + !(other.respond_to?(:indifferent_access?) && + other.indifferent_access?) end def hash_with_indifference?(other) other.is_a?(::Hash) && - other.respond_to?(:indifferent_access?) && - other.indifferent_access? + other.respond_to?(:indifferent_access?) && + other.indifferent_access? end end end |