lib/lifeboat.rb in lifeboat-0.3.0 vs lib/lifeboat.rb in lifeboat-0.3.1

@@ -4,21 +4,13 @@
 require 'yaml'
 require 'fileutils'
 require 'thread'
 
 class AWS
-  # DUPLICATION IS RISING ON THE self.root METHOD
-  # MACHETE 
   def self.root
-    if Rails.version == "2.1.2"
-      YAML::load(IO.read(Rails.root + "/config/aws.yml"))
-    elsif Rails.version == "2.3.8"
-      YAML::load(IO.read(Rails.root + "config/aws.yml"))
-    else
-      raise "Email [e-mail] with this error"
-      YAML::load(IO.read(File.dirname(__FILE__) + '/../config/aws.yml'))
-    end
+    rails_root = (Rails.version < "2.1.2") ? RAILS_ROOT : Rails.root
+    YAML::load(IO.read(File.join(rails_root, 'config', 'aws.yml')))
   end
 end
 
 
 class Credentials
@@ -29,13 +21,13 @@
 # TODO: RESEARCH HOW TO REFACTOR OUT
   end
 
   begin
     def self.key
-      AWS.root[RAILS_ENV]['key']
+      AWS.root[RAILS_ENV]['access_key_id']
     end
     def self.secret
-      AWS.root[RAILS_ENV]['secret']
+      AWS.root[RAILS_ENV]['secret_access_key']
     end
   rescue RightAws::AwsError
     puts"LIFEBOAT : AWS Access Key Id needs a subscription for the service."
   end
 end