uptimerobot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2dd9afefcc2700e84aee76b59b8eff83f6b4189
-  data.tar.gz: 759431d88327f91c1a390f3befa84f71e9d67ab5
+  metadata.gz: b141a6405dfeb49f0e3207f558eb80655890c2a9
+  data.tar.gz: 668131150b4b46e6729d8b61665f3868d1bd6f19
 SHA512:
-  metadata.gz: 58f973019110873771c81b56930fd33f88ba38c90f37ce0f12871827b36119a6dffc00af77d7b6e820da30f3209d20dcf12f9781586856501bfe1cadca551e81
-  data.tar.gz: 6318681db5a9db150551477735b3724c7089618f827f8153eaa88daf8081dd6ee07d9956a469bc65707057243bf2110e106234d36043c15c486367c395d77795
+  metadata.gz: 6a99db16eb179856b27273531dd742e13074b09959df945fd7228daa5e2cbd62be93d66bd7328910a07ee2a665f4b8795ca4fb12c786f36afd71109d63b6f645
+  data.tar.gz: 2cd2b99dbadc341804dcc32b9ed6e7ca7bd00f148932936b79e71bd9e4dfb0def4d863202e1023e55e2b440642911b46c98ce35bdfe282f58bede2879f26ab35

data/lib/uptimerobot.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'json'
 
 require 'faraday'

data/lib/uptimerobot/client.rb

@@ -18,11 +18,20 @@ class UptimeRobot::Client
     Faraday::Adapter::Test
   ]
 
+  OPTIONS = [
+    :apiKey,
+    :raise_no_monitors_error,
+    :skip_unescape_monitor
+  ]
+
   def initialize(options)
-    @apiKey = options.delete(:apiKey)
-    @raise_no_monitors_error = !!options.delete(:raise_no_monitors_error)
+    @options = {}
+
+    OPTIONS.each do |key|
+      @options[key] = options.delete(key)
+    end
 
-    raise ArgumentError, ':apiKey is required' unless @apiKey
+    raise ArgumentError, ':apiKey is required' unless @options[:apiKey]
 
     options[:url] ||= ENDPOINT
 
@@ -60,7 +69,7 @@ class UptimeRobot::Client
 
   def request(method_name, params = {})
     params.update(
-      :apiKey => @apiKey,
+      :apiKey => @options[:apiKey],
       :format => 'json',
       :noJsonCallback => 1
     )
@@ -72,10 +81,19 @@ class UptimeRobot::Client
     end
 
     json = response.body
+    validate_response!(json)
+
+    if method_name == :getMonitors and not @options[:skip_unescape_monitor]
+      unescape_monitor!(json)
+    end
 
+    json
+  end
+
+  def validate_response!(json)
     if json['stat'] != 'ok'
       if json['id'] == '212'
-        if @raise_no_monitors_error
+        if @options[:raise_no_monitors_error]
           raise UptimeRobot::Error.new(json)
         else
           json.update(
@@ -87,7 +105,12 @@ class UptimeRobot::Client
         raise UptimeRobot::Error.new(json)
       end
     end
+  end
 
-    json
+  def unescape_monitor!(json)
+    json['monitors']['monitor'].each do |monitor|
+      friendlyname = monitor['friendlyname']
+      monitor['friendlyname'] = CGI.unescapeHTML(friendlyname)
+    end
   end
 end

data/lib/uptimerobot/version.rb

@@ -1,3 +1,3 @@
 module UptimeRobot
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/uptimerobot_spec.rb

@@ -113,6 +113,50 @@ describe UptimeRobot::Client do
 
       expect(client.getMonitors(params)).to eq response
     end
+
+    context 'when include escaped string' do
+      let(:escaped_string) do
+        'http monitor (basic auth)'
+      end
+
+      let(:unescaped_string) do
+        'http monitor (basic auth)'
+      end
+
+      let(:response_with_escaped_string) do
+        res = response.dup
+        res['monitors']['monitor'][0]['friendlyname'] = escaped_string
+        res
+      end
+
+      let(:response_with_unescaped_string) do
+        res = response.dup
+        res['monitors']['monitor'][0]['friendlyname'] = unescaped_string
+        res
+      end
+
+      it do
+        client = uptime_robot do |stub|
+          stub.get('getMonitors') do |env|
+            expect(env.params).to eq DEFAULT_PARAMS.merge(stringify_hash(params))
+            [200, {'Content-Type' => 'json'}, JSON.dump(response_with_escaped_string)]
+          end
+        end
+
+        expect(client.getMonitors(params)).to eq response_with_unescaped_string
+      end
+
+      it do
+        client = uptime_robot(:skip_unescape_monitor => true) do |stub|
+          stub.get('getMonitors') do |env|
+            expect(env.params).to eq DEFAULT_PARAMS.merge(stringify_hash(params))
+            [200, {'Content-Type' => 'json'}, JSON.dump(response_with_escaped_string)]
+          end
+        end
+
+        expect(client.getMonitors(params)).to eq response_with_escaped_string
+      end
+    end
   end
 
   describe '#newMonitor' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uptimerobot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara