netbox-client-ruby 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9535356ec28f6b98e36cbe9716a17a6a3274c3aa8fa61c94546d83259863ef4
-  data.tar.gz: 88fd17466447a4dc38f61d05b94ac3ead97662b2de1d9b7e59b52be2e50e9f0a
+  metadata.gz: ec7ff93496769653e21eea7c3f04b184890fb7babdc00ea8f0f8173cc7040470
+  data.tar.gz: ff23b46b13f2f849dd3b4b3465ff42ead9b771ff5a064a6aa27d9582031b4f4a
 SHA512:
-  metadata.gz: 1e70efad1051fd7f8f50d707cabf92ff3549048459b447987695f4b7ba3ef023fcd827dcce076070ab7821b22a1f636505fd6a21ffc0e7632f5b233365ace673
-  data.tar.gz: 1cb160fa098d2a08420bbd972d67ee7d5e3ab885c43484b44625dd0938aca2bd1a060ed7c494d7351d187fe6851296a2b549d0eabee1962396418f1b48aef9ed
+  metadata.gz: 2f2437ae2ecb563e586b62ac05a852f6726f46d2e117373ebf0381b6b9e615906fe74504ea5898036380c08ed98b8b2b72e04095ed3b9649303f9859fa0f7da8
+  data.tar.gz: e8ab26e54501488a91c0bc1544c2cfb8c7b79801bb6e73fa87c0c3351d24481b2a07b87ae369dab263f2b3bd7450c035a179d959f443032fdc943cf48e14a8a3

data/.github/workflows/rspec.yml

@@ -15,12 +15,29 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: ["2.7", "3.0"]
+        ruby: ['2.7', '3.0', '3.1', '3.2']
+        gemfile:
+          [
+            'Gemfile',
+            'gemfiles/faraday0.gemfile',
+            'gemfiles/faraday1.gemfile',
+            'gemfiles/faraday2.gemfile',
+          ]
+        # Faraday 0.x with Ruby 3.x not supported
+        exclude:
+          - ruby: '3.0'
+            gemfile: gemfiles/faraday0.gemfile
+          - ruby: '3.1'
+            gemfile: gemfiles/faraday0.gemfile
+          - ruby: '3.2'
+            gemfile: gemfiles/faraday0.gemfile
     runs-on: ${{ matrix.os }}
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle exec rake spec
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake spec

data/.gitignore

@@ -14,4 +14,3 @@ quickstart.rb
 *.gz
 
 /vendor/
-Gemfile.lock

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+gem "faraday", "~> 1.10"
+gem "faraday_middleware"
+
 # Specify your gem dependencies in netbox-client-ruby.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,115 @@
+PATH
+  remote: .
+  specs:
+    netbox-client-ruby (0.9.0)
+      dry-configurable (~> 1)
+      faraday (>= 0.11.0, < 3)
+      faraday-detailed_logger (~> 2.1)
+      ipaddress (~> 0.8, >= 0.8.3)
+      openssl (>= 2.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-detailed_logger (2.5.0)
+      faraday (>= 0.16, < 3)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    ipaddress (0.8.3)
+    method_source (1.0.0)
+    multipart-post (2.3.0)
+    openssl (3.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (1.8.0)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  faraday (~> 1.10)
+  faraday_middleware
+  netbox-client-ruby!
+  pry (~> 0.10)
+  rake (~> 13)
+  rspec (~> 3.5)
+  rubocop (~> 0.48)
+  rubocop-rspec (~> 1.15)
+
+BUNDLED WITH
+   2.4.10

data/README.md

@@ -15,6 +15,12 @@ Add this line to your application's Gemfile:
 gem 'netbox-client-ruby'
 ```
 
+If your application already uses Faraday 0.x or 1.x and you cannot otherwise upgrade to Faraday 2, you must also add this line to your application's Gemfile:
+
+```ruby
+gem 'faraday_middleware' # remove when upgrading to Faraday 2+
+```
+
 And then execute:
 
     $ bundle
@@ -173,6 +179,7 @@ Not all objects which the Netbox API exposes are currently implemented. Implemen
   * Prefixes: `NetboxClientRuby.ipam.prefixes`
   * RIRs: `NetboxClientRuby.ipam.rirs`
   * Roles: `NetboxClientRuby.ipam.roles`
+  * Services: `NetboxClientRuby.ipam.services`
   * VLANs: `NetboxClientRuby.ipam.vlans`
   * VLAN Groups: `NetboxClientRuby.ipam.vlan_groups`
   * VRFs: `NetboxClientRuby.ipam.vrfs`

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.10.0

data/bin/setup

@@ -5,4 +5,6 @@ set -vx
 
 bundle install
 
-# Do any other automated setup that you need to do here
+for filename in gemfiles/*.gemfile; do
+  BUNDLE_GEMFILE=$filename bundle install
+done

data/dump.sql

@@ -5187,6 +5187,7 @@ COPY public.ipam_role (id, name, slug, weight, created, last_updated) FROM stdin
 --
 
 COPY public.ipam_service (id, created, last_updated, name, protocol, port, description, device_id, virtual_machine_id) FROM stdin;
+1	2023-04-23	2023-04-23 15:44:58.595982+00	Service 0	6	443	This is Description	\N	1
 \.
 
 
@@ -5195,6 +5196,7 @@ COPY public.ipam_service (id, created, last_updated, name, protocol, port, descr
 --
 
 COPY public.ipam_service_ipaddresses (id, service_id, ipaddress_id) FROM stdin;
+1	1	4
 \.
 
 
@@ -5326,6 +5328,7 @@ COPY public.taggit_taggeditem (id, object_id, content_type_id, tag_id) FROM stdi
 32	1	9	4
 33	1	11	5
 34	8	17	9
+35	1	47	5
 \.
 
 
@@ -5774,7 +5777,7 @@ SELECT pg_catalog.setval('public.extras_imageattachment_id_seq', 1, false);
 -- Name: extras_objectchange_id_seq; Type: SEQUENCE SET; Schema: public; Owner: netbox
 --
 
-SELECT pg_catalog.setval('public.extras_objectchange_id_seq', 318, true);
+SELECT pg_catalog.setval('public.extras_objectchange_id_seq', 319, true);
 
 
 --
@@ -5851,14 +5854,14 @@ SELECT pg_catalog.setval('public.ipam_role_id_seq', 1, true);
 -- Name: ipam_service_id_seq; Type: SEQUENCE SET; Schema: public; Owner: netbox
 --
 
-SELECT pg_catalog.setval('public.ipam_service_id_seq', 1, false);
+SELECT pg_catalog.setval('public.ipam_service_id_seq', 1, true);
 
 
 --
 -- Name: ipam_service_ipaddresses_id_seq; Type: SEQUENCE SET; Schema: public; Owner: netbox
 --
 
-SELECT pg_catalog.setval('public.ipam_service_ipaddresses_id_seq', 1, false);
+SELECT pg_catalog.setval('public.ipam_service_ipaddresses_id_seq', 1, true);
 
 
 --
@@ -5935,7 +5938,7 @@ SELECT pg_catalog.setval('public.taggit_tag_id_seq', 9, true);
 -- Name: taggit_taggeditem_id_seq; Type: SEQUENCE SET; Schema: public; Owner: netbox
 --
 
-SELECT pg_catalog.setval('public.taggit_taggeditem_id_seq', 34, true);
+SELECT pg_catalog.setval('public.taggit_taggeditem_id_seq', 35, true);
 
 
 --

data/gemfiles/faraday0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "faraday", "= 0.11"
+gem "faraday_middleware", "< 1"
+
+gemspec path: ".."

data/gemfiles/faraday0.gemfile.lock

@@ -0,0 +1,94 @@
+PATH
+  remote: ..
+  specs:
+    netbox-client-ruby (0.9.0)
+      dry-configurable (~> 1)
+      faraday (>= 0.11.0, < 3)
+      faraday-detailed_logger (~> 2.1)
+      ipaddress (~> 0.8, >= 0.8.3)
+      openssl (>= 2.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
+    faraday-detailed_logger (2.4.0)
+      faraday (>= 0.8, < 2)
+      zeitwerk (~> 2.0)
+    faraday_middleware (0.14.0)
+      faraday (>= 0.7.4, < 1.0)
+    ipaddress (0.8.3)
+    method_source (1.0.0)
+    multipart-post (2.3.0)
+    openssl (3.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (1.8.0)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  faraday (= 0.11)
+  faraday_middleware (< 1)
+  netbox-client-ruby!
+  pry (~> 0.10)
+  rake (~> 13)
+  rspec (~> 3.5)
+  rubocop (~> 0.48)
+  rubocop-rspec (~> 1.15)
+
+BUNDLED WITH
+   2.4.10

data/gemfiles/faraday1.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "faraday", "= 1.0"
+gem "faraday_middleware", "< 2"
+
+gemspec path: ".."

data/gemfiles/faraday1.gemfile.lock

@@ -0,0 +1,93 @@
+PATH
+  remote: ..
+  specs:
+    netbox-client-ruby (0.9.0)
+      dry-configurable (~> 1)
+      faraday (>= 0.11.0, < 3)
+      faraday-detailed_logger (~> 2.1)
+      ipaddress (~> 0.8, >= 0.8.3)
+      openssl (>= 2.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    faraday (1.0.0)
+      multipart-post (>= 1.2, < 3)
+    faraday-detailed_logger (2.5.0)
+      faraday (>= 0.16, < 3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    ipaddress (0.8.3)
+    method_source (1.0.0)
+    multipart-post (2.3.0)
+    openssl (3.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (1.8.0)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  faraday (= 1.0)
+  faraday_middleware (< 2)
+  netbox-client-ruby!
+  pry (~> 0.10)
+  rake (~> 13)
+  rspec (~> 3.5)
+  rubocop (~> 0.48)
+  rubocop-rspec (~> 1.15)
+
+BUNDLED WITH
+   2.4.10

data/gemfiles/faraday2.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "faraday", "< 3"
+gem "faraday-net_http_persistent"
+
+gemspec path: ".."

data/gemfiles/faraday2.gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: ..
+  specs:
+    netbox-client-ruby (0.9.0)
+      dry-configurable (~> 1)
+      faraday (>= 0.11.0, < 3)
+      faraday-detailed_logger (~> 2.1)
+      ipaddress (~> 0.8, >= 0.8.3)
+      openssl (>= 2.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    base64 (0.1.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-detailed_logger (2.5.0)
+      faraday (>= 0.16, < 3)
+    faraday-net_http (3.0.2)
+    faraday-net_http_persistent (2.1.0)
+      faraday (~> 2.5)
+      net-http-persistent (~> 4.0)
+    ipaddress (0.8.3)
+    method_source (1.0.0)
+    net-http-persistent (4.0.2)
+      connection_pool (~> 2.2)
+    openssl (3.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (0.93.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    unicode-display_width (1.8.0)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  faraday (< 3)
+  faraday-net_http_persistent
+  netbox-client-ruby!
+  pry (~> 0.10)
+  rake (~> 13)
+  rspec (~> 3.5)
+  rubocop (~> 0.48)
+  rubocop-rspec (~> 1.15)
+
+BUNDLED WITH
+   2.4.10

data/lib/netbox_client_ruby/api/ipam/service.rb

@@ -0,0 +1,31 @@
+require 'netbox_client_ruby/entity'
+require 'netbox_client_ruby/api/ipam/ip_address'
+
+module NetboxClientRuby
+  module IPAM
+    class Service
+      include Entity
+
+      id id: :id
+      deletable true
+      path 'ipam/services/:id.json'
+      creation_path 'ipam/services/'
+      object_fields(
+        device: proc { |raw_data| Device.new raw_data['id'] },
+        virtual_machine: proc { |raw_data| VirtualMachine.new raw_data['id'] },
+        protocol: proc { |raw_data| ServiceProtocol.new raw_data },
+        ipaddresses: proc { |raw_data| IpAddress.new raw_data['id'] }
+      )
+      readonly_fields :display_name
+    end
+
+    class ServiceProtocol
+      attr_reader :value, :label
+
+      def initialize(raw_data)
+        @value = raw_data['value']
+        @label = raw_data['label']
+      end
+    end
+  end
+end

data/lib/netbox_client_ruby/api/ipam/services.rb

@@ -0,0 +1,21 @@
+require 'netbox_client_ruby/entities'
+require 'netbox_client_ruby/api/ipam/service'
+
+module NetboxClientRuby
+  module IPAM
+    class Services
+      include Entities
+
+      path 'ipam/services.json'
+      data_key 'results'
+      count_key 'count'
+      entity_creator :entity_creator
+
+      private
+
+      def entity_creator(raw_entity)
+        Service.new raw_entity['id']
+      end
+    end
+  end
+end

data/lib/netbox_client_ruby/api/ipam.rb

@@ -10,8 +10,8 @@ require 'netbox_client_ruby/api/ipam/rir'
 require 'netbox_client_ruby/api/ipam/rirs'
 require 'netbox_client_ruby/api/ipam/role'
 require 'netbox_client_ruby/api/ipam/roles'
-# require 'netbox_client_ruby/api/ipam/service'
-# require 'netbox_client_ruby/api/ipam/services'
+require 'netbox_client_ruby/api/ipam/service'
+require 'netbox_client_ruby/api/ipam/services'
 require 'netbox_client_ruby/api/ipam/vlan_group'
 require 'netbox_client_ruby/api/ipam/vlan_groups'
 require 'netbox_client_ruby/api/ipam/vlan'
@@ -29,6 +29,7 @@ module NetboxClientRuby
       prefixes: Prefixes,
       rirs: Rirs,
       roles: Roles,
+      services: Services,
       vlans: Vlans,
       vlan_groups: VlanGroups,
       vrfs: Vrfs
@@ -44,6 +45,7 @@ module NetboxClientRuby
       prefix: Prefix,
       rir: Rir,
       role: Role,
+      service: Service,
       vlan: Vlan,
       vlan_group: VlanGroup,
       vrf: Vrf

data/lib/netbox_client_ruby/communication.rb

@@ -1,5 +1,4 @@
-require 'netbox_client_ruby/error/client_error'
-require 'netbox_client_ruby/error/remote_error'
+require 'netbox_client_ruby/error'
 require 'netbox_client_ruby/connection'
 
 module NetboxClientRuby

data/lib/netbox_client_ruby/connection.rb

@@ -1,7 +1,22 @@
 require 'faraday'
-require 'faraday_middleware'
 require 'faraday/detailed_logger'
-require 'netbox_client_ruby/error/local_error'
+require 'netbox_client_ruby/error'
+
+if Faraday::VERSION < '2'
+  begin
+    require 'faraday_middleware'
+  rescue LoadError => e
+    message = <<~MSG
+      For the current version of Faraday (#{Faraday::VERSION}), "faraday_middleware"
+      is a required peer dependency of "netbox-client-ruby". Please install
+      "faraday_middleware" separately OR upgrade to Faraday 2, in which case,
+      "faraday_middleware" is not needed to work with "netbox-client-ruby".
+
+      #{e.message}
+    MSG
+    raise NetboxClientRuby::Error, message
+  end
+end
 
 module NetboxClientRuby
   class Connection

data/lib/netbox_client_ruby/entities.rb

@@ -1,5 +1,5 @@
 require 'netbox_client_ruby/entity'
-require 'netbox_client_ruby/error/local_error'
+require 'netbox_client_ruby/error'
 
 module NetboxClientRuby
   module Entities

data/lib/netbox_client_ruby/entity.rb

@@ -1,5 +1,5 @@
 require 'netbox_client_ruby/communication'
-require 'netbox_client_ruby/error/local_error'
+require 'netbox_client_ruby/error'
 
 module NetboxClientRuby
   module Entity

data/lib/netbox_client_ruby/error.rb

@@ -0,0 +1,6 @@
+module NetboxClientRuby
+  class Error < StandardError; end
+  class ClientError < Error; end
+  class LocalError < Error; end
+  class RemoteError < Error; end
+end

data/lib/netbox_client_ruby.rb

@@ -1,4 +1,5 @@
 require 'dry-configurable'
+require 'netbox_client_ruby/error'
 require 'netbox_client_ruby/api'
 
 module NetboxClientRuby

data/netbox-client-ruby.gemspec

@@ -26,9 +26,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_runtime_dependency 'dry-configurable', '~> 1'
-  spec.add_runtime_dependency 'faraday', '>= 0.11.0', '< 2'
+  spec.add_runtime_dependency 'faraday', '>= 0.11.0', '< 3'
   spec.add_runtime_dependency 'faraday-detailed_logger', '~> 2.1'
-  spec.add_runtime_dependency 'faraday_middleware', '>= 0.11', '< 2'
   spec.add_runtime_dependency 'ipaddress', '~> 0.8', '>= 0.8.3'
   spec.add_runtime_dependency 'openssl', '>= 2.0.5'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netbox-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Christian Mäder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -33,7 +33,7 @@ dependencies:
         version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: faraday-detailed_logger
   requirement: !ruby/object:Gem::Requirement
@@ -58,26 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +191,7 @@ files:
 - ".rspec"
 - Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -222,6 +203,12 @@ files:
 - docker/start.sh
 - docker/start.test.sh
 - dump.sql
+- gemfiles/faraday0.gemfile
+- gemfiles/faraday0.gemfile.lock
+- gemfiles/faraday1.gemfile
+- gemfiles/faraday1.gemfile.lock
+- gemfiles/faraday2.gemfile
+- gemfiles/faraday2.gemfile.lock
 - lib/netbox-client-ruby.rb
 - lib/netbox_client_ruby.rb
 - lib/netbox_client_ruby/api.rb
@@ -297,6 +284,8 @@ files:
 - lib/netbox_client_ruby/api/ipam/rirs.rb
 - lib/netbox_client_ruby/api/ipam/role.rb
 - lib/netbox_client_ruby/api/ipam/roles.rb
+- lib/netbox_client_ruby/api/ipam/service.rb
+- lib/netbox_client_ruby/api/ipam/services.rb
 - lib/netbox_client_ruby/api/ipam/vlan.rb
 - lib/netbox_client_ruby/api/ipam/vlan_group.rb
 - lib/netbox_client_ruby/api/ipam/vlan_groups.rb
@@ -330,9 +319,7 @@ files:
 - lib/netbox_client_ruby/connection.rb
 - lib/netbox_client_ruby/entities.rb
 - lib/netbox_client_ruby/entity.rb
-- lib/netbox_client_ruby/error/client_error.rb
-- lib/netbox_client_ruby/error/local_error.rb
-- lib/netbox_client_ruby/error/remote_error.rb
+- lib/netbox_client_ruby/error.rb
 - netbox-client-ruby.gemspec
 - netbox-client-ruby_rsa
 - netbox-client-ruby_rsa.pub

data/lib/netbox_client_ruby/error/client_error.rb

@@ -1,4 +0,0 @@
-module NetboxClientRuby
-  class ClientError < StandardError
-  end
-end

data/lib/netbox_client_ruby/error/local_error.rb

@@ -1,4 +0,0 @@
-module NetboxClientRuby
-  class LocalError < StandardError
-  end
-end

data/lib/netbox_client_ruby/error/remote_error.rb

@@ -1,4 +0,0 @@
-module NetboxClientRuby
-  class RemoteError < StandardError
-  end
-end