ragios-client 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b98557ec97a23273955677e3c7a598b203b62c
-  data.tar.gz: 1a085ade4b9fc6db130fc147378011d854ccb346
+  metadata.gz: 694083a982523bfda3ff6c41619416b9acb78245
+  data.tar.gz: 562c7f99a44d0ddf523e15cf064b561504f49c8b
 SHA512:
-  metadata.gz: 23b1f879fe0702210f7af4d3faee489f2cfbe731d7ab1cf05d2b9f51da670902366e5ad1c8f9daa75d0f52c56e3918658bb18d8247b7c06101890750a4c420ed
-  data.tar.gz: fed5f2b956daac6d810c34928ec0e0db1c788dcdc96f36b4c526526ba3dd85c4cbfe552dda708615b6f9286edde0da5de038cb83571aa35dc1b5fc91a6a274bd
+  metadata.gz: 22c9c0995303ea0d864691f597140ca9409b135335de99b6296fc1fe8c405402e4de0e1104acae0c55f17c9ce4bd6116d21711a7e3f17ea601cd252cf8611120
+  data.tar.gz: 76113d058ea49825a1350e9f26be09e2ac4f296b4faaf6d4842c299d3cfe3f67e095c4236b7458cd34c1be77839051d39a0dddb9eb133af2266a492f0e47094b

data/README.rdoc

@@ -15,14 +15,15 @@
 
  ragios.login('admin', 'password')
 
- monitors = [{monitor: "my website",
-  every: "5m",
-  url: "http://mywebsite.com",
-  via: "twtter_notifier",
-  plugin: "url_monitor"
- }]
+ monitor = {
+   monitor: "my website",
+   every: "5m",
+   url: "http://mywebsite.com",
+   via: "twtter_notifier",
+   plugin: "url_monitor"
+ }
 
- ragios.add monitors
+ ragios.add monitor
 
  ragios.find(monitor_id)
 
@@ -49,6 +50,5 @@
 
 == Copyright
 
-Copyright (c) 2013 obi-a. See LICENSE.txt for
+Copyright (c) 2014 obi-a. See LICENSE.txt for
 further details.
-

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/ragios-client.rb

@@ -15,8 +15,8 @@ module Ragios
     def initialize(args = {})
       @address = args.fetch(:address, 'http://127.0.0.1')
       @port = args.fetch(:port, '5041')
-      @username = args.fetch(:username, '')
-      @password = args.fetch(:password, '')
+      @username = args.fetch(:username, nil)
+      @password = args.fetch(:password, nil)
     end
 
     def login(username,password)
@@ -25,8 +25,8 @@ module Ragios
       auth_session
     end
 
-    def add(monitors)
-      api_request { RestClient.post "#{address_port}/monitors/", generate_json(monitors), http_request_options }
+    def add(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 }
@@ -89,6 +89,7 @@ private
     end
 
     def auth_session
+      return "" if [@username, @password].any? { |e| e.nil? }
       auth = RestClient.post "#{address_port}/session", { :username=> @username, :password => @password}
       hash = parse_json(auth)
       hash[:AuthSession]

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.4 ruby lib
+# stub: ragios-client 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ragios-client"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   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-04-26"
+  s.date = "2014-08-23"
   s.description = "ruby client for ragios"
   s.email = "obioraakubue@yahoo.com"
   s.extra_rdoc_files = [

data/spec/ragios-client_spec.rb

@@ -1,329 +1,189 @@
 require 'rubygems'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/ragios-client'))
 
-#use for fast testing
+#use for fast tests
 plugin = "mock_plugin"
-#using the url_monitor plugin will perform a real http request on each check leading to slow tests
-#plugin = "url_monitor"
+
+def generate_json(str)
+  JSON.generate(str)
+end
 
 admin = 'admin'
 password = 'ragios'
 
 describe "Ragios Client" do
   before(:each) do
-    @ragios = Ragios::Client.new(username: admin,password: password)
-  end
-
-  it "adds a monitor" do
-    monitors = [{monitor: "Google",
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier","twitter_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    returned_monitors.first.should include(monitors.first)
-    monitor_id = returned_monitors.first[:_id]
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot add a monitor with no plugin" do
-    monitors = [{monitor: "Google",
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: "gmail_notifier"}]
-    begin
-      @ragios.add monitors
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No Plugin Found")
+    #@ragios = Ragios::Client.new(username: admin, password: password)
+    @ragios = Ragios::Client.new
+  end
+  describe "#add" do
+    it "adds a monitor" do
+      monitor = {
+        monitor: "Google",
+        url: "http://google.com",
+        every: "5m",
+        contact: "admin@mail.com",
+        via: ["gmail_notifier","twitter_notifier"],
+        plugin: plugin
+      }
+
+      returned_monitor = @ragios.add(monitor)
+      returned_monitor.should include(monitor)
+      monitor_id = returned_monitor[:_id]
+
+      #teardown
+      @ragios.delete(monitor_id)
     end
-  end
 
-  it "cannot add a monitor with no notifier" do
-    monitors = [{monitor: "Google",
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      plugin: plugin }]
-    begin
-      @ragios.add monitors
-    rescue Exception => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No Notifier Found")
+    it "cannot add a monitor with no plugin" do
+      monitor = {
+        monitor: "Google",
+        url: "http://google.com",
+        every: "5m",
+        contact: "admin@mail.com",
+        via: "gmail_notifier"
+      }
+      begin
+        @ragios.add monitor
+      rescue => e
+        e.should be_an_instance_of Ragios::ClientException
+        e.message.should include("No Plugin Found")
+      end
     end
-  end
 
-  it "cannot add a badly formed monitor" do
-    expect{@ragios.add("bad data")}.to raise_error(JSON::GeneratorError)
-  end
-
-  it "should retrieve a monitor by id" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    received_monitor = @ragios.find(monitor_id)
-    received_monitor.should include(monitors.first)
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot retrieve a monitor that doesnt exist" do
-    begin
-      @ragios.find('dont_exist')
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = dont_exist")
+    it "cannot add a monitor with no notifier" do
+      monitor = {
+        monitor: "Google",
+        url: "http://google.com",
+        every: "5m",
+        contact: "admin@mail.com",
+        plugin: plugin
+      }
+      begin
+        @ragios.add monitor
+      rescue Exception => e
+        e.should be_an_instance_of Ragios::ClientException
+        e.message.should include("No Notifier Found")
+      end
     end
-  end
-
-  it "should find monitors that match multiple key/value pairs" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin,
-      tag: "test" }]
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
 
-    options = {tag: 'test', every: '5m', monitor: unique_name}
-    found_monitors = @ragios.where(options)
-    found_monitors.first.should include(monitors.first)
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "returns an empty array when no monitor matches multiple key/value pairs" do
-    options = {something: "dont_exist", every: "5m", monitor: "dont_exist"}
-    @ragios.where(options).should == []
-  end
-
-  it "should update a monitor" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    update_options = {every: "10m", via: ["twitter_notifier"]}
-    updated_monitor = @ragios.update(monitor_id, update_options)
-    updated_monitor.should include(update_options)
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot update a monitor with bad data" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    expect { @ragios.update(monitor_id,"bad data") }.to raise_error(JSON::GeneratorError)
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot update a monitor that don't exist" do
-    update_options = {every: "5m", via: ["twitter_notifier"]}
-    monitor_id = "dont_exist"
-    begin
-      @ragios.update(monitor_id,update_options)
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = dont_exist")
+    it "cannot add a badly formed monitor" do
+      expect{@ragios.add("bad data")}.to raise_error(JSON::GeneratorError)
     end
   end
-
-  it "tests a monitor" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    hash = @ragios.test(monitor_id)
-    hash[:ok].should == true
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot test a monitor that don't exist" do
-    monitor_id = "dont_exist"
-    begin
-      @ragios.test(monitor_id)
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = dont_exist")
+  describe "More API calls" do
+    before(:each) do
+      @unique_name = "Google #{Time.now.to_i}"
+      @monitor = {
+        monitor: @unique_name,
+        url: "http://google.com",
+        every: "5m",
+        contact: "admin@mail.com",
+        via: ["gmail_notifier"],
+        plugin: plugin,
+        tag: "test"
+      }
+
+      returned_monitor = @ragios.add(@monitor)
+      @monitor_id = returned_monitor[:_id]
     end
-  end
-
-  it "deletes a monitor" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-    begin
-      @ragios.find(monitor_id)
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = #{monitor_id}")
+    describe "#find" do
+      it "should retrieve a monitor by id" do
+        received_monitor = @ragios.find(@monitor_id)
+        received_monitor.should include(@monitor)
+      end
+      it "cannot retrieve a monitor that doesnt exist" do
+        expect{ @ragios.find('dont_exist') }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = dont_exist"))
+      end
     end
-  end
-
-  it "cannot delete a monitor that doesnt exist" do
-    monitor_id = "dont_exist"
-    begin
-      @ragios.find(monitor_id)
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = #{monitor_id}")
+    describe "#where" do
+      it "should find monitors that match multiple key/value pairs" do
+        options = {tag: 'test', every: '5m', monitor: @unique_name}
+        found_monitors = @ragios.where(options)
+        found_monitors.first.should include(@monitor)
+      end
+      it "returns an empty array when no monitor matches multiple key/value pairs" do
+        options = {something: "dont_exist", every: "5m", monitor: "dont_exist"}
+        @ragios.where(options).should == []
+      end
     end
-  end
-
-  it "stops an active monitor" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    active_monitor = @ragios.find(monitor_id)
-    active_monitor[:status_].should == "active"
-
-    hash = @ragios.stop(monitor_id)
-    hash[:ok].should == true
-
-    stopped_monitor = @ragios.find(monitor_id)
-    stopped_monitor[:status_].should == "stopped"
-
-    #stop monitor is idempotent
-    hash = @ragios.stop(monitor_id)
-    hash[:ok].should == true
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot stop a monitor that dont exist" do
-    monitor_id = "dont_exist"
-    begin
-      @ragios.stop(monitor_id)
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = #{monitor_id}")
+    describe "#update" do
+      it "should update a monitor" do
+        update_options = {every: "10m", via: ["twitter_notifier"]}
+        @ragios.update(@monitor_id, update_options).should == {ok: true}
+      end
+      it "cannot update a monitor with bad data" do
+        expect { @ragios.update(@monitor_id,"bad data") }.to raise_error(JSON::GeneratorError)
+      end
+      it "cannot update a monitor that don't exist" do
+        update_options = {every: "5m", via: ["twitter_notifier"]}
+        expect { @ragios.update("dont_exist", update_options) }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = dont_exist"))
+      end
     end
-  end
-
-  it "restarts a stopped monitor" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    @ragios.stop(monitor_id)
-    stopped_monitor = @ragios.find(monitor_id)
-    stopped_monitor[:status_].should == "stopped"
-
-    hash = @ragios.restart(monitor_id)
-    hash[:ok].should == true
-
-    active_monitor = @ragios.find(monitor_id)
-    active_monitor[:status_].should == "active"
-
-    #restart monitor is idempotent
-    hash = @ragios.restart(monitor_id)
-    hash[:ok].should == true
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
-  end
-
-  it "cannot restart a monitor that dont exist" do
-    monitor_id = "dont_exist"
-    begin
-      @ragios.restart(monitor_id)
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("No monitor found with id = #{monitor_id}")
+    describe "#test" do
+      it "tests a monitor" do
+        @ragios.test(@monitor_id).should == {ok: true}
+      end
+      it "cannot test a monitor that don't exist" do
+        expect { @ragios.test("dont_exist") }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = dont_exist"))
+      end
+    end
+    describe "#delete" do
+      it "deletes a monitor" do
+        new_monitor_id = @ragios.add(@monitor)[:_id]
+        @ragios.delete(new_monitor_id).should == {ok: true}
+      end
+      it "cannot delete a monitor that doesnt exist" do
+        this_monitor_id = "dont_exist"
+        expect{ @ragios.find(this_monitor_id) }.to raise_error(Ragios::ClientException, generate_json(error: "No monitor found with id = #{this_monitor_id}"))
+      end
+    end
+    describe "#stop" do
+      it "stops an active monitor" do
+        active_monitor = @ragios.find(@monitor_id)
+        active_monitor[:status_].should == "active"
+
+        @ragios.stop(@monitor_id).should == {ok: true}
+
+        stopped_monitor = @ragios.find(@monitor_id)
+        stopped_monitor[:status_].should == "stopped"
+
+        #stop monitor is idempotent
+        @ragios.stop(@monitor_id).should == {ok: true}
+      end
+      it "cannot stop a monitor that dont exist" do
+        this_monitor_id = "dont_exist"
+        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
+        @ragios.stop(@monitor_id)
+        stopped_monitor = @ragios.find(@monitor_id)
+        stopped_monitor[:status_].should == "stopped"
+
+        @ragios.restart(@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}
+      end
+      it "cannot restart 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}"))
+      end
+    end
+    describe "#all" do
+      it "retrieves all monitors" do
+        retrieved_monitors = @ragios.all
+        retrieved_monitors.should_not be_empty
+        retrieved_monitors.should be_an_instance_of Array
+      end
+    end
+    after(:each) do
+      @ragios.delete(@monitor_id)
     end
   end
 
@@ -332,51 +192,23 @@ describe "Ragios Client" do
   end
 
   it "rejects incorrect login credentials" do
-    begin
-      @ragios.login('incorret','incorret')
-    rescue => e
-      e.should be_an_instance_of Ragios::ClientException
-      e.message.should include("You are not authorized to access this resource")
-    end
-  end
-
-  it "retrieves all monitors" do
-    #setup starts
-    unique_name = "Google #{Time.now.to_i}"
-    monitors = [{monitor: unique_name,
-      url: "http://google.com",
-      every: "5m",
-      contact: "admin@mail.com",
-      via: ["gmail_notifier"],
-      plugin: plugin }]
-
-    returned_monitors = @ragios.add monitors
-    monitor_id = returned_monitors.first[:_id]
-    #setup ends
-
-    retrieved_monitors = @ragios.all
-    retrieved_monitors.should_not be_empty
-    retrieved_monitors.should be_an_instance_of Array
-
-    #teardown
-    hash = @ragios.delete(monitor_id)
-    hash[:ok].should == true
+    expect { @ragios.login('incorret','incorret') }.to raise_error(Ragios::ClientException, generate_json(error: "You are not authorized to access this resource"))
   end
 
   it "has default settings" do
     ragios_client = Ragios::Client.new
     ragios_client.address.should == "http://127.0.0.1"
     ragios_client.port.should == "5041"
-    ragios_client.username.should == ""
-    ragios_client.password.should == ""
+    ragios_client.username.should == nil
+    ragios_client.password.should == nil
   end
 
   it "accepts new default address" do
     ragios_client = Ragios::Client.new(address: 'https://mysite.com', port: '6802')
     ragios_client.address.should == "https://mysite.com"
     ragios_client.port.should == "6802"
-    ragios_client.username.should == ""
-    ragios_client.password.should == ""
+    ragios_client.username.should == nil
+    ragios_client.password.should == nil
   end
 
   it "accepts new default login credentials" do
@@ -387,12 +219,11 @@ describe "Ragios Client" do
     ragios_client.password.should == "abc123"
   end
 
-    it "accepts new default settings" do
+  it "accepts new default settings" do
     ragios_client = Ragios::Client.new(username: 'superadmin', password: 'abc123', address: 'https://mysite.com', port: '6802')
     ragios_client.address.should == "https://mysite.com"
     ragios_client.port.should == "6802"
     ragios_client.username.should == "superadmin"
     ragios_client.password.should == "abc123"
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragios-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - obi-a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client