Skip to content

Commit 8963a4c

Browse files
authored
Merge pull request #73 from line/feature/rubocop
Add Rubocop and fix related code
2 parents 13e0dc4 + 2f728b3 commit 8963a4c

30 files changed

+165
-128
lines changed

.rubocop.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
AllCops:
2+
TargetRubyVersion: 2.1
3+
Exclude:
4+
- 'examples/**/*'
5+
6+
Gemspec/RequiredRubyVersion:
7+
Enabled: false
8+
9+
Style/TrailingCommaInHashLiteral:
10+
Enabled: false
11+
Style/TrailingCommaInArrayLiteral:
12+
Enabled: false
13+
Style/WordArray:
14+
Enabled: false
15+
Style/NumericLiterals:
16+
Enabled: false
17+
Style/BlockDelimiters:
18+
Enabled: false
19+
Style/MutableConstant:
20+
Enabled: false
21+
Style/StringLiterals:
22+
Enabled: false
23+
Style/RaiseArgs:
24+
Enabled: false
25+
Style/PercentLiteralDelimiters:
26+
Enabled: false
27+
Style/NumericPredicate:
28+
Enabled: false
29+
Style/Documentation:
30+
Enabled: false
31+
Style/IfUnlessModifier:
32+
Enabled: false
33+
Style/Semicolon:
34+
Enabled: false
35+
Style/EachWithObject:
36+
Enabled: false
37+
38+
Naming/HeredocDelimiterNaming:
39+
Enabled: false
40+
Naming/UncommunicativeMethodParamName:
41+
Enabled: false
42+
Naming/ConstantName:
43+
Enabled: false
44+
Naming/AccessorMethodName:
45+
Enabled: false
46+
Naming/MethodName:
47+
Enabled: false
48+
49+
Metrics/LineLength:
50+
Max: 200
51+
Metrics/BlockLength:
52+
Enabled: false
53+
Metrics/MethodLength:
54+
Enabled: false
55+
Metrics/ClassLength:
56+
Enabled: false
57+
58+
Layout/SpaceInsideBlockBraces:
59+
Enabled: false
60+
Layout/SpaceInsideHashLiteralBraces:
61+
Enabled: false
62+
Layout/IndentHeredoc:
63+
Enabled: false
64+
Layout/ExtraSpacing:
65+
Enabled: false
66+
Layout/SpaceAroundOperators:
67+
Enabled: false
68+
69+
Lint/UnusedBlockArgument:
70+
Enabled: false
71+
Lint/DuplicateMethods:
72+
Enabled: false
73+
Lint/UselessAssignment:
74+
Enabled: false

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ rvm:
77
- ruby-head
88
before_install:
99
- gem install bundler
10+
script:
11+
- bundle exec rubocop
12+
- bundle exec rspec

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
source 'https://rubygems.org'
22

33
gemspec
4+
5+
group :development, :test do
6+
# ref: http://docs.rubocop.org/en/latest/installation/
7+
gem 'rubocop', '~> 0.56.0', require: false
8+
end

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
33

44
RSpec::Core::RakeTask.new(:spec)
55

6-
task :default => :spec
6+
task default: :spec

lib/line/bot/client.rb

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
module Line
2222
module Bot
2323
class Client
24-
2524
# @return [String]
2625
attr_accessor :channel_token, :channel_secret, :endpoint
2726

@@ -204,7 +203,7 @@ def get_room_member_profile(room_id, user_id)
204203
# (next property to be included in the response)
205204
#
206205
# @return [Net::HTTPResponse]
207-
def get_group_member_ids(group_id, continuation_token=nil)
206+
def get_group_member_ids(group_id, continuation_token = nil)
208207
endpoint_path = "/bot/group/#{group_id}/members/ids"
209208
endpoint_path += "?start=#{continuation_token}" if continuation_token
210209
get(endpoint_path)
@@ -217,7 +216,7 @@ def get_group_member_ids(group_id, continuation_token=nil)
217216
# (next property to be included in the response)
218217
#
219218
# @return [Net::HTTPResponse]
220-
def get_room_member_ids(room_id, continuation_token=nil)
219+
def get_room_member_ids(room_id, continuation_token = nil)
221220
endpoint_path = "/bot/room/#{room_id}/members/ids"
222221
endpoint_path += "?start=#{continuation_token}" if continuation_token
223222
get(endpoint_path)
@@ -393,16 +392,17 @@ def parse_events_from(request_body)
393392
# @param channel_signature [String] Request'header 'X-LINE-Signature' # HTTP_X_LINE_SIGNATURE
394393
#
395394
# @return [Boolean]
396-
def validate_signature(content = "", channel_signature)
395+
def validate_signature(content, channel_signature)
397396
return false if !channel_signature || !channel_secret
398397

399-
hash = OpenSSL::HMAC::digest(OpenSSL::Digest::SHA256.new, channel_secret, content)
398+
hash = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, channel_secret, content)
400399
signature = Base64.strict_encode64(hash)
401400

402401
variable_secure_compare(channel_signature, signature)
403402
end
404403

405-
private
404+
private
405+
406406
# Constant time string comparison.
407407
#
408408
# via timing attacks.
@@ -423,6 +423,5 @@ def secure_compare(a, b)
423423
res == 0
424424
end
425425
end
426-
427426
end
428427
end

lib/line/bot/event/base.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def initialize(src)
2323
def [](key)
2424
@src[key]
2525
end
26-
2726
end
2827
end
2928
end

lib/line/bot/event/message.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ module MessageType
2828

2929
class Message < Base
3030
def type
31-
begin
32-
Line::Bot::Event::MessageType.const_get(@src['message']['type'].capitalize)
33-
rescue NameError => e
34-
Line::Bot::Event::MessageType::Unsupport
35-
end
31+
Line::Bot::Event::MessageType.const_get(@src['message']['type'].capitalize)
32+
rescue NameError => e
33+
Line::Bot::Event::MessageType::Unsupport
3634
end
3735

3836
def message

lib/line/bot/httpclient.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
module Line
2121
module Bot
2222
class HTTPClient
23-
2423
# @return [Net::HTTP]
2524
def http(uri)
2625
http = Net::HTTP.new(uri.host, uri.port)

lib/line/bot/request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def payload
3939
messages: messages
4040
}
4141

42-
payload.delete_if{|k, v| v.nil?}.to_json
42+
payload.delete_if { |k, v| v.nil? }.to_json
4343
end
4444

4545
# @return [Hash]

line-bot-api.gemspec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# coding: utf-8
2-
lib = File.expand_path('../lib', __FILE__)
1+
lib = File.expand_path('lib', __dir__)
32
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
43
require 'line/bot/api/version'
54

@@ -20,9 +19,9 @@ Gem::Specification.new do |spec|
2019

2120
spec.required_ruby_version = '>= 2.0.0'
2221

23-
spec.add_development_dependency 'rake', "~> 10.4"
24-
spec.add_development_dependency "bundler", "~> 1.11"
25-
spec.add_development_dependency "webmock", "~> 1.24"
2622
spec.add_development_dependency "addressable", "~> 2.3"
23+
spec.add_development_dependency "bundler", "~> 1.11"
24+
spec.add_development_dependency 'rake', "~> 10.4"
2725
spec.add_development_dependency "rspec", "~> 3.0"
26+
spec.add_development_dependency "webmock", "~> 1.24"
2827
end

0 commit comments

Comments
 (0)