RubyGems - ruby-miradore - Versions diffs - 2.1.2 → 2.1.3 - Mend

ruby-miradore 2.1.2 → 2.1.3

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 (27) hide show

checksums.yaml +4 -4
data/.travis.yml +1 -1
data/Gemfile.lock +24 -8
data/fixtures/vcr_cassettes/Change_User_Email_Address.yml +2 -2
data/fixtures/vcr_cassettes/Change_User_Email_Address_Error.yml +2 -2
data/fixtures/vcr_cassettes/Change_User_Email_Address_Without_v1.yml +2 -2
data/fixtures/vcr_cassettes/Get_Device_Location.yml +3 -3
data/fixtures/vcr_cassettes/Get__Mobile_Device.yml +6 -6
data/fixtures/vcr_cassettes/InvDevice.yml +4 -4
data/fixtures/vcr_cassettes/LockDevice_all.yml +2 -2
data/fixtures/vcr_cassettes/all_criteria.yml +56 -24
data/fixtures/vcr_cassettes/auth_not_found.yml +2 -2
data/fixtures/vcr_cassettes/error_by_serial_number.yml +2 -2
data/fixtures/vcr_cassettes/full_list_and_details.yml +5 -5
data/fixtures/vcr_cassettes/get_location.yml +2 -2
data/fixtures/vcr_cassettes/get_user_from_miradore.yml +2 -2
data/fixtures/vcr_cassettes/search_by_serial_number.yml +7 -7
data/fixtures/vcr_cassettes/user_alredy_exist_in_miradore.yml +159 -0
data/lib/ruby/miradore/version.rb +1 -1
data/lib/ruby/miradore.rb +38 -34
data/ruby-miradore.gemspec +3 -1
metadata +32 -8
data/ruby-miradore-0.1.2.gem +0 -0
data/ruby-miradore-0.1.3.gem +0 -0
data/ruby-miradore-1.1.0.gem +0 -0
data/ruby-miradore-1.1.1.gem +0 -0
data/ruby-miradore-1.2.2.gem +0 -0

data/fixtures/vcr_cassettes/user_alredy_exist_in_miradore.yml ADDED Viewed

@@ -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 CHANGED Viewed

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

data/lib/ruby/miradore.rb CHANGED Viewed

@@ -4,6 +4,7 @@ require_relative "miradore/version"
 require "httparty"
 require "json"
 require "crack/xml"
+require "active_support/core_ext/hash/conversions"
 require "finest/builder"
 module Ruby
@@ -32,54 +33,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
+            )
+          )
+        end
+        protected
+        def http_method(**args)
+          url = Miradore.url[version] % args.merge(
+            item: to_s.demodulize,
+            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"))
+        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.demodulize}(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
@@ -154,6 +159,5 @@ module Ruby
     class Organization < Request; end
-    class MiradoreError < Request; end
   end
 end

data/ruby-miradore.gemspec CHANGED Viewed

@@ -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', '~> 2.0'
   spec.add_dependency "crack", "~> 0.4"
   spec.add_dependency "finest-builder", "~> 1.0"
   spec.add_dependency "httparty", "~> 0.18"

metadata CHANGED Viewed

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-miradore
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Eduard Garcia Castelló
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-02 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: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
@@ -129,13 +157,9 @@ files:
 - 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/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.gemspec
 homepage: https://github.com/eddygarcas/ruby-miradore
 licenses:
@@ -153,7 +177,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:
   - - ">="

data/ruby-miradore-0.1.2.gem DELETED Viewed

Binary file

data/ruby-miradore-0.1.3.gem DELETED Viewed

Binary file

data/ruby-miradore-1.1.0.gem DELETED Viewed

Binary file

data/ruby-miradore-1.1.1.gem DELETED Viewed

Binary file

data/ruby-miradore-1.2.2.gem DELETED Viewed

Binary file