From f7dc3d656c51b6ea730501e1b3c64d2bb59e75a2 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 12 Oct 2016 08:23:53 -0700 Subject: [PATCH] Upgrade Rubocop to 0.43 (#63) --- Gemfile | 2 +- lib/http/2/compressor.rb | 4 ++-- lib/http/2/connection.rb | 8 ++++---- lib/http/2/framer.rb | 10 +++++----- lib/tasks/generate_huffman_table.rb | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index e3ff32d..01fa7aa 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ group :test do gem 'pry-byebug', platform: :mri gem 'rspec', '~> 3.4.0' gem 'rspec-autotest' - gem 'rubocop', '~> 0.40.0' + gem 'rubocop', '~> 0.43' end gemspec diff --git a/lib/http/2/compressor.rb b/lib/http/2/compressor.rb index d4a2538..f3aa82c 100644 --- a/lib/http/2/compressor.rb +++ b/lib/http/2/compressor.rb @@ -527,12 +527,12 @@ def header(buf) case header[:type] when :indexed - fail CompressionError if header[:name] == 0 + fail CompressionError if (header[:name]).zero? header[:name] -= 1 when :changetablesize header[:value] = header[:name] else - if header[:name] == 0 + if (header[:name]).zero? header[:name] = string(buf) else header[:name] -= 1 diff --git a/lib/http/2/connection.rb b/lib/http/2/connection.rb index 4209169..fa7f91f 100644 --- a/lib/http/2/connection.rb +++ b/lib/http/2/connection.rb @@ -379,7 +379,7 @@ def encode(frame) # @param frame [Hash] # @return [Boolean] def connection_frame?(frame) - frame[:stream] == 0 || + (frame[:stream]).zero? || frame[:type] == :settings || frame[:type] == :ping || frame[:type] == :goaway @@ -445,11 +445,11 @@ def validate_settings(role, settings) # Clients MUST reject any attempt to change the # SETTINGS_ENABLE_PUSH setting to a value other than 0 by treating the # message as a connection error (Section 5.4.1) of type PROTOCOL_ERROR. - return ProtocolError.new("invalid #{key} value") unless v == 0 + return ProtocolError.new("invalid #{key} value") unless v.zero? when :client # Any value other than 0 or 1 MUST be treated as a # connection error (Section 5.4.1) of type PROTOCOL_ERROR. - unless v == 0 || v == 1 + unless v.zero? || v == 1 return ProtocolError.new("invalid #{key} value") end end @@ -483,7 +483,7 @@ def validate_settings(role, settings) # # @param frame [Hash] def connection_settings(frame) - connection_error unless frame[:type] == :settings && frame[:stream] == 0 + connection_error unless frame[:type] == :settings && (frame[:stream]).zero? # Apply settings. # side = diff --git a/lib/http/2/framer.rb b/lib/http/2/framer.rb index ff7e362..f35269f 100644 --- a/lib/http/2/framer.rb +++ b/lib/http/2/framer.rb @@ -216,7 +216,7 @@ def generate(frame) length += 4 when :settings - if frame[:stream] != 0 + if (frame[:stream]).nonzero? fail CompressionError, "Invalid stream ID (#{frame[:stream]})" end @@ -357,14 +357,14 @@ def parse(buf) if frame[:flags].include? :priority e_sd = payload.read_uint32 frame[:stream_dependency] = e_sd & RBIT - frame[:exclusive] = (e_sd & EBIT) != 0 + frame[:exclusive] = (e_sd & EBIT) != 0 # rubocop:disable Style/NumericPredicate frame[:weight] = payload.getbyte + 1 end frame[:payload] = payload.read(frame[:length]) when :priority e_sd = payload.read_uint32 frame[:stream_dependency] = e_sd & RBIT - frame[:exclusive] = (e_sd & EBIT) != 0 + frame[:exclusive] = (e_sd & EBIT) != 0 # rubocop:disable Style/NumericPredicate frame[:weight] = payload.getbyte + 1 when :rst_stream frame[:error] = unpack_error payload.read_uint32 @@ -373,11 +373,11 @@ def parse(buf) # NOTE: frame[:length] might not match the number of frame[:payload] # because unknown extensions are ignored. frame[:payload] = [] - unless frame[:length] % 6 == 0 + unless (frame[:length] % 6).zero? fail ProtocolError, 'Invalid settings payload length' end - if frame[:stream] != 0 + if (frame[:stream]).nonzero? fail ProtocolError, "Invalid stream ID (#{frame[:stream]})" end diff --git a/lib/tasks/generate_huffman_table.rb b/lib/tasks/generate_huffman_table.rb index acdfb63..b841ecf 100644 --- a/lib/tasks/generate_huffman_table.rb +++ b/lib/tasks/generate_huffman_table.rb @@ -25,10 +25,10 @@ def initialize(depth) def add(code, len, chr) self.final = true if chr == EOS && @depth <= 7 - if len == 0 + if len.zero? @emit = chr else - bit = (code & (1 << (len - 1))) == 0 ? 0 : 1 + bit = (code & (1 << (len - 1))).zero? ? 0 : 1 node = @next[bit] ||= Node.new(@depth + 1) node.add(code, len - 1, chr) end @@ -68,7 +68,7 @@ def self.generate_machine n = node emit = '' (BITS_AT_ONCE - 1).downto(0) do |i| - bit = (input & (1 << i)) == 0 ? 0 : 1 + bit = (input & (1 << i)).zero? ? 0 : 1 n = n.next[bit] next unless n.emit if n.emit == EOS