Merge 9959c99 into bc911e9

sferik · Sep 24, 2017 · fd8724c · fd8724c
2 parents bc911e9 + 9959c99
commit fd8724c
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,12 @@
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 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,12 @@ Style/FrozenStringLiteralComment:
 Style/NumericPredicate:
   Enabled: false
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%w': ()
+
+Style/SymbolArray:
+  EnforcedStyle: brackets
 
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: 'comma'
diff --git a/lib/twitter/profile.rb b/lib/twitter/profile.rb
@@ -88,7 +88,7 @@ def insecure_uri(uri)
     end
 
     def profile_image_suffix(size)
-      :original == size.to_sym ? '\\1' : "_#{size}\\1"
+      size.to_sym == :original ? '\\1' : "_#{size}\\1"
     end
   end
 end
diff --git a/lib/twitter/rest/tweets.rb b/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',

diff --git a/spec/twitter/direct_message_spec.rb b/spec/twitter/direct_message_spec.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'helper'
 
 describe Twitter::DirectMessage do

diff --git a/spec/twitter/entity/uri_spec.rb b/spec/twitter/entity/uri_spec.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'helper'
 
 describe Twitter::Entity::URI do

diff --git a/spec/twitter/rest/favorites_spec.rb b/spec/twitter/rest/favorites_spec.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'helper'
 
 describe Twitter::REST::Favorites do

diff --git a/spec/twitter/rest/tweets_spec.rb b/spec/twitter/rest/tweets_spec.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'helper'
 
 describe Twitter::REST::Tweets do

diff --git a/spec/twitter/tweet_spec.rb b/spec/twitter/tweet_spec.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'helper'
 
 describe Twitter::Tweet do

diff --git a/spec/twitter/user_spec.rb b/spec/twitter/user_spec.rb
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 require 'helper'
 
 describe Twitter::User do