Fix RuboCop offenses

Author: sferik

.rubocop.yml

@@ -1,3 +1,12 @@
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Lint/Void:
+  Enabled: false
+
 Metrics/BlockLength:
   Max: 36
   Exclude:
@@ -21,9 +30,6 @@ Metrics/ParameterLists:
   Max: 4
   CountKeywordArgs: true
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 Style/CollectionMethods:
   Enabled: true
   PreferredMethods:
@@ -45,8 +51,5 @@ Style/FrozenStringLiteralComment:
 Style/NumericPredicate:
   Enabled: false
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: 'comma'

Rakefile

@@ -28,4 +28,4 @@ Yardstick::Rake::Verify.new do |verify|
   verify.threshold = 59.0
 end
 
-task default: [:spec, :rubocop, :verify_measurements]
+task default: %i[spec rubocop verify_measurements]

lib/twitter/profile.rb

@@ -1,4 +1,5 @@
 require 'addressable/uri'
+require 'cgi'
 require 'memoizable'
 
 module Twitter
@@ -11,7 +12,7 @@ class << self
     private
 
       def alias_predicate_uri_methods(method)
-        %w(_url? _uri_https? _url_https?).each do |replacement|
+        %w[_url? _uri_https? _url_https?].each do |replacement|
           alias_method_sub(method, PREDICATE_URI_METHOD_REGEX, replacement)
         end
       end
@@ -26,7 +27,7 @@ def alias_method_sub(method, pattern, replacement)
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
     # @return [Addressable::URI]
     def profile_banner_uri(size = :web)
-      parse_encoded_uri(insecure_uri([@attrs[:profile_banner_url], size].join('/'))) unless @attrs[:profile_banner_url].nil?
+      parse_uri(insecure_uri([@attrs[:profile_banner_url], size].join('/'))) unless @attrs[:profile_banner_url].nil?
     end
     alias profile_banner_url profile_banner_uri
 
@@ -35,7 +36,7 @@ def profile_banner_uri(size = :web)
     # @param size [String, Symbol] The size of the image. Must be one of: 'mobile', 'mobile_retina', 'web', 'web_retina', 'ipad', or 'ipad_retina'
     # @return [Addressable::URI]
     def profile_banner_uri_https(size = :web)
-      parse_encoded_uri([@attrs[:profile_banner_url], size].join('/')) unless @attrs[:profile_banner_url].nil?
+      parse_uri([@attrs[:profile_banner_url], size].join('/')) unless @attrs[:profile_banner_url].nil?
     end
     alias profile_banner_url_https profile_banner_uri_https
 
@@ -51,7 +52,7 @@ def profile_banner_uri?
     # @param size [String, Symbol] The size of the image. Must be one of: 'mini', 'normal', 'bigger' or 'original'
     # @return [Addressable::URI]
     def profile_image_uri(size = :normal)
-      parse_encoded_uri(insecure_uri(profile_image_uri_https(size))) unless @attrs[:profile_image_url_https].nil?
+      parse_uri(insecure_uri(profile_image_uri_https(size))) unless @attrs[:profile_image_url_https].nil?
     end
     alias profile_image_url profile_image_uri
 
@@ -66,7 +67,7 @@ def profile_image_uri_https(size = :normal)
       # https://a0.twimg.com/profile_images/1759857427/image1326743606.png
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_mini.png
       # https://a0.twimg.com/profile_images/1759857427/image1326743606_bigger.png
-      parse_encoded_uri(@attrs[:profile_image_url_https].sub(PROFILE_IMAGE_SUFFIX_REGEX, profile_image_suffix(size))) unless @attrs[:profile_image_url_https].nil?
+      parse_uri(@attrs[:profile_image_url_https].sub(PROFILE_IMAGE_SUFFIX_REGEX, profile_image_suffix(size))) unless @attrs[:profile_image_url_https].nil?
     end
     alias profile_image_url_https profile_image_uri_https
 
@@ -79,16 +80,16 @@ def profile_image_uri?
 
   private
 
-    def parse_encoded_uri(uri)
-      Addressable::URI.parse(URI.encode(uri))
+    def parse_uri(uri)
+      Addressable::URI.parse(uri)
     end
 
     def insecure_uri(uri)
       uri.to_s.sub(/^https/i, 'http')
     end
 
     def profile_image_suffix(size)
-      :original == size.to_sym ? '\\1' : "_#{size}\\1"
+      size.to_sym == :original ? '\\1' : "_#{size}\\1"
     end
   end
 end

lib/twitter/rest/request.rb

@@ -108,7 +108,7 @@ def symbolize_keys!(object)
             object[index] = symbolize_keys!(val)
           end
         elsif object.is_a?(Hash)
-          object.keys.each do |key|
+          object.dup.each_key do |key|
             object[key.to_sym] = symbolize_keys!(object.delete(key))
           end
         end

lib/twitter/rest/tweets.rb

@@ -328,7 +328,7 @@ def unretweet(*args)
       #
       # @see https://dev.twitter.com/rest/public/uploading-media
       def upload(media) # rubocop:disable MethodLength, AbcSize
-        if !(File.basename(media) =~ /\.mp4$/)
+        if File.basename(media) !~ /\.mp4$/
           Twitter::REST::Request.new(self, :multipart_post, 'https://upload.twitter.com/1.1/media/upload.json', key: :media, file: media).perform
         else
           init = Twitter::REST::Request.new(self, :post, 'https://upload.twitter.com/1.1/media/upload.json',

lib/twitter/streaming/event.rb

@@ -1,14 +1,14 @@
 module Twitter
   module Streaming
     class Event
-      LIST_EVENTS = [
-        :list_created, :list_destroyed, :list_updated, :list_member_added,
-        :list_member_added, :list_member_removed, :list_user_subscribed,
-        :list_user_subscribed, :list_user_unsubscribed, :list_user_unsubscribed
+      LIST_EVENTS = %i[
+        list_created list_destroyed list_updated list_member_added
+        list_member_added list_member_removed list_user_subscribed
+        list_user_subscribed list_user_unsubscribed list_user_unsubscribed
       ].freeze
 
-      TWEET_EVENTS = [
-        :favorite, :unfavorite, :quoted_tweet
+      TWEET_EVENTS = %i[
+        favorite unfavorite quoted_tweet
       ].freeze
 
       attr_reader :name, :source, :target, :target_object

spec/twitter/direct_message_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe Twitter::DirectMessage do

spec/twitter/entity/uri_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe Twitter::Entity::URI do

spec/twitter/error_spec.rb

@@ -26,7 +26,7 @@
     end
   end
 
-  %w(error errors).each do |key|
+  %w[error errors].each do |key|
     context "when JSON body contains #{key}" do
       before do
         body = "{\"#{key}\":\"Internal Server Error\"}"

spec/twitter/rest/favorites_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe Twitter::REST::Favorites do

spec/twitter/rest/tweets_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe Twitter::REST::Tweets do

spec/twitter/tweet_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe Twitter::Tweet do

spec/twitter/user_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'helper'
 
 describe Twitter::User do

twitter.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors = ['Erik Michaels-Ober', 'John Nunemaker', 'Wynn Netherland', 'Steve Richert', 'Steve Agalloco']
   spec.description = 'A Ruby interface to the Twitter API.'
-  spec.email = %w([email protected])
-  spec.files = %w(.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md twitter.gemspec) + Dir['lib/**/*.rb']
+  spec.email = %w[[email protected]]
+  spec.files = %w[.yardopts CHANGELOG.md CONTRIBUTING.md LICENSE.md README.md twitter.gemspec] + Dir['lib/**/*.rb']
   spec.homepage = 'http://sferik.github.com/twitter/'
-  spec.licenses = %w(MIT)
+  spec.licenses = %w[MIT]
   spec.name = 'twitter'
-  spec.require_paths = %w(lib)
+  spec.require_paths = %w[lib]
   spec.required_ruby_version = '>= 1.9.3'
   spec.summary = spec.description
   spec.version = Twitter::Version