eve_online 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cadda78a7d2823ea8f60726c89e502e1caa67ee86dd28e038cb572f5fe80071
-  data.tar.gz: 0cf160ff1abfd87caa400555de5c69e5b9625265ea1b581480e22a84cdde8793
+  metadata.gz: 5b14b54b7da3429b1bd0c1b6e975195aaba4d24e0272a5c38d4e7a9aa5b0de42
+  data.tar.gz: 5c39f9345325b3bf9a9764ffbe49704b96fc43c1325e9a06e2ffbadbcd8f9fa6
 SHA512:
-  metadata.gz: b91ba41d06502f88b69af1de359bbf2f3c10b2fe515590e3fc574cc3216a404c5dc02a959b6a00491a1ee6e4d9284e68a9dad2ff2ac682077a6272326d922523
-  data.tar.gz: 3bf4ea87dfc8ef0198828da27ba2ce54f34cbb2c46f94f2e824c71f5aeb2ae24733bb508d927c4cd8e540cda83b53c713d4305bc3e66bc8de6ebfaedf306c1c3
+  metadata.gz: e8c723bba7c7f720c5a8f7f78c9f3f6a02ac2559d3ac58fa0f5a89bcafaf7c111edd23ade1c51fe01b8b5bd53e40a31315902a6f35ee7940113691d81c4624b5
+  data.tar.gz: 34376fdfe262ab51ab60550e725a19fbe1eb4458db64f91e3660ccc76f4cd39aa391b46ac002fda5923cc65751ea1750a2a53e71075cca13d2555da03bea14af

data/.deepsource.toml

@@ -0,0 +1,5 @@
+version = 1
+
+[[analyzers]]
+name = "ruby"
+enabled = true

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.35.0
+
+* Add `EveOnline::ESI::PublicContracts`
+* Add `EveOnline::ESI::Models::PublicContract`
+* Add `EveOnline::ESI::Models::PublicContractItem`
+* Add `EveOnline::ESI::PublicContract`
+
 ## v0.34.0
 
 * Rename `EveOnline::ESI::Models::Race#alliance_id` to `#faction_id`. [Fix esi issue 812](https://github.com/esi/esi-issues/issues/812).

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    eve_online (0.34.0)
+    eve_online (0.35.0)
       activesupport (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -19,7 +19,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.0)
+    ast (2.4.1)
     awesome_print (1.8.0)
     coderay (1.1.3)
     colorize (0.8.1)
@@ -51,7 +51,7 @@ GEM
       tomlrb
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
+    parallel (1.19.2)
     parser (2.7.1.3)
       ast (~> 2.4.0)
     pry (0.13.1)
@@ -95,7 +95,7 @@ GEM
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
     safe_yaml (1.0.5)
-    sexp_processor (4.14.1)
+    sexp_processor (4.15.0)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/Gemfile.mutant.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    eve_online (0.34.0)
+    eve_online (0.35.0)
       activesupport (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -27,7 +27,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.0)
+    ast (2.4.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)

data/README.md

@@ -3,8 +3,9 @@
 [![CircleCI](https://circleci.com/gh/evemonk/eve_online.svg?style=svg)](https://circleci.com/gh/evemonk/eve_online)
 [![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)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/955073c905b91d53e68c/test_coverage)](https://codeclimate.com/github/evemonk/eve_online/test_coverage)
+[![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)
+[![DeepSource](https://static.deepsource.io/deepsource-badge-light-mini.svg)](https://deepsource.io/gh/evemonk/eve_online/?ref=repository-badge)
 
 This gem implement Ruby API for EveOnline MMORPG (ESI).
 
@@ -763,8 +764,98 @@ contracts.etag # => "6e18566a8f786f08aba678262360d0c74a783f9923aa43f8043133e4"
 
 #### Get public contracts
 
+```ruby
+options = { region_id: 10_000_043, page: 1 }
+
+contracts = EveOnline::ESI::PublicContracts.new(options)
+
+contracts.scope # => nil
+
+contracts.page # => 1
+
+contracts.total_pages # => 4
+
+contracts.contracts.size # => 1000
+
+contract = contracts.contracts.first
+
+contract.as_json # => {:buyout=>nil,
+                 #     :collateral=>0.0,
+                 #     :contract_id=>157834735,
+                 #     :date_expired=>Wed, 17 Jun 2020 21:36:41 UTC +00:00,
+                 #     :date_issued=>Wed, 20 May 2020 21:36:41 UTC +00:00,
+                 #     :days_to_complete=>0,
+                 #     :end_location_id=>60008494,
+                 #     :for_corporation=>true,
+                 #     :issuer_corporation_id=>897372069,
+                 #     :issuer_id=>1314102096,
+                 #     :price=>1250000000.0,
+                 #     :reward=>0.0,
+                 #     :start_location_id=>60008494,
+                 #     :title=>"Apostle Me10/Te16 Complete Bpc 10 Pack",
+                 #     :type=>"item_exchange",
+                 #     :volume=>100.0}
+
+contract.buyout # => nil
+contract.collateral # => 0.0
+contract.contract_id # => 157834735
+contract.date_expired # => Wed, 17 Jun 2020 21:36:41 UTC +00:00
+contract.date_issued # => Wed, 20 May 2020 21:36:41 UTC +00:00
+contract.days_to_complete # => 0
+contract.end_location_id # => 60008494
+contract.for_corporation # => true
+contract.issuer_corporation_id # => 897372069
+contract.issuer_id # => 1314102096
+contract.price # => 1250000000.0
+contract.reward # => 0.0
+contract.start_location_id # => 60008494
+contract.title # => "Apostle Me10/Te16 Complete Bpc 10 Pack"
+contract.type # => "item_exchange"
+contract.volume # => 100.0
+
+contracts.etag # => "3f7fdf9a69e35bb35d619b6cb5043a2766d11ca6306a8b5af369ce6e"
+```
+
 #### Get public contract bids
 
+```ruby
+options = { contract_id: 157_872_948, page: 1 }
+
+contract = EveOnline::ESI::PublicContract.new(options)
+
+contract.scope # => nil
+
+contract.page # => 1
+
+contract.total_pages # => 1
+
+contract.items.size # => 1
+
+item = contract.items.first
+
+item.as_json # => {:is_blueprint_copy=>true,
+             #     :is_included=>true,
+             #     :item_id=>1029552558074,
+             #     :material_efficiency=>10,
+             #     :quantity=>1,
+             #     :record_id=>3210378611,
+             #     :runs=>400,
+             #     :time_efficiency=>20,
+             #     :type_id=>29040}
+
+item.is_blueprint_copy # => true
+item.is_included # => true
+item.item_id # => 1029552558074
+item.material_efficiency # => 10
+item.quantity # => 1
+item.record_id # => 3210378611
+item.runs # => 400
+item.time_efficiency # => 20
+item.type_id # => 29040
+
+contract.etag # => "d458c3f56c114882a9ecfe1aaf173837310b15b6e7cef86a019e700f"
+```
+
 #### Get public contract items
 
 #### Get corporation contracts
@@ -2298,12 +2389,12 @@ races.races.size # => 4
 
 race = races.races.first
 
-race.as_json # => {:alliance_id=>500002,
+race.as_json # => {:faction_id=>500002,
              #     :description=>"Once a thriving tribal civilization, the Minmatar...",
              #     :name=>"Minmatar",
              #     :race_id=>2}
 
-race.alliance_id # => 500002
+race.faction_id # => 500002
 race.description # => "Once a thriving tribal civilization, the Minmatar..."
 race.name # => "Minmatar"
 race.race_id # => 2

data/lib/eve_online.rb

@@ -46,6 +46,8 @@ require "eve_online/esi/character_clones"
 require "eve_online/esi/character_implants"
 
 require "eve_online/esi/character_contracts"
+require "eve_online/esi/public_contracts"
+require "eve_online/esi/public_contract"
 
 require "eve_online/esi/corporation"
 require "eve_online/esi/corporation_alliance_history"
@@ -155,6 +157,8 @@ require "eve_online/esi/models/character_ship"
 require "eve_online/esi/models/blueprint"
 require "eve_online/esi/models/standing"
 require "eve_online/esi/models/contract"
+require "eve_online/esi/models/public_contract"
+require "eve_online/esi/models/public_contract_item"
 require "eve_online/esi/models/fatigue"
 require "eve_online/esi/models/notification"
 require "eve_online/esi/models/event"

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

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class PublicContract < Base
+        def as_json
+          {
+            buyout: buyout,
+            collateral: collateral,
+            contract_id: contract_id,
+            date_expired: date_expired,
+            date_issued: date_issued,
+            days_to_complete: days_to_complete,
+            end_location_id: end_location_id,
+            for_corporation: for_corporation,
+            issuer_corporation_id: issuer_corporation_id,
+            issuer_id: issuer_id,
+            price: price,
+            reward: reward,
+            start_location_id: start_location_id,
+            title: title,
+            type: type,
+            volume: volume
+          }
+        end
+
+        def buyout
+          options["buyout"]
+        end
+
+        def collateral
+          options["collateral"]
+        end
+
+        def contract_id
+          options["contract_id"]
+        end
+
+        def date_expired
+          date_expired = options["date_expired"]
+
+          parse_datetime_with_timezone(date_expired) if date_expired
+        end
+
+        def date_issued
+          date_issued = options["date_issued"]
+
+          parse_datetime_with_timezone(date_issued) if date_issued
+        end
+
+        def days_to_complete
+          options["days_to_complete"]
+        end
+
+        def end_location_id
+          options["end_location_id"]
+        end
+
+        def for_corporation
+          options["for_corporation"]
+        end
+
+        def issuer_corporation_id
+          options["issuer_corporation_id"]
+        end
+
+        def issuer_id
+          options["issuer_id"]
+        end
+
+        def price
+          options["price"]
+        end
+
+        def reward
+          options["reward"]
+        end
+
+        def start_location_id
+          options["start_location_id"]
+        end
+
+        def title
+          options["title"]
+        end
+
+        def type
+          options["type"]
+        end
+
+        def volume
+          options["volume"]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class PublicContractItem < Base
+        def as_json
+          {
+            is_blueprint_copy: is_blueprint_copy,
+            is_included: is_included,
+            item_id: item_id,
+            material_efficiency: material_efficiency,
+            quantity: quantity,
+            record_id: record_id,
+            runs: runs,
+            time_efficiency: time_efficiency,
+            type_id: type_id
+          }
+        end
+
+        def is_blueprint_copy
+          options["is_blueprint_copy"]
+        end
+
+        def is_included
+          options["is_included"]
+        end
+
+        def item_id
+          options["item_id"]
+        end
+
+        def material_efficiency
+          options["material_efficiency"]
+        end
+
+        def quantity
+          options["quantity"]
+        end
+
+        def record_id
+          options["record_id"]
+        end
+
+        def runs
+          options["runs"]
+        end
+
+        def time_efficiency
+          options["time_efficiency"]
+        end
+
+        def type_id
+          options["type_id"]
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/public_contract.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class PublicContract < Base
+      API_PATH = "/v1/contracts/public/items/%<contract_id>s/"
+
+      attr_reader :contract_id, :page
+
+      def initialize(options)
+        super
+
+        @contract_id = options.fetch(:contract_id)
+        @page = options.fetch(:page, 1)
+      end
+
+      def items
+        @items ||=
+          begin
+            output = []
+            response.each do |item|
+              output << Models::PublicContractItem.new(item)
+            end
+            output
+          end
+      end
+
+      def scope
+      end
+
+      def additional_query_params
+        [:page]
+      end
+
+      def path
+        format(API_PATH, contract_id: contract_id)
+      end
+    end
+  end
+end

data/lib/eve_online/esi/public_contracts.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    class PublicContracts < Base
+      API_PATH = "/v1/contracts/public/%<region_id>s/"
+
+      attr_reader :region_id, :page
+
+      def initialize(options)
+        super
+
+        @region_id = options.fetch(:region_id)
+        @page = options.fetch(:page, 1)
+      end
+
+      def contracts
+        @contracts ||=
+          begin
+            output = []
+            response.each do |contract|
+              output << Models::PublicContract.new(contract)
+            end
+            output
+          end
+      end
+
+      def scope
+      end
+
+      def additional_query_params
+        [:page]
+      end
+
+      def path
+        format(API_PATH, region_id: region_id)
+      end
+    end
+  end
+end

data/lib/eve_online/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eve_online
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Igor Zubkov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".deepsource.toml"
 - ".github/FUNDING.yml"
 - ".gitignore"
 - ".mdlrc"
@@ -296,6 +297,8 @@ files:
 - lib/eve_online/esi/models/planet_short.rb
 - lib/eve_online/esi/models/planets.rb
 - lib/eve_online/esi/models/position.rb
+- lib/eve_online/esi/models/public_contract.rb
+- 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/server_status.rb
@@ -312,6 +315,8 @@ files:
 - lib/eve_online/esi/models/wallet_journal.rb
 - lib/eve_online/esi/models/wallet_transaction.rb
 - 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/server_status.rb
 - lib/eve_online/esi/universe_ancestries.rb
 - lib/eve_online/esi/universe_asteroid_belt.rb