RubyGems - rock_rms - Versions diffs - 9.4.0 → 9.5.0 - Mend

rock_rms 9.4.0 → 9.5.0

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

checksums.yaml +4 -4
data/lib/rock_rms/error.rb +11 -5
data/lib/rock_rms/parse_oj.rb +1 -1
data/lib/rock_rms/version.rb +1 -1
data/spec/rock_rms/error_spec.rb +8 -2
data/spec/rock_rms/fixtures/not_found_error.html +79 -0
metadata +4 -3
/data/spec/rock_rms/fixtures/{html_error.html → internal_error.html} +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00e545d57a7d7a7e938e4ae3a4d970d9e064f24eff3cc3758d14dde42721f5a5
-  data.tar.gz: 2a8d4cba35f6e596e36234eed56c7623d90b1ebca0dc8ab0c68c7dbe60c9e99b
+  metadata.gz: 290a1e9489236ab8bf4d3b938d118abec555927314236ca96022f335d35f5a46
+  data.tar.gz: 35d09f4b4b6bf271600e751d6d65d5953d8dfdcfcabd2000fbfe656cfd69cdf6
 SHA512:
-  metadata.gz: 784bebf22ee911423278d8cf61b3edfa85d72847f4dc382e766dfe670f2d92581beb45a3d90e8eff5a8ac3d3f291c8f2c9fd154f1523354188a25ede77a786b7
-  data.tar.gz: e2fb4f706393c503724e687076edb6794ec6e56fa9488512438697ba41680ccea7859ae2f9129292fd4e0e68ea990e6d11827d9c4d6bbe684dcd88b71ce88e3d
+  metadata.gz: c3d8a12350735b09eb5054a5316de7d178d01f15105efae76c5230ba98507c3534ea711df2e70693a79adafb6a04a034ac49ec01b968344359975b1c3c4ead98
+  data.tar.gz: c3bd70d6d4fd2e36e87a507da5d0010b15ab9dff36dc3831f9fa0841183e3a448f020f3913fb7f92b3bb1190c087f63400ec6f269111ce95471d8f0fcaac1178

data/lib/rock_rms/error.rb CHANGED Viewed

@@ -46,17 +46,23 @@ module FaradayMiddleware
     private
     def html_body?(body)
-      body.lstrip.start_with?('<!DOCTYPE html>')
+      /(<!DOCTYPE html>)|(<html>)/ =~ body
     end
     def check_html_error(env)
       return unless html_body?(env[:body])
-      return unless /An error has occurred while processing your request/ =~ env[:body]
+      if /An error has occurred while processing your request/ =~ env[:body]
+        raise RockRMS::InternalServerError, error_message(
+          status: 500, url: env[:url], body: 'Unknown API error.'
+        )
+      end
-      raise RockRMS::InternalServerError, error_message(
-        status: 500, url: env[:url], body: 'Unknown API error.'
-      )
+      if /Page Not Found/ =~ env[:body]
+        raise RockRMS::NotFound, error_message(
+          status: 404, url: env[:url], body: 'Page not found.'
+        )
+      end
     end
     def error_message(env)

data/lib/rock_rms/parse_oj.rb CHANGED Viewed

@@ -15,7 +15,7 @@ module FaradayMiddleware
     private
     def html_body?(body)
-      body.start_with?('<!DOCTYPE html>')
+      /(<!DOCTYPE html>)|(<html>)/ =~ body
     end
     def empty_body?(body)

data/lib/rock_rms/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module RockRMS
-  VERSION = '9.4.0'.freeze
+  VERSION = '9.5.0'.freeze
 end

data/spec/rock_rms/error_spec.rb CHANGED Viewed

@@ -75,10 +75,16 @@ RSpec.describe RockRMS::Error do
   end
   context 'html error responses' do
-    it 'raises exception for html error' do
-      body = File.read('spec/rock_rms/fixtures/html_error.html')
+    it 'raises exception for internal error' do
+      body = File.read('spec/rock_rms/fixtures/internal_error.html')
       stub(200, body)
       expect_failure(500, 'Unknown API error.')
     end
+    it 'raises exception for not found error' do
+      body = File.read('spec/rock_rms/fixtures/not_found_error.html')
+      stub(200, body)
+      expect_failure(404, 'Page not found.')
+    end
   end
 end

data/spec/rock_rms/fixtures/not_found_error.html ADDED Viewed

@@ -0,0 +1,79 @@
+<html>
+  <head>
+    <title>Object moved</title>
+  </head>
+  <body>
+    <h2>Object moved to <a href="/page/123">here</a>.</h2>
+  </body>
+</html>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Rock - Page Not Found</title>
+    <link rel="stylesheet" href="/Themes/Rock/Styles/bootstrap.css" />
+    <link rel="stylesheet" href="/Themes/Rock/Styles/theme.css" />
+    <!-- Icons -->
+    <link rel="shortcut icon" href="/Assets/Icons/favicon.ico" />
+    <link
+      rel="apple-touch-icon-precomposed"
+      sizes="144x144"
+      href="/Assets/Icons/touch-icon-ipad-retina.png"
+    />
+    <link
+      rel="apple-touch-icon-precomposed"
+      sizes="114x114"
+      href="/Assets/Icons/touch-icon-iphone-retina.png"
+    />
+    <link
+      rel="apple-touch-icon-precomposed"
+      sizes="72x72"
+      href="/Assets/Icons/touch-icon-ipad.png"
+    />
+    <link
+      rel="apple-touch-icon-precomposed"
+      href="/Assets/Icons/touch-icon-iphone.png"
+    />
+    <script src="/Scripts/Bundles/RockJQueryLatest?v=RWC4egkRBNjCo9_aBrw2jUeb13vsJBPHaIryUym02aM1"></script>
+  </head>
+  <body id="splash" class="error">
+    <form method="post" action="/" id="form1">
+      <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE" value="" />
+      <input
+        type="hidden"
+        name="__VIEWSTATEGENERATOR"
+        id="__VIEWSTATEGENERATOR"
+        value=""
+      />
+      <div id="content">
+        <div id="logo"></div>
+        <div id="content-box">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="error-wrap">
+                <h1>We Can't Find That Page</h1>
+                <p class="error-icon info">
+                  <i class="fa fa-question-circle"></i>
+                </p>
+                <p>
+                  Sorry, but the page you are looking for can not be found.
+                  Check the address of the page and see your administrator if
+                  you still need assistance.
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </form>
+  </body>
+</html>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rock_rms
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.5.0
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -265,7 +265,8 @@ files:
 - rock_rms.gemspec
 - spec/rock_rms/client_spec.rb
 - spec/rock_rms/error_spec.rb
-- spec/rock_rms/fixtures/html_error.html
+- spec/rock_rms/fixtures/internal_error.html
+- spec/rock_rms/fixtures/not_found_error.html
 - spec/rock_rms/resources/attribute_spec.rb
 - spec/rock_rms/resources/attribute_values_spec.rb
 - spec/rock_rms/resources/batch_spec.rb

/data/spec/rock_rms/fixtures/{html_error.html → internal_error.html} RENAMED Viewed

File without changes