squall 1.3.0 → 1.3.1

data/spec/squall/ip_address_spec.rb

@@ -10,10 +10,6 @@ describe Squall::IpAddress do
   describe "#list" do
     use_vcr_cassette 'ipaddress/list'
 
-    it "requires network_id" do
-      expect { @ip.list }.to raise_error(ArgumentError)
-    end
-
     it "returns ip_addresses" do
       ips = @ip.list(1)
       ips.should be_an(Array)
@@ -29,21 +25,13 @@ describe Squall::IpAddress do
     use_vcr_cassette 'ipaddress/edit'
 
     ip_params = {
-      :address         => '109.123.91.67',
-      :netmask         => '255.255.255.193',
-      :broadcast       => '109.123.91.128',
-      :network_address => '109.123.91.65',
-      :gateway         => '109.123.91.66'
+      address:         '109.123.91.67',
+      netmask:         '255.255.255.193',
+      broadcast:       '109.123.91.128',
+      network_address: '109.123.91.65',
+      gateway:         '109.123.91.66'
     }
 
-    it "raises ArgumentError without required arguments" do
-      expect { @ip.edit }.to raise_error(ArgumentError)
-    end
-
-    it "raises ArgumentError without id argument" do
-      expect { @ip.edit(1) }.to raise_error(ArgumentError)
-    end
-
     it "edits the IpAddress" do
       ip = @ip.edit(1, 1, ip_params)
       @ip.success.should be_true
@@ -53,21 +41,13 @@ describe Squall::IpAddress do
   describe "#create" do
     use_vcr_cassette 'ipaddress/create'
 
-    it "raises ArgumentError without network_id" do
-      expect { @ip.create }.to raise_error(ArgumentError)
-    end
-
-    it "raises ArgumentError without required options" do
-      expect { @ip.create(1, {}) }.to raise_error(ArgumentError)
-    end
-
     it "creates a new IP" do
       new_ip = @ip.create(1,
-        :address         => '109.123.91.24',
-        :netmask         => '255.255.255.194',
-        :broadcast       => '109.123.91.129',
-        :network_address => '109.123.91.66',
-        :gateway         => '109.123.91.67'
+        address:         '109.123.91.24',
+        netmask:         '255.255.255.194',
+        broadcast:       '109.123.91.129',
+        network_address: '109.123.91.66',
+        gateway:         '109.123.91.67'
       )
 
       @ip.success.should be_true
@@ -77,11 +57,6 @@ describe Squall::IpAddress do
   describe "#delete" do
     use_vcr_cassette 'ipaddress/delete'
 
-    it "raises ArgumentError without network_id or id" do
-      expect { @ip.delete }.to raise_error(ArgumentError)
-      expect { @ip.delete(1) }.to raise_error(ArgumentError)
-    end
-
     it "deletes the IP" do
       @ip.delete(1, 1)
       @ip.success.should be_true

data/spec/squall/network_spec.rb

@@ -8,6 +8,7 @@ describe Squall::Network do
 
   describe "#list" do
     use_vcr_cassette "network/list"
+
     it "returns a network list" do
       networks = @network.list
       networks.size.should be(2)
@@ -22,73 +23,56 @@ describe Squall::Network do
 
   describe "#edit" do
     use_vcr_cassette 'network/edit'
-    it "requires an id" do
-      expect { @network.edit }.to raise_error(ArgumentError)
-      @network.success.should be_false
-    end
-
-    it "errors on invalid params" do
-      expect { @network.edit(1, :what => 1) }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
 
     it "accepts valid params" do
-      @network.edit(1, :label => 'one')
+      @network.edit(1, label: 'one')
       @network.success.should be_true
 
-      @network.edit(1, :network_group_id => 1)
+      @network.edit(1, network_group_id: 1)
       @network.success.should be_true
 
-      @network.edit(1, :identifier => 'lolzsdfds')
+      @network.edit(1, identifier: 'lolzsdfds')
       @network.success.should be_true
 
-      @network.edit(1, :vlan => 1)
+      @network.edit(1, vlan: 1)
       @network.success.should be_true
 
-      @network.edit(1, :label => 'two', :vlan => 2, :identifier => 'woah')
+      @network.edit(1, label: 'two', vlan: 2, identifier: 'woah')
       @network.success.should be_true
     end
   end
 
   describe "#create" do
     use_vcr_cassette "network/create"
-    it "requires label" do
-      requires_attr(:label) { @network.create }
-    end
 
     it "raises error on duplicate account" do
       pending "Broken in OnApp" do
         expect {
-          @network.create(:label => 'networktaken')
+          @network.create(label: 'networktaken')
         }.to raise_error(Squall::ServerError)
         @network.errors['label'].should include("has already been taken")
       end
     end
 
-    it "raises error on invalid params" do
-      expect {
-        @network.create(:what => 'networktaken', :label => 'wut')
-      }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
-
     it "creates a network" do
-      network = @network.create(:label => 'newnetwork', :vlan => 1, :identifier => 'newnetworkid')
+      network = @network.create(label: 'newnetwork', vlan: 1, identifier: 'newnetworkid')
       @network.success.should be_true
 
       network['label'].should == 'newnetwork'
       network['vlan'].should == 1
       network['identifier'].should == 'newnetworkid'
 
-      network = @network.create(:label => 'newnetwork')
+      network = @network.create(label: 'newnetwork')
       network['label'].should == 'newnetwork'
       network['vlan'].should be_nil
       @network.success.should be_true
 
-      network = @network.create(:label => 'newnetwork', :vlan => 2)
+      network = @network.create(label: 'newnetwork', vlan: 2)
       network['label'].should == 'newnetwork'
       network['vlan'].should == 2
       @network.success.should be_true
 
-      network = @network.create(:label => 'newnetwork', :identifier => 'something')
+      network = @network.create(label: 'newnetwork', identifier: 'something')
       network['label'].should == 'newnetwork'
       network['identifier'].should == 'something'
       @network.success.should be_true
@@ -97,14 +81,19 @@ describe Squall::Network do
 
   describe "#delete" do
     use_vcr_cassette 'network/delete'
-    it "requires an id" do
-      expect { @network.delete }.to raise_error(ArgumentError)
-      @network.success.should be_false
-    end
 
     it "deletes the network" do
       delete = @network.delete(16)
       @network.success.should be_true
     end
   end
+
+  describe "#rebuild" do
+    use_vcr_cassette 'network/rebuild'
+
+    it "rebuilds the network for VM" do
+      rebuild = @network.rebuild(58)
+      @network.success.should be_true
+    end
+  end
 end

data/spec/squall/network_zone_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Squall::NetworkZone do
   before(:each) do
     @network_zone = Squall::NetworkZone.new
-    @valid = {:label => "My zone"}
+    @valid = {label: "My zone"}
   end
 
   describe "#list" do
@@ -22,9 +22,6 @@ describe Squall::NetworkZone do
 
   describe "#show" do
     use_vcr_cassette "network_zones/show"
-    it "requires an id" do
-      expect { @network_zone.show }.to raise_error(ArgumentError)
-    end
 
     it "returns a network zone" do
       network_zones = @network_zone.show(1)
@@ -34,14 +31,6 @@ describe Squall::NetworkZone do
 
   describe "#create" do
     use_vcr_cassette "network_zones/create"
-    it "requires label" do
-      invalid = @valid.reject{|k,v| k == :label }
-      requires_attr(:label) { @network_zone.create(invalid) }
-    end
-
-    it "raises error on unknown params" do
-      expect { @network_zone.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
 
     it "creates a network zone" do
       @network_zone.create(@valid)
@@ -60,21 +49,14 @@ describe Squall::NetworkZone do
       end
     end
 
-    it "raises error on unknown params" do
-      expect { @network_zone.edit(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
-
     it "edits a network zone" do
-      @network_zone.edit(1, :label => "Updated zone")
+      @network_zone.edit(1, label: "Updated zone")
       @network_zone.success.should be_true
     end
   end
 
   describe "#delete" do
     use_vcr_cassette "network_zones/delete"
-    it "requires an id" do
-      expect { @network_zone.delete }.to raise_error(ArgumentError)
-    end
 
     it "deletes a network zone" do
       @network_zone.delete(1)
@@ -85,14 +67,6 @@ describe Squall::NetworkZone do
   describe "#attach" do
     use_vcr_cassette "network_zones/attach"
 
-    it "requires an id" do
-      expect { @network_zone.attach }.to raise_error(ArgumentError)
-    end
-
-    it "requires a network id" do
-      expect { @network_zone.attach(1) }.to raise_error(ArgumentError)
-    end
-
     it "attaches a network to the network zone" do
       request = @network_zone.attach(1, 2)
       @network_zone.success.should be_true
@@ -102,14 +76,6 @@ describe Squall::NetworkZone do
   describe "#detach" do
     use_vcr_cassette "network_zones/detach"
 
-    it "requires an id" do
-      expect { @network_zone.detach }.to raise_error(ArgumentError)
-    end
-
-    it "requires a network id" do
-      expect { @network_zone.detach(1) }.to raise_error(ArgumentError)
-    end
-
     it "detaches a network to the network zone" do
       request = @network_zone.detach(1, 2)
       @network_zone.success.should be_true

data/spec/squall/payment_spec.rb

@@ -4,16 +4,12 @@ describe Squall::Payment do
   before(:each) do
     @keys = ["amount", "invoice_number"]
     @payment = Squall::Payment.new
-    @valid = {:amount => 500}
+    @valid = {amount: 500}
   end
 
   describe "#list" do
     use_vcr_cassette "payment/list"
 
-    it "requires user id" do
-      expect { @payment.list }.to raise_error(ArgumentError)
-    end
-
     it "returns a user list" do
       payments = @payment.list(1)
       payments.should be_an(Array)
@@ -27,10 +23,6 @@ describe Squall::Payment do
 
   describe "#create" do
     use_vcr_cassette "payment/create"
-    it "requires amount" do
-      invalid = @valid.reject{|k,v| k == :amount }
-      requires_attr(:amount) { @payment.create(1, invalid) }
-    end
 
     it "allows all optional params" do
       optional = [:invoice_number]
@@ -40,10 +32,6 @@ describe Squall::Payment do
       end
     end
 
-    it "raises error on unknown params" do
-      expect { @payment.create(1, @valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
-
     it "creates a payment for a user" do
       user = @payment.create(1, @valid)
       @payment.success.should be_true
@@ -61,21 +49,14 @@ describe Squall::Payment do
       end
     end
 
-    it "raises error on unknown params" do
-      expect { @payment.edit(1, 1, :what => 'what') }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
-
     it "edits a payment" do
-      user = @payment.edit(1, 1, :amount => 100)
+      user = @payment.edit(1, 1, amount: 100)
       @payment.success.should be_true
     end
   end
 
   describe "#delete" do
     use_vcr_cassette "payment/delete"
-    it "requires an id" do
-      expect { @payment.delete }.to raise_error(ArgumentError)
-    end
 
     it "deletes a payment" do
       @payment.delete(1, 1)

data/spec/squall/role_spec.rb

@@ -7,6 +7,7 @@ describe Squall::Role do
 
   describe "#list" do
     use_vcr_cassette "role/list"
+
     it "returns roles" do
       roles = @role.list
       roles.all?{|r| r.first == "role"}
@@ -15,9 +16,6 @@ describe Squall::Role do
 
   describe "#show" do
     use_vcr_cassette "role/show"
-    it "requires an id" do
-      expect { @role.show }.to raise_error(ArgumentError)
-    end
 
     it "returns a role" do
       role = @role.show(1)
@@ -27,9 +25,6 @@ describe Squall::Role do
 
   describe "#edit" do
     use_vcr_cassette "role/edit"
-    it "requires an id" do
-      expect { @role.edit }.to raise_error(ArgumentError)
-    end
 
     it "allows all optional params" do
       optional = [:label, :permission_ids]
@@ -42,7 +37,7 @@ describe Squall::Role do
 
     it "updates the role" do
       pending "OnApp is returning an empty response" do
-        role = @role.edit(1, :label => 'New')
+        role = @role.edit(1, label: 'New')
         role['label'].should == 'New'
       end
     end
@@ -50,9 +45,6 @@ describe Squall::Role do
 
   describe "#delete" do
     use_vcr_cassette "role/delete"
-    it "requires an id" do
-      expect { @role.delete }.to raise_error(ArgumentError)
-    end
 
     it "returns a role" do
       role = @role.delete(3)
@@ -78,17 +70,13 @@ describe Squall::Role do
   describe "#create" do
     use_vcr_cassette "role/create"
 
-    it "requires label" do
-      requires_attr(:label) { @role.create }
-    end
-
     it "allows permission_ids" do
       @role.should_receive(:request).once.and_return Hash.new('role' => [])
-      @role.create(:label => "test", :permission_ids => 1)
+      @role.create(label: "test", permission_ids: 1)
     end
 
     it "creates a role" do
-      response = @role.create({:label => 'Test Create', :permission_ids => 1})
+      response = @role.create({label: 'Test Create', permission_ids: 1})
       response["role"]['label'].should  == 'Test Create'
       response["role"]['permissions'].should_not be_empty
     end

data/spec/squall/support/base_spec.rb

@@ -15,7 +15,7 @@ describe Squall::Base do
   describe "#request" do
     it "200-207 returns success" do
       (200..207).each do |i|
-        mock_request(:get, "/#{i}", :status => [i, "OK"], :body => "{\"something\":[\"OK\"]}")
+        mock_request(:get, "/#{i}", status: [i, "OK"], body: "{\"something\":[\"OK\"]}")
         base = Squall::Base.new
         base.request(:get, "/#{i}")
         base.success.should be_true
@@ -23,7 +23,7 @@ describe Squall::Base do
     end
 
     it "raises NotFound for 404s" do
-      mock_request(:get, '/404', :status => [404, "NotFound"], :body => "{\"errors\":[\"Resource not found\"]}")
+      mock_request(:get, '/404', status: [404, "NotFound"], body: "{\"errors\":[\"Resource not found\"]}")
       @base.request(:get, '/404')
 
       @base.success.should be_false
@@ -31,7 +31,7 @@ describe Squall::Base do
     end
 
     it "raises ServerError on errors" do
-      mock_request(:get, '/500', :status => [500, "Internal Server Error"], :body => "{\"errors\":[\"Internal Server Error\"]}")
+      mock_request(:get, '/500', status: [500, "Internal Server Error"], body: "{\"errors\":[\"Internal Server Error\"]}")
       @base.request(:get, '/500')
 
       @base.success.should be_false
@@ -39,7 +39,7 @@ describe Squall::Base do
     end
 
     it "raises RequestError on errors" do
-      mock_request(:get, '/422', :status => [422, "Unprocessable"], :body => "{\"errors\":[\"Unprocessable\"]}")
+      mock_request(:get, '/422', status: [422, "Unprocessable"], body: "{\"errors\":[\"Unprocessable\"]}")
       @base.request(:get, '/422')
 
       @base.success.should be_false
@@ -52,12 +52,6 @@ describe Squall::Base do
     end
   end
 
-  describe "#params" do
-    it "returns Params.new" do
-      @base.params.should be_a(Squall::Params)
-    end
-  end
-
   describe "#default_params" do
     it "sets the default options" do
       @base.default_params.should == {}
@@ -65,22 +59,22 @@ describe Squall::Base do
 
     it "merges the query in" do
       expected = {
-        :query => {
-          :base => {:one => 1, :two => 2}
+        query: {
+          base: {one: 1, two: 2}
         }
       }
-      @base.default_params(:one => 1, :two => 2).should include(expected)
+      @base.default_params(one: 1, two: 2).should include(expected)
     end
 
     it "uses the subclass name as the key" do
       base_test = CamelTest.new
       base_test.default_params.should == {}
       expected = {
-        :query => {
-          :camel_test => {:one => 1, :two => 2}
+        query: {
+          camel_test: {one: 1, two: 2}
         }
       }
-      base_test.default_params(:one => 1, :two => 2).should include(expected)
+      base_test.default_params(one: 1, two: 2).should include(expected)
     end
   end
 

data/spec/squall/template_spec.rb

@@ -24,10 +24,6 @@ describe Squall::Template do
 
   describe "#make_public" do
     use_vcr_cassette 'template/make_public'
-    it "requires an id" do
-      expect { @template.make_public }.to raise_error(ArgumentError)
-      @template.success.should be_false
-    end
 
     it "makes the template public" do
       pub = @template.make_public(1)

data/spec/squall/transaction_spec.rb

@@ -11,6 +11,7 @@ describe Squall::Transaction do
 
   describe "#list" do
     use_vcr_cassette 'transaction/list'
+
     it "lists transactions" do
       list = @transaction.list
       list.size.should be(3)
@@ -22,9 +23,6 @@ describe Squall::Transaction do
 
   describe "#show" do
     use_vcr_cassette "transaction/show"
-    it "requires an id" do
-      expect { @transaction.show }.to raise_error(ArgumentError)
-    end
 
     it "returns a transaction" do
       transaction = @transaction.show(1)

data/spec/squall/user_group_spec.rb

@@ -4,7 +4,7 @@ describe Squall::UserGroup do
   before(:each) do
     @keys = ["amount"]
     @user_group = Squall::UserGroup.new
-    @valid = {:label => "My new group"}
+    @valid = {label: "My new group"}
   end
 
   describe "#list" do
@@ -23,14 +23,6 @@ describe Squall::UserGroup do
 
   describe "#create" do
     use_vcr_cassette "user_group/create"
-    it "requires label" do
-      invalid = @valid.reject{|k,v| k == :label }
-      requires_attr(:label) { @user_group.create(invalid) }
-    end
-
-    it "raises error on unknown params" do
-      expect { @user_group.create(@valid.merge(:what => 'what')) }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
 
     it "creates a user group" do
       @user_group.create(@valid)
@@ -41,10 +33,6 @@ describe Squall::UserGroup do
   describe "#edit" do
     use_vcr_cassette "user_group/edit"
 
-    it "raises error on unknown params" do
-      expect { @user_group.edit(1, :what => 'what') }.to raise_error(ArgumentError, 'Unknown params: what')
-    end
-
     it "edits a user group" do
       @user_group.edit(1, @valid)
       @user_group.success.should be_true
@@ -53,14 +41,10 @@ describe Squall::UserGroup do
 
   describe "#delete" do
     use_vcr_cassette "user_group/delete"
-    it "requires an id" do
-      expect { @user_group.delete }.to raise_error(ArgumentError)
-    end
 
     it "deletes a user group" do
       @user_group.delete(1)
       @user_group.success.should be_true
     end
   end
-
 end