zoomeye-rb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb0000a0778a5f22bfa139290c2d117c514548da3a3399d8c9dbd8f5255ad7d
-  data.tar.gz: 6571f7f69a6898a28a509603c262d2de56cfd4513aa3484e2eedf63037341c2e
+  metadata.gz: 0c7ac4f2270bdd15aecdf4990d564864e4d0e432f14c7b8a8ac8dfc947c7e416
+  data.tar.gz: a1933aa0d63f225b74ab4b2a5445fdf43c5d4c5cfa9c6fad607a6793627e8a7f
 SHA512:
-  metadata.gz: e63100f48bcd4cf82d86e6538c6f0d54d7bfd5e6ba622374cdd4baaa7a62c7e90b9d7c1f9477d6689b3433bb1bbb11babd92d23953cf0b5ed9eb4489b4518e1c
-  data.tar.gz: fd724c156cf3c0d6d19fee2bc9a5aee426ce2634b4af2c224cbbc6dd22896e313a4ba18e2c908a17db5d83b3ccb093b9a3940ddce971744fe3a9df8135a20142
+  metadata.gz: a7b6e4ba66407cdc41e28535d924c7d8a5f2bf899827653d9ef005e247f28594ff81a9a665c3631e8cbf51b1e58e69f4f3192169e7f5778e98678d0f6c761a84
+  data.tar.gz: f0930c95f9391e32ada4e327261520054a18ed85e931554e50bdf830bb532c6abd5931286656c4550bea2a2a505514d9b8dce5d1d66fa1b1a0f4a941928103fb

data/.github/workflows/test.yml

@@ -0,0 +1,25 @@
+name: Ruby CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7, "3.0"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Build and test with Rake
+        run: |
+          gem install bundler
+          bundle install
+          bundle exec rake

data/README.md

@@ -1,6 +1,6 @@
 # zoomeye-rb
 
-[![Build Status](https://travis-ci.com/ninoseki/zoomeye-rb.svg?branch=master)](https://travis-ci.com/ninoseki/zoomeye-rb)
+[![Ruby CI](https://github.com/ninoseki/zoomeye-rb/actions/workflows/test.yml/badge.svg)](https://github.com/ninoseki/zoomeye-rb/actions/workflows/test.yml)
 [![Coverage Status](https://coveralls.io/repos/github/ninoseki/zoomeye-rb/badge.svg?branch=master)](https://coveralls.io/github/ninoseki/zoomeye-rb?branch=master)
 [![CodeFactor](https://www.codefactor.io/repository/github/ninoseki/zoomeye-rb/badge)](https://www.codefactor.io/repository/github/ninoseki/zoomeye-rb)
 
@@ -17,11 +17,11 @@ gem install zoomeye
 ```ruby
 require "zoomeye"
 
-# when given nothing, it tries to load your usernamem & password via ENV["ZOOMEYE_USERNAME"] and ENV["ZOOMEYE_PASSWORD"]
+# when given nothing, it tries to load your API key via ENV["ZOOMEYE_API_KEY"]
 api = ZoomEye::API.new
 
 # or you can set them manually
-api = ZoomEye::API.new(username: "USERNAME", password: "PASSWORD")
+api = ZoomEye::API.new(api_key: "YOUR_API_KEY")
 
 # Host search
 api.host.search("port:80 nginx")

data/lib/zoomeye.rb

@@ -6,7 +6,6 @@ require "zoomeye/clients/base"
 
 require "zoomeye/clients/host"
 require "zoomeye/clients/resource_info"
-require "zoomeye/clients/user"
 require "zoomeye/clients/web"
 
 require "zoomeye/api"

data/lib/zoomeye/api.rb

@@ -2,34 +2,21 @@
 
 module ZoomEye
   class API
-    def initialize(username: ENV["ZOOMEYE_USERNAME"], password: ENV["ZOOMEYE_PASSWORD"])
-      @username = username
-      raise ArgumentError, "No usernamme has been found or provided!" unless @username
-
-      @password = password
-      raise ArgumentError, "No password has been found or provided!" unless @password
-    end
-
-    def user
-      @user ||= Clients::User.new(username: @username, password: @password)
+    def initialize(api_key: ENV["ZOOMEYE_API_KEY"])
+      @api_key = api_key
+      raise ArgumentError, "No API key has been found or provided!" unless @api_key
     end
 
     def web
-      @web ||= Clients::Web.new(access_token: access_token)
+      @web ||= Clients::Web.new(@api_key)
     end
 
     def host
-      @host ||= Clients::Host.new(access_token: access_token)
+      @host ||= Clients::Host.new(@api_key)
     end
 
     def resource_info
-      @resource_info ||= Clients::ResourceInfo.new(access_token: access_token)
-    end
-
-    private
-
-    def access_token
-      @access_token ||= user.access_token
+      @resource_info ||= Clients::ResourceInfo.new(@api_key)
     end
   end
 end

data/lib/zoomeye/clients/base.rb

@@ -10,10 +10,8 @@ module ZoomEye
       HOST = "api.zoomeye.org"
       BASE_URL = "https://#{HOST}"
 
-      def initialize(username: nil, password: nil, access_token: nil)
-        @username = username
-        @password = password
-        @access_token = access_token
+      def initialize(api_key)
+        @api_key = api_key
       end
 
       private
@@ -48,23 +46,17 @@ module ZoomEye
           when 200
             yield json
           else
-            error = json.dig("message") || body
+            error = json["message"] || body
             raise Error, "Unsupported response code returned: #{code} - #{error}"
           end
         end
       end
 
-      def token_headers
-        {
-          Authorization: "JWT #{@access_token}"
-        }
-      end
-
-      def build_request(type: "GET", path:, params: {})
+      def build_request(path:, type: "GET", params: {})
         uri = url_for(path)
         uri.query = URI.encode_www_form(params) if type == "GET"
 
-        headers = path == "/user/login" ? {} : token_headers
+        headers = { "API-KEY": @api_key }
 
         request = case type
                   when "GET"

data/lib/zoomeye/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZoomEye
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/zoomeye.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "httplog", "~> 1.4"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.9"
-  spec.add_development_dependency "vcr", "~> 5.0"
-  spec.add_development_dependency "webmock", "~> 3.7"
+  spec.add_development_dependency "rspec", "~> 3.10"
+  spec.add_development_dependency "vcr", "~> 6.0"
+  spec.add_development_dependency "webmock", "~> 3.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zoomeye-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Manabu Niseki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2021-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: httplog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
 description: ZoomEye API wrapper for Ruby
 email:
 - manabu.niseki@gmail.com
@@ -101,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -115,15 +129,15 @@ files:
 - lib/zoomeye/clients/base.rb
 - lib/zoomeye/clients/host.rb
 - lib/zoomeye/clients/resource_info.rb
-- lib/zoomeye/clients/user.rb
 - lib/zoomeye/clients/web.rb
 - lib/zoomeye/version.rb
+- renovate.json
 - zoomeye.gemspec
 homepage: https://github.com/ninoseki/zoomeye-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: ZoomEye API wrapper for Ruby
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.4
-before_install: gem install bundler -v 2.0.2

data/lib/zoomeye/clients/user.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module ZoomEye
-  module Clients
-    class User < Base
-      def access_token
-        _post("/user/login", username: @username, password: @password) { |json| json.dig("access_token") }
-      end
-    end
-  end
-end