shodanz 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 410e95de412de33cdbe2fb4fd47ed7eda7e9bdbc1dc86f68a09050cf5ec316fc
-  data.tar.gz: 94dc8c3425f95bd0d7294499618e58f2f3e4b88f174f132ced5b2316a52800b1
+  metadata.gz: 99a5e96240f1b07b93e2c291fe7881099b27f171210f2d5119235b790f4b8df8
+  data.tar.gz: cd332d55feb245bf520fffde2cd8fde08684c07189e3131b9ad8243e23704a72
 SHA512:
-  metadata.gz: 29dea01f7e595b0b7eb6700eaa5e04dac0a426606c6bd28882b9ac484c48e48bb9ff35aa26cfd7b60996cde16273ff27d92534dd5e7909997c75c58c94b0d228
-  data.tar.gz: e7c851400c229bd11749d4acafc8c9b784ef29b61c40f1187db7774886f565aa82935086f648178eac2e3f6782f5618572074fa5a468803c670a3ae31d4ed2d6
+  metadata.gz: c3b310b4ecb5a9623b8b8c5921658363aa5eab7b38aa9b0b2dd94d025aba2833f979ef4de0906434f06e24ebce31ba2618103f17a09e4a790434f632c99a45b2
+  data.tar.gz: b8114254a3f2e11da8d37532e723c2e1dd9d5e881de38cc0ee489a9ba7144393adb379b7994df404817c1cc22faa0d56eb930faf7049184d0092226c22eaaacb

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: async-http
+    versions:
+    - 0.55.0
+  - dependency-name: pry
+    versions:
+    - 0.14.0

data/.github/workflows/ci.yml

@@ -1,18 +1,22 @@
 name: CI
 
 on:
-  member:
   push:
     branches:
     - master
+  pull_request:
+    branches:
+    - master
   schedule:
   - cron: "0 9 * * *"
 
 jobs:
   test:
-
+    if: |
+      github.actor == 'picatz' ||
+      github.actor == 'dependabot[bot]' ||
+      github.actor == 'dependabot-preview[bot]'
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v1
     - name: Set up Ruby 2.7
@@ -23,7 +27,7 @@ jobs:
       env:
         SHODAN_API_KEY: ${{secrets.SHODAN_API_KEY}}
       run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        gem install bundler:2.2.33
+        bundle _2.2.33_ install --jobs 4 --retry 3
         bundle exec rspec
 

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/shodanz.svg)](https://badge.fury.io/rb/shodanz)
 [![Yard Docs](http://img.shields.io/badge/shodanz-docs-blue.svg)](https://www.rubydoc.info/gems/shodanz/)
+![CI](https://github.com/picatz/shodanz/workflows/CI/badge.svg)
 
 A modern, async Ruby [gem](https://rubygems.org/) for [Shodan](https://www.shodan.io/), the world's first search engine for Internet-connected devices.
 

data/lib/shodanz/apis/exploits.rb

@@ -19,13 +19,13 @@ module Shodanz
       attr_accessor :key
 
       # The path to the REST API endpoint.
-      URL = 'https://exploits.shodan.io/api/'
+      URL = 'https://exploits.shodan.io/'
 
       # @param key [String] SHODAN API key, defaulted to
       # the *SHODAN_API_KEY* enviroment variable.
       def initialize(key: ENV['SHODAN_API_KEY'])
         @url      = URL
-        @internet = Async::HTTP::Internet.new
+        @client   = Async::HTTP::Client.new(Async::HTTP::Endpoint.parse(@url))
         self.key  = key
 
         warn 'No key has been found or provided!' unless key?
@@ -50,7 +50,7 @@ module Shodanz
         params = turn_into_query(**params)
         facets = turn_into_facets(**facets)
         params[:page] = page
-        get('search', **params.merge(**facets))
+        get('api/search', **params.merge(**facets))
       end
 
       # This method behaves identical to the "/search" method with
@@ -62,7 +62,7 @@ module Shodanz
         params = turn_into_query(**params)
         facets = turn_into_facets(**facets)
         params[:page] = page
-        get('count', **params.merge(**facets))
+        get('api/count', **params.merge(**facets))
       end
     end
   end

data/lib/shodanz/apis/rest.rb

@@ -22,7 +22,7 @@ module Shodanz
       # @param key [String] SHODAN API key, defaulted to the *SHODAN_API_KEY* enviroment variable.
       def initialize(key: ENV['SHODAN_API_KEY'])
         @url      = URL
-        @internet = Async::HTTP::Internet.new
+        @client   = Async::HTTP::Client.new(Async::HTTP::Endpoint.parse(@url))
         self.key  = key
 
         warn 'No key has been found or provided!' unless key?

data/lib/shodanz/apis/streaming.rb

@@ -28,7 +28,7 @@ module Shodanz
       # @param key [String] SHODAN API key, defaulted to the *SHODAN_API_KEY* enviroment variable.
       def initialize(key: ENV['SHODAN_API_KEY'])
         @url      = URL
-        @internet = Async::HTTP::Internet.new
+        @client   = Async::HTTP::Client.new(Async::HTTP::Endpoint.parse(@url))
         self.key  = key
 
         warn 'No key has been found or provided!' unless key?

data/lib/shodanz/apis/utils.rb

@@ -20,10 +20,10 @@ module Shodanz
       end
 
       # Perform a direct POST HTTP request to the REST API.
-      def post(path, **params)
-        return sync_post(path, **params) unless Async::Task.current?
+      def post(path, body: nil, **params)
+        return sync_post(path, params: params, body: body) unless Async::Task.current?
 
-        async_post(path, **params)
+        async_post(path, params: params, body: body)
       end
 
       # Perform the main function of consuming the streaming API.
@@ -78,11 +78,11 @@ module Shodanz
         return json
       end
 
-      def getter(path, one_shot=false, **params)
+      def getter(path, **params)
         # param keys should all be strings
         params = params.transform_keys(&:to_s)
         # build up url string based on special params
-        url = "#{@url}#{path}?key=#{@key}"
+        url = "/#{path}?key=#{@key}"
         # special params
         params.each do |param,value|
           next if value.is_a?(String) && value.empty?
@@ -90,38 +90,50 @@ module Shodanz
           url += "&#{param}=#{value}"
         end
 
-        resp = @internet.get(url)
+        resp = @client.get(url)
 
-        # parse all lines in the response body as JSON
-        json = JSON.parse(resp.body.join)
+        if resp.success?
+          # parse all lines in the response body as JSON
+          json = JSON.parse(resp.body.join)
 
-        @internet.close if one_shot
+          handle_any_json_errors(json)
 
-        handle_any_json_errors(json)
-
-        return json
+          return json
+        else
+          raise "Got response status #{resp.status}"
+        end
       ensure
+        @client.pool.close
         resp&.close
-        @internet = Async::HTTP::Internet.new if one_shot
       end
 
-      def poster(path, one_shot=false, **params)
+      def poster(path, one_shot: false, params: nil, body: nil)
         # param keys should all be strings
         params = params.transform_keys(&:to_s)
-        # make POST request to server
-        resp = @internet.post("#{@url}#{path}?key=#{@key}", params)
+        # and the key param is constant
+        params["key"] = @key
+        # encode as a URL string
+        params = URI.encode_www_form(params)
+        # optional JSON body string
+        json_body = body.nil? ? nil : JSON.dump(body)
+        # build URL path
+        path = "/#{path}?#{params}" 
 
-        # parse all lines in the response body as JSON
-        json = JSON.parse(resp.body.join)
+        # make POST request to server
+        resp = @client.post(path, nil, json_body)
 
-        @internet.close if one_shot
+        if resp.success?
+          json = JSON.parse(resp.body.join)
 
-        handle_any_json_errors(json)
+          handle_any_json_errors(json)
 
-        return json
+          return json
+        else
+          raise "Got response status #{resp.status}"
+        end
       ensure
+        @client.pool.close
         resp&.close
-        @internet = Async::HTTP::Internet.new if one_shot
       end
 
       def slurper(path, **params)
@@ -132,7 +144,7 @@ module Shodanz
           counter = 0
         end
         # make GET request to server
-        resp = @internet.get("#{@url}#{path}?key=#{@key}", params)
+        resp = @client.get("/#{path}?key=#{@key}", params)
         # read body line-by-line
         until resp.body.nil? || resp.body.empty?
           resp.body.read.each_line do |line|
@@ -151,25 +163,25 @@ module Shodanz
 
       def async_get(path, **params)
         Async::Task.current.async do
-          getter(path, false, **params)
+          getter(path, **params)
         end
       end
 
       def sync_get(path, **params)
         Async do
-          getter(path, true, **params)
+          getter(path, **params)
         end.wait
       end
 
-      def async_post(path, **params)
+      def async_post(path, params: nil, body: nil)
         Async::Task.current.async do
-          poster(path, false, **params)
+          poster(path, params: params, body: body)
         end
       end
 
-      def sync_post(path, **params)
+      def sync_post(path, params: nil, body: nil)
         Async do
-          poster(path, true, **params)
+          poster(path, params: params, body: body)
         end.wait
       end
 

data/lib/shodanz/errors.rb

@@ -15,7 +15,7 @@ module Shodanz
     end
 
     class NoAPIKey < StandardError
-      def initialize(msg = 'No API key has been found or provided! ( setup your SHODAN_API_KEY environment varialbe )')
+      def initialize(msg = 'No API key has been found or provided! ( setup your SHODAN_API_KEY environment variable )')
         super
       end
     end

data/lib/shodanz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shodanz
-  VERSION = '2.0.2'
+  VERSION = '2.0.6'
 end

data/shodanz.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'async-http', '>= 0.38.1', '< 0.51.0'
-  spec.add_dependency 'async', '>= 1.17.1', '< 1.25.0'
+  spec.add_dependency 'async-http', '>= 0.38.1', '< 0.57.0'
+  spec.add_dependency 'async', '>= 1.17.1', '< 2.1.0'
 
-  spec.add_development_dependency 'async-rspec', '~> 1.14.0'
-  spec.add_development_dependency 'bundler', '~> 2.1.2'
-  spec.add_development_dependency 'pry', '~> 0.12.2'
+  spec.add_development_dependency 'async-rspec', '~> 1.16.1'
+  spec.add_development_dependency 'bundler', '~> 2.2.0'
+  spec.add_development_dependency 'pry', '~> 0.14.1'
   spec.add_development_dependency 'rake', '~> 13.0.0'
   spec.add_development_dependency 'rb-readline', '~> 0.5.5'
-  spec.add_development_dependency 'rspec', '~> 3.9.0'
+  spec.add_development_dependency 'rspec', '~> 3.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shodanz
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.6
 platform: ruby
 authors:
 - Kent 'picatz' Gruber
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -19,7 +19,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.57.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 1.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,49 +49,49 @@ dependencies:
         version: 1.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
 description: Featuring full support for the REST, Streaming and Exploits API
 email:
 - kgruber1@emich.edu
@@ -141,10 +141,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -171,7 +171,7 @@ homepage: https://github.com/picatz/shodanz
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: A modern, async Ruby gem for Shodan, the world's first search engine for
   Internet-connected devices.

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.15.3