logicmonitor_simple 0.1.2 → 0.1.3

data/lib/logicmonitor_simple.rb

@@ -3,7 +3,7 @@
 # Simple LogicMonitor API library - a spartan wrapper around the LogicMonitor API
 #
 # Author: Michael Mittelstadt (<meek@getsatisfaction.com>)
-# Version: 0.1.2
+# Version: 0.1.3
 #
 # Usage:
 #
@@ -21,38 +21,43 @@ require 'multi_json'
 require 'cgi'
 
 module Logicmonitor
-    class Simple
-        def initialize(domain, username, password)
-            @domain   = domain
-            @username = username
-            @password = password
-            @cookies  = []
-            self.sign_in({ 'c' => @domain, 'u' => @username, 'p' => @password })
-        end
-
-        def method_missing(method, *args)
-            method = method.to_s.split('_').each_with_index.map { |e,i| i>0 ? e.capitalize : e }.join
-            http_args = args[0].to_camelback_keys.map do |k,v|
-              if v.is_a? Array
-                  v = v.join(',')
-              end
-              "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
-            end.join('&') rescue ""
-            g = Curl.get("https://#{@domain}.logicmonitor.com/santaba/rpc/#{method}?#{http_args}") do |http|
-                if @cookies.size > 0
-                    http.headers['Cookie'] = @cookies.join('; ')
-                end
-            end
+  class Simple
 
-            if @cookies.empty?
-                @cookies = g.header_str.scan(/^Set-Cookie: ([^\r]+)?\r/m)
-            end
+    def auth_credentials
+      { 'c' => @domain, 'u' => @username, 'p' => @password }
+    end
 
-            if g.status.to_i > 399
-                raise "Received unexpected HTTP status #{g.status} Response Body: #{g.body_str}"
-            end
+    def initialize(domain, username, password)
+      @domain   = domain
+      @username = username
+      @password = password
+      @cookies  = []
+    end
 
-            MultiJson.decode(g.body_str) or raise Logicmonitor::Simple::Error "Received invalid JSON from LogicMonitor"
+    def method_missing(method, *args)
+      method = method.to_s.split('_').each_with_index.map { |e,i| i>0 ? e.capitalize : e }.join
+      http_args = (args[0] || {}).merge(auth_credentials).to_camelback_keys.map do |k,v|
+        if v.is_a? Array
+          v = v.join(',')
         end
+        "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
+      end.join('&')
+       
+      g = Curl.get("https://#{@domain}.logicmonitor.com/santaba/rpc/#{method}?#{http_args}") do |http|
+        if @cookies.size > 0
+          http.headers['Cookie'] = @cookies.join('; ')
+        end
+      end
+
+      if @cookies.empty?
+        @cookies = g.header_str.scan(/^Set-Cookie: ([^\r]+)?\r/m)
+      end
+
+      if g.status.to_i > 399
+        raise "Received unexpected HTTP status #{g.status} Response Body: #{g.body_str}"
+      end
+      
+      MultiJson.decode(g.body_str) or raise Logicmonitor::Simple::Error 'Received invalid JSON from LogicMonitor'
     end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logicmonitor_simple
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -88,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple API client for LogicMonitor
 test_files: []
-has_rdoc: