ruby-miradore 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae4429c886f0c83f4f8e45ed0e5ca2c8a33b3c3b170e60c0061180a476ed5edf
-  data.tar.gz: f8ee91a7f7893fbc7a1b43976a5673ee0d8aed2e5cf40097862a182b5127e453
+  metadata.gz: bbe3675a437a4f1a7db9f1970b5ffff9f49d7767f8f074212b1d4c115bb4a352
+  data.tar.gz: d62031266909082c468a35bd316c642f46c7342bb788283aee194f13cc21c4a0
 SHA512:
-  metadata.gz: 29c3cba4f3ec8e0708a737c9217de99caed9880bc3b24e56b220c5cac27f148e3acba2fb53a2715340a2ee379fa67ea5c12b4cfb66297a7477b515fc95e79520
-  data.tar.gz: 199c7dddd4b12a9c79ee411a9bdca3ac314afa12db5c9c7d5a0a63fc29151352fbf2834f51eba0a96cdb688ec2e7280aa4a036824ef7fd13f773c76e79ecbce2
+  metadata.gz: 391f48e2cf12a8837494506f3badf713fa7c0ad27f3b29b67cedaa9f4cfcbea98f43d70cfa7bd810f9ab7526de9982b7139b77375dec7115d18b7b5b558b5e14
+  data.tar.gz: a6c04e0cc89456c175855c73cbde0f7f6b172193fc612b828ae93dbf656c921f7ff41fe33cc72a2dec7708bbe2ac365620f0db28c4a6569cf53bd37d71c848b1

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-miradore (0.2.1)
+    ruby-miradore (1.0.0)
       crack (~> 0.4.5)
       finest-builder (~> 0.0.4)
       httparty (~> 0.18.1)
@@ -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/lib/ruby/miradore.rb

@@ -1,48 +1,71 @@
 # 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']
+      @@msp_api_key = ENV["MSP_API_KEY"]
     end
 
     def self.api_urls
       {
-        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}.online.miradore.com/API/Device?auth=%{auth}&select=ID,%{item}.*&filters=%{filter}",
+        v1: "https://%{subdomain}.online.miradore.com/API/Device?auth=%{auth}&select=*,Category.*,InvDevice.*,InvStorage.*,InvOS.*,Enrollment.*,Client.*,User.*,Location.*,Security.*,ReportedLocation.*&filters=%{filter}",
+        v2: "https://%{subdomain}.online.miradore.com/API/v2/Device/%{id}/%{method}"
       }
     end
 
     def self.url(version = :v1, *args)
-      Miradore::api_urls[version] % { subdomain: args[0], id: args[1], method: args[2], auth: Miradore::api_key }
+      Miradore.api_urls[version] % {
+        subdomain: args[0],
+        item: args[1],
+        id: args[1],
+        method: args[2],
+        filter: args[2][0].nil? ? nil : "(InvDevice.SerialNumber eq #{args[2][0]})",
+        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")
-
-        if response.is_a?(Array)
-          response.map! { |e| Device.new(e.transform_keys(&:downcase), subdomain) }
-        else
-          Device.new(response.transform_keys(&:downcase), subdomain)
-        end
+        response = JSON.parse(
+          Crack::XML.parse(
+            get(
+              Miradore.url(version, subdomain, class_name, args)
+            ).body
+          ).to_json,
+          quirks_mode: true
+        ).dig("Content", "Items", "Device")
+        transform(response, subdomain)
       rescue StandardError
-        raise MspConnectionError.new("Error connecting to manager service provider")
+        raise MspConnectionError, "Error connecting to manager service provider"
+      end
+
+      def self.transform(response, subdomain)
+        return response.map! { |e| Device.new(e.transform_keys(&:downcase), subdomain) } if response.is_a?(Array)
+
+        Device.new(response.transform_keys(&:downcase), subdomain)
       end
 
+      def self.version
+        superclass == Request ? :simple_v1 : :v1
+      end
+
+      def self.class_name
+        to_s.split("::").last
+      end
     end
 
     class Device
@@ -63,7 +86,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 +104,33 @@ 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]))
+        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")
+        raise MspConnectionError, "Error connecting to manager service provider"
       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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-miradore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Eduard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake