fog-core 2.3.0 → 2.4.0

data/lib/fog/test_helpers/mock_helper.rb

@@ -9,91 +9,91 @@ Fog.mock! if ENV["FOG_MOCK"] == "true"
 # if in mocked mode, fill in some fake credentials for us
 if Fog.mock?
   Fog.credentials = {
-    :aws_access_key_id                => "aws_access_key_id",
-    :aws_secret_access_key            => "aws_secret_access_key",
-    :ia_access_key_id                 => "aws_access_key_id",
-    :ia_secret_access_key             => "aws_secret_access_key",
-    :bluebox_api_key                  => "bluebox_api_key",
-    :bluebox_customer_id              => "bluebox_customer_id",
-    :brightbox_client_id              => "brightbox_client_id",
-    :brightbox_secret                 => "brightbox_secret",
-    :cloudstack_disk_offering_id      => "",
-    :cloudstack_host                  => "http://cloudstack.example.org",
-    :cloudstack_network_ids           => "",
-    :cloudstack_service_offering_id   => "4437ac6c-9fe3-477a-57ec-60a5a45896a4",
-    :cloudstack_template_id           => "8a31cf9c-f248-0588-256e-9dbf58785216",
-    :cloudstack_zone_id               => "c554c592-e09c-9df5-7688-4a32754a4305",
-    :clodo_api_key                    => "clodo_api_key",
-    :clodo_username                   => "clodo_username",
-    :digitalocean_api_key             => "digitalocean_api_key",
-    :digitalocean_client_id           => "digitalocean_client_id",
-    :dnsimple_token                   => "dnsimple_token",
-    :dnsimple_account                 => "dnsimple_account",
-    :dnsmadeeasy_api_key              => "dnsmadeeasy_api_key",
-    :dnsmadeeasy_secret_key           => "dnsmadeeasy_secret_key",
-    :glesys_username                  => "glesys_username",
-    :glesys_api_key                   => "glesys_api_key",
-    :go_grid_api_key                  => "go_grid_api_key",
-    :go_grid_shared_secret            => "go_grid_shared_secret",
-    :google_storage_access_key_id     => "google_storage_access_key_id",
-    :google_storage_secret_access_key => "google_storage_secret_access_key",
-    :google_project                   => "google_project_name",
-    :google_client_email              => "fake@developer.gserviceaccount.com",
-    :google_key_location              => "~/fake.p12",
-    :hp_access_key                    => "hp_access_key",
-    :hp_secret_key                    => "hp_secret_key",
-    :hp_tenant_id                     => "hp_tenant_id",
-    :hp_avl_zone                      => "hp_avl_zone",
-    :os_account_meta_temp_url_key     => "os_account_meta_temp_url_key",
-    :ibm_username                     => "ibm_username",
-    :ibm_password                     => "ibm_password",
-    :joyent_username                  => "joyentuser",
-    :joyent_password                  => "joyentpass",
-    :linode_api_key                   => "linode_api_key",
-    :local_root                       => "~/.fog",
-    :bare_metal_cloud_password        => "bare_metal_cloud_password",
-    :bare_metal_cloud_username        => "bare_metal_cloud_username",
-    :ninefold_compute_key             => "ninefold_compute_key",
-    :ninefold_compute_secret          => "ninefold_compute_secret",
-    :ninefold_storage_secret          => "ninefold_storage_secret",
-    :ninefold_storage_token           => "ninefold_storage_token",
+    aws_access_key_id: "aws_access_key_id",
+    aws_secret_access_key: "aws_secret_access_key",
+    ia_access_key_id: "aws_access_key_id",
+    ia_secret_access_key: "aws_secret_access_key",
+    bluebox_api_key: "bluebox_api_key",
+    bluebox_customer_id: "bluebox_customer_id",
+    brightbox_client_id: "brightbox_client_id",
+    brightbox_secret: "brightbox_secret",
+    cloudstack_disk_offering_id: "",
+    cloudstack_host: "http://cloudstack.example.org",
+    cloudstack_network_ids: "",
+    cloudstack_service_offering_id: "4437ac6c-9fe3-477a-57ec-60a5a45896a4",
+    cloudstack_template_id: "8a31cf9c-f248-0588-256e-9dbf58785216",
+    cloudstack_zone_id: "c554c592-e09c-9df5-7688-4a32754a4305",
+    clodo_api_key: "clodo_api_key",
+    clodo_username: "clodo_username",
+    digitalocean_api_key: "digitalocean_api_key",
+    digitalocean_client_id: "digitalocean_client_id",
+    dnsimple_token: "dnsimple_token",
+    dnsimple_account: "dnsimple_account",
+    dnsmadeeasy_api_key: "dnsmadeeasy_api_key",
+    dnsmadeeasy_secret_key: "dnsmadeeasy_secret_key",
+    glesys_username: "glesys_username",
+    glesys_api_key: "glesys_api_key",
+    go_grid_api_key: "go_grid_api_key",
+    go_grid_shared_secret: "go_grid_shared_secret",
+    google_storage_access_key_id: "google_storage_access_key_id",
+    google_storage_secret_access_key: "google_storage_secret_access_key",
+    google_project: "google_project_name",
+    google_client_email: "fake@developer.gserviceaccount.com",
+    google_key_location: "~/fake.p12",
+    hp_access_key: "hp_access_key",
+    hp_secret_key: "hp_secret_key",
+    hp_tenant_id: "hp_tenant_id",
+    hp_avl_zone: "hp_avl_zone",
+    os_account_meta_temp_url_key: "os_account_meta_temp_url_key",
+    ibm_username: "ibm_username",
+    ibm_password: "ibm_password",
+    joyent_username: "joyentuser",
+    joyent_password: "joyentpass",
+    linode_api_key: "linode_api_key",
+    local_root: "~/.fog",
+    bare_metal_cloud_password: "bare_metal_cloud_password",
+    bare_metal_cloud_username: "bare_metal_cloud_username",
+    ninefold_compute_key: "ninefold_compute_key",
+    ninefold_compute_secret: "ninefold_compute_secret",
+    ninefold_storage_secret: "ninefold_storage_secret",
+    ninefold_storage_token: "ninefold_storage_token",
     # :public_key_path                  => "~/.ssh/id_rsa.pub",
     # :private_key_path                 => "~/.ssh/id_rsa",
-    :openstack_api_key                => "openstack_api_key",
-    :openstack_username               => "openstack_username",
-    :openstack_tenant                 => "openstack_tenant",
-    :openstack_auth_url               => "http://openstack:35357/v2.0/tokens",
-    :ovirt_url                        => "http://ovirt:8080/api",
-    :ovirt_username                   => "admin@internal",
-    :ovirt_password                   => "123123",
-    :rackspace_api_key                => "rackspace_api_key",
-    :rackspace_username               => "rackspace_username",
-    :riakcs_access_key_id             => "riakcs_access_key_id",
-    :riakcs_secret_access_key         => "riakcs_secret_access_key",
-    :vcloud_host                      => "vcloud_host",
-    :vcloud_password                  => "vcloud_password",
-    :vcloud_username                  => "vcloud_username",
-    :vcloud_director_host             => "vcloud-director-host",
-    :vcloud_director_password         => "vcloud_director_password",
-    :vcloud_director_username         => "vcd_user@vcd_org_name",
-    :voxel_api_key                    => "voxel_api_key",
-    :voxel_api_secret                 => "voxel_api_secret",
-    :zerigo_email                     => "zerigo_email",
-    :zerigo_token                     => "zerigo_token",
-    :dynect_customer                  => "dynect_customer",
-    :dynect_username                  => "dynect_username",
-    :dynect_password                  => "dynect_password",
-    :vsphere_server                   => "virtualcenter.lan",
-    :vsphere_username                 => "apiuser",
-    :vsphere_password                 => "apipassword",
-    :vsphere_expected_pubkey_hash     => "abcdef1234567890",
-    :libvirt_uri                      => "qemu:///system",
-    :libvirt_username                 => "root",
-    :libvirt_password                 => "password",
-    :cloudsigma_username              => "csuname",
-    :cloudsigma_password              => "cspass",
-    :kubevirt_token                   => "[TOKEN]",
-    :kubevirt_hostname                => "localhost",
-    :kubevirt_port                    => "6443"
+    openstack_api_key: "openstack_api_key",
+    openstack_username: "openstack_username",
+    openstack_tenant: "openstack_tenant",
+    openstack_auth_url: "http://openstack:35357/v2.0/tokens",
+    ovirt_url: "http://ovirt:8080/api",
+    ovirt_username: "admin@internal",
+    ovirt_password: "123123",
+    rackspace_api_key: "rackspace_api_key",
+    rackspace_username: "rackspace_username",
+    riakcs_access_key_id: "riakcs_access_key_id",
+    riakcs_secret_access_key: "riakcs_secret_access_key",
+    vcloud_host: "vcloud_host",
+    vcloud_password: "vcloud_password",
+    vcloud_username: "vcloud_username",
+    vcloud_director_host: "vcloud-director-host",
+    vcloud_director_password: "vcloud_director_password",
+    vcloud_director_username: "vcd_user@vcd_org_name",
+    voxel_api_key: "voxel_api_key",
+    voxel_api_secret: "voxel_api_secret",
+    zerigo_email: "zerigo_email",
+    zerigo_token: "zerigo_token",
+    dynect_customer: "dynect_customer",
+    dynect_username: "dynect_username",
+    dynect_password: "dynect_password",
+    vsphere_server: "virtualcenter.lan",
+    vsphere_username: "apiuser",
+    vsphere_password: "apipassword",
+    vsphere_expected_pubkey_hash: "abcdef1234567890",
+    libvirt_uri: "qemu:///system",
+    libvirt_username: "root",
+    libvirt_password: "password",
+    cloudsigma_username: "csuname",
+    cloudsigma_password: "cspass",
+    kubevirt_token: "[TOKEN]",
+    kubevirt_hostname: "localhost",
+    kubevirt_port: "6443"
   }.merge(Fog.credentials)
 end

data/lib/fog/test_helpers/types_helper.rb

@@ -3,6 +3,7 @@
 # allows both nil.is_a?(Fog::Nullable::String) and ''.is_a?(Fog::Nullable::String)
 module Fog
   module Boolean; end
+
   module Nullable
     module Boolean; end
     module Integer; end

data/lib/tasks/test_task.rb

@@ -27,8 +27,8 @@ module Fog
         Fog.providers.each do |key, value|
           threads << Thread.new do
             Thread.main[:results] << {
-              :provider => value,
-              :success  => sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
+              provider: value,
+              success: sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
             }
           end
         end

data/spec/compute/models/server_spec.rb

@@ -26,13 +26,13 @@ describe Fog::Compute::Server do
         end
       end
 
-
       describe "when the ssh_ip_address exists" do
         # Define these constants which would be imported by net-ssh once loaded
         module Net
           module SSH
             class AuthenticationFailed  < RuntimeError
             end
+
             class Disconnect < RuntimeError
             end
           end
@@ -55,7 +55,7 @@ describe Fog::Compute::Server do
           it "is false" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::AuthenticationFailed.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::AuthenticationFailed.new }
                 @server.stub(:ssh, raise_error) do
                   refute @server.sshable?
                 end
@@ -67,7 +67,7 @@ describe Fog::Compute::Server do
             @server.instance_variable_set(:@sshable_timeout, 8)
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::AuthenticationFailed.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::AuthenticationFailed.new }
                 @server.stub(:ssh, raise_error) do
                   @server.sshable?
                   assert_nil @server.instance_variable_get(:@sshable_timeout), nil
@@ -81,7 +81,7 @@ describe Fog::Compute::Server do
           it "is false" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::Disconnect.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::Disconnect.new }
                 @server.stub(:ssh, raise_error) do
                   refute @server.sshable?
                 end
@@ -93,7 +93,7 @@ describe Fog::Compute::Server do
             @server.instance_variable_set(:@sshable_timeout, 8)
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise Net::SSH::Disconnect.new }
+                raise_error = lambda { |_cmd, _options={}| raise Net::SSH::Disconnect.new }
                 @server.stub(:ssh, raise_error) do
                   @server.sshable?
                   assert_nil @server.instance_variable_get(:@sshable_timeout), nil
@@ -107,7 +107,7 @@ describe Fog::Compute::Server do
           it "is false" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise SystemCallError.new("message, 0") }
+                raise_error = lambda { |_cmd, _options={}| raise SystemCallError.new("message, 0") }
                 @server.stub(:ssh, raise_error) do
                   refute @server.sshable?
                 end
@@ -118,7 +118,7 @@ describe Fog::Compute::Server do
           it "does not increase SSH timeout" do
             @server.stub(:ready?, true) do
               @server.stub(:ssh_ip_address, "10.0.0.1") do
-                raise_error = lambda { |_cmd, _options| raise SystemCallError.new("message, 0") }
+                raise_error = lambda { |_cmd, _options={}| raise SystemCallError.new("message, 0") }
                 @server.stub(:ssh, raise_error) do
                   @server.sshable?
                   assert_equal @server.instance_variable_get(:@sshable_timeout), 8

data/spec/compute_spec.rb

@@ -24,7 +24,7 @@ describe "Fog::Compute" do
     end
 
     it "instantiates an instance of Fog::Compute::<Provider> from the :provider keyword arg" do
-      compute = Fog::Compute.new(:provider => :therightway)
+      compute = Fog::Compute.new(provider: :therightway)
       assert_instance_of(Fog::TheRightWay::Compute, compute)
     end
 
@@ -44,7 +44,7 @@ describe "Fog::Compute" do
     end
 
     it "instantiates an instance of Fog::<Provider>::Compute from the :provider keyword arg" do
-      compute = Fog::Compute.new(:provider => :thewrongway)
+      compute = Fog::Compute.new(provider: :thewrongway)
       assert_instance_of(Fog::Compute::TheWrongWay, compute)
     end
 
@@ -76,19 +76,19 @@ describe "Fog::Compute" do
 
     describe "when both Fog::Compute::<Provider> and Fog::<Provider>::Compute exist" do
       it "prefers Fog::<Provider>::Compute" do
-        compute = Fog::Compute.new(:provider => :bothways)
+        compute = Fog::Compute.new(provider: :bothways)
         assert_instance_of(Fog::BothWays::Compute, compute)
       end
     end
 
     it "passes the supplied keyword args less :provider to Fog::Compute::<Provider>#new" do
-      compute = Fog::Compute.new(:provider => :bothways, :extra => :stuff)
-      assert_equal({ :extra => :stuff }, compute.args)
+      compute = Fog::Compute.new(provider: :bothways, extra: :stuff)
+      assert_equal({ extra: :stuff }, compute.args)
     end
 
     it "raises ArgumentError when given a :provider where a Fog::Compute::Provider that does not exist" do
       assert_raises(ArgumentError) do
-        Fog::Compute.new(:provider => :wat)
+        Fog::Compute.new(provider: :wat)
       end
     end
   end

data/spec/connection_spec.rb

@@ -15,7 +15,7 @@ describe Fog::Core::Connection do
   end
 
   it "adds custom user-agents to Fog requests" do
-    Fog::VERSION = 'Version'
+    Fog::VERSION = "Version".freeze
     Fog::Core::Connection.add_user_agent("my-app/1.2")
 
     connection = Fog::Core::Connection.new("http://example.com")
@@ -31,7 +31,7 @@ describe Fog::Core::Connection do
 
   it "doesn't error when persistence is enabled and debug_response is disabled" do
     options = {
-      :debug_response => false
+      debug_response: false
     }
     Fog::Core::Connection.new("http://example.com", true, options)
   end
@@ -40,14 +40,14 @@ describe Fog::Core::Connection do
     it "does not emit a warning when provided this argument in the initializer" do
       $stderr = StringIO.new
 
-      Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
+      Fog::Core::Connection.new("http://example.com", false, path_prefix: "foo")
 
       assert_empty($stderr.string)
     end
 
     it "raises when the 'path' arg is present and this arg is supplied" do
       assert_raises(ArgumentError) do
-        Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo", :path => "bar")
+        Fog::Core::Connection.new("http://example.com", false, path_prefix: "foo", path: "bar")
       end
     end
   end
@@ -60,13 +60,14 @@ describe Fog::Core::Connection do
           def params
             @params
           end
+
           def new(_, params)
             @params = params
           end
         end
 
         Object.stub_const("Excon", spy) do
-          Fog::Core::Connection.new("http://example.com", false, :path => "bar")
+          Fog::Core::Connection.new("http://example.com", false, path: "bar")
           assert_equal("bar", spy.params[:path])
         end
       end
@@ -78,6 +79,7 @@ describe Fog::Core::Connection do
           spy.instance_eval do
             def new(*_args); self; end
             def params; @params; end
+
             def request(params)
               @params = params
             end
@@ -87,16 +89,16 @@ describe Fog::Core::Connection do
 
       it "uses the initializer-supplied :path_prefix arg with #request :arg to formulate a path to send to Excon.request" do
         Object.stub_const("Excon", spy) do
-          c = Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
-          c.request(:path => "bar")
+          c = Fog::Core::Connection.new("http://example.com", false, path_prefix: "foo")
+          c.request(path: "bar")
           assert_equal("foo/bar", spy.params[:path])
         end
       end
 
       it "does not introduce consecutive '/'s into the path if 'path' starts with a '/'" do
         Object.stub_const("Excon", spy) do
-          c = Fog::Core::Connection.new("http://example.com", false, :path_prefix => "foo")
-          c.request(:path => "/bar")
+          c = Fog::Core::Connection.new("http://example.com", false, path_prefix: "foo")
+          c.request(path: "/bar")
           assert_equal("foo/bar", spy.params[:path])
         end
       end

data/spec/core/cache_spec.rb

@@ -1,10 +1,33 @@
 require "spec_helper"
 require "securerandom"
-require "tmpdir"
 
 module Fog
   class SubFogTestModel < Fog::Model
     identity  :id
+
+    attribute :config
+    attribute :subconfig
+
+    def initialize(new_attributes = {})
+      super
+
+      # This way we make YAML to use aliases
+      self.config = {
+        "users" => [
+          { "user1" => "user1@email" },
+          { "user2" => "user2@email" }
+        ]
+      }
+      self.subconfig = config["users"][0]
+    end
+  end
+end
+
+module Fog
+  class SubFogTestCollection < Fog::Collection
+    model Fog::SubFogTestModel
+
+    attribute :spec_attribute
   end
 end
 
@@ -44,7 +67,7 @@ describe Fog::Cache do
     # nothing exists, nothing comes back
     assert_equal Fog::Cache.metadata, {}
     # write/read
-    Fog::Cache.write_metadata({:last_dumped => "Tuesday, November 8, 2016"})
+    Fog::Cache.write_metadata({last_dumped: "Tuesday, November 8, 2016"})
     assert_equal Fog::Cache.metadata[:last_dumped], "Tuesday, November 8, 2016"
 
     # diff namespace, diff metadata
@@ -52,10 +75,10 @@ describe Fog::Cache do
     assert_nil Fog::Cache.metadata[:last_dumped]
     # still accessible per namespace
     Fog::Cache.namespace_prefix = "for-service-user-region-foo"
-    assert_equal Fog::Cache.metadata[:last_dumped],  "Tuesday, November 8, 2016"
+    assert_equal Fog::Cache.metadata[:last_dumped], "Tuesday, November 8, 2016"
     # can overwrite
-    Fog::Cache.write_metadata({:last_dumped => "Diff date"})
-    assert_equal Fog::Cache.metadata[:last_dumped],  "Diff date"
+    Fog::Cache.write_metadata({last_dumped: "Diff date"})
+    assert_equal Fog::Cache.metadata[:last_dumped], "Diff date"
 
     # can't write a non-hash/data entry.
     assert_raises Fog::Cache::CacheDir do
@@ -65,10 +88,9 @@ describe Fog::Cache do
     # namespace must be set as well.
     assert_raises Fog::Cache::CacheDir do
       Fog::Cache.namespace_prefix = nil
-      Fog::Cache.write_metadata({:a => "b"})
+      Fog::Cache.write_metadata({a: "b"})
     end
-
- end
+  end
 
   it "can load cache data from disk" do
     path = File.expand_path("~/.fog-cache-test-#{Time.now.to_i}.yml")
@@ -116,7 +138,7 @@ describe Fog::Cache do
   it "Fog cache ignores bad cache data - empty file, from disk" do
     Fog::Cache.expire_cache!(Fog::SubFogTestModel, @service)
     id = SecureRandom.hex
-    a = Fog::SubFogTestModel.new(:id => id, :service => @service)
+    a = Fog::SubFogTestModel.new(id: id, service: @service)
     a.cache.dump
 
     # input bad data
@@ -130,13 +152,12 @@ describe Fog::Cache do
     assert_equal 1, Fog::Cache.load(Fog::SubFogTestModel, @service).size
   end
 
-
   it "can be dumped and reloaded back in" do
 
     Fog::Cache.expire_cache!(Fog::SubFogTestModel, @service)
 
     id = SecureRandom.hex
-    a = Fog::SubFogTestModel.new(:id => id, :service => @service)
+    a = Fog::SubFogTestModel.new(id: id, service: @service)
 
     assert_equal File.exist?(Fog::Cache.namespace(Fog::SubFogTestModel, @service)), false
     a.cache.dump
@@ -155,8 +176,8 @@ describe Fog::Cache do
 
     # security groups on aws for eg can have the same identity group name 'default'.
     # there are no restrictions on `identity` fog attributes to be uniq.
-    a = Fog::SubFogTestModel.new(:id => id, :service => @service, :bar => 'bar')
-    b = Fog::SubFogTestModel.new(:id => id, :service => @service, :foo => 'foo')
+    a = Fog::SubFogTestModel.new(id: id, service: @service, bar: "bar")
+    b = Fog::SubFogTestModel.new(id: id, service: @service, foo: "foo")
 
     a.cache.dump
     b.cache.dump
@@ -173,8 +194,8 @@ describe Fog::Cache do
 
     # security groups on aws for eg can have the same identity group name 'default'.
     # there are no restrictions on `identity` fog attributes to be uniq.
-    a = Fog::SubFogTestModel.new(:id => id, :service => @service, :bar => 'bar')
-    b = Fog::SubFogTestModel.new(:id => id, :service => @service, :foo => 'foo')
+    a = Fog::SubFogTestModel.new(id: id, service: @service, bar: "bar")
+    b = Fog::SubFogTestModel.new(id: id, service: @service, foo: "foo")
 
     a.cache.dump
     b.cache.dump
@@ -188,4 +209,19 @@ describe Fog::Cache do
     # unique-ify based on the attributes...
     assert_equal instances.size, 2
   end
+
+  it "dumps model with collection attributes and reloads them" do
+    Fog::Cache.expire_cache!(Fog::SubFogTestModel, @service)
+
+    c = Fog::SubFogTestCollection.new(service: @service, spec_attribute: 42)
+
+    id = SecureRandom.hex
+    a = Fog::SubFogTestModel.new(id: id, service: @service, collection: c)
+
+    a.cache.dump
+
+    instances = Fog::Cache.load(Fog::SubFogTestModel, @service)
+    assert_equal instances.first.id, id
+    assert_equal instances.first.collection.spec_attribute, 42
+  end
 end

data/spec/core/collection_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+require "securerandom"
+
+class FogTestModelForCollection < Fog::Model
+  identity  :id
+end
+
+class FogTestCollection < Fog::Collection
+  model FogTestModelForCollection
+
+  def all
+    self
+  end
+end
+
+describe Fog::Collection do
+  describe "array delegation" do
+    it "delegates methods with keywords to Array" do
+      c = FogTestCollection.new
+      c << FogTestModelForCollection.new(id: SecureRandom.hex)
+      assert_equal c.sample(1, random: Random)[0], c[0]
+    end
+  end
+end

data/spec/core/model_spec.rb

@@ -3,6 +3,17 @@ require "securerandom"
 
 class FogTestModel < Fog::Model
   identity  :id
+  attribute :value
+
+  def create
+    self.identity = SecureRandom.hex
+    self
+  end
+
+  def update
+    self.value = 42
+    self
+  end
 end
 
 describe Fog::Model do
@@ -21,7 +32,7 @@ describe Fog::Model do
 
     it "is equal if it has the same non-nil identity and the same class" do
       id = SecureRandom.hex
-      assert_equal FogTestModel.new(:id => id), FogTestModel.new(:id => id)
+      assert_equal FogTestModel.new(id: id), FogTestModel.new(id: id)
     end
 
     it "is not equal if both have nil identity, but are different objects" do
@@ -29,8 +40,30 @@ describe Fog::Model do
     end
 
     it "is not equal if it has a different identity" do
-      refute_equal FogTestModel.new(:id => SecureRandom.hex),
-                   FogTestModel.new(:id => SecureRandom.hex)
+      refute_equal FogTestModel.new(id: SecureRandom.hex),
+                   FogTestModel.new(id: SecureRandom.hex)
+    end
+  end
+
+  describe "#save" do
+    describe "on a non persisted object" do
+      it "creates a new resource" do
+        a = FogTestModel.new
+        a.stub(:persisted?, false) do
+          a.save
+          refute_nil(a.identity)
+        end
+      end
+    end
+
+    describe "on a persisted object" do
+      it "updates resource" do
+        a = FogTestModel.new
+        a.stub(:persisted?, true) do
+          a.save
+          assert_equal(a.value, 42)
+        end
+      end
     end
   end
 end

data/spec/core/stringify_keys_spec.rb

@@ -4,7 +4,7 @@ describe "Fog::StringifyKeys" do
   describe ".stringify" do
     describe "when key is a Symbol" do
       it "replaces key with String" do
-        input = { :key => "value" }
+        input = { key: "value" }
         output = Fog::StringifyKeys.stringify(input)
         assert(output.key?("key"))
       end
@@ -26,11 +26,11 @@ describe "Fog::StringifyKeys" do
 
     describe "when keys are deeply nested" do
       it "updates only top level key" do
-        input = { :key1 => { :key2 => { :key3 => nil }}}
+        input = { key1: { key2: { key3: nil }}}
 
         output = Fog::StringifyKeys.stringify(input)
 
-        expected = { "key1" => { :key2 => { :key3 => nil }}}
+        expected = { "key1" => { key2: { key3: nil }}}
         assert_equal(expected, output)
       end
     end

data/spec/core/whitelist_keys_spec.rb

@@ -4,7 +4,7 @@ describe "Fog::WhitelistKeys" do
   describe ".whitelist" do
     describe "when other keys are present" do
       it "returns Hash with only allowed keys" do
-        input = { :name => "name", :type => "type", :size => 80 }
+        input = { name: "name", type: "type", size: 80 }
         valid_keys = %w(name size)
 
         output = Fog::WhitelistKeys.whitelist(input, valid_keys)
@@ -16,7 +16,7 @@ describe "Fog::WhitelistKeys" do
 
     describe "when key is a Symbol" do
       it "returns a String" do
-        input = { :name => "name" }
+        input = { name: "name" }
         valid_keys = %w(name)
 
         output = Fog::WhitelistKeys.whitelist(input, valid_keys)