squall 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 2
+:patch: 3
 :build: 
 :major: 0
 :minor: 0

data/lib/squall/client.rb

@@ -1,7 +1,7 @@
 module Squall
   class Client
 
-    attr_reader :successful, :request, :response, :result, :message
+    attr_reader :successful, :request, :response, :result, :message, :raw_response
 
     def initialize
       @default_options = {:accept => :json, :content_type => 'application/json'}
@@ -52,7 +52,8 @@ module Squall
     end
 
     def valid_options!(accepted, actual)
-      unknown_keys = actual.keys - accepted
+      actual = actual.keys if actual.is_a?(Hash)
+      unknown_keys = actual - accepted
       raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(", ")}") unless unknown_keys.empty?
     end
 
@@ -63,9 +64,10 @@ module Squall
     end
 
     def handle_response(_response, _request, _result)
-      @request    = _request
-      @result     = _result
-      @response   = _response
+      @request      = _request
+      @result       = _result
+      @response     = _response
+      @raw_response = _response
       @successful = (200..207).include?(_response.code)
 
       case _response.code

data/lib/squall/virtual_machine.rb

@@ -1,7 +1,21 @@
 module Squall
   class VirtualMachine < Client
 
-    URI_PREFIX = 'virtual_machines'
+    URI_PREFIX   = 'virtual_machines'
+    VALID_PARAMS = [:primary_network_id, 
+                    :cpus, 
+                    :label, 
+                    :cpu_shares, 
+                    :template_id, 
+                    :swap_disk_size,
+                    :memory, 
+                    :required_virtual_machine_build, 
+                    :hypervisor_id, 
+                    :required_ip_address_assignment,
+                    :rate_limit, 
+                    :primary_disk_size,
+                    :hostname,
+                    :initial_root_password ]
 
     def list
       if get(URI_PREFIX)
@@ -16,28 +30,8 @@ module Squall
     end
 
     def edit(id, params = {})
-      valid = [ :primary_network_id, 
-                :cpus, 
-                :label, 
-                :cpu_shares, 
-                :template_id, 
-                :swap_disk_size,
-                :memory, 
-                :required_virtual_machine_build, 
-                :hypervisor_id, 
-                :required_ip_address_assignment,
-                :rate_limit, 
-                :primary_disk_size,
-                :hostname,
-                :initial_root_password,
-                :reboot ]
-
-      valid_options!(valid, params)
-    
-      reboot_after   = params.delete(:reboot)
-      update_request = put("#{URI_PREFIX}/#{id}", { :virtual_machine => params }) 
-      reboot(id) if reboot_after
-      update_request
+      valid_options!(VALID_PARAMS, params)
+      put("#{URI_PREFIX}/#{id}", { :virtual_machine => params }) 
     end
 
     def create(params = {})
@@ -55,9 +49,10 @@ module Squall
     end
 
     def search(pattern, *fields)
-      fields = [:label] if fields.nil?
+      fields = [:label] if fields.empty?
+      valid_options!(VALID_PARAMS, fields)
       list.select do |vm| 
-        fields.detect { |field| vm[field.to_s].match(/#{pattern}/) }
+        fields.detect { |field| vm.has_key?(field.to_s) && vm[field.to_s].to_s.match(/#{pattern}/) }
       end
     end
   end

data/squall.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{squall}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Mazzi"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/squall/virtual_machine.rb",
     "squall.gemspec",
     "test/fixtures/virtual_machines.json",
+    "test/fixtures/virtual_machines_1.json",
     "test/helper.rb",
     "test/test_client.rb",
     "test/test_squall.rb",

data/test/fixtures/virtual_machines_1.json

@@ -0,0 +1 @@
+{"virtual_machine":{"label":"label1","cpus":2,"operating_system_distro":"rhel","created_at":"2010-11-16T17:37:23Z","template_id":9,"operating_system":"linux","cpu_shares":16,"updated_at":"2010-11-16T17:37:23Z","memory":512,"local_remote_access_port":null,"allowed_swap":true,"recovery_mode":null,"allow_resize_without_reboot":true,"xen_id":null,"id":1,"hypervisor_id":1,"total_disk_size":6,"ip_addresses":[],"user_id":5,"template_label":null,"hostname":"label1.example.com","booted":false,"monthly_bandwidth_used":0,"remote_access_password":null,"min_disk_size":5,"initial_root_password":"password1","identifier":"woah","locked":false,"built":false}}

data/test/helper.rb

@@ -20,9 +20,9 @@ class Test::Unit::TestCase
       "http://#{Squall.api_user}:#{Squall.api_password}@#{Squall.api_endpoint.host}#{Squall.api_endpoint.path}"
   end
 
-  def stub_json_request(meth, uri, content = nil)
-    content = File.read(File.join(File.dirname(__FILE__), "fixtures/#{uri}.json")) if content.nil?
-    fake_response = Net::HTTPOK.new('1.1', '200', 'OK') 
+  def stub_json_request(meth, uri, content = nil, code = 200)
+    content = File.read(File.join(File.dirname(__FILE__), "fixtures/#{uri.gsub('/', '_')}.json")) if content.nil?
+    fake_response = Net::HTTPOK.new('1.1', code, 'OK') 
     fake_response['Content-Type'] = 'application/json' 
     fake_response.instance_variable_set('@body', content)
     FakeWeb.register_uri(meth, "#{uri_with_login}/#{uri}.json", :content_type => 'application/json', :response => fake_response)

data/test/test_virtual_machine.rb

@@ -16,6 +16,83 @@ class TestVirtualMachine < Test::Unit::TestCase
     assert_equal 2, vms.size
     assert_equal 'label1', vms[0]['label']
     assert_equal 'label2', vms[1]['label']
+    assert_equal true, @virtual.successful
+    assert_instance_of Array, vms
+  end
+
+  def test_show
+    stub_json_request(:get, 'virtual_machines/1')
+    show = @virtual.show(1)
+    assert_instance_of Hash, show
+    expected = {"monthly_bandwidth_used"=>0, "cpus"=>2, "label"=>"label1", 
+                "created_at"=>"2010-11-16T17:37:23Z", "operating_system_distro"=>"rhel", 
+                "cpu_shares"=>16, "operating_system"=>"linux", "template_id"=>9, 
+                "allowed_swap"=>true, "local_remote_access_port"=>nil, "memory"=>512,
+                "updated_at"=>"2010-11-16T17:37:23Z", "allow_resize_without_reboot"=>true,
+                "recovery_mode"=>nil, "hypervisor_id"=>1, "id"=>1, "xen_id"=>nil, 
+                "user_id"=>5, "booted"=>false, "hostname"=>"label1.example.com", 
+                "template_label"=>nil, "total_disk_size"=>6, "identifier"=>"woah", 
+                "initial_root_password"=>"password1", "min_disk_size"=>5, "remote_access_password"=>nil,
+                "built"=>false, "locked"=>false, "ip_addresses"=>[]}
+    assert_equal expected, show
+    assert_equal true, @virtual.successful
+  end
+
+  def test_edit
+    stub_json_request(:put, 'virtual_machines/1', '')
+    edit = @virtual.edit(1, :cpus => 1)
+    assert_equal true, edit
+    assert_equal true, @virtual.successful
+    
+    e = assert_raises ArgumentError do
+      @virtual.edit(1, :what => 1)
+    end
+    assert_match /Unknown key\(s\): what/, e.message
+  end
+
+  def test_create
+    params = {:memory => 128, :cpus => 1, :label => 'test_create', :template_id => 1, 
+              :hypervisor_id => 1, :initial_root_password => 'hi', :hostname => 'test_create'}
+
+    response = '{"virtual_machine":{"primary_network_id":"1", "cpus":"1", "label":"test_create",
+    "cpu_shares":"10", "template_id":"1", "swap_disk_size":"1", "memory":"128",
+    "required_virtual_machine_build":"1", "hypervisor_id":"1",
+    "required_ip_address_assignment":"1", "rate_limit":"10",
+    "primary_disk_size":"5", "hostname":"s",
+    "initial_root_password":"hi"} }'
+
+    stub_json_request(:post, 'virtual_machines', response)
+
+    create = @virtual.create(params)
+    assert_equal true, create
+    assert_equal JSON.parse(response), @virtual.message
+  end
 
+  def test_destroy
+    stub_json_request(:delete, 'virtual_machines/1', '')
+    destroy = @virtual.destroy(1)
+    assert_equal true, destroy
   end
+
+  def test_reboot
+    stub_json_request(:post, 'virtual_machines/1/reboot', '')
+    reboot = @virtual.reboot(1)
+    assert_equal true, reboot
+  end
+
+  def test_search
+    stub_json_request(:get, 'virtual_machines')
+    search = @virtual.search('label2')
+    assert_equal 1, search.size
+
+    search = @virtual.search('label2', :label)
+    assert_equal 1, search.size
+
+    search = @virtual.search('label', :label)
+    assert_equal 2, search.size
+
+    search = @virtual.search(1, :hypervisor_id)
+    assert_equal 2, search.size
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squall
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Justin Mazzi
@@ -95,6 +95,7 @@ files:
 - lib/squall/virtual_machine.rb
 - squall.gemspec
 - test/fixtures/virtual_machines.json
+- test/fixtures/virtual_machines_1.json
 - test/helper.rb
 - test/test_client.rb
 - test/test_squall.rb