ruby-miradore 2.1.2 → 2.2.5

data/fixtures/vcr_cassettes/get_location.yml

@@ -35,7 +35,7 @@ http_interactions:
       X-Frame-Options:
       - SAMEORIGIN
       Date:
-      - Sat, 21 Aug 2021 11:48:04 GMT
+      - Fri, 29 Oct 2021 13:37:45 GMT
       Content-Length:
       - '282'
     body:
@@ -43,5 +43,5 @@ http_interactions:
       string: <?xml version="1.0" encoding="utf-8"?><Content><Items count="1"><Organization><ID>1</ID><Name>PUR
         Projet</Name><FullName>PUR Projet</FullName><Created>17.05.2021 09:02:43</Created><Modified>17.05.2021
         09:02:43</Modified></Organization></Items></Content>
-  recorded_at: Sat, 21 Aug 2021 11:48:02 GMT
+  recorded_at: Fri, 29 Oct 2021 13:37:43 GMT
 recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/get_user_from_miradore.yml

@@ -35,12 +35,12 @@ http_interactions:
       X-Frame-Options:
       - SAMEORIGIN
       Date:
-      - Sat, 21 Aug 2021 11:48:04 GMT
+      - Fri, 29 Oct 2021 13:37:44 GMT
       Content-Length:
       - '301'
     body:
       encoding: ASCII-8BIT
       string: <?xml version="1.0" encoding="utf-8"?><Content><Items count="1"><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></Items></Content>
-  recorded_at: Sat, 21 Aug 2021 11:48:02 GMT
+  recorded_at: Fri, 29 Oct 2021 13:37:43 GMT
 recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/search_by_serial_number.yml

@@ -39,15 +39,15 @@ http_interactions:
       X-Frame-Options:
       - SAMEORIGIN
       Date:
-      - Sat, 21 Aug 2021 11:48:03 GMT
+      - Fri, 29 Oct 2021 13:37:43 GMT
       Content-Length:
-      - '564'
+      - '566'
     body:
       encoding: ASCII-8BIT
-      string: <?xml version="1.0" encoding="utf-8"?><Content><Items count="1"><Device><ID>2</ID><User><ID>17</ID></User><Enrollment><ID>9</ID><User><ID>3</ID></User></Enrollment><OnlineStatus>Active</OnlineStatus><LastReported>21.08.2021
-        02:24:30</LastReported><LastReportedDays>0</LastReportedDays><LastReportedHours>9</LastReportedHours><LastReportedMinutes>564</LastReportedMinutes><IPAddress>37.223.231.81</IPAddress><MACAddress>DC:71:96:FB:8A:56</MACAddress><Platform>WindowsDesktop</Platform><OSVersionName>Windows
+      string: <?xml version="1.0" encoding="utf-8"?><Content><Items count="1"><Device><ID>2</ID><User><ID>3</ID></User><Enrollment><ID>9</ID><User><ID>3</ID></User></Enrollment><OnlineStatus>Active</OnlineStatus><LastReported>29.10.2021
+        07:55:57</LastReported><LastReportedDays>0</LastReportedDays><LastReportedHours>6</LastReportedHours><LastReportedMinutes>342</LastReportedMinutes><IPAddress>149.62.159.244</IPAddress><MACAddress>DC:71:96:FB:8A:56</MACAddress><Platform>WindowsDesktop</Platform><OSVersionName>Windows
         10 Home (20H2)</OSVersionName><Client><ID>2</ID></Client><ConfigProfileDeployments
-        /><Status>AutoGenerated</Status><Created>29.04.2021 13:01:04</Created><Modified>20.08.2021
-        16:23:50</Modified><Source>MiradoreOnline</Source></Device></Items></Content>
-  recorded_at: Sat, 21 Aug 2021 11:48:01 GMT
+        /><Status>AutoGenerated</Status><Created>29.04.2021 13:01:04</Created><Modified>28.09.2021
+        15:32:10</Modified><Source>MiradoreOnline</Source></Device></Items></Content>
+  recorded_at: Fri, 29 Oct 2021 13:37:41 GMT
 recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/update_model_of_a_computer_device.yml

@@ -0,0 +1,39 @@
+---
+http_interactions:
+- request:
+    method: patch
+    uri: https://test634.online.miradore.com/API/v2/Device/9/
+    body:
+      encoding: UTF-8
+      string: '{"category":"Laptops","friendlyname":"Eduard personal","userEmailAddress":"eduard@rzilient.club","location":["Barcelona"],"tags":["Personal"],"ownershipStartDate":"2021-11-03
+        10:25:18 +0100"}'
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Api-Key:
+      -
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Microsoft-IIS/10.0
+      X-Frame-Options:
+      - SAMEORIGIN
+      - SAMEORIGIN
+      Date:
+      - Wed, 03 Nov 2021 09:25:18 GMT
+      Content-Length:
+      - '0'
+    body:
+      encoding: UTF-8
+      string: ''
+  recorded_at: Wed, 03 Nov 2021 09:25:19 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/update_model_of_a_computer_device_v2.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: https://test634.online.miradore.com/API/v2/Device/9/category
+    body:
+      encoding: UTF-8
+      string: '"Laptops"'
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Api-Key:
+      -
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      Server:
+      - Microsoft-IIS/10.0
+      X-Frame-Options:
+      - SAMEORIGIN
+      - SAMEORIGIN
+      Date:
+      - Wed, 03 Nov 2021 10:48:33 GMT
+      Content-Length:
+      - '81'
+    body:
+      encoding: UTF-8
+      string: '{"categoryID":3,"name":"Laptops","description":null,"deviceCount":2,"image":null}'
+  recorded_at: Wed, 03 Nov 2021 10:48:34 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/update_model_of_a_computer_device_v2_2.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: put
+    uri: https://test634.online.miradore.com/API/v2/Device/9/model
+    body:
+      encoding: UTF-8
+      string: '{"model":"test"}'
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      X-Api-Key:
+      - 1_8,Yo-TV8QyCiBUF
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Content-Type:
+      - application/json; charset=utf-8
+      Server:
+      - Microsoft-IIS/10.0
+      X-Frame-Options:
+      - SAMEORIGIN
+      - SAMEORIGIN
+      Date:
+      - Wed, 03 Nov 2021 13:30:26 GMT
+      Content-Length:
+      - '2'
+    body:
+      encoding: UTF-8
+      string: "{}"
+  recorded_at: Wed, 03 Nov 2021 13:30:27 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/user_alredy_exist_in_miradore.yml

@@ -0,0 +1,159 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://rzilient.online.miradore.com/API/User?auth=&filters=&select=*,ID
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Content>
+          <Items>
+            <User>
+              <Email>jim.straw@trestacom.com</Email>
+              <Firstname>Jim</Firstname>
+              <Lastname>Straw</Lastname>
+              <PhoneNumber>123456789</PhoneNumber>
+            </User>
+          </Items>
+        </Content>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Length:
+      - '179'
+      Content-Type:
+      - text/xml; charset=utf-8
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Tue, 02 Nov 2021 11:37:07 GMT
+    body:
+      encoding: UTF-8
+      string: "<Content><Error><Description>Failed to validate imported &#39;User&#39;:
+        Email &#39;jim.straw@trestacom.com&#39; is already in use.</Description><Code>400</Code></Error></Content>"
+  recorded_at: Tue, 02 Nov 2021 11:37:08 GMT
+- request:
+    method: post
+    uri: https://rzilient.online.miradore.com/API/User?auth=&filters=&select=*,ID
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Content>
+          <Items>
+            <User>
+              <Email>jim.straw@trestacom.com</Email>
+              <Firstname>Jim</Firstname>
+              <Lastname>Straw</Lastname>
+              <PhoneNumber>123456789</PhoneNumber>
+            </User>
+          </Items>
+        </Content>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Length:
+      - '179'
+      Content-Type:
+      - text/xml; charset=utf-8
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Tue, 02 Nov 2021 11:37:12 GMT
+    body:
+      encoding: UTF-8
+      string: "<Content><Error><Description>Failed to validate imported &#39;User&#39;:
+        Email &#39;jim.straw@trestacom.com&#39; is already in use.</Description><Code>400</Code></Error></Content>"
+  recorded_at: Tue, 02 Nov 2021 11:37:12 GMT
+- request:
+    method: post
+    uri: https://rzilient.online.miradore.com/API/User?auth=&filters=&select=*,ID
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Content>
+          <Items>
+            <User>
+              <Email>jim.straw@trestacom.com</Email>
+              <Firstname>Jim</Firstname>
+              <Lastname>Straw</Lastname>
+              <PhoneNumber>123456789</PhoneNumber>
+            </User>
+          </Items>
+        </Content>
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      Content-Length:
+      - '179'
+      Content-Type:
+      - text/xml; charset=utf-8
+      Expires:
+      - "-1"
+      Server:
+      - Microsoft-IIS/10.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Frame-Options:
+      - SAMEORIGIN
+      Date:
+      - Tue, 02 Nov 2021 11:37:54 GMT
+    body:
+      encoding: UTF-8
+      string: "<Content><Error><Description>Failed to validate imported &#39;User&#39;:
+        Email &#39;jim.straw@trestacom.com&#39; is already in use.</Description><Code>400</Code></Error></Content>"
+  recorded_at: Tue, 02 Nov 2021 11:37:54 GMT
+recorded_with: VCR 6.0.0

data/lib/ruby/miradore/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Miradore
-    VERSION = "2.1.2"
+    VERSION = "2.2.5"
   end
 end

data/lib/ruby/miradore.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require_relative "miradore/version"
+require "active_support/core_ext/hash/conversions"
 require "httparty"
 require "json"
 require "crack/xml"
 require "finest/builder"
 
+
 module Ruby
   module Miradore
 
@@ -32,54 +34,58 @@ module Ruby
         remove_instance_variable(:@auth) if @auth.nil?
       end
 
-      #
-      # This call will perform all GET calls regardless the API version that it's calling.
-      # The version would be determined based on the superclass name.
-      # If the superclass is Request the GET will call simple_v1 which will require the item which is class name.
-      # otherwise will call to retrieve devices based on filters.
-      #
-      def self.all(**args)
-        response = JSON.parse(
-          Crack::XML.parse(
-            get(
-              Miradore.url[version] % args.merge(
-                item: object_name,
-                attribute: args.fetch(:attribute, "*"),
-                auth: args.fetch(:auth, nil),
-                filter: args.fetch(:filter, nil)
-              )
-            ).body
-          ).to_json,
-          quirks_mode: true
-        ).dig("Content", "Items")
-        transform(response, args)
-      rescue StandardError => e
-        MiradoreError.new({ error: e&.message || "Error connecting to manager service provider", status: :not_found })
-      end
-
       class << self
+        #
+        # This call will perform all GET calls regardless the API version that it's calling.
+        # The version would be determined based on the superclass name.
+        # If the superclass is Request the GET will call simple_v1 which will require the item which is class name.
+        # otherwise will call to retrieve devices based on filters.
+        #
+        def all(**args)
+          transform(
+            Crack::XML.parse(
+              http_method(args).body
+            ).dig("Content", "Items"), args
+          )
+        end
+
+        def add(**args)
+          transform(
+            Crack::XML.parse(
+              http_method(args.merge(method: :post, attribute: "ID")).body
+            )["Content"]
+          )
+        end
+
+        protected
+
+        def http_method(**args)
+          url = Miradore.url[version] % args.merge(
+            item: to_s.split("::").last,
+            attribute: args.fetch(:attribute, "*"),
+            auth: args.fetch(:auth, nil),
+            filter: args.fetch(:filter, nil)
+          )
+          method(args.fetch(:method, :get)).call(url, body: args.fetch(:body, nil)&.to_xml(root: "Content", skip_types: true))
+        end
+
         private
 
         def transform(res, args = {})
-          instance_name = "Ruby::Miradore::#{res.keys.first.capitalize}"
           if res.values.first.is_a?(Array)
             return res.values.first.map! do |e|
-              Object.const_get(instance_name).new(args.merge(e.transform_keys(&:downcase)))
+              const_get(to_s).new(args.merge(e.transform_keys(&:downcase)))
             end
           end
-
-          Object.const_get(instance_name).new(args.merge(res.values.first&.transform_keys(&:downcase)))
+          const_get(to_s).new(args.merge(res.values.first&.transform_keys(&:downcase)))
         rescue StandardError
-          MiradoreError.new({ error: "#{object_name}(s) not found", status: :not_found })
+          { error: "#{to_s.split("::").last}(s) not found", status: :not_found }
         end
 
         def version
           superclass == Object ? :request_v1 : :item_v1
         end
 
-        def object_name
-          to_s.split("::").last
-        end
       end
 
     end
@@ -114,8 +120,12 @@ module Ruby
         http_method(args.merge(method: :get, action: __method__))
       end
 
-      def patch(**args)
-        http_method(args.merge(method: :patch))
+      def family(**args)
+        http_method(args.merge(method: :put, action: :category))
+      end
+
+      def model(**args)
+        http_method(args.merge(method: :put, action: __method__))
       end
 
       def device_serial_number
@@ -134,6 +144,14 @@ module Ruby
         !!invdevice&.imei
       end
 
+      def patch(**args)
+        http_method(args.merge(method: __method__))
+      end
+
+      def post(**args)
+        http_method(args.merge(method: __method__))
+      end
+
       private
 
       def http_method(**args)
@@ -154,6 +172,5 @@ module Ruby
 
     class Organization < Request; end
 
-    class MiradoreError < Request; end
   end
 end

data/ruby-miradore.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Miradore MSP Ruby Gem"
   spec.homepage      = "https://github.com/eddygarcas/ruby-miradore"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.3")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.4")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "activesupport", "~> 6.1"
+  spec.add_dependency 'builder', '~> 3.1'
   spec.add_dependency "crack", "~> 0.4"
   spec.add_dependency "finest-builder", "~> 1.0"
   spec.add_dependency "httparty", "~> 0.18"

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-miradore
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.5
 platform: ruby
 authors:
 - Eduard Garcia Castelló
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +150,25 @@ files:
 - fixtures/vcr_cassettes/Get__Mobile_Device.yml
 - fixtures/vcr_cassettes/InvDevice.yml
 - fixtures/vcr_cassettes/LockDevice_all.yml
+- fixtures/vcr_cassettes/add_new_other_device.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/full_list_and_details.yml
+- fixtures/vcr_cassettes/get_computer_device_to_update.yml
+- fixtures/vcr_cassettes/get_computer_device_to_update_2.yml
 - fixtures/vcr_cassettes/get_location.yml
 - fixtures/vcr_cassettes/get_user_from_miradore.yml
 - fixtures/vcr_cassettes/search_by_serial_number.yml
+- fixtures/vcr_cassettes/update_model_of_a_computer_device.yml
+- fixtures/vcr_cassettes/update_model_of_a_computer_device_v2.yml
+- fixtures/vcr_cassettes/update_model_of_a_computer_device_v2_2.yml
+- fixtures/vcr_cassettes/user_alredy_exist_in_miradore.yml
 - lib/ruby/miradore.rb
 - lib/ruby/miradore/version.rb
-- ruby-miradore-0.1.2.gem
-- ruby-miradore-0.1.3.gem
-- ruby-miradore-1.1.0.gem
-- ruby-miradore-1.1.1.gem
-- ruby-miradore-1.2.2.gem
+- ruby-miradore-2.0.1.gem
+- ruby-miradore-2.0.2.gem
+- ruby-miradore-2.1.2.gem
 - ruby-miradore.gemspec
 homepage: https://github.com/eddygarcas/ruby-miradore
 licenses:
@@ -153,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.3
+      version: 2.7.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="