fog 0.0.9 → 0.0.10

data/lib/fog/collection.rb

@@ -39,7 +39,7 @@ module Fog
     def attributes
       attributes = {}
       for attribute in self.class.attributes
-        attributes[attribute] = send(:"#{attribute}")
+        attributes[attribute] = send("#{attribute}")
       end
       attributes
     end
@@ -47,9 +47,9 @@ module Fog
     def merge_attributes(new_attributes = {})
       for key, value in new_attributes
         if aliased_key = self.class.aliases[key]
-          send(:"#{aliased_key}=", value)
+          send("#{aliased_key}=", value)
         else
-          send(:"#{key}=", value)
+          send("#{key}=", value)
         end
       end
       self

data/lib/fog/connection.rb

@@ -3,8 +3,8 @@ require 'openssl'
 require 'socket'
 require 'uri'
 
-require "#{File.dirname(__FILE__)}/errors"
-require "#{File.dirname(__FILE__)}/response"
+require "fog/errors"
+require "fog/response"
 
 unless Fog.mocking?
 

data/lib/fog/errors.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/parser"
+require "fog/parser"
 
 module Fog
   module Errors

data/lib/fog/model.rb

@@ -34,7 +34,7 @@ module Fog
     def attributes
       attributes = {}
       for attribute in self.class.attributes
-        attributes[attribute] = send(:"#{attribute}")
+        attributes[attribute] = send("#{attribute}")
       end
       attributes
     end
@@ -42,9 +42,9 @@ module Fog
     def merge_attributes(new_attributes = {})
       for key, value in new_attributes
         if aliased_key = self.class.aliases[key]
-          send(:"#{aliased_key}=", value)
+          send("#{aliased_key}=", value)
         else
-          send(:"#{key}=", value)
+          send("#{key}=", value)
         end
       end
       self

data/spec/aws/models/ec2/address_spec.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::Address' do
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" do
+      address = Fog::AWS::EC2::Address.new(
+        'instanceId'  => 'i-00000000',
+        'publicIp'    => '0.0.0.0'
+      )
+      address.instance_id.should == 'i-00000000'
+      address.public_ip.should == '0.0.0.0'
+    end
+
+  end
+
+  describe "#addresses" do
+
+    it "should return a Fog::AWS::EC2::Addresses" do
+      ec2.addresses.new.addresses.should be_a(Fog::AWS::EC2::Addresses)
+    end
+
+    it "should be the addresses the address is related to" do
+      addresses = ec2.addresses
+      addresses.new.addresses.should == addresses
+    end
+
+  end
+
+  describe "#destroy" do
+
+    it "should return true if the address is deleted" do
+      address = ec2.addresses.create
+      address.destroy.should be_true
+    end
+
+  end
+
+  describe "#reload" do
+
+    before(:each) do
+      @address = ec2.addresses.create
+      @reloaded = @address.reload
+    end
+
+    after(:each) do
+      @address.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::Address" do
+      @reloaded.should be_a(Fog::AWS::EC2::Address)
+    end
+
+    it "should reset attributes to remote state" do
+      @address.attributes.should == @reloaded.attributes
+    end
+
+  end
+
+  describe "#save" do
+
+    before(:each) do
+      @address = ec2.addresses.new
+    end
+
+    it "should return true when it succeeds" do
+      @address.save.should be_true
+      @address.destroy
+    end
+
+    it "should not exist in addresses before save" do
+      @address.addresses.get(@address.public_ip).should be_nil
+    end
+
+    it "should exist in buckets after save" do
+      @address.save
+      @address.addresses.get(@address.public_ip).should_not be_nil
+      @address.destroy
+    end
+
+  end
+
+end

data/spec/aws/models/ec2/addresses_spec.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::Addresses' do
+
+  describe "#all" do
+
+    it "should return a Fog::AWS::EC2::Addresses" do
+      ec2.addresses.all.should be_a(Fog::AWS::EC2::Addresses)
+    end
+
+    it "should include persisted addresses" do
+      address = ec2.addresses.create
+      ec2.addresses.get(address.public_ip).should_not be_nil
+      address.destroy
+    end
+
+  end
+
+  describe "#create" do
+
+    before(:each) do
+      @address = ec2.addresses.create
+    end
+
+    after(:each) do
+      @address.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::Address" do
+      @address.should be_a(Fog::AWS::EC2::Address)
+    end
+
+    it "should exist on ec2" do
+      ec2.addresses.get(@address.public_ip).should_not be_nil
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a Fog::AWS::EC2::Address if a matching address exists" do
+      address = ec2.addresses.create
+      get = ec2.addresses.get(address.public_ip)
+      address.attributes.should == get.attributes
+      address.destroy
+    end
+
+    it "should return nil if no matching address exists" do
+      ec2.addresses.get('0.0.0.0').should be_nil
+    end
+
+  end
+
+  describe "#new" do
+
+    it "should return a Fog::AWS::EC2::Address" do
+      ec2.addresses.new.should be_a(Fog::AWS::EC2::Address)
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should return a Fog::AWS::EC2::Addresses" do
+      ec2.addresses.all.reload.should be_a(Fog::AWS::EC2::Addresses)
+    end
+
+  end
+
+end

data/spec/aws/models/ec2/key_pair_spec.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::KeyPair' do
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" #do
+    #   address = Fog::AWS::EC2::KeyPair.new(
+    #     'instanceId'  => 'i-00000000',
+    #     'publicIp'    => '0.0.0.0'
+    #   )
+    #   address.instance_id.should == 'i-00000000'
+    #   address.public_ip.should == '0.0.0.0'
+    # end
+
+  end
+
+  describe "#key_pairs" do
+
+    it "should return a Fog::AWS::EC2::KeyPairs" do
+      ec2.key_pairs.new.key_pairs.should be_a(Fog::AWS::EC2::KeyPairs)
+    end
+
+    it "should be the key_pairs the keypair is related to" do
+      key_pairs = ec2.key_pairs
+      key_pairs.new.key_pairs.should == key_pairs
+    end
+
+  end
+
+  describe "#destroy" do
+
+    it "should return true if the key_pair is deleted" do
+      address = ec2.key_pairs.create(:name => 'keyname')
+      address.destroy.should be_true
+    end
+
+  end
+
+  describe "#reload" do
+
+    before(:each) do
+      @key_pair = ec2.key_pairs.create(:name => 'keyname')
+      @reloaded = @key_pair.reload
+    end
+
+    after(:each) do
+      @key_pair.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::KeyPair" do
+      @reloaded.should be_a(Fog::AWS::EC2::KeyPair)
+    end
+
+    it "should reset attributes to remote state" do
+      @key_pair.attributes.should == @reloaded.attributes
+    end
+
+  end
+
+  describe "#save" do
+
+    before(:each) do
+      @key_pair = ec2.key_pairs.new(:name => 'keyname')
+    end
+
+    it "should return true when it succeeds" do
+      @key_pair.save.should be_true
+      @key_pair.destroy
+    end
+
+    it "should not exist in key_pairs before save" do
+      @key_pair.key_pairs.get(@key_pair.name).should be_nil
+    end
+
+    it "should exist in buckets after save" do
+      @key_pair.save
+      @key_pair.key_pairs.get(@key_pair.name).should_not be_nil
+      @key_pair.destroy
+    end
+
+  end
+
+end

data/spec/aws/models/ec2/key_pairs_spec.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::KeyPairs' do
+
+  describe "#all" do
+
+    it "should return a Fog::AWS::EC2::KeyPairs" do
+      ec2.key_pairs.all.should be_a(Fog::AWS::EC2::KeyPairs)
+    end
+
+    it "should include persisted key_pairs" do
+      key_pair = ec2.key_pairs.create(:name => 'keyname')
+      ec2.key_pairs.get(key_pair.name).should_not be_nil
+      key_pair.destroy
+    end
+
+  end
+
+  describe "#create" do
+
+    before(:each) do
+      @key_pair = ec2.key_pairs.create(:name => 'keyname')
+    end
+
+    after(:each) do
+      @key_pair.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::KeyPair" do
+      @key_pair.should be_a(Fog::AWS::EC2::KeyPair)
+    end
+
+    it "should exist on ec2" do
+      ec2.key_pairs.get(@key_pair.name).should_not be_nil
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a Fog::AWS::EC2::KeyPair if a matching key_pair exists" do
+      key_pair = ec2.key_pairs.create(:name => 'keyname')
+      get = ec2.key_pairs.get(key_pair.name)
+      key_pair.attributes[:fingerprint].should == get.attributes[:fingerprint]
+      key_pair.attributes[:name].should == get.attributes[:name]
+      key_pair.destroy
+    end
+
+    it "should return nil if no matching key_pair exists" do
+      ec2.key_pairs.get('notakeyname').should be_nil
+    end
+
+  end
+
+  describe "#new" do
+
+    it "should return a Fog::AWS::EC2::KeyPair" do
+      ec2.key_pairs.new(:name => 'keyname').should be_a(Fog::AWS::EC2::KeyPair)
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should return a Fog::AWS::EC2::KeyPairs" do
+      ec2.key_pairs.all.reload.should be_a(Fog::AWS::EC2::KeyPairs)
+    end
+
+  end
+
+end

data/spec/aws/models/ec2/security_group_spec.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::SecurityGroup' do
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" #do
+    #   address = Fog::AWS::EC2::SecurityGroup.new(
+    #     'instanceId'  => 'i-00000000',
+    #     'publicIp'    => '0.0.0.0'
+    #   )
+    #   address.instance_id.should == 'i-00000000'
+    #   address.public_ip.should == '0.0.0.0'
+    # end
+
+  end
+
+  describe "#security_groups" do
+
+    it "should return a Fog::AWS::EC2::SecurityGroups" do
+      ec2.security_groups.new.security_groups.should be_a(Fog::AWS::EC2::SecurityGroups)
+    end
+
+    it "should be the security_groups the keypair is related to" do
+      security_groups = ec2.security_groups
+      security_groups.new.security_groups.should == security_groups
+    end
+
+  end
+
+  describe "#destroy" do
+
+    it "should return true if the security_group is deleted" do
+      address = ec2.security_groups.create(:group_description => 'groupdescription', :group_name => 'keyname')
+      address.destroy.should be_true
+    end
+
+  end
+
+  describe "#reload" do
+
+    before(:each) do
+      @security_group = ec2.security_groups.create(:group_description => 'groupdescription', :group_name => 'keyname')
+      @reloaded = @security_group.reload
+    end
+
+    after(:each) do
+      @security_group.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::SecurityGroup" do
+      @reloaded.should be_a(Fog::AWS::EC2::SecurityGroup)
+    end
+
+    it "should reset attributes to remote state" do
+      @security_group.attributes.should == @reloaded.attributes
+    end
+
+  end
+
+  describe "#save" do
+
+    before(:each) do
+      @security_group = ec2.security_groups.new(:group_description => 'groupdescription', :group_name => 'keyname')
+    end
+
+    it "should return true when it succeeds" do
+      @security_group.save.should be_true
+      @security_group.destroy
+    end
+
+    it "should not exist in security_groups before save" do
+      @security_group.security_groups.get(@security_group.group_name).should be_nil
+    end
+
+    it "should exist in buckets after save" do
+      @security_group.save
+      @security_group.security_groups.get(@security_group.group_name).should_not be_nil
+      @security_group.destroy
+    end
+
+  end
+
+end