tweakphoeus 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7515558791d3bb44e239251dc6d0c6e80e7f5016
-  data.tar.gz: ce23946d37d62c994beeb79fa8c2f8a608419ff9
+SHA256:
+  metadata.gz: 75e41d28b98ec62b97907e6adb7fa885a1fafc784045717fa44611e4aa172a68
+  data.tar.gz: b8c45de633c250c6c06a6307ce8cf023a8763c4579afc0513ac153e896eded6e
 SHA512:
-  metadata.gz: 791dc3839b5f832b7c4eb340adb97e3f781e0075d5f4ec49f28358547949892b9e21e0b9e43b09a52214328535a562b1a19b60bf380e6204be5b8dfaef19680f
-  data.tar.gz: ce4966aca13bb4c2b081f8c7963536342e018c6c4a2cec9b26d025065ab19f07cee61628329d8e10e5094c7e751b745e3e899607ceace9803324459b8e1122f8
+  metadata.gz: 21c2be488160c13d8b5202f80508e6960d0f07348880f7170bee2d541cd433cca8e865b0c7fd9eb1342f2749e9d5fa540b1ad83938ad77e3bb6b236e6b70bedd
+  data.tar.gz: b1601abc1b9e426f2c3bc6e729464739ccebd5b3eae5f6f80c91982558a05f18352c395450be3cd50327b2f0278894f448bd91a0cf079a0305be5f1207860fbe

data/.github/workflows/auto-tag.yaml

@@ -0,0 +1,15 @@
+name: Auto-tag
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  auto-tag:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: duderman/gh-gem-tag-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tag_prefix: v

data/.github/workflows/main.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7.4
+        bundler-cache: true
+    - name: Run the default task
+      run: bundle exec rake
+    services:
+      whoami:
+        image: containous/whoami
+        ports:
+          - 8080:80

data/.github/workflows/on_new_tag.yaml

@@ -0,0 +1,17 @@
+name: On new tag
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish-new-version:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Publish gem
+      uses: dawidd6/action-publish-gem@v1
+      with:
+        api_key: ${{secrets.RUBYGEMS_API_KEY}}
+        github_token: ${{secrets.GITHUB_TOKEN}}

data/.github/workflows/version-forget-me-not.yaml

@@ -0,0 +1,17 @@
+name: Version Forget-Me-Not
+
+on:
+  pull_request:
+    branches:
+      - master
+      - main
+    types: [opened, synchronize]
+
+jobs:
+  semver-check:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: simplybusiness/version-forget-me-not@v2.1.0
+        env:
+          ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION_FILE_PATH: "lib/tweakphoeus/version.rb"

data/CHANGELOG.md

@@ -15,3 +15,22 @@
 -- v0.3.0 - adding HTTP proxy management and fixing circular reference
 
 -- v0.4.1 - adding random User-Agent generator
+
+-- v0.4.2 - adding ssl verification & deletion of active support methods
+
+-- v0.4.5 - pushing typhoeus version
+
+-- v0.5.0 - Upgrading dependencies and revamping development environment
+
+Bumping required ruby version to >=2.6.0
+
+
+Upgrading Typhoeus dependency to 1.4.0
+
+
+Upgrading Development dependencies:
+- Bundler 2.2
+- Rake 13.0
+- Rspec 3.10
+
+Swapping CI environment from CircleCI to Github Actions

data/README.md

@@ -1,13 +1,11 @@
-[![Stories in Ready](https://badge.waffle.io/basestylo/Tweakphoeus.png?label=ready&title=Ready)](https://waffle.io/basestylo/Tweakphoeus)
 [![Gem Version](https://badge.fury.io/rb/tweakphoeus.svg)](https://badge.fury.io/rb/tweakphoeus)
-[![Circle CI](https://circleci.com/gh/basestylo/Tweakphoeus/tree/master.svg?style=svg)](https://circleci.com/gh/basestylo/Tweakphoeus/tree/master)
 [![Code Climate](https://codeclimate.com/github/basestylo/Tweakphoeus/badges/gpa.svg)](https://codeclimate.com/github/basestylo/Tweakphoeus)
 [![Issue Count](https://codeclimate.com/github/basestylo/Tweakphoeus/badges/issue_count.svg)](https://codeclimate.com/github/basestylo/Tweakphoeus)
 # Tweakphoeus
 
 We usually describe this gem as 'typhoeus on steroids'. We add some browser features, for example cookies management and automation in tipical headers that browsers define in his HTTP stack.
 
-We love scrapping and this gem was created for this. 
+We love scrapping and this gem was created for this.
 
 From crazy developers to another crazy developers, Created in Bizneo.com and maintained in this small group of developers.
 
@@ -53,4 +51,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/tweakphoeus.rb

@@ -7,32 +7,33 @@ module Tweakphoeus
     attr_accessor :cookie_jar
     attr_accessor :base_headers
 
-    def initialize()
+    def initialize(ua_systems: [:linux, :mac])
       @cookie_jar = {}
       @referer = [""]
       @base_headers = {
-        "User-Agent" => UserAgent.random(systems: [:linux, :mac]),
-        "Accept-Language" => "es-ES,es;q=0.8,en-US;q=0.5,en;q=0.3",
+        "User-Agent" => UserAgent.random(systems: ua_systems),
+        "Accept-Language" => "es-ES,es;q=0.9,en;q=0.8",
         "Accept-Encoding" => "",
         "Connection" => "keep-alive"
       }
       @proxy = nil
       @proxyuserpwd = nil
+      @ssl_verifypeer = true
     end
 
-    def get(url, body: nil, params: nil, headers: nil, redirect: true)
+    def get(url, body: nil, params: nil, headers: nil, redirect: true, ssl_verifypeer: @ssl_verifypeer)
       set_referer_from_headers(headers)
-      http_request(url, body: body, params: params, headers: headers, redirect: redirect, method: :get)
+      http_request(url, body: body, params: params, headers: headers, redirect: redirect, method: :get, ssl_verifypeer: ssl_verifypeer)
     end
 
-    def delete(url, body: nil, headers: nil, redirect: true)
+    def delete(url, body: nil, headers: nil, redirect: true, ssl_verifypeer: @ssl_verifypeer)
       set_referer_from_headers(headers)
-      http_request(url, body: body, headers: headers, redirect: redirect, method: :delete)
+      http_request(url, body: body, headers: headers, redirect: redirect, method: :delete, ssl_verifypeer: ssl_verifypeer)
     end
 
-    def post(url, body: nil, params: nil, headers: nil, redirect: false)
+    def post(url, body: nil, params: nil, headers: nil, redirect: false, ssl_verifypeer: @ssl_verifypeer)
       set_referer_from_headers(headers)
-      http_request(url, body: body, params: nil, headers: headers, redirect: redirect, method: :post)
+      http_request(url, body: body, params: nil, headers: headers, redirect: redirect, method: :post, ssl_verifypeer: ssl_verifypeer)
     end
 
     def get_hide_inputs response
@@ -67,7 +68,7 @@ module Tweakphoeus
       headers ||= {}
       cookies = parse_cookie(headers["Cookie"])
 
-      while domain.present?
+      while domain != ""
         if @cookie_jar[domain]
           @cookie_jar[domain].each do |key, value|
             cookies[key] ||= value
@@ -91,11 +92,11 @@ module Tweakphoeus
 
     private
 
-    def http_request(url, body: nil, params: nil, headers: nil, redirect: false, method: :get)
+    def http_request(url, body: nil, params: nil, headers: nil, redirect: false, method: :get, ssl_verifypeer: @ssl_verifypeer)
       request_headers = merge_default_headers(headers)
       request_headers["Cookie"] = cookie_string(url, headers)
       request_headers["Referer"] = get_referer
-      response = Typhoeus.send(method, url, body: body, params: params, headers: request_headers, proxy: @proxy, proxyuserpwd: @proxyuserpwd)
+      response = Typhoeus.send(method, url, body: body, params: params, headers: request_headers, proxy: @proxy, proxyuserpwd: @proxyuserpwd, ssl_verifypeer: ssl_verifypeer)
       obtain_cookies(response)
       set_referer(url) if method != :post
       if redirect && has_redirect?(response)
@@ -107,7 +108,8 @@ module Tweakphoeus
                                 body: body,
                                 headers: headers,
                                 redirect: redirect,
-                                method: method)
+                                method: method,
+                                ssl_verifypeer: ssl_verifypeer)
       end
       response
     end

data/lib/tweakphoeus/user_agent.rb

@@ -10,8 +10,8 @@ module Tweakphoeus
     class << self
       def random(systems: OS_DATA[:types])
         user_agent = "Mozilla/5.0 (#{os[systems.sample]}) #{browser}"
-        firefox_version = user_agent.match(/Firefox\/([0-9\.]+)/).try(:[], 1)
-        user_agent.gsub!(')', "; rv:#{firefox_version})") if firefox_version
+        firefox_version = user_agent.match(/Firefox\/([0-9\.]+)/)
+        user_agent.gsub!(')', "; rv:#{firefox_version[1]})") if firefox_version.is_a?(MatchData)
         user_agent
       end
 
@@ -21,14 +21,14 @@ module Tweakphoeus
         {
           win: "Windows NT #{%w(5 6 7 8 10).sample + '.' + %w(0 1).sample}",
           linux: "X11; #{["", OS_DATA[:linux_distro].sample+"; "].sample}Linux #{OS_DATA[:arch].sample}",
-          mac: "Macintosh; Intel Mac OS X 10_#{Random.rand(9..12)}_#{Random.rand(0..5)}"
+          mac: "Macintosh; Intel Mac OS X 10_#{Random.rand(11..13)}_#{Random.rand(0..3)}"
         }
       end
 
       def browser
-        chrome_version = "Chrome/5#{Random.rand(0..9)}.0.#{Random.rand(1000..4000)}.#{Random.rand(100..900)}"
+        chrome_version = "Chrome/6#{Random.rand(0..5)}.0.#{Random.rand(1000..4000)}.#{Random.rand(100..900)}"
         webkit_603 = "603.#{Random.rand(0..9)}.#{Random.rand(0..9)}"
-        ["Gecko/20100101 Firefox/#{Random.rand(40..54)}.#{Random.rand(0..9)}",
+        ["Gecko/20100101 Firefox/#{Random.rand(55..59)}.0",
          "AppleWebKit/537.36 (KHTML, like Gecko) #{chrome_version} Safari/537.36",
          "AppleWebKit/#{webkit_603} (KHTML, like Gecko) Version/10.1 #{chrome_version} Safari/#{webkit_603}"
         ].sample

data/lib/tweakphoeus/version.rb

@@ -1,3 +1,3 @@
 module Tweakphoeus
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/tweakphoeus.gemspec

@@ -1,34 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'tweakphoeus/version'
+# frozen_string_literal: true
+
+require_relative "lib/tweakphoeus/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "tweakphoeus"
   spec.version       = Tweakphoeus::VERSION
   spec.authors       = ["David Martin Garcia"]
-  spec.email         = ["base.dks@gmail.com"]
+  spec.email         = ["davidmartingarcia@gmail.com"]
 
   spec.summary       = %q{Typhoeus on steroids.}
-  spec.description   = %q{Typhoeus wrapper with new pretty things: cookie handler for example.}
+  spec.description   = %q{Typhoeus wrapper with some extras.}
   spec.homepage      = "https://github.com/basestylo/Tweakphoeus/"
   spec.license       = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
+  spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/dmartingarcia/Tweakphoeus"
+  spec.metadata["changelog_uri"] = "https://github.com/dmartingarcia/Tweakphoeus/blob/master/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+  end
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0", "> 3.0.0"
+  spec.add_dependency 'typhoeus', '~> 1.4'
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tweakphoeus
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - David Martin Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -16,78 +16,69 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-description: 'Typhoeus wrapper with new pretty things: cookie handler for example.'
+        version: '3.10'
+description: Typhoeus wrapper with some extras.
 email:
-- base.dks@gmail.com
+- davidmartingarcia@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/auto-tag.yaml"
+- ".github/workflows/main.yml"
+- ".github/workflows/on_new_tag.yaml"
+- ".github/workflows/version-forget-me-not.yaml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -104,7 +95,10 @@ homepage: https://github.com/basestylo/Tweakphoeus/
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  allowed_push_host: https://rubygems.org/
+  homepage_uri: https://github.com/basestylo/Tweakphoeus/
+  source_code_uri: https://github.com/dmartingarcia/Tweakphoeus
+  changelog_uri: https://github.com/dmartingarcia/Tweakphoeus/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -113,15 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Typhoeus on steroids.

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6