Merge conflict.

README.md

@@ -50,15 +50,20 @@ Include Lifeboat in your model class:
 
 Provide your AWS credentials in config/lifeboat.yml
 
-  development:
-    queue_name_prefix: your-app-development
-    key: YOURSECRETACCESSID
-    secret: YOUR-secRE/TACCe\ssKEy
+test:
+  key: YOURSECRETACCESSID
+  secret: YOUR-secRE/TACCe\ssKEy
+  queue_name_prefix: your-app-development
 
-  test:
-    queue_name_prefix: your-app-test
-    key: YOURSECRETACCESSID
-    secret: YOUR-secRE/TACCe\ssKEy
+development:
+  key: YOURSECRETACCESSID
+  secret: YOUR-secRE/TACCe\ssKEy
+  queue_name_prefix: your-app-development
+
+production:
+  key: YOURSECRETACCESSID
+  secret: YOUR-secRE/TACCe\ssKEy
+  queue_name_prefix: your-app-development
 
   production:
     queue_name_prefix: your-app-production
@@ -113,4 +118,4 @@ Buit by Ivan.
 
 Designed by Ivan & Ryan.
 
-Inspired by Amazon.  ([And not in a good way.](http://www.businessinsider.com/amazon-lost-data-2011-4))
+Inspired by Amazon.  ([And not in a good way.](http://www.businessinsider.com/amazon-lost-data-2011-4))

VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

lib/lifeboat.rb

@@ -67,7 +67,8 @@ def after_initialize
   [:create, :update, :destroy ].each do |action|
     define_method(action.to_s + "_lifeboat") do
       begin
-        q = RightAws::SqsGen2::Queue.create(@cue, action.to_s+"_"+ self.class.to_s.downcase, true)
+        queue_name = action.to_s+"_"+ self.class.to_s.downcase + "_" + RAILS_ENV
+        q = RightAws::SqsGen2::Queue.create(@cue, queue_name, true)
         q.send_message(self.attributes.to_json)
       rescue RightAws::AwsError => e
         puts "LifeBoat RightAws::AwsError TIMEOUT"

lifeboat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lifeboat}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Acosta-Rubio"]
-  s.date = %q{2011-05-04}
+  s.date = %q{2011-05-05}
   s.description = %q{ }
   s.email = %q{ivan@bakedweb.net}
   s.extra_rdoc_files = [

spec/lifeboat_spec.rb

@@ -10,6 +10,8 @@
 ActiveRecord::Base.establish_connection(config['test'])
 
 def rebuild_model options = {}
+ #   ActiveRecord::Base.connection.create_database('lifeboat_test')
+
   ActiveRecord::Base.connection.create_table :fake_models, :force => true do |table|
     table.column :name, :string
     table.column :phone, :string
@@ -32,6 +34,7 @@ class Fake < ActiveRecord::Base
   include LifeBoat
 end
 
+RAILS_ENV = "test"
 
 class Helper
     def self.clean_all_queues
@@ -44,7 +47,11 @@ def self.clean_all_queues
 
 class Rails
   def self.root
-    ''
+    Dir.pwd
+  end
+
+  def self.version
+    '2.1.2'
   end
 end
 
@@ -93,27 +100,27 @@ def self.root
 
   it "reads messages from a cue" do
     Fake.create(:name => "ivan")
-    messages = LifeBoat.read_queue("create_fake")
+    messages = LifeBoat.read_queue("create_fake_test")
     messages.size.should == 1
   end
 
   it "the message it creates contains the attributes ob the object as json" do
     f = Fake.create(:name => "ivan")
-    q = LifeBoat.read_queue("create_fake")
+    q = LifeBoat.read_queue("create_fake_test")
     q[0].body.should == f.attributes.to_json
   end
 
   it "deletes SQS queue when parent is deleted" do
     f = Fake.create(:name => "updated")
     f.destroy
-    messages = LifeBoat.read_queue("destroy_fake")
+    messages = LifeBoat.read_queue("destroy_fake_test")
     messages.size.should == 1
   end
 
   it "updates SQS queue when parent is updated" do
     f = Fake.create(:name => "Er Update")
     f.name= "28347834" ; f.save
-    messages= LifeBoat.read_queue("update_fake")
+    messages= LifeBoat.read_queue("update_fake_test")
     messages.size.should == 1
   end