RubyGems - ruby-miradore - Versions diffs - 0.2.1 → 1.2.1 - Mend

ruby-miradore 0.2.1 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml +4 -4
data/.rubocop.yml +1 -0
data/Gemfile +5 -0
data/Gemfile.lock +15 -4
data/fixtures/vcr_cassettes/InvDevice.yml +52 -0
data/fixtures/vcr_cassettes/LockDevice.yml +42 -0
data/fixtures/vcr_cassettes/all_criteria.yml +70 -0
data/fixtures/vcr_cassettes/auth_not_found.yml +45 -0
data/fixtures/vcr_cassettes/error_by_serial_number.yml +45 -0
data/fixtures/vcr_cassettes/search_by_serial_number.yml +59 -0
data/lib/ruby/miradore.rb +65 -31
data/lib/ruby/miradore/version.rb +1 -1
data/ruby-miradore.gemspec +1 -1
metadata +10 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4429c886f0c83f4f8e45ed0e5ca2c8a33b3c3b170e60c0061180a476ed5edf
-  data.tar.gz: f8ee91a7f7893fbc7a1b43976a5673ee0d8aed2e5cf40097862a182b5127e453
+  metadata.gz: e0bd96940a4c4d640f0096d5a49e8adbee0df4e7992cd265ce230533ae94df59
+  data.tar.gz: 645bb0e57c7c7b34ffed49641da01f9ca06a93ec061cc19b8e9e050c7039f3b1
 SHA512:
-  metadata.gz: 29c3cba4f3ec8e0708a737c9217de99caed9880bc3b24e56b220c5cac27f148e3acba2fb53a2715340a2ee379fa67ea5c12b4cfb66297a7477b515fc95e79520
-  data.tar.gz: 199c7dddd4b12a9c79ee411a9bdca3ac314afa12db5c9c7d5a0a63fc29151352fbf2834f51eba0a96cdb688ec2e7280aa4a036824ef7fd13f773c76e79ecbce2
+  metadata.gz: 46aea179dfa2b8297345caf2e07c863d1d7b1851af7bac1e4349d1b5b7654c8a7883cccd9a1ca4dd009c0cc9402793b1f3340a445af8e5eb9af75e96268b1b58
+  data.tar.gz: bc4f5528e43eb569243e52502232c84073370b3d642ca95ac776a1578f2518b37bc6d736ee03334a4ab01e37e44fe0bdba1920566123690fa296e14453611fa6

data/.rubocop.yml CHANGED Viewed

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.7.3
+  NewCops: disable
 Style/StringLiterals:
   Enabled: true

data/Gemfile CHANGED Viewed

@@ -4,3 +4,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ruby-miradore.gemspec
 gemspec
+group :test do
+  gem "vcr"
+  gem "webmock"
+end

data/Gemfile.lock CHANGED Viewed

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    ruby-miradore (0.2.1)
+    ruby-miradore (1.2.0)
       crack (~> 0.4.5)
-      finest-builder (~> 0.0.4)
+      finest-builder (~> 0.0.5)
       httparty (~> 0.18.1)
       rake (~> 13.0)
       rspec (~> 3.0)
@@ -12,11 +12,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
     finest-builder (0.0.5)
+    hashdiff (1.0.1)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -27,6 +30,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.1.1)
@@ -44,19 +48,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.13.0)
+    rubocop (1.14.0)
       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.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.5.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.0.0)
+    vcr (6.0.0)
+    webmock (3.12.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 PLATFORMS
   x86_64-darwin-20
@@ -64,6 +73,8 @@ PLATFORMS
 DEPENDENCIES
   ruby-miradore!
+  vcr
+  webmock
 BUNDLED WITH
    2.2.15

data/fixtures/vcr_cassettes/InvDevice.yml ADDED Viewed

@@ -0,0 +1,52 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rzilient.online.miradore.com/API/Device?auth=&filters=&select=ID,InvDevice.*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/xml
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Thu, 13 May 2021 15:14:47 GMT
+      Content-Length:
+      - '1166'
+    body:
+      encoding: UTF-8
+      string: '<?xml version="1.0" encoding="utf-8"?><Content><Items count="2"><Device><ID>1</ID><InvDevice><Model>Apple
+        iPhone9,3</Model><Manufacturer>Apple</Manufacturer><ProductName>iPhone9,3</ProductName><SoftwareVersion>iOS
+        14.4.2</SoftwareVersion><SerialNumber>C76TLUEMHG7F</SerialNumber><IMEI>355332088433360</IMEI><WiFiMAC>d4:dc:cd:d6:09:be</WiFiMAC><BluetoothMAC>d4:dc:cd:d6:09:e1</BluetoothMAC><UDID>84c87a9edf0c577227b96dcbe7bf45713c358ede</UDID><StoreAccountActive>True</StoreAccountActive><DoNotDisturbActive>False</DoNotDisturbActive><DeviceType>MN8X2QL</DeviceType><EASIdentifier>LU1R1J5V0H73JCTEJ2A732LI8G</EASIdentifier><DeviceName>iPhone
+        de: Eduard</DeviceName><InventoryTime>13.05.2021 14:18:41</InventoryTime></InvDevice></Device><Device><ID>2</ID><InvDevice><Model>ASUSTeK
+        COMPUTER INC. VivoBook_ASUSLaptop X712FA_X712FA</Model><Manufacturer>ASUSTeK
+        COMPUTER INC.</Manufacturer><ProductName>VivoBook_ASUSLaptop X712FA_X712FA</ProductName><SoftwareVersion>Windows
+        10 Home (20H2)</SoftwareVersion><SerialNumber>K8N0CV07315233B</SerialNumber><DeviceName>QUENTIN</DeviceName><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvDevice></Device></Items></Content>'
+  recorded_at: Thu, 13 May 2021 15:14:48 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/LockDevice.yml ADDED Viewed

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://rzilient.online.miradore.com/API/v2/Device/1/lock
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      X-Api-Key:
+      - 3_IHBPttQ.ub[OG27
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      Server:
+      - Microsoft-IIS/10.0
+      X-Powered-By:
+      - ARR/3.0
+      - ASP.NET
+      - ASP.NET
+      X-Frame-Options:
+      - SAMEORIGIN
+      - SAMEORIGIN
+      Date:
+      - Thu, 13 May 2021 15:14:48 GMT
+      Content-Length:
+      - '2'
+    body:
+      encoding: UTF-8
+      string: '""'
+  recorded_at: Thu, 13 May 2021 15:14:48 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/all_criteria.yml ADDED Viewed

@@ -0,0 +1,70 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rzilient.online.miradore.com/API/Device?auth=&filters=&select=*,Category.*,InvDevice.*,InvStorage.*,InvOS.*,Enrollment.*,Client.*,User.*,Location.*,Security.*,ReportedLocation.*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/xml
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Thu, 13 May 2021 15:14:48 GMT
+      Content-Length:
+      - '4613'
+    body:
+      encoding: UTF-8
+      string: '<?xml version="1.0" encoding="utf-8"?><Content><Items count="2"><Device><ID>1</ID><User><ID>2</ID><Email>edugarcas@gmail.com</Email><Source>GUI</Source><Status>Active</Status><Created>22.04.2021
+        06:32:00</Created><Modified>22.04.2021 06:32:00</Modified></User><Category><ID>1</ID><Name>Smartphone</Name></Category><Enrollment><ID>5</ID><User><ID>2</ID></User><Created>22.04.2021
+        06:32:00</Created><Completed>22.04.2021 06:33:20</Completed><Type>Email</Type><Sender>eduard@rzilient.club</Sender></Enrollment><OnlineStatus>Active</OnlineStatus><LastReported>13.05.2021
+        15:14:15</LastReported><LastReportedDays>0</LastReportedDays><LastReportedHours>0</LastReportedHours><LastReportedMinutes>0</LastReportedMinutes><IPAddress>46.25.48.185</IPAddress><MACAddress>d4:dc:cd:d6:09:be</MACAddress><Platform>iOS</Platform><Client><ID>1</ID><ManagementType>iOSUnsupervised</ManagementType></Client><ConfigProfileDeployments><ConfigProfileDeployment><ID>1</ID><ConfigProfile><ID>5</ID></ConfigProfile></ConfigProfileDeployment><ConfigProfileDeployment><ID>2</ID><ConfigProfile><ID>6</ID></ConfigProfile></ConfigProfileDeployment></ConfigProfileDeployments><OSVersionName>iOS
+        14.4.2</OSVersionName><Status>AutoGenerated</Status><Created>22.04.2021 06:33:20</Created><Modified>27.04.2021
+        09:20:21</Modified><Source>MiradoreOnline</Source><InvDevice><Model>Apple
+        iPhone9,3</Model><Manufacturer>Apple</Manufacturer><ProductName>iPhone9,3</ProductName><SoftwareVersion>iOS
+        14.4.2</SoftwareVersion><SerialNumber>C76TLUEMHG7F</SerialNumber><IMEI>355332088433360</IMEI><WiFiMAC>d4:dc:cd:d6:09:be</WiFiMAC><BluetoothMAC>d4:dc:cd:d6:09:e1</BluetoothMAC><UDID>84c87a9edf0c577227b96dcbe7bf45713c358ede</UDID><StoreAccountActive>True</StoreAccountActive><DoNotDisturbActive>False</DoNotDisturbActive><DeviceType>MN8X2QL</DeviceType><EASIdentifier>LU1R1J5V0H73JCTEJ2A732LI8G</EASIdentifier><DeviceName>iPhone
+        de: Eduard</DeviceName><InventoryTime>13.05.2021 14:18:41</InventoryTime></InvDevice><InvStorages><InvStorage><Type>Internal</Type><FreeSpace>16310157685</FreeSpace><TotalSpace>34359738368</TotalSpace><InventoryTime>13.05.2021
+        14:18:41</InventoryTime></InvStorage></InvStorages><InvOS><Platform>iOS</Platform><Version>14.4.2</Version><Build>18D70</Build><InventoryTime>13.05.2021
+        14:18:41</InventoryTime></InvOS><Security><PasscodeSet>Yes</PasscodeSet><EncryptionStatus>Enabled</EncryptionStatus></Security><ReportedLocation><Latitude>41.39850887104272</Latitude><Longitude>2.163043615588689</Longitude><Provider>Unknown</Provider><FixTime>29.04.2021
+        13:55:02</FixTime><InventoryTime>29.04.2021 13:55:20</InventoryTime></ReportedLocation></Device><Device><ID>2</ID><User><ID>3</ID><Name>de
+        Lambert Quentin</Name><Email>quentin@rzilient.club</Email><Firstname>Quentin</Firstname><Lastname>de
+        Lambert</Lastname><Source>GUI</Source><Status>Active</Status><Created>22.04.2021
+        06:51:53</Created><Modified>22.04.2021 06:51:53</Modified></User><Enrollment><ID>9</ID><User><ID>3</ID></User><Created>29.04.2021
+        12:22:31</Created><Completed>29.04.2021 13:01:04</Completed><Type>Email</Type><Sender>eduard@rzilient.club</Sender></Enrollment><OnlineStatus>Active</OnlineStatus><LastReported>13.05.2021
+        12:30:02</LastReported><LastReportedDays>0</LastReportedDays><LastReportedHours>3</LastReportedHours><LastReportedMinutes>164</LastReportedMinutes><IPAddress>46.27.180.174</IPAddress><MACAddress>DC:71:96:FB:8A:56</MACAddress><Platform>WindowsDesktop</Platform><Client><ID>2</ID><ManagementType>BuiltInMDM</ManagementType></Client><ConfigProfileDeployments
+        /><OSVersionName>Windows 10 Home (20H2)</OSVersionName><Status>AutoGenerated</Status><Created>29.04.2021
+        13:01:04</Created><Modified>29.04.2021 13:01:04</Modified><Source>MiradoreOnline</Source><InvDevice><Model>ASUSTeK
+        COMPUTER INC. VivoBook_ASUSLaptop X712FA_X712FA</Model><Manufacturer>ASUSTeK
+        COMPUTER INC.</Manufacturer><ProductName>VivoBook_ASUSLaptop X712FA_X712FA</ProductName><SoftwareVersion>Windows
+        10 Home (20H2)</SoftwareVersion><SerialNumber>K8N0CV07315233B</SerialNumber><DeviceName>QUENTIN</DeviceName><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvDevice><InvStorages><InvStorage><Type>Internal</Type><Volume>C:
+        OS</Volume><FreeSpace>382347399168</FreeSpace><TotalSpace>511137091584</TotalSpace><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvStorage></InvStorages><InvOS><Platform>WindowsDesktop</Platform><Version>10.0.19042.928</Version><Language>fr-FR</Language><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvOS><Security><PasscodeSet>Unknown</PasscodeSet><EncryptionStatus>Disabled</EncryptionStatus></Security></Device></Items></Content>'
+  recorded_at: Thu, 13 May 2021 15:14:48 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/auth_not_found.yml ADDED Viewed

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rzilient.online.miradore.com/API/Device?auth=&filters=&select=ID,InvDevice.*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Length:
+      - '98'
+      Content-Type:
+      - text/xml; charset=utf-8
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Tue, 18 May 2021 10:29:27 GMT
+    body:
+      encoding: UTF-8
+      string: "<Content><Error><Description>Authentication failed</Description><Code>401</Code></Error></Content>"
+  recorded_at: Tue, 18 May 2021 10:29:24 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/error_by_serial_number.yml ADDED Viewed

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rzilient.online.miradore.com/API/Device?auth=&filters=(InvDevice.SerialNumber%20eq%20SRE)&select=*,Category.*,InvDevice.*,InvStorage.*,InvOS.*,Enrollment.*,Client.*,User.*,Location.*,Security.*,ReportedLocation.*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/xml
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Tue, 18 May 2021 10:05:37 GMT
+      Content-Length:
+      - '76'
+    body:
+      encoding: UTF-8
+      string: <?xml version="1.0" encoding="utf-8"?><Content><Items count="0" /></Content>
+  recorded_at: Tue, 18 May 2021 10:05:34 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/search_by_serial_number.yml ADDED Viewed

@@ -0,0 +1,59 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://rzilient.online.miradore.com/API/Device?auth=&filters=(InvDevice.SerialNumber%20eq%20K8N0CV07315233B)&select=*,Category.*,InvDevice.*,InvStorage.*,InvOS.*,Enrollment.*,Client.*,User.*,Location.*,Security.*,ReportedLocation.*
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Type:
+      - text/xml
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Thu, 13 May 2021 15:14:48 GMT
+      Content-Length:
+      - '2046'
+    body:
+      encoding: UTF-8
+      string: '<?xml version="1.0" encoding="utf-8"?><Content><Items count="1"><Device><ID>2</ID><User><ID>3</ID><Name>de
+        Lambert Quentin</Name><Email>quentin@rzilient.club</Email><Firstname>Quentin</Firstname><Lastname>de
+        Lambert</Lastname><Source>GUI</Source><Status>Active</Status><Created>22.04.2021
+        06:51:53</Created><Modified>22.04.2021 06:51:53</Modified></User><Enrollment><ID>9</ID><User><ID>3</ID></User><Created>29.04.2021
+        12:22:31</Created><Completed>29.04.2021 13:01:04</Completed><Type>Email</Type><Sender>eduard@rzilient.club</Sender></Enrollment><OnlineStatus>Active</OnlineStatus><LastReported>13.05.2021
+        12:30:02</LastReported><LastReportedDays>0</LastReportedDays><LastReportedHours>3</LastReportedHours><LastReportedMinutes>164</LastReportedMinutes><IPAddress>46.27.180.174</IPAddress><MACAddress>DC:71:96:FB:8A:56</MACAddress><Platform>WindowsDesktop</Platform><Client><ID>2</ID><ManagementType>BuiltInMDM</ManagementType></Client><ConfigProfileDeployments
+        /><OSVersionName>Windows 10 Home (20H2)</OSVersionName><Status>AutoGenerated</Status><Created>29.04.2021
+        13:01:04</Created><Modified>29.04.2021 13:01:04</Modified><Source>MiradoreOnline</Source><InvDevice><Model>ASUSTeK
+        COMPUTER INC. VivoBook_ASUSLaptop X712FA_X712FA</Model><Manufacturer>ASUSTeK
+        COMPUTER INC.</Manufacturer><ProductName>VivoBook_ASUSLaptop X712FA_X712FA</ProductName><SoftwareVersion>Windows
+        10 Home (20H2)</SoftwareVersion><SerialNumber>K8N0CV07315233B</SerialNumber><DeviceName>QUENTIN</DeviceName><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvDevice><InvStorages><InvStorage><Type>Internal</Type><Volume>C:
+        OS</Volume><FreeSpace>382347399168</FreeSpace><TotalSpace>511137091584</TotalSpace><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvStorage></InvStorages><InvOS><Platform>WindowsDesktop</Platform><Version>10.0.19042.928</Version><Language>fr-FR</Language><InventoryTime>12.05.2021
+        12:30:16</InventoryTime></InvOS><Security><PasscodeSet>Unknown</PasscodeSet><EncryptionStatus>Disabled</EncryptionStatus></Security></Device></Items></Content>'
+  recorded_at: Thu, 13 May 2021 15:14:48 GMT
+recorded_with: VCR 6.0.0

data/lib/ruby/miradore.rb CHANGED Viewed

@@ -1,48 +1,60 @@
 # frozen_string_literal: true
 require_relative "miradore/version"
-require 'httparty'
-require 'json'
-require 'crack/xml'
-require 'finest/builder'
+require "httparty"
+require "json"
+require "crack/xml"
+require "finest/builder"
 module Ruby
   module Miradore
     class MspConnectionError < StandardError; end
     def self.api_key
-      @@msp_api_key = ENV['MSP_API_KEY']
+      ENV["MSP_API_KEY"]
     end
-    def self.api_urls
+    def self.url
       {
-        v1: 'https://%{subdomain}.online.miradore.com/API/Device?auth=%{auth}&select=*,Category.*,InvDevice.*,InvStorage.*,InvOS.*,Enrollment.*,Client.*,User.*,Location.*,Security.*,ReportedLocation.*',
-        v2: 'https://%{subdomain}.online.miradore.com/API/v2/Device/%{id}/%{method}'
+        simple_v1: "https://%<subdomain>s.online.miradore.com/API/Device?auth=%<auth>s&select=ID,%<item>s.*&filters=%<filter>s",
+        v1: "https://%<subdomain>s.online.miradore.com/API/Device?auth=%<auth>s&select=*,Category.*,InvDevice.*,InvStorage.*,InvOS.*,Enrollment.*,Client.*,User.*,Location.*,Security.*,ReportedLocation.*&filters=%<filter>s",
+        v2: "https://%<subdomain>s.online.miradore.com/API/v2/Device/%<id>s/%<method>s"
       }
     end
-    def self.url(version = :v1, *args)
-      Miradore::api_urls[version] % { subdomain: args[0], id: args[1], method: args[2], auth: Miradore::api_key }
-    end
-    class Listing
+    class Request
       include HTTParty
       format :json
       attr_reader :subdomain
-      def self.all(subdomain, *args)
-        response = JSON.parse(Crack::XML.parse(get(Miradore::url(:v1, subdomain)).body).to_json, :quirks_mode => true).dig("Content", "Items", "Device")
+      def self.all(**args)
+        response = JSON.parse(
+          Crack::XML.parse(
+            get(
+              Miradore.url[version] % args.merge(item: class_name, auth: args.fetch(:auth, Miradore.api_key), filter: args.fetch(:filter, nil))
+            ).body
+          ).to_json,
+          quirks_mode: true
+        ).dig("Content", "Items", "Device")
+        transform(response || { error: "Device(s) not found", status: :not_found }, args)
+      rescue StandardError => err
+        transform(response || { error: err&.message || "Error connecting to manager service provider", status: :not_found }, args)
+      end
-        if response.is_a?(Array)
-          response.map! { |e| Device.new(e.transform_keys(&:downcase), subdomain) }
-        else
-          Device.new(response.transform_keys(&:downcase), subdomain)
-        end
-      rescue StandardError
-        raise MspConnectionError.new("Error connecting to manager service provider")
+      def self.transform(response, args = {})
+        return response.map! { |e| Device.new(e.transform_keys(&:downcase), args) } if response.is_a?(Array)
+        Device.new(response&.transform_keys(&:downcase), args)
+      end
+      def self.version
+        superclass == Request ? :simple_v1 : :v1
       end
+      def self.class_name
+        to_s.split("::").last
+      end
     end
     class Device
@@ -50,12 +62,13 @@ module Ruby
       include HTTParty
       format :json
-      attr_reader :subdomain
+      attr_writer :subdomain, :auth
-      def initialize(json = nil, subdomain = nil)
+      def initialize(json = nil, args = {})
         super json
-        @subdomain = subdomain
-        remove_instance_variable(:@subdomain) if subdomain.nil?
+        @subdomain = args[:subdomain]
+        @auth = args[:auth]
+        remove_instance_variable(:@subdomain) if @subdomain.nil?
       end
       def lock(*args)
@@ -63,7 +76,7 @@ module Ruby
       end
       def lostmode(*args)
-        if (args[0])
+        if args[0]
           http_method(:post, id, __method__)
         else
           http_method(:delete, id, __method__)
@@ -81,13 +94,34 @@ module Ruby
       private
       def http_method(*args)
-        self.class.headers 'X-API-Key' => Miradore::api_key
-        self.class.method(args[0]).call(Miradore::url(:v2, subdomain, args[1], args[2]))
-      rescue StandardError
-        raise MspConnectionError.new("Error connecting to manager service provider")
+        self.class.headers "X-API-Key" => @auth || Miradore.api_key
+        url = Miradore.url[:v2] % { subdomain: @subdomain, id: args[1], method: args[2] }
+        self.class.method(args[0]).call(url)
+      rescue StandardError => err
+        { error: err&.message || "Error connecting to manager service provider", status: :not_found }
       end
     end
+    class Category < Request; end
+    class InvDevice < Request; end
+    class InvStorage < Request; end
+    class InvOS < Request; end
+    class Enrollment < Request; end
+    class Client < Request; end
+    class User < Request; end
+    class Location < Request; end
+    class Security < Request; end
+    class ReportedLocation < Request; end
   end
 end

data/lib/ruby/miradore/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module Ruby
   module Miradore
-    VERSION = "0.2.1"
+    VERSION = "1.2.1"
   end
 end

data/ruby-miradore.gemspec CHANGED Viewed

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rspec", "~> 3.0"
   spec.add_dependency "rubocop", "~> 1.7"
   spec.add_dependency "httparty", "~> 0.18.1"
-  spec.add_dependency "finest-builder",  "~> 0.0.4"
+  spec.add_dependency "finest-builder",  "~> 0.0.5"
   spec.add_dependency "crack", "~> 0.4.5"
   # For more information and examples about making a new gem, checkout our

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-miradore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Eduard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- fixtures/vcr_cassettes/InvDevice.yml
+- fixtures/vcr_cassettes/LockDevice.yml
+- fixtures/vcr_cassettes/all_criteria.yml
+- fixtures/vcr_cassettes/auth_not_found.yml
+- fixtures/vcr_cassettes/error_by_serial_number.yml
+- fixtures/vcr_cassettes/search_by_serial_number.yml
 - lib/ruby/miradore.rb
 - lib/ruby/miradore/version.rb
 - ruby-miradore-0.1.0.gem