Added Rubocop (through BestPracticeProject), RSpec 3 and added more specs

Author: kaspernj

Gemfile.lock

@@ -7,10 +7,15 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
+    best_practice_project (0.0.4)
+      psych (~> 2.0.0)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     datet (0.0.25)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
     hayabusa (0.0.25)
@@ -33,21 +38,38 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
     multi_json (1.11.0)
+    parser (2.2.3.0)
+      ast (>= 1.1, < 3.0)
     php4r (0.0.4)
       datet
       http2
       string-strtr
+    powerpack (0.1.1)
+    psych (2.0.15)
+    rainbow (2.0.0)
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.35.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.3.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+    ruby-progressbar (1.7.5)
     ruby_process (0.0.9)
       tsafe
       wref
@@ -67,11 +89,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  best_practice_project (>= 0.0.4)
   bundler (>= 1.0.0)
   codeclimate-test-reporter
   hayabusa (~> 0.0.25)
   http2!
   rake
   rdoc (~> 3.12)
-  rspec (~> 2.8.0)
+  rspec (~> 3.4.0)
+  rubocop (~> 0.35.0)
   sqlite3
+
+BUNDLED WITH
+   1.10.6

Rakefile

@@ -1,37 +1,40 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'bundler'
+require "rubygems"
+require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
+require "rake"
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList["spec/**/*_spec.rb"]
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+  spec.pattern = "spec/**/*_spec.rb"
   spec.rcov = true
 end
 
-task :default => :spec
+task default: :spec
 
-require 'rdoc/task'
+require "rdoc/task"
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?("VERSION") ? File.read("VERSION") : ""
 
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = "rdoc"
   rdoc.title = "http2 #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 Bundler::GemHelper.install_tasks
+
+require "best_practice_project"
+BestPracticeProject.load_tasks

config/rubocop.yml

@@ -0,0 +1,2 @@
+---
+inherit_from: rubocop_todo.yml

config/rubocop_todo.yml

@@ -0,0 +1,62 @@
+inherit_from: "$$$best_practice_project_config_path$$$"
+
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-25 09:59:59 +0100 using RuboCop version 0.35.0.
+# 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: 3
+Metrics/AbcSize:
+  Max: 39
+
+# Offense count: 12
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+# Offense count: 4
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 221
+
+# Offense count: 8
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 6
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/http2.rb'
+    - 'lib/http2/response_reader.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'lib/http2/utils.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/http2.rb'
+    - 'lib/http2/connection.rb'
+    - 'lib/http2/response_reader.rb'
+    - 'spec/http2_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
+Style/TrivialAccessors:
+  Exclude:
+    - 'lib/http2/connection.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+Style/WordArray:
+  MinSize: 3

http2.gemspec

@@ -25,11 +25,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("string-cases", "~> 0")
   s.add_development_dependency("rake")
-  s.add_development_dependency("rspec", "~> 2.8.0")
+  s.add_development_dependency("rspec", "~> 3.4.0")
   s.add_development_dependency("rdoc", "~> 3.12")
   s.add_development_dependency("bundler", ">= 1.0.0")
   s.add_development_dependency("hayabusa", "~> 0.0.25")
   s.add_development_dependency("sqlite3")
   s.add_development_dependency("codeclimate-test-reporter")
+  s.add_development_dependency("best_practice_project", ">= 0.0.4")
+  s.add_development_dependency("rubocop", "~> 0.35.0")
 end
-

lib/http2.rb

@@ -3,7 +3,7 @@
 require "monitor" unless ::Kernel.const_defined?(:Monitor)
 require "string-cases"
 
-#This class tries to emulate a browser in Ruby without any visual stuff. Remember cookies, keep sessions alive, reset connections according to keep-alive rules and more.
+# This class tries to emulate a browser in Ruby without any visual stuff. Remember cookies, keep sessions alive, reset connections according to keep-alive rules and more.
 #===Examples
 # Http2.new(host: "www.somedomain.com", port: 80, ssl: false, debug: false) do |http|
 #  res = http.get("index.rhtml?show=some_page")
@@ -18,7 +18,7 @@ class Http2
   # Autoloader for subclasses.
   def self.const_missing(name)
     require "#{File.dirname(__FILE__)}/http2/#{::StringCases.camel_to_snake(name)}.rb"
-    return Http2.const_get(name)
+    Http2.const_get(name)
   end
 
   # Converts a URL to "is.gd"-short-URL.
@@ -45,17 +45,21 @@ def initialize(args = {})
       begin
         yield(self)
       ensure
-        self.destroy
+        destroy
       end
     end
   end
 
   def host
-    @args[:host]
+    @args.fetch(:host)
   end
 
   def port
-    @args[:port]
+    @args.fetch(:port)
+  end
+
+  def ssl?
+    @args[:ssl] ? true : false
   end
 
   def reconnect
@@ -68,7 +72,7 @@ def new_url
     builder.port = port
     builder.protocol = @args[:protocol]
 
-    return builder
+    builder
   end
 
   # Closes current connection if any, changes the arguments on the object and reconnects keeping all cookies and other stuff intact.
@@ -104,9 +108,9 @@ def parse_args(*args)
       raise "Invalid arguments: '#{args.class.name}'"
     end
 
-    raise "Invalid URL: '#{args[:url]}'" unless args[:url].to_s.split("\n").length == 1
+    raise "Invalid URL: '#{args[:url]}'" if args[:url] != "" && args[:url].to_s.split("\n").length != 1
 
-    return args
+    args
   end
 
   # Returns a result-object based on the arguments.
@@ -154,7 +158,7 @@ def default_headers(args = {})
 
     headers.merge!(@args[:extra_headers]) if @args[:extra_headers]
     headers.merge!(args[:headers]) if args[:headers]
-    return headers
+    headers
   end
 
   # Posts to a certain page.
@@ -172,29 +176,29 @@ def post_multipart(*args)
   end
 
   # Returns a header-string which normally would be used for a request in the given state.
-  def header_str(headers_hash, args = {})
+  def header_str(headers_hash)
     headers_hash["Cookie"] = cookie_header_string
 
     headers_str = ""
     headers_hash.each do |key, val|
       headers_str << "#{key}: #{val}#{@nl}"
     end
 
-    return headers_str
+    headers_str
   end
 
   def cookie_header_string
     cstr = ""
 
     first = true
-    @cookies.each do |cookie_name, cookie|
+    @cookies.each do |_cookie_name, cookie|
       cstr << "; " unless first
       first = false if first
       ensure_single_lines([cookie.name, cookie.value])
       cstr << "#{Http2::Utils.urlenc(cookie.name)}=#{Http2::Utils.urlenc(cookie.value)}"
     end
 
-    return cstr
+    cstr
   end
 
   def cookie(name)
@@ -231,13 +235,13 @@ def inspect
 private
 
   def host_header
-    #Possible to give custom host-argument.
+    # Possible to give custom host-argument.
     host = args[:host] || self.host
     port = args[:port] || self.port
 
     host_header_string = "#{host}" # Copy host string to avoid changing the original string if port has been given!
     host_header_string << ":#{port}" if port && ![80, 443].include?(port.to_i) && !@args[:skip_port_in_host_header]
-    return host_header_string
+    host_header_string
   end
 
   # Registers the states from a result.
@@ -247,7 +251,6 @@ def autostate_register(res)
 
     res.body.to_s.scan(/<input type="hidden" name="__(EVENTTARGET|EVENTARGUMENT|VIEWSTATE|LASTFOCUS)" id="(.*?)" value="(.*?)" \/>/) do |match|
       name = "__#{match[0]}"
-      id = match[1]
       value = match[2]
 
       puts "Http2: Registered autostate-value with name '#{name}' and value '#{value}'." if @debug
@@ -266,22 +269,22 @@ def parse_init_args(args)
     args = {host: args} if args.is_a?(String)
     raise "Arguments wasnt a hash." unless args.is_a?(Hash)
 
-    args.each do |key, val|
+    args.each do |key, _val|
       raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_INITIALIZE.include?(key)
     end
 
     args[:proxy][:connect] = true if args[:proxy] && !args[:proxy].key?(:connect) && args[:ssl]
 
     raise "No host was given." unless args[:host]
-    return args
+    args
   end
 
   def set_default_values
     @debug = @args[:debug]
     @autostate_values = {} if autostate
     @nl = @args[:nl] || "\r\n"
 
-    if !@args[:port]
+    unless @args[:port]
       if @args[:ssl]
         @args[:port] = 443
       else

lib/http2/base_request.rb

@@ -0,0 +1,22 @@
+class Http2::BaseRequest
+  attr_reader :http2, :args, :debug
+
+  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type]
+
+  def initialize(http2, args)
+    @http2 = http2
+    @args = http2.parse_args(args)
+    @debug = http2.debug
+    @nl = http2.nl
+
+    @args.each do |key, _val|
+      raise "Invalid key: '#{key}'." unless VALID_ARGUMENTS_POST.include?(key)
+    end
+
+    @conn = @http2.connection
+  end
+
+  def path
+    @args.fetch(:url)
+  end
+end