aws_config.rb in propono-2.0.0.rc1

- old
+ new

@@ -1,13 +1,8 @@
 module Propono
-
-  def self.aws_options
-    AwsConfig.new(Propono.config).aws_options
-  end
-  
   class AwsConfig
-    
+
     def initialize(config)
       @config = config
     end
 
     def aws_options
@@ -16,13 +11,13 @@
           :use_iam_profile => true,
           :region => @config.queue_region
         }
       else
         {
-          :aws_access_key_id => @config.access_key,
-          :aws_secret_access_key => @config.secret_key,
+          :access_key_id => @config.access_key,
+          :secret_access_key => @config.secret_key,
           :region => @config.queue_region
         }
       end
     end
   end
-end
\ No newline at end of file
+end