ruby-miradore 4.2.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb518a8a63cfa4e58056095564a1ec19bc9e813dba11ac741ecefbf0fede3fb4
-  data.tar.gz: 88da70493a33e3a06c815f85c9eaf5d8532021e8a7df7020c1422ee53b6c992f
+  metadata.gz: 6970f265b7922dee506ea4625614c650157fa9c1205d3e411e5e70811a0f626a
+  data.tar.gz: 31aaa50424e7d70b8e3c58349bb3a9e0954ad27441a6f7cf2f8381f851e23d3a
 SHA512:
-  metadata.gz: 4912e132150438b5a08fe30b5c3b6c2c968b6f0514816b9c25f50e764be78522d5bb740c155ca68309f87b2cb5ab61cec65584ee4ba0b8a52346a92d70f51033
-  data.tar.gz: 352544d524d5dec3b94fe4aeb13fe56c60965dd42cad8bd95c2a546c1de5ac3149468452ab826d21e72999218122e6ebc596a8fb3260c07435b6ed49ee8ee548
+  metadata.gz: 20d16bf2aa88223b73c7964d6419407b505b7d39a1af4eca02670b06a0a893768ade53003e151453a4b1a05feaae16dbc3e9078957efeedc9dfc6d98fe215493
+  data.tar.gz: 60d40d8faedfb94a2c8121edd0b2ec86865e17467e66736007a16e9ecaa08345d45f867aff2968e91cd3bd9509c7cf72147e219576ff21d77337e29e194eaf34

data/.ruby-version

@@ -1 +1 @@
-3.1.1
+3.2.0

data/.travis.yml

@@ -2,5 +2,5 @@
 language: ruby
 cache: bundler
 rvm:
-  - 3.1.0
+  - 3.1.2
 before_install: gem install bundler

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ruby-miradore (4.2.0)
+    ruby-miradore (4.4.1)
       activesupport (~> 7.0)
       builder (~> 3.1)
       crack (~> 0.4)
-      finest-builder (~> 1.0)
+      finest-builder (~> 2.0)
       httparty (~> 0.20)
       rake (~> 13.0)
       rspec (~> 3.10)
@@ -14,69 +14,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.0)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
-    finest-builder (1.1.1)
+    finest-builder (2.0.0)
     hashdiff (1.0.1)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.15.0)
+    json (2.6.3)
+    mini_mime (1.1.2)
+    minitest (5.17.0)
     multi_xml (0.6.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.26.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.45.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    vcr (6.0.0)
-    webmock (3.14.0)
+    unicode-display_width (2.4.2)
+    vcr (6.1.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -91,4 +91,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.3
+   2.4.5

data/fixtures/vcr_cassettes/Change_User_Email_Address.yml

@@ -19,11 +19,11 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 400
-      message: Bad Request
+      code: 401
+      message: Unauthorized
     headers:
       Content-Type:
-      - application/json; charset=utf-8
+      - text/plain
       Server:
       - Microsoft-IIS/10.0
       X-Content-Type-Options:
@@ -35,11 +35,11 @@ http_interactions:
       Strict-Transport-Security:
       - max-age=31536000; includeSubDomains
       Date:
-      - Thu, 24 Feb 2022 15:33:21 GMT
+      - Tue, 25 Oct 2022 10:51:38 GMT
       Content-Length:
-      - '2'
+      - '530'
     body:
       encoding: UTF-8
-      string: "{}"
-  recorded_at: Thu, 24 Feb 2022 15:33:22 GMT
+      string: 'Status Code: 401; Unauthorized                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    '
+  recorded_at: Tue, 25 Oct 2022 10:51:39 GMT
 recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/Change_User_Email_Address_Error.yml

@@ -12,7 +12,7 @@ http_interactions:
       Accept:
       - application/json
       X-Api-Key:
-      -
+      - ''
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
@@ -26,15 +26,20 @@ http_interactions:
       - text/plain
       Server:
       - Microsoft-IIS/10.0
+      X-Content-Type-Options:
+      - nosniff
       X-Frame-Options:
       - SAMEORIGIN
-      - SAMEORIGIN
+      Referrer-Policy:
+      - same-origin
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains
       Date:
-      - Fri, 29 Oct 2021 13:37:41 GMT
+      - Tue, 25 Oct 2022 10:50:52 GMT
       Content-Length:
       - '527'
     body:
       encoding: UTF-8
       string: 'Status Code: 404; Not Found                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    '
-  recorded_at: Fri, 29 Oct 2021 13:37:39 GMT
+  recorded_at: Tue, 25 Oct 2022 10:50:52 GMT
 recorded_with: VCR 6.0.0

data/lib/ruby/miradore/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Miradore
-    VERSION = "4.2.1"
+    VERSION = "4.4.0"
   end
 end

data/lib/ruby/miradore.rb

@@ -3,6 +3,7 @@
 require_relative 'miradore/version'
 require 'active_support/isolated_execution_state'
 require 'active_support/core_ext/hash/conversions'
+require 'active_support/core_ext/module/attribute_accessors'
 require 'httparty'
 require 'json'
 require 'crack/xml'
@@ -11,11 +12,15 @@ require 'finest/builder'
 module Ruby
   module Miradore
 
-    def self.url
-      {
-        v1: 'https://%<subdomain>s.online.miradore.com/API/%<item>s/%<id>s?auth=%<auth>s&select=*,%<attribute>s&filters=%<filter>s&options=%<options>s',
-        v2: 'https://%<subdomain>s.online.miradore.com/API/v2/Device/%<id>s/%<method>s'
-      }
+    mattr_accessor :url, default: {
+      v1: 'https://%<subdomain>s.online.miradore.com/API/%<item>s/%<id>s?auth=%<auth>s&select=*,%<attribute>s&filters=%<filter>s&options=%<options>s',
+      v2: 'https://%<subdomain>s.online.miradore.com/API/v2/Device/%<id>s/%<method>s'
+    }
+    mattr_accessor :phone_types, default: %w[Android iOS WindowsPhone]
+
+    # Setup data from initializer
+    def self.setup
+      yield(self)
     end
 
     class Request
@@ -25,11 +30,11 @@ module Ruby
 
       attr_writer :subdomain, :auth, :json
 
-      def initialize(json = {})
-        super json
-        @subdomain ||= json[:subdomain]
-        @auth ||= json[:auth]
-        @json ||= json.to_json
+      def initialize(args = {})
+        super args
+        @subdomain ||= args[:subdomain]
+        @auth ||= args[:auth]
+        @json ||= args.to_json
         remove_instance_variable(:@subdomain) if @subdomain.nil?
         remove_instance_variable(:@auth) if @auth.nil?
       end
@@ -40,18 +45,18 @@ module Ruby
       # 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)
+      def all(args = {})
         transform(
           Crack::XML.parse(
-            http_method_v1(**args).body
+            http_method_v1(args).body
           ).dig('Content', 'Items'), args
         )
       end
 
-      def call(**args)
+      def call(args = {})
         transform(
           Crack::XML.parse(
-            http_method_v1(**args.merge(attribute: 'ID')).body
+            http_method_v1(args.merge(attribute: 'ID')).body
           )['Content'], args
         )
       end
@@ -60,8 +65,7 @@ module Ruby
         @json
       end
 
-
-      def http_method_v1(**args)
+      def http_method_v1(args)
         url = Miradore.url[:v1] % args.merge(
           subdomain: @subdomain || args[:subdomain],
           auth: args.fetch(:auth, @auth),
@@ -96,48 +100,48 @@ module Ruby
       headers "Content-Type": 'application/json'
       headers "Accept": 'application/json'
 
-      def initialize(json = {})
-        super json
+      def initialize(args = {})
+        super args
       end
 
-      def lock(**args)
-        http_method(**args.merge(method: :post, id: id, action: __method__))
+      def lock(args = {})
+        http_method(args.merge(method: :post, id: id, action: __method__))
       end
 
-      def lostmode(**args)
+      def lostmode(args = {})
         if args[0]
-          http_method(**args.merge(method: :post, id: id, action: __method__))
+          http_method(args.merge(method: :post, id: id, action: __method__))
         else
-          http_method(**args.merge(method: :delete, id: id, action: __method__))
+          http_method(args.merge(method: :delete, id: id, action: __method__))
         end
       end
 
-      def reboot(**args)
-        http_method(**args.merge(method: :post, id: id, action: __method__))
+      def reboot(args = {})
+        http_method(args.merge(method: :post, id: id, action: __method__))
       end
 
-      def wipe(**args)
-        http_method(**args.merge(method: :post, id: id, action: __method__))
+      def wipe(args = {})
+        http_method(args.merge(method: :post, id: id, action: __method__))
       end
 
-      def location(**args)
-        http_method(**args.merge(method: :get, action: __method__))
+      def location(args = {})
+        http_method(args.merge(method: :get, action: __method__))
       end
 
-      def family(**args)
-        http_method(**args.merge(method: :put, action: :category))
+      def family(args = {})
+        http_method(args.merge(method: :put, action: :category))
       end
 
-      def model(**args)
-        http_method(**args.merge(method: :put, action: __method__))
+      def model(args = {})
+        http_method(args.merge(method: :put, action: __method__))
       end
 
-      def activate(**args)
-        http_method(**args.merge(method: :post, action: __method__))
+      def activate(args = {})
+        http_method(args.merge(method: :post, action: __method__))
       end
 
-      def retire(**args)
-        http_method(**args.merge(method: :delete, id: id, action: nil))
+      def retire(args = {})
+        http_method(args.merge(method: :delete, id: id, action: nil))
       end
 
       def device_serial_number
@@ -153,16 +157,16 @@ module Ruby
       end
 
       def phone?
-        %w[Android iOS WindowsPhone].include?(platform)
+        Miradore.phone_types.include?(platform)
       end
 
-      def call(**args)
-        http_method(**args)
+      def call(args = {})
+        http_method(args)
       end
 
       private
 
-      def http_method(**args)
+      def http_method(args)
         self.class.headers 'X-API-Key' => @auth || args[:auth]
         url = Miradore.url[:v2] % {
           subdomain: @subdomain || args[:subdomain],

data/ruby-miradore.gemspec

@@ -3,16 +3,16 @@
 require_relative "lib/ruby/miradore/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "ruby-miradore"
-  spec.version       = Ruby::Miradore::VERSION
-  spec.authors       = ["Eduard Garcia Castelló"]
-  spec.email         = %w[edugarcas@gmail.com eduard@rzilient.club]
+  spec.name = "ruby-miradore"
+  spec.version = Ruby::Miradore::VERSION
+  spec.authors = ["Eduard Garcia Castelló"]
+  spec.email = %w[edugarcas@gmail.com eduard@rzilient.club]
 
-  spec.summary       = "Miradore is a MSP providing an API to get devices information as well s perform some security actions."
-  spec.description   = "Miradore MSP Ruby Gem"
-  spec.homepage      = "https://github.com/eddygarcas/ruby-miradore"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.1")
+  spec.summary = "Miradore is a MSP providing an API to get devices information as well s perform some security actions."
+  spec.description = "Miradore MSP Ruby Gem"
+  spec.homepage = "https://github.com/eddygarcas/ruby-miradore"
+  spec.license = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", "~> 7.0"
   spec.add_dependency 'builder', '~> 3.1'
   spec.add_dependency "crack", "~> 0.4"
-  spec.add_dependency "finest-builder", "~> 1.0"
+  spec.add_dependency "finest-builder", "~> 2.0"
   spec.add_dependency "httparty", "~> 0.20"
   spec.add_dependency "rake", "~> 13.0"
   spec.add_dependency "rspec", "~> 3.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-miradore
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Eduard Garcia Castelló
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.1
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Miradore is a MSP providing an API to get devices information as well s perform