squall 1.2.1beta1 → 1.3.0

data/lib/squall/support/base.rb

@@ -1,5 +1,3 @@
-Faraday.register_middleware :response, :on_app_errors => Squall::OnAppErrors
-
 module Squall
   # All OnApp API classes subclass Base to get access to
   # HTTParty methods and other convenience methods
@@ -44,20 +42,22 @@ module Squall
     #   request :put, '/something.json', :something => 1 # PUT /something.json?something=1
     def request(request_method, path, options = {})
       check_config
+
       conn = Faraday.new(:url => Squall.config[:base_uri]) do |c|
         c.basic_auth Squall.config[:username], Squall.config[:password]
         c.params = (options[:query] || {})
         c.request :url_encoded
-        c.response :on_app_errors
         c.response :json
         c.adapter :net_http
         if Squall.config[:debug]
          c.use Faraday::Response::Logger
         end
       end
+
       response = conn.send(request_method, path)
+
       @success = (200..207).include?(response.env[:status])
-      @result = response.body
+      @result  = response.body
     end
 
     # Raises an error if a request is made without first calling Squall.config

data/lib/squall/support/exception.rb

@@ -1,13 +1,4 @@
 module Squall
   # Config missing
   class NoConfig < StandardError;end
-  
-  # HTTP 404 not found
-  class NotFoundError < StandardError;end
-
-  # HTTP 422
-  class ClientError < StandardError;end
-  
-  # HTTP 500 error
-  class ServerError < StandardError;end
 end

data/lib/squall/support/version.rb

@@ -1,3 +1,3 @@
 module Squall
-  VERSION = '1.2.1beta1'
+  VERSION = '1.3.0'
 end

data/lib/squall.rb

@@ -3,7 +3,6 @@ require 'faraday_middleware'
 
 require 'squall/support/version'
 require 'squall/support/exception'
-require 'squall/support/on_app_errors'
 require 'squall/support/yaml'
 
 module Squall

data/spec/squall/data_store_zone_spec.rb

@@ -8,7 +8,7 @@ describe Squall::DataStoreZone do
 
   describe "#list" do
     use_vcr_cassette "data_store_zone/list"
-    
+
     it "returns all data store zones" do
       data_store_zones = @data_store_zone.list
       data_store_zones.should be_an(Array)
@@ -19,30 +19,26 @@ describe Squall::DataStoreZone do
       data_store_zones.all? {|w| w.is_a?(Hash) }.should be_true
     end
   end
-  
+
   describe "#show" do
     use_vcr_cassette "data_store_zone/show"
     it "requires an id" do
       expect { @data_store_zone.show }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid data store zone id" do
-      expect { @data_store_zone.show(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a data store zone" do
       data_store_zone = @data_store_zone.show(1)
       data_store_zone.should be_a(Hash)
     end
   end
-  
+
   describe "#create" do
     use_vcr_cassette "data_store_zone/create"
     it "requires label" do
       invalid = @valid.reject{|k,v| k == :label }
       requires_attr(:label) { @data_store_zone.create(invalid) }
     end
-    
+
     it "raises error on unknown params" do
       expect { @data_store_zone.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -52,10 +48,10 @@ describe Squall::DataStoreZone do
       @data_store_zone.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "data_store_zone/edit"
-    
+
     it "allows select params" do
       optional = [:label]
       @data_store_zone.should_receive(:request).exactly(optional.size).times.and_return Hash.new()
@@ -63,7 +59,7 @@ describe Squall::DataStoreZone do
         @data_store_zone.edit(1, param => "test")
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @data_store_zone.edit(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -72,12 +68,8 @@ describe Squall::DataStoreZone do
       @data_store_zone.edit(1, :label => "Updated zone")
       @data_store_zone.success.should be_true
     end
-    
-    it "raises an error for an invalid data store zone id" do
-      expect { @data_store_zone.edit(404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
   end
-  
+
   describe "#delete" do
     use_vcr_cassette "data_store_zone/delete"
     it "requires an id" do
@@ -88,10 +80,6 @@ describe Squall::DataStoreZone do
       @data_store_zone.delete(1)
       @data_store_zone.success.should be_true
     end
-
-    it "returns NotFound for invalid data store zone id" do
-      expect { @data_store_zone.delete(404) }.to raise_error(Squall::NotFoundError)
-    end
   end
 
 end

data/spec/squall/firewall_rule_spec.rb

@@ -53,10 +53,6 @@ describe Squall::FirewallRule do
       expect { @firewall_rule.create(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
 
-    it "raises an error for an invalid vm id" do
-      expect { @firewall_rule.create(404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "creates a firewall rule for a virtual machine" do
       @firewall_rule.create(1, @valid)
       @firewall_rule.success.should be_true
@@ -82,10 +78,6 @@ describe Squall::FirewallRule do
       @firewall_rule.edit(1, 1, :port => 1000)
       @firewall_rule.success.should be_true
     end
-
-    it "raises an error for an invalid firewall rule id" do
-      expect { @firewall_rule.edit(1, 404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
   end
 
   describe "#delete" do
@@ -99,10 +91,6 @@ describe Squall::FirewallRule do
       @firewall_rule.delete(1, 1)
       @firewall_rule.success.should be_true
     end
-
-    it "returns NotFound for missing virtual machine" do
-      expect { @firewall_rule.delete(1, 404) }.to raise_error(Squall::NotFoundError)
-    end
   end
 
 end

data/spec/squall/hypervisor_spec.rb

@@ -13,12 +13,12 @@ describe Squall::Hypervisor do
       hvs = @hv.list
       hvs.should be_an(Array)
     end
-    
+
     it "contains hypervisor data" do
       hvs = @hv.list
       hvs.all?.should be_true
     end
-    
+
   end
 
   describe "#show" do
@@ -27,10 +27,6 @@ describe Squall::Hypervisor do
       expect { @hv.show }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid hvs" do
-      expect { @hv.show(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a hv" do
       @hv.show(1)
       @hv.success.should be_true
@@ -88,11 +84,6 @@ describe Squall::Hypervisor do
       @hv.success.should be_false
     end
 
-    it "404s on not found" do
-      expect { @hv.reboot(404) }.to raise_error(Squall::NotFoundError)
-      @hv.success.should be_false
-    end
-
     it "reboots the hypervisor" do
       reboot = @hv.reboot(1)
       @hv.success.should be_true
@@ -105,92 +96,87 @@ describe Squall::Hypervisor do
       expect { @hv.delete }.to raise_error(ArgumentError)
     end
 
-    it "404s on not found" do
-      expect { @hv.delete(404) }.to raise_error(Squall::NotFoundError)
-      @hv.success.should be_false
-    end
-
     it "returns a hv" do
       @hv.delete(1)
       @hv.success.should be_true
     end
   end
-  
+
   describe "#data_store_joins" do
     use_vcr_cassette "hypervisor/data_store_joins"
-    
+
     it "returns a list of data store joins" do
       joins = @hv.data_store_joins(1)
       joins.should be_an(Array)
     end
-    
+
     it "contains the data store join data" do
       joins = @hv.data_store_joins(1)
       joins.all? {|w| w.is_a?(Hash) }.should be_true
     end
-    
+
   end
-  
+
   describe "#add_data_store_join" do
     use_vcr_cassette "hypervisor/add_data_store_join"
-    
+
     it "adds the data store to the hypervisor zone" do
       @hv.add_data_store_join(1, 1)
       @hv.success.should be_true
     end
-    
+
   end
-  
+
   describe "#remove_data_store_join" do
     use_vcr_cassette "hypervisor/remove_data_store_join"
-    
+
     it "removes the data store from the hypervisor zone" do
       @hv.remove_data_store_join(1, 1)
       @hv.success.should be_true
     end
-    
+
   end
-  
+
   describe "#network_joins" do
     use_vcr_cassette "hypervisor/network_joins"
-    
+
     it "returns a list of network joins" do
       joins = @hv.network_joins(1)
       joins.should be_an(Array)
     end
-    
+
     it "contains the network join data" do
       joins = @hv.network_joins(1)
       joins.all? {|w| w.is_a?(Hash) }.should be_true
     end
-    
+
   end
-  
+
   describe "#add_network_join" do
     use_vcr_cassette "hypervisor/add_network_join"
-    
+
     it "requires network id" do
       requires_attr(:network_id) { @hv.add_network_join(1, :interface => "interface") }
     end
-    
+
     it "requires interface" do
       requires_attr(:interface) { @hv.add_network_join(1, :network_id => 1) }
     end
-    
+
     it "adds the network to the hypervisor zone" do
       @hv.add_network_join(1, :network_id => 1, :interface => "interface")
       @hv.success.should be_true
     end
-    
+
   end
-  
+
   describe "#remove_network_join" do
     use_vcr_cassette "hypervisor/remove_network_join"
-    
+
     it "removes the network from the hypervisor zone" do
       @hv.remove_network_join(1, 1)
       @hv.success.should be_true
     end
-    
+
   end
 end

data/spec/squall/hypervisor_zone_spec.rb

@@ -8,7 +8,7 @@ describe Squall::HypervisorZone do
 
   describe "#list" do
     use_vcr_cassette "hypervisor_zones/list"
-    
+
     it "returns all hypervisor zones" do
       hypervisor_zoness = @hypervisor_zone.list
       hypervisor_zoness.should be_an(Array)
@@ -19,30 +19,26 @@ describe Squall::HypervisorZone do
       hypervisor_zoness.all? {|w| w.is_a?(Hash) }.should be_true
     end
   end
-  
+
   describe "#show" do
     use_vcr_cassette "hypervisor_zones/show"
     it "requires an id" do
       expect { @hypervisor_zone.show }.to raise_error(ArgumentError)
     end
 
-    it "returns not found for invalid hypervisor zone id" do
-      expect { @hypervisor_zone.show(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns a hypervisor zone" do
       hypervisor_zones = @hypervisor_zone.show(1)
       hypervisor_zones.should be_a(Hash)
     end
   end
-  
+
   describe "#create" do
     use_vcr_cassette "hypervisor_zones/create"
     it "requires label" do
       invalid = @valid.reject{|k,v| k == :label }
       requires_attr(:label) { @hypervisor_zone.create(invalid) }
     end
-    
+
     it "raises error on unknown params" do
       expect { @hypervisor_zone.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -52,10 +48,10 @@ describe Squall::HypervisorZone do
       @hypervisor_zone.success.should be_true
     end
   end
-  
+
   describe "#edit" do
     use_vcr_cassette "hypervisor_zones/edit"
-    
+
     it "allows select params" do
       optional = [:label]
       @hypervisor_zone.should_receive(:request).exactly(optional.size).times.and_return Hash.new()
@@ -63,7 +59,7 @@ describe Squall::HypervisorZone do
         @hypervisor_zone.edit(1, param => "test")
       end
     end
-    
+
     it "raises error on unknown params" do
       expect { @hypervisor_zone.edit(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -72,12 +68,8 @@ describe Squall::HypervisorZone do
       @hypervisor_zone.edit(1, :label => "Updated zone")
       @hypervisor_zone.success.should be_true
     end
-    
-    it "raises an error for an invalid hypervisor zone id" do
-      expect { @hypervisor_zone.edit(404, @valid) }.to raise_error(Squall::NotFoundError)
-    end
   end
-  
+
   describe "#delete" do
     use_vcr_cassette "hypervisor_zones/delete"
     it "requires an id" do
@@ -88,103 +80,99 @@ describe Squall::HypervisorZone do
       @hypervisor_zone.delete(1)
       @hypervisor_zone.success.should be_true
     end
-
-    it "returns NotFound for invalid hypervisor zone id" do
-      expect { @hypervisor_zone.delete(404) }.to raise_error(Squall::NotFoundError)
-    end
   end
-  
+
   describe "#hypervisors" do
     use_vcr_cassette "hypervisor_zones/hypervisors"
-    
+
     it "returns a list of hypervisors" do
       hypervisors = @hypervisor_zone.hypervisors(1)
       hypervisors.should be_an(Array)
     end
-    
+
     it "contains the hypervisor data" do
       hypervisors = @hypervisor_zone.hypervisors(1)
       hypervisors.all? {|w| w.is_a?(Hash) }.should be_true
     end
-    
+
   end
-  
+
   describe "#data_store_joins" do
     use_vcr_cassette "hypervisor_zones/data_store_joins"
-    
+
     it "returns a list of data store joins" do
       joins = @hypervisor_zone.data_store_joins(1)
       joins.should be_an(Array)
     end
-    
+
     it "contains the data store join data" do
       joins = @hypervisor_zone.data_store_joins(1)
       joins.all? {|w| w.is_a?(Hash) }.should be_true
     end
-    
+
   end
-  
+
   describe "#add_data_store_join" do
     use_vcr_cassette "hypervisor_zones/add_data_store_join"
-    
+
     it "adds the data store to the hypervisor zone" do
       @hypervisor_zone.add_data_store_join(1, 1)
       @hypervisor_zone.success.should be_true
     end
-    
+
   end
-  
+
   describe "#remove_data_store_join" do
     use_vcr_cassette "hypervisor_zones/remove_data_store_join"
-    
+
     it "removes the data store from the hypervisor zone" do
       @hypervisor_zone.remove_data_store_join(1, 1)
       @hypervisor_zone.success.should be_true
     end
-    
+
   end
-  
+
   describe "#network_joins" do
     use_vcr_cassette "hypervisor_zones/network_joins"
-    
+
     it "returns a list of network joins" do
       joins = @hypervisor_zone.network_joins(1)
       joins.should be_an(Array)
     end
-    
+
     it "contains the network join data" do
       joins = @hypervisor_zone.network_joins(1)
       joins.all? {|w| w.is_a?(Hash) }.should be_true
     end
-    
+
   end
-  
+
   describe "#add_network_join" do
     use_vcr_cassette "hypervisor_zones/add_network_join"
-    
+
     it "requires network id" do
       requires_attr(:network_id) { @hypervisor_zone.add_network_join(1, :interface => "interface") }
     end
-    
+
     it "requires interface" do
       requires_attr(:interface) { @hypervisor_zone.add_network_join(1, :network_id => 1) }
     end
-    
+
     it "adds the network to the hypervisor zone" do
       @hypervisor_zone.add_network_join(1, :network_id => 1, :interface => "interface")
       @hypervisor_zone.success.should be_true
     end
-    
+
   end
-  
+
   describe "#remove_network_join" do
     use_vcr_cassette "hypervisor_zones/remove_network_join"
-    
+
     it "removes the network from the hypervisor zone" do
       @hypervisor_zone.remove_network_join(1, 1)
       @hypervisor_zone.success.should be_true
     end
-    
+
   end
 
 end

data/spec/squall/ip_address_join_spec.rb

@@ -12,15 +12,11 @@ describe Squall::IpAddressJoin do
       expect { @join.list }.to raise_error(ArgumentError)
     end
 
-    it "raises NotFound with an invalid virtual machine ID" do
-      expect { @join.list(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns list of ip_addresses" do
       ips = @join.list(1)
       ips.should be_an(Array)
     end
-    
+
     it "contains IP address data" do
       ips = @join.list(1)
       ips.all?.should be_true
@@ -35,12 +31,6 @@ describe Squall::IpAddressJoin do
       expect { @join.assign(1) }.to raise_error(ArgumentError)
     end
 
-    it "raises NotFound with an invalid virtual machine ID" do
-      expect {
-        @join.assign(404, {:ip_address_id => 1, :network_interface_id => 1})
-      }.to raise_error(Squall::NotFoundError)
-    end
-
     it "assigns the IP join" do
       join = @join.assign(1, {:ip_address_id => 1, :network_interface_id => 1})
       @join.success.should be_true
@@ -55,10 +45,6 @@ describe Squall::IpAddressJoin do
       expect { @join.delete(1) }.to raise_error(ArgumentError)
     end
 
-    it "raises NotFound with an invalid ID" do
-      expect { @join.delete(404, 1) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "deletes the IP join" do
       @join.delete(1, 1)
       @join.success.should be_true

data/spec/squall/ip_address_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Squall::IpAddress do
   before(:each) do
     @ip = Squall::IpAddress.new
-    @keys = ["netmask", "disallowed_primary", "address", "created_at", "updated_at", "network_id", 
+    @keys = ["netmask", "disallowed_primary", "address", "created_at", "updated_at", "network_id",
     "network_address", "broadcast", "id", "gateway"]
   end
 
@@ -14,15 +14,11 @@ describe Squall::IpAddress do
       expect { @ip.list }.to raise_error(ArgumentError)
     end
 
-    it "404s on invalid network" do
-      expect { @ip.list(404) }.to raise_error(Squall::NotFoundError)
-    end
-
     it "returns ip_addresses" do
       ips = @ip.list(1)
       ips.should be_an(Array)
     end
-    
+
     it "contains ip address data" do
       ips = @ip.list(1)
       ips.all?.should be_true

data/spec/squall/network_spec.rb

@@ -47,11 +47,6 @@ describe Squall::Network do
       @network.edit(1, :label => 'two', :vlan => 2, :identifier => 'woah')
       @network.success.should be_true
     end
-
-    it "404s on not found" do
-      expect { @network.edit(404) }.to raise_error(Squall::NotFoundError)
-      @network.success.should be_false
-    end
   end
 
   describe "#create" do
@@ -62,7 +57,7 @@ describe Squall::Network do
 
     it "raises error on duplicate account" do
       pending "Broken in OnApp" do
-        expect { 
+        expect {
           @network.create(:label => 'networktaken')
         }.to raise_error(Squall::ServerError)
         @network.errors['label'].should include("has already been taken")
@@ -70,7 +65,7 @@ describe Squall::Network do
     end
 
     it "raises error on invalid params" do
-      expect { 
+      expect {
         @network.create(:what => 'networktaken', :label => 'wut')
       }.to raise_error(ArgumentError, 'Unknown params: what')
     end
@@ -107,11 +102,6 @@ describe Squall::Network do
       @network.success.should be_false
     end
 
-    it "404s on not found" do
-      expect { @network.delete(404) }.to raise_error(Squall::NotFoundError)
-      @network.success.should be_false
-    end
-
     it "deletes the network" do
       delete = @network.delete(16)
       @network.success.should be_true