refactor DB constructor

vigetlabs · Jun 27, 2011 · e5e6fe2 · e5e6fe2
1 parent a81bb7b
commit e5e6fe2
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/app/models/db.rb b/app/models/db.rb
@@ -4,12 +4,8 @@
 module Hurl
   class DB
     def self.couch
-      return @couch if @couch
-      couch_url = ENV['COUCH_URL']    if !!ENV['COUCH_URL']
-      couch_url = ENV['CLOUDANT_URL'] if !!ENV['CLOUDANT_URL']
-      if couch_url
-        @couch = CouchRest.database(couch_url)
-      end
+      @couch_url ||= ENV['COUCH_URL'] || ENV['CLOUDANT_URL']
+      @couch ||= CouchRest.database(@couch_url) if @couch_url
     end
 
     def self.find(scope, id)