lib/fog/brightbox/models/compute/volume.rb in fog-brightbox-1.10.0 vs lib/fog/brightbox/models/compute/volume.rb in fog-brightbox-1.11.0

@@ -100,42 +100,42 @@
         def resize(options)
           requires :identity
 
           # The API requires the old "from" size to avoid acting on stale data
           # We can merge this and if the API rejects the request, the model was out of sync
-          options.merge!(:from => size)
+          options[:from] = size
 
           data = service.resize_volume(identity, options)
           merge_attributes(data)
           true
         end
 
         def save
           if persisted?
             options = {
-              :delete_with_server => delete_with_server,
-              :description => description,
-              :name => name,
-              :serial => serial
+              delete_with_server: delete_with_server,
+              description: description,
+              name: name,
+              serial: serial
             }.delete_if { |_k, v| v.nil? || v == "" }
 
             data = service.update_volume(identity, options)
           else
-            raise Fog::Errors::Error.new("'image_id' and 'filesystem_type' are mutually exclusive") if image_id && filesystem_type
-            raise Fog::Errors::Error.new("'image_id' or 'filesystem_type' is required") unless image_id || filesystem_type
+            raise Fog::Errors::Error, "'image_id' and 'filesystem_type' are mutually exclusive" if image_id && filesystem_type
+            raise Fog::Errors::Error, "'image_id' or 'filesystem_type' is required" unless image_id || filesystem_type
 
             options = {
-              :delete_with_server => delete_with_server,
-              :description => description,
-              :encrypted => encrypted,
-              :filesystem_label => filesystem_label,
-              :filesystem_type => filesystem_type,
-              :name => name,
-              :serial => serial,
-              :size => size
+              delete_with_server: delete_with_server,
+              description: description,
+              encrypted: encrypted,
+              filesystem_label: filesystem_label,
+              filesystem_type: filesystem_type,
+              name: name,
+              serial: serial,
+              size: size
             }.delete_if { |_k, v| v.nil? || v == "" }
 
-            options.merge!(:image => image_id) unless image_id.nil? || image_id == ""
+            options[:image] = image_id unless image_id.nil? || image_id == ""
 
             data = service.create_volume(options)
           end
 
           merge_attributes(data)