shanesveller-webbynode-api 0.0.4 → 0.0.5

data/VERSION

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

data/lib/webbynode-api.rb

@@ -18,9 +18,12 @@ class WebbyNode
 
     # Uses HTTParty to submit a secure API request via email address and token
     def auth_get(url, options = {})
+      raise ArgumentError, "No API information given" unless @email && @api_key
       options[:query] ||= {}
       options[:query].merge!(:email => @email, :token => @api_key)
-      self.class.get(url, options)
+      results = self.class.get(url, options)
+      raise ArgumentError, "Probable bad API information given" if results == {}
+      return results
     end
 
     # Catches simple requests for specific API data returned via a hash

data/test/data/bad-auth.xml

@@ -0,0 +1 @@
+Authentication required

data/test/data/webbies.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hash>
+  <webbies type="array">
+    <webby>
+      <status>on</status>
+      <ip>222.111.222.111</ip>
+      <node>location-a01</node>
+      <plan>Webby_384</plan>
+      <name>webby1</name>
+      <notes nil="true"></notes>
+    </webby>
+  </webbies>
+</hash>

data/test/webbynode-api_test.rb

@@ -1,11 +1,29 @@
 require 'test_helper'
 
 class WebbynodeApiTest < Test::Unit::TestCase
+  context "with bad API token or email" do
+    setup do
+      @email ="example@email.com"
+      @api_key = "123456"
+      data_path = File.join(File.dirname(__FILE__), "data")
+      FakeWeb.clean_registry
+      FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/client\?\w+/i, :body => File.read("#{data_path}/bad-auth.xml"))
+    end
+    should "raise ArgumentError if no API data given" do
+      assert_raise(ArgumentError){ WebbyNode::Client.new(nil, nil) }
+      assert_raise(ArgumentError){ WebbyNode::Client.new(@email, nil) }
+      assert_raise(ArgumentError){ WebbyNode::Client.new(nil, @api_key) }
+    end
+    should "raise ArgumentError if bad API data given" do
+      assert_raise(ArgumentError){ WebbyNode::Client.new(@email, @api_key) }
+    end
+  end
   context "fetching client data from API" do
     setup do
       email = "example@email.com"
       api_key = "123456"
       data_path = File.join(File.dirname(__FILE__), "data")
+      FakeWeb.clean_registry
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/client\?.+/i, :body => File.read("#{data_path}/client.xml"))
       @api = WebbyNode::Client.new(email, api_key)
     end
@@ -48,6 +66,7 @@ class WebbynodeApiTest < Test::Unit::TestCase
       api_key = "123456"
       hostname = "webby1"
       data_path = File.join(File.dirname(__FILE__), "data")
+      FakeWeb.clean_registry
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/webby\/\w+\/start\?.+/i, :body => File.read("#{data_path}/webby-start.xml"))
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/webby\/\w+\/shutdown\?.+/i, :body => File.read("#{data_path}/webby-shutdown.xml"))
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/webby\/\w+\/reboot\?.+/i, :body => File.read("#{data_path}/webby-reboot.xml"))
@@ -88,6 +107,7 @@ class WebbynodeApiTest < Test::Unit::TestCase
       email = "example@email.com"
       api_key = "123456"
       data_path = File.join(File.dirname(__FILE__), "data")
+      FakeWeb.clean_registry
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/dns\?.+/i, :body => File.read("#{data_path}/dns.xml"))
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/dns\/\d+\?.+/i, :body => File.read("#{data_path}/dns-1.xml"))
       @dns = WebbyNode::DNS.new(email, api_key)
@@ -113,6 +133,7 @@ class WebbynodeApiTest < Test::Unit::TestCase
       api_key = "123456"
       id = 1
       data_path = File.join(File.dirname(__FILE__), "data")
+      FakeWeb.clean_registry
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/dns\?.+/i, :body => File.read("#{data_path}/dns.xml"))
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/dns\/\d+\?.+/i, :body => File.read("#{data_path}/dns-1.xml"))
       FakeWeb.register_uri(:get, /https:\/\/manager\.webbynode\.com\/api\/xml\/dns\/\d+\/records\?.+/i, :body => File.read("#{data_path}/dns-records.xml"))

data/webbynode-api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webbynode-api}
-  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.authors = ["Shane Sveller"]
@@ -21,10 +21,12 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/webbynode-api.rb",
      "lib/webbynode-api/data.rb",
+     "test/data/bad-auth.xml",
      "test/data/client.xml",
      "test/data/dns-1.xml",
      "test/data/dns-records.xml",
      "test/data/dns.xml",
+     "test/data/webbies.xml",
      "test/data/webby-reboot.xml",
      "test/data/webby-shutdown.xml",
      "test/data/webby-start.xml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shanesveller-webbynode-api
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Shane Sveller
@@ -31,10 +31,12 @@ files:
 - VERSION
 - lib/webbynode-api.rb
 - lib/webbynode-api/data.rb
+- test/data/bad-auth.xml
 - test/data/client.xml
 - test/data/dns-1.xml
 - test/data/dns-records.xml
 - test/data/dns.xml
+- test/data/webbies.xml
 - test/data/webby-reboot.xml
 - test/data/webby-shutdown.xml
 - test/data/webby-start.xml