ragios-client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08914572074ac34b5f24ea0b94c3f685627b7219
-  data.tar.gz: d3f6e3ff19d467df4ec5ba74479b2610ccf2542e
+  metadata.gz: 94a6de0be7af241876c75561127cc5a7a052d1d9
+  data.tar.gz: 827f4091bcadbbfbd5a3e65efa654500b71ce8d2
 SHA512:
-  metadata.gz: cf423af3019cf3d6a3e3fdfdf0321e26de72bdb5abad9de4e00871703c7abbc5f74d8987dfef9d152129dbdb9b49dd92e6a2c4138b621a3137ff183661408f15
-  data.tar.gz: e36d0cb2c2dc0f176cfeac80477484c0876519e69b25c7c18e4dbe55cc3158da6676b23aa37724e02363e03de66060624654055c3249932156402bd586f9ef43
+  metadata.gz: 5b1a9ec6cc9000930cffb6437bb3dd5780ba2a08d72068f25f4f3be8f1e5b40675764a607e1442ef84fbf88ea491102d043d093525f6b4596f63302f271097dd
+  data.tar.gz: f794a28bc5baee99daa9624c7fbb548a7fc3c23ea5dbfaa7bf163fd1735fe45fa714bfff4fb259330f960383ab97b81a9c6983935a893ccad0dd6c9bad9a6a4f

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/ragios-client.rb

@@ -50,14 +50,24 @@ module Ragios
     def update(monitor_id, options)
       api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",generate_json(options), http_request_options }
     end
+    def find_event(event_id)
+      api_request { RestClient.get "#{address_port}/events/#{event_id}/", auth_cookie }
+    end
+    def all_events(limit = nil)
+      params = limit ? "?take=#{limit}" : ""
+      api_request { RestClient.get "#{address_port}/events#{params}", auth_cookie }
+    end
+    def delete_event(event_id)
+      api_request { RestClient.delete "#{address_port}/events/#{event_id}", auth_cookie }
+    end
     def events(monitor_id, startdate, enddate, limit=nil)
-      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events", {params: options(startdate, enddate, limit)} }
+      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events", options(startdate, enddate, limit) }
     end
     def events_by_type(monitor_id, type, startdate, enddate, limit=nil)
-      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events_by_type/#{type}", {params: options(startdate, enddate, limit)} }
+      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events_by_type/#{type}", options(startdate, enddate, limit) }
     end
     def events_by_state(monitor_id, state, startdate, enddate, limit=nil)
-      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events_by_state/#{state}", {params: options(startdate, enddate, limit)} }
+      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events_by_state/#{state}", options(startdate, enddate, limit) }
     end
     def test(monitor_id)
       api_request { RestClient.post "#{address_port}/tests", {:id => monitor_id}, http_request_options }
@@ -65,11 +75,13 @@ module Ragios
 
 private
     def options(startdate, enddate, limit = nil)
-      options = {}
-      options[:start_date] = startdate
-      options[:end_date] = enddate
-      options[:take] = limit if limit
-      options
+      params = {}
+      params[:start_date] = startdate
+      params[:end_date] = enddate
+      params[:take] = limit if limit
+      query_options = auth_cookie
+      query_options[:params] = params
+      query_options
     end
     def api_request
       response = yield
@@ -83,12 +95,12 @@ private
     end
 
     def auth_cookie
-      {:cookies => {:AuthSession => auth_session}}
+      {:cookies => {:RagiosAuthSession => auth_session}}
     end
 
     def http_request_options
       {:content_type => :json,
-       :cookies => {:AuthSession => auth_session}
+       :cookies => {:RagiosAuthSession => auth_session}
       }
     end
 
@@ -108,7 +120,7 @@ private
       return "" if [@username, @password].any? { |e| e.nil? }
       auth = RestClient.post "#{address_port}/session", { :username=> @username, :password => @password}
       hash = parse_json(auth)
-      hash[:AuthSession]
+      hash[:RagiosAuthSession]
     rescue => e
       raise_error(e)
     end

data/ragios-client.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ragios-client 0.0.6 ruby lib
+# stub: ragios-client 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ragios-client"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["obi-a"]
-  s.date = "2014-12-27"
+  s.date = "2015-01-19"
   s.description = "ruby client for ragios"
   s.email = "obioraakubue@yahoo.com"
   s.extra_rdoc_files = [

data/spec/ragios-client_spec.rb

@@ -30,16 +30,27 @@ describe "Ragios Client" do
     end
     describe "#events" do
       it "returns all events by monitor" do
-        @ragios.events(@query_monitor_id, "1980","2015").should_not == 0
-        first_id = @ragios.events(@query_monitor_id, "1980","2015").first[:monitor][:_id]
+        sleep 2
+        events = @ragios.events(@query_monitor_id, "1980","2040")
+        events.should_not == 0
+        first_id = events.first[:monitor][:_id]
         @query_monitor_id.should == first_id
-        @ragios.events(@query_monitor_id, "1980","2015", 1).count.should == 1
+        @ragios.events(@query_monitor_id, "1980","2040", 1).count.should == 1
       end
     end
     describe "#events_by_state" do
       it "returns a monitor's events by specified state" do
         sleep 1
-        @ragios.events_by_state(@query_monitor_id, "passed", "1980","2015",1).count.should == 1
+        @ragios.events_by_state(@query_monitor_id, "passed", "1980","2040",1).count.should == 1
+      end
+    end
+    describe "more events API" do
+      it "returns all events" do
+        event = @ragios.all_events(1).first
+        new_event = @ragios.find_event(event[:_id])
+        new_event.should == event
+        @ragios.delete_event(event[:_id])
+        expect { @ragios.find_event(event[:_id]) }.to raise_error(Ragios::ClientException)
       end
     end
     after(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragios-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - obi-a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client