ragios-client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 694083a982523bfda3ff6c41619416b9acb78245
-  data.tar.gz: 562c7f99a44d0ddf523e15cf064b561504f49c8b
+  metadata.gz: 08914572074ac34b5f24ea0b94c3f685627b7219
+  data.tar.gz: d3f6e3ff19d467df4ec5ba74479b2610ccf2542e
 SHA512:
-  metadata.gz: 22c9c0995303ea0d864691f597140ca9409b135335de99b6296fc1fe8c405402e4de0e1104acae0c55f17c9ce4bd6116d21711a7e3f17ea601cd252cf8611120
-  data.tar.gz: 76113d058ea49825a1350e9f26be09e2ac4f296b4faaf6d4842c299d3cfe3f67e095c4236b7458cd34c1be77839051d39a0dddb9eb133af2266a492f0e47094b
+  metadata.gz: cf423af3019cf3d6a3e3fdfdf0321e26de72bdb5abad9de4e00871703c7abbc5f74d8987dfef9d152129dbdb9b49dd92e6a2c4138b621a3137ff183661408f15
+  data.tar.gz: e36d0cb2c2dc0f176cfeac80477484c0876519e69b25c7c18e4dbe55cc3158da6676b23aa37724e02363e03de66060624654055c3249932156402bd586f9ef43

data/README.rdoc

@@ -23,7 +23,7 @@
    plugin: "url_monitor"
  }
 
- ragios.add monitor
+ ragios.create monitor
 
  ragios.find(monitor_id)
 
@@ -41,6 +41,12 @@
 
  ragios.test(monitor_id)
 
+ ragios.events(monitor_id, start_date, end_date, limit)
+
+ ragios.events_by_type(monitor_id, event_type, start_date, end_date, limit)
+
+ ragios.events_by_state(monitor_id, state, start_date, end_date, limit)
+
  ragios.address
  #=> http://localhost
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/ragios-client.rb

@@ -25,36 +25,52 @@ module Ragios
       auth_session
     end
 
-    def add(monitor)
+    def create(monitor)
       api_request { RestClient.post "#{address_port}/monitors/", generate_json(monitor), http_request_options }
     end
     def find(monitor_id)
       api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/", auth_cookie }
     end
-    def all
-      api_request { RestClient.get "#{address_port}/monitors/", auth_cookie }
+    def all(limit = nil)
+      params = limit ? "?take=#{limit}" : ""
+      api_request { RestClient.get "#{address_port}/monitors#{params}", auth_cookie }
     end
     def stop(monitor_id)
       api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",{:status => "stopped"}, http_request_options }
     end
-    def restart(monitor_id)
+    def start(monitor_id)
       api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",{:status => "active"},http_request_options }
     end
     def delete(monitor_id)
       api_request { RestClient.delete "#{address_port}/monitors/#{monitor_id}", auth_cookie }
     end
     def where(options)
-      api_request { RestClient.get "#{address_port}/monitors?#{URI.encode_www_form(options)}", auth_cookie }
+      api_request { RestClient.get "#{address_port}/monitors/attributes?#{URI.encode_www_form(options)}", auth_cookie }
     end
     def update(monitor_id, options)
       api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",generate_json(options), http_request_options }
     end
-
+    def events(monitor_id, startdate, enddate, limit=nil)
+      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/events", {params: 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)} }
+    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)} }
+    end
     def test(monitor_id)
       api_request { RestClient.post "#{address_port}/tests", {:id => monitor_id}, http_request_options }
     end
 
 private
+    def options(startdate, enddate, limit = nil)
+      options = {}
+      options[:start_date] = startdate
+      options[:end_date] = enddate
+      options[:take] = limit if limit
+      options
+    end
     def api_request
       response = yield
       parse_json(response)

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.5 ruby lib
+# stub: ragios-client 0.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ragios-client"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-08-23"
+  s.date = "2014-12-27"
   s.description = "ruby client for ragios"
   s.email = "obioraakubue@yahoo.com"
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/obi-a/ragios-client"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.3"
   s.summary = "Ruby client for ragios"
 
   if s.respond_to? :specification_version then

data/spec/ragios-client_spec.rb

@@ -16,8 +16,38 @@ describe "Ragios Client" do
     #@ragios = Ragios::Client.new(username: admin, password: password)
     @ragios = Ragios::Client.new
   end
-  describe "#add" do
-    it "adds a monitor" do
+  describe "queries" do
+    before(:each) do
+      monitor = {
+        monitor: "Google",
+        url: "http://google.com",
+        every: "5m",
+        contact: "admin@mail.com",
+        via: ["gmail_notifier","twitter_notifier"],
+        plugin: plugin
+      }
+      @query_monitor_id = @ragios.create(monitor)[:_id]
+    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]
+        @query_monitor_id.should == first_id
+        @ragios.events(@query_monitor_id, "1980","2015", 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
+      end
+    end
+    after(:each) do
+      @ragios.delete(@query_monitor_id)
+    end
+  end
+  describe "#create" do
+    it "creates a monitor" do
       monitor = {
         monitor: "Google",
         url: "http://google.com",
@@ -27,7 +57,7 @@ describe "Ragios Client" do
         plugin: plugin
       }
 
-      returned_monitor = @ragios.add(monitor)
+      returned_monitor = @ragios.create(monitor)
       returned_monitor.should include(monitor)
       monitor_id = returned_monitor[:_id]
 
@@ -35,7 +65,7 @@ describe "Ragios Client" do
       @ragios.delete(monitor_id)
     end
 
-    it "cannot add a monitor with no plugin" do
+    it "cannot create a monitor with no plugin" do
       monitor = {
         monitor: "Google",
         url: "http://google.com",
@@ -44,14 +74,14 @@ describe "Ragios Client" do
         via: "gmail_notifier"
       }
       begin
-        @ragios.add monitor
+        @ragios.create monitor
       rescue => e
         e.should be_an_instance_of Ragios::ClientException
         e.message.should include("No Plugin Found")
       end
     end
 
-    it "cannot add a monitor with no notifier" do
+    it "cannot create a monitor with no notifier" do
       monitor = {
         monitor: "Google",
         url: "http://google.com",
@@ -60,15 +90,15 @@ describe "Ragios Client" do
         plugin: plugin
       }
       begin
-        @ragios.add monitor
+        @ragios.create monitor
       rescue Exception => e
         e.should be_an_instance_of Ragios::ClientException
         e.message.should include("No Notifier Found")
       end
     end
 
-    it "cannot add a badly formed monitor" do
-      expect{@ragios.add("bad data")}.to raise_error(JSON::GeneratorError)
+    it "cannot create a badly formed monitor" do
+      expect{@ragios.create("bad data")}.to raise_error(JSON::GeneratorError)
     end
   end
   describe "More API calls" do
@@ -84,7 +114,7 @@ describe "Ragios Client" do
         tag: "test"
       }
 
-      returned_monitor = @ragios.add(@monitor)
+      returned_monitor = @ragios.create(@monitor)
       @monitor_id = returned_monitor[:_id]
     end
     describe "#find" do
@@ -130,7 +160,7 @@ describe "Ragios Client" do
     end
     describe "#delete" do
       it "deletes a monitor" do
-        new_monitor_id = @ragios.add(@monitor)[:_id]
+        new_monitor_id = @ragios.create(@monitor)[:_id]
         @ragios.delete(new_monitor_id).should == {ok: true}
       end
       it "cannot delete a monitor that doesnt exist" do
@@ -156,23 +186,23 @@ describe "Ragios Client" do
         expect { @ragios.stop(this_monitor_id) }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = #{this_monitor_id}"))
       end
     end
-    describe "#restart" do
-      it "restarts a stopped monitor" do
+    describe "#start" do
+      it "starts a stopped monitor" do
         @ragios.stop(@monitor_id)
         stopped_monitor = @ragios.find(@monitor_id)
         stopped_monitor[:status_].should == "stopped"
 
-        @ragios.restart(@monitor_id).should == {ok: true}
+        @ragios.start(@monitor_id).should == {ok: true}
 
         active_monitor = @ragios.find(@monitor_id)
         active_monitor[:status_].should == "active"
 
-        #restart monitor is idempotent
-        @ragios.restart(@monitor_id).should == {ok: true}
+        #start monitor is idempotent
+        @ragios.start(@monitor_id).should == {ok: true}
       end
-      it "cannot restart a monitor that dont exist" do
+      it "cannot start a monitor that dont exist" do
         this_monitor_id = "dont_exist"
-        expect { @ragios.restart(this_monitor_id) }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = #{this_monitor_id}"))
+        expect { @ragios.start(this_monitor_id) }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = #{this_monitor_id}"))
       end
     end
     describe "#all" do
@@ -181,6 +211,9 @@ describe "Ragios Client" do
         retrieved_monitors.should_not be_empty
         retrieved_monitors.should be_an_instance_of Array
       end
+      it "can limit the number of monitors retrieved" do
+        @ragios.all(limit = 1).count.should == 1
+      end
     end
     after(:each) do
       @ragios.delete(@monitor_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragios-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - obi-a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for ragios