trav3 0.2.0 → 0.2.1

data/lib/trav3/get.rb

@@ -1,27 +1,30 @@
 # frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 require 'json'
 
 module Trav3
   module GET
+    # rubocop:disable Metrics/MethodLength
     def self.call(travis, url, raw_reply = false)
       uri = URI(url)
       req = Net::HTTP::Get.new(uri.request_uri)
-      travis.headers.each_pair { |header, value|
+      travis.headers.each_pair do |header, value|
         req[header] = value
-      }
+      end
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = (uri.scheme == "https")
+      http.use_ssl = (uri.scheme == 'https')
       response = http.request(req)
 
-      if raw_reply
-        response.body
-      elsif Net::HTTPOK == response.code_type
+      return response.body if raw_reply
+
+      if Net::HTTPOK == response.code_type
         Success.new(travis, response)
       else
         RequestError.new(travis, response)
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/trav3/headers.rb

@@ -12,7 +12,7 @@ module Trav3
     def build(**args)
       @heads ||= {}
 
-      for (key, value) in args
+      args.each do |(key, value)|
         @heads[key] = value
       end
 
@@ -24,7 +24,8 @@ module Trav3
     end
 
     def +(other)
-      raise ArgumentError, "Invalid type provided." unless other.is_a?(Headers)
+      raise TypeError, "Headers type expected, #{other.class} given" unless other.is_a? Headers
+
       @heads.merge(other.instance_variable_get(:@heads))
 
       self

data/lib/trav3/options.rb

@@ -15,7 +15,7 @@ module Trav3
     def build(**args)
       @opts ||= []
 
-      for (key, value) in args
+      args.each do |(key, value)|
         remove(key)
         @opts.push("#{key}=#{value}")
       end
@@ -24,13 +24,26 @@ module Trav3
     end
 
     def remove(key)
-      @opts = @opts.keep_if {|item, _|
-        !(/^#{key}=/ === "#{item}")
-      }
+      return_value = nil
+
+      @opts = @opts.keep_if do |item, value|
+        if entry_match?(key, item)
+          return_value = value
+          false
+        else
+          true
+        end
+      end
+
+      return_value
+    end
+
+    def reset!
+      @opts = []
     end
 
     def +(other)
-      raise ArgumentError, "Invalid type provided." unless other.is_a?(Options)
+      raise TypeError, "Options type expected, #{other.class} given" unless other.is_a? Options
 
       @opts += other.instance_variable_get(:@opts)
 
@@ -42,7 +55,13 @@ module Trav3
     end
 
     def to_h
-      @opts.map {|item| item.split("=") }.to_h
+      @opts.map { |item| item.split('=') }.to_h
+    end
+
+    private
+
+    def entry_match?(entry, item)
+      /^#{entry}=/.match? item.to_s
     end
   end
 end

data/lib/trav3/pagination.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Trav3
   class Pagination
     def initialize(travis, result)
@@ -11,19 +12,19 @@ module Trav3
     end
 
     def next
-      get("#{API_ROOT}#{self.dig("@pagination").dig("next").dig("@href")}")
+      get("#{API_ROOT}#{dig('@pagination').dig('next').dig('@href')}")
     end
 
     def first
-      get("#{API_ROOT}#{self.dig("@pagination").dig("first").dig("@href")}")
+      get("#{API_ROOT}#{dig('@pagination').dig('first').dig('@href')}")
     end
 
     def last
-      get("#{API_ROOT}#{self.dig("@pagination").dig("last").dig("@href")}")
+      get("#{API_ROOT}#{dig('@pagination').dig('last').dig('@href')}")
     end
 
-    def get(x)
-      Trav3::GET.(travis, x)
+    def get(url)
+      Trav3::GET.call(travis, url)
     end
     private :get
 

data/lib/trav3/post.rb

@@ -1,26 +1,31 @@
 # frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 require 'json'
 
 module Trav3
   module POST
-    def self.call(travis, url, fields={})
+    # rubocop:disable Metrics/MethodLength
+    def self.call(travis, url, **fields)
       uri = URI( url.sub(/\?.*$/, '') )
       req = Net::HTTP::Post.new(uri.request_uri)
-      travis.headers.each_pair { |header, value|
+      travis.headers.each_pair do |header, value|
         req[header] = value
-      }
+      end
+      body = fields.delete(:body)
+      req.body = body if body
       req.set_form_data(**fields) unless fields.empty?
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = (uri.scheme == "https")
+      http.use_ssl = (uri.scheme == 'https')
       response = http.request(req)
-      
+
       if [Net::HTTPAccepted, Net::HTTPOK].include? response.code_type
         Success.new(travis, response)
       else
         RequestError.new(travis, response)
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/trav3/result.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'forwardable'
 
 module Trav3
@@ -20,7 +21,7 @@ module Trav3
 
   class Unimplemented < StandardError
     def message
-      "This feature is not implemented."
+      'This feature is not implemented.'
     end
   end
 
@@ -29,10 +30,10 @@ module Trav3
     attr_reader :travis
     def_delegators :@json, :[], :dig, :keys, :values, :has_key?
     def_delegators :@response, :code, :code_type, :uri, :message, :read_header,
-                               :header, :value, :entity, :response, :body,
-                               :decode_content, :msg, :reading_body, :read_body,
-                               :http_version, :connection_close?, :connection_keep_alive?,
-                               :initialize_http_header, :get_fields, :each_header
+                   :header, :value, :entity, :response, :body, :decode_content,
+                   :msg, :reading_body, :read_body, :http_version,
+                   :connection_close?, :connection_keep_alive?,
+                   :initialize_http_header, :get_fields, :each_header
     def initialize(travis, response)
       @travis = travis
       @response = response
@@ -40,11 +41,16 @@ module Trav3
     end
 
     def inspect
-      "<#{self.class} Response: keys = #{self.keys}>"
+      "<#{self.class} Response: keys = #{keys}>"
+    end
+
+    def success?
+      raise Unimplemented
     end
 
-    def success?; raise Unimplemented  end
-    def failure?; raise Unimplemented  end
+    def failure?
+      raise Unimplemented
+    end
     private :travis
   end
 
@@ -53,12 +59,22 @@ module Trav3
       Trav3::Pagination.new(travis, self)
     end
 
-    def success?; true  end
-    def failure?; false end
+    def success?
+      true
+    end
+
+    def failure?
+      false
+    end
   end
 
   class RequestError < Response
-    def success?; false end
-    def failure?; true  end
+    def success?
+      false
+    end
+
+    def failure?
+      true
+    end
   end
 end

data/lib/trav3/version.rb

@@ -1,3 +1,3 @@
 module Trav3
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'.freeze
 end

data/trav3.gemspec

@@ -1,31 +1,30 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "trav3/version"
+require 'trav3/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "trav3"
+  spec.name          = 'trav3'
   spec.version       = Trav3::VERSION
-  spec.authors       = ["Daniel P. Clark"]
-  spec.email         = ["6ftdan@gmail.com"]
+  spec.authors       = ['Daniel P. Clark']
+  spec.email         = ['6ftdan@gmail.com']
 
-  spec.summary       = %q{Simple Travis V3 API Client}
-  spec.description   = %q{A Simple client abstraction for the Travis V3 API}
-  spec.homepage      = "https://github.com/danielpclark/trav3"
-  spec.license       = "MIT"
+  spec.summary       = 'Simple Travis V3 API Client'
+  spec.description   = 'A Simple client abstraction for the Travis V3 API'
+  spec.homepage      = 'https://github.com/danielpclark/trav3'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(/^(test|spec|features)\//)
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(/^exe\//) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
   # Generate YARD DOC on install
-  spec.metadata["yard.run"] = "yri"
+  spec.metadata['yard.run'] = 'yri'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.8"
-  spec.add_development_dependency "factory_bot", "~> 4.11"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'factory_bot', '~> 4.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trav3
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.11'
+        version: '3.8'
 description: A Simple client abstraction for the Travis V3 API
 email:
 - 6ftdan@gmail.com
@@ -73,8 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile