eve_online 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c8425edfba5f5350b3f78a80d6304bcd6f7f55c6efd706e03bb23a2ebba5b64
-  data.tar.gz: ca5da43f14db713471031d1dfb503404bed3c10b7cf4971bafe8c32914141e6a
+  metadata.gz: 65d576fbc17478176c4263d33598813505b783b6e796885b43f5024e32463950
+  data.tar.gz: f6aa4d023bcd8a2a2b08a0c975d192f06360b0d56d0e4fbff03d2f4cfac67a6f
 SHA512:
-  metadata.gz: 7b8459d805017d112ae748e5e6a296e241720f6bd27736a42af74193ab272e7e9ee6dc9bb21a4cc73006d89fff7cb53b3ab0353b259b64d5609945bb9b0cb250
-  data.tar.gz: c56e731258f197a3f1facc6e40797207ecf873b75e529817bc9895aa672dfe658f6f5bcf94d2e2820173f245cb4d0129d930c6f2a035fd3bb27ea3e4bc799641
+  metadata.gz: 1d2f7a4fe87043d80116ece05d4db4e45f56045e80f722d375a006e78aaee80c19ee5807336cc3b452e0841169c9dd78ef82a7f0aff05c6cc9f26f460c5a3926
+  data.tar.gz: 91fb7f5dc523c480e68924dbc49b38a28926742dde3947e281d3cf7ed75e5f93864931d57af5b45e155be5204de98e2c3162da7b4c7134c6e6d871fb9bae6bab

data/.circleci/config.yml

@@ -1,9 +1,9 @@
 version: 2
 
 jobs:
-  ruby-2.6.6:
+  ruby-2.6.8:
     docker:
-      - image: circleci/ruby:2.6.6
+      - image: circleci/ruby:2.6.8
     steps:
       - checkout
       - run: rm Gemfile.lock
@@ -14,9 +14,9 @@ jobs:
       - run: bundle exec standardrb
       - run: bundle exec fasterer
       - run: bundle exec mdl README.md CHANGELOG.md
-  ruby-2.7.2:
+  ruby-2.7.4:
     docker:
-      - image: circleci/ruby:2.7.2
+      - image: circleci/ruby:2.7.4
     steps:
       - checkout
       - run: rm Gemfile.lock
@@ -27,9 +27,9 @@ jobs:
       - run: bundle exec standardrb
       - run: bundle exec fasterer
       - run: bundle exec mdl README.md CHANGELOG.md
-  ruby-3.0.0:
+  ruby-3.0.2:
     docker:
-      - image: circleci/ruby:3.0.0
+      - image: circleci/ruby:3.0.2
     steps:
       - checkout
       - run: rm Gemfile.lock
@@ -45,6 +45,6 @@ workflows:
   version: 2
   tests:
     jobs:
-      - ruby-2.6.6
-      - ruby-2.7.2
-      - ruby-3.0.0
+      - ruby-2.6.8
+      - ruby-2.7.4
+      - ruby-3.0.2

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 99
+  allow:
+  - dependency-type: direct
+  - dependency-type: indirect

data/.rubocop.yml

@@ -0,0 +1,11 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+
+Style/WordArray:
+  Enabled: true
+  EnforcedStyle: brackets
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes

data/.ruby-version

@@ -1 +1 @@
-3.0.0
+3.0.2

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise "activesupport_52" do
   gem "activesupport", "~> 5.2.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.41.0
+
+* Add `EveOnline::ESI::Search`
+
 ## v0.40.0
 
 * Add `EveOnline::Formulas::TrainingRate`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eve_online (0.40.0)
+    eve_online (0.41.0)
       activesupport (>= 5.2.0)
       faraday
       faraday_middleware
@@ -9,40 +9,55 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
     awesome_print (1.9.2)
-    chef-utils (16.11.7)
+    chef-utils (17.4.25)
+      concurrent-ruby
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
-    docile (1.3.5)
-    faraday (1.3.0)
+    docile (1.4.0)
+    faraday (1.7.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
     fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
     hashdiff (1.0.1)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     kramdown (2.3.1)
       rexml
@@ -55,7 +70,7 @@ GEM
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
     method_source (1.0.0)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
@@ -63,23 +78,23 @@ GEM
     mixlib-shellout (3.2.5)
       chef-utils
     multipart-post (2.1.1)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.3)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.2-x86_64-darwin)
+    nokogiri (1.12.3-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.20.2)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -96,42 +111,42 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rubocop (1.19.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.2)
+    ruby2_keywords (0.0.5)
+    ruby_parser (3.17.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sexp_processor (4.15.3)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    standard (1.0.4)
-      rubocop (= 1.11.0)
-      rubocop-performance (= 1.10.1)
+    simplecov_json_formatter (0.1.3)
+    standard (1.2.0)
+      rubocop (= 1.19.1)
+      rubocop-performance (= 1.11.5)
     thor (1.1.0)
     tomlrb (2.0.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
     vcr (6.0.0)
-    webmock (3.12.1)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     zeitwerk (2.4.2)
@@ -159,4 +174,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.15
+   2.2.26

data/README.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/eve_online.svg)](https://badge.fury.io/rb/eve_online)
 [![Gem Downloads](https://img.shields.io/gem/dt/eve_online.svg)](https://rubygems.org/gems/eve_online)
 [![Known Vulnerabilities](https://snyk.io/test/github/evemonk/eve_online/badge.svg)](https://snyk.io/test/github/evemonk/eve_online)
-[![security](https://hakiri.io/github/evemonk/eve_online/master.svg)](https://hakiri.io/github/evemonk/eve_online/master)
+[![security](https://hakiri.io/github/evemonk/eve_online/main.svg)](https://hakiri.io/github/evemonk/eve_online/main)
 [![DeepSource](https://static.deepsource.io/deepsource-badge-light-mini.svg)](https://deepsource.io/gh/evemonk/eve_online/?ref=repository-badge)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
@@ -1898,6 +1898,81 @@ market_prices.etag # => "2d5acc3bd4555821bb91d787596f5ddad129f849739e83162e93c02
 
 #### Search on a string
 
+```ruby
+# simple search
+
+options = { search: "Jita" }
+
+search = EveOnline::ESI::Search.new(options)
+
+search.as_json # => {:agent_ids=>[3018357],
+               #     :alliance_ids=>[99011026, 99005382, 99010662, 99010663, 99010665, 99010666],
+               #     :character_ids=>[2118081143, ... 2114943117],
+               #     :constellation_ids=>[],
+               #     :corporation_ids=>[],
+               #     :faction_ids=>[],
+               #     :inventory_type_ids=>[56844, 56847, 56846, 56853, 56849, 56852, 56850, 52275, 56848, 56851, 56845],
+               #     :region_ids=>[],
+               #     :solar_system_ids=>[30000142],
+               #     :station_ids=>[]}
+
+search.agent_ids # => [3018357]
+search.alliance_ids # => [99011026, 99005382, 99010662, 99010663, 99010665, 99010666]
+search.character_ids.size # => 467
+search.character_ids.first # => 2118081143
+search.constellation_ids # => []
+search.corporation_ids # => []
+search.faction_ids  # => []
+search.inventory_type_ids # => [56844, 56847, 56846, 56853, 56849, 56852, 56850, 52275, 56848, 56851, 56845]
+search.region_ids # => []
+search.solar_system_ids # => [30000142]
+search.station_ids # => []
+
+search.etag # => "b6602e595e8d8df37b5191b82e75faba91284281b6fe71965d09e2f1"
+
+# strict search
+
+options = { search: "Jita", strict: true }
+
+search = EveOnline::ESI::Search.new(options)
+
+search.as_json # => {:agent_ids=>[],
+               #     :alliance_ids=>[99005382],
+               #     :character_ids=>[1392050776],
+               #     :constellation_ids=>[],
+               #     :corporation_ids=>[98004200, 98049474, 383768304, 98358437],
+               #     :faction_ids=>[],
+               #     :inventory_type_ids=>[],
+               #     :region_ids=>[],
+               #     :solar_system_ids=>[30000142],
+               #     :station_ids=>[]}
+
+# strict search with filter by categories
+
+# List of default categories (used when categories is empty):
+# ["agent", "alliance", "character", "constellation", "corporation", "faction",
+# "inventory_type", "region", "solar_system", "station"]
+
+# So, add `categories: ['solar_system']` and see:
+
+options = { search: "Jita", categories: ["solar_system"], strict: true }
+
+search = EveOnline::ESI::Search.new(options)
+
+search.as_json # => {:agent_ids=>[],
+               #    :alliance_ids=>[],
+               #    :character_ids=>[],
+               #    :constellation_ids=>[],
+               #    :corporation_ids=>[],
+               #    :faction_ids=>[],
+               #    :inventory_type_ids=>[],
+               #    :region_ids=>[],
+               #    :solar_system_ids=>[30000142],
+               #    :station_ids=>[]}
+
+search.solar_system_ids # => [30000142]
+```
+
 ### Skills
 
 #### Get character attributes
@@ -3210,6 +3285,7 @@ Thank you everyone!
 * Ian Flynn (@monban)
 * Mekaret Eriker (@Mekaret)
 * Y. (@lunohodov)
+* Trevor Copeland (@sicks)
 
 ## License
 

data/lib/eve_online/esi/base.rb

@@ -113,8 +113,6 @@ module EveOnline
               f.use middleware[:class]
             end
           end
-          # f.use Faraday::Response::Logger
-          # f.use FaradayMiddleware::FollowRedirects, limit: 5
           f.response :json, content_type: "application/json"
           f.adapter adapter
         end
@@ -147,7 +145,7 @@ module EveOnline
           hash[param] = public_send(param)
         end
 
-        hash.reject { |_, v| v.blank? }
+        hash.reject { |_, v| v.nil? || v == "" }
       end
 
       def resource

data/lib/eve_online/esi/models/search.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class Search < Base
+        def as_json
+          {
+            agent_ids: agent_ids,
+            alliance_ids: alliance_ids,
+            character_ids: character_ids,
+            constellation_ids: constellation_ids,
+            corporation_ids: corporation_ids,
+            faction_ids: faction_ids,
+            inventory_type_ids: inventory_type_ids,
+            region_ids: region_ids,
+            solar_system_ids: solar_system_ids,
+            station_ids: station_ids
+          }
+        end
+
+        def agent_ids
+          options.fetch("agent", [])
+        end
+
+        def alliance_ids
+          options.fetch("alliance", [])
+        end
+
+        def character_ids
+          options.fetch("character", [])
+        end
+
+        def constellation_ids
+          options.fetch("constellation", [])
+        end
+
+        def corporation_ids
+          options.fetch("corporation", [])
+        end
+
+        def faction_ids
+          options.fetch("faction", [])
+        end
+
+        def inventory_type_ids
+          options.fetch("inventory_type", [])
+        end
+
+        def region_ids
+          options.fetch("region", [])
+        end
+
+        def solar_system_ids
+          options.fetch("solar_system", [])
+        end
+
+        def station_ids
+          options.fetch("stations", [])
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/search.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module EveOnline
+  module ESI
+    class Search < Base
+      extend Forwardable
+
+      API_PATH = "/v2/search/"
+
+      DEFAULT_CATEGORIES = [
+        "agent",
+        "alliance",
+        "character",
+        "constellation",
+        "corporation",
+        "faction",
+        "inventory_type",
+        "region",
+        "solar_system",
+        "station"
+      ]
+
+      attr_reader :search, :strict, :raw_categories, :categories
+
+      def initialize(options)
+        super
+
+        @search = options.fetch(:search)
+        @strict = options.fetch(:strict, false)
+        @raw_categories = options.fetch(:categories, DEFAULT_CATEGORIES)
+        @raw_categories.each do |c|
+          unless DEFAULT_CATEGORIES.include?(c)
+            raise(ArgumentError)
+          end
+        end
+        @categories = @raw_categories.join(",")
+      end
+
+      def_delegators :model, :as_json, :agent_ids, :alliance_ids,
+        :character_ids, :constellation_ids, :corporation_ids, :faction_ids,
+        :inventory_type_ids, :region_ids, :solar_system_ids, :station_ids
+
+      def model
+        @model ||= Models::Search.new(response)
+      end
+
+      def scope
+      end
+
+      def additional_query_params
+        [:search, :categories, :strict]
+      end
+
+      def path
+        format(API_PATH, search: search, categories: categories, strict: strict)
+      end
+    end
+  end
+end

data/lib/eve_online/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EveOnline
-  VERSION = "0.40.0"
+  VERSION = "0.41.0"
 end

data/lib/eve_online.rb

@@ -92,6 +92,8 @@ module EveOnline
     autoload :MarketGroup, "eve_online/esi/market_group"
     autoload :MarketPrices, "eve_online/esi/market_prices"
 
+    autoload :Search, "eve_online/esi/search"
+
     autoload :CharacterAttributes, "eve_online/esi/character_attributes"
     autoload :CharacterSkillQueue, "eve_online/esi/character_skill_queue"
     autoload :CharacterSkills, "eve_online/esi/character_skills"
@@ -175,6 +177,7 @@ module EveOnline
       autoload :WalletTransaction, "eve_online/esi/models/wallet_transaction"
       autoload :CorporationOrder, "eve_online/esi/models/corporation_order"
       autoload :HomeLocation, "eve_online/esi/models/home_location"
+      autoload :Search, "eve_online/esi/models/search"
       autoload :ServerStatus, "eve_online/esi/models/server_status"
 
       autoload :MarketHistory, "eve_online/esi/models/market_history"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,8 +189,10 @@ files:
 - ".deepsource.toml"
 - ".fasterer.yml"
 - ".github/FUNDING.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".mdlrc"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".standard.yml"
 - Appraisals
@@ -330,6 +332,7 @@ files:
 - lib/eve_online/esi/models/public_contract_item.rb
 - lib/eve_online/esi/models/race.rb
 - lib/eve_online/esi/models/region.rb
+- lib/eve_online/esi/models/search.rb
 - lib/eve_online/esi/models/server_status.rb
 - lib/eve_online/esi/models/skill.rb
 - lib/eve_online/esi/models/skill_queue_entry.rb
@@ -346,6 +349,7 @@ files:
 - lib/eve_online/esi/models/war.rb
 - lib/eve_online/esi/public_contract.rb
 - lib/eve_online/esi/public_contracts.rb
+- lib/eve_online/esi/search.rb
 - lib/eve_online/esi/server_status.rb
 - lib/eve_online/esi/universe_ancestries.rb
 - lib/eve_online/esi/universe_asteroid_belt.rb
@@ -416,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: EveOnline ESI API