From 2fac75c369d5ae1381ff302cc40e0bbd989d6aa7 Mon Sep 17 00:00:00 2001
From: Jason Frey <jfrey@redhat.com>
Date: Wed, 14 Jun 2017 13:45:03 -0400
Subject: [PATCH] Put back region_description method that was accidentally
 extracted

---
 Gemfile                               |  2 +-
 lib/extensions/ar_region.rb           |  6 +++++-
 spec/lib/extensions/ar_region_spec.rb | 13 +++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d53ca354c55..ea7aa069a4b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ manageiq_plugin "manageiq-providers-vmware"
 manageiq_plugin "manageiq-ui-classic"
 
 # Unmodified gems
-gem "activerecord-id_regions",        "~>0.1.0"
+gem "activerecord-id_regions",        "~>0.2.0"
 gem "activerecord-session_store",     "~>1.0.0"
 gem "acts_as_tree",                   "~>2.1.0" # acts_as_tree needs to be required so that it loads before ancestry
 gem "ancestry",                       "~>2.2.1",       :require => false
diff --git a/lib/extensions/ar_region.rb b/lib/extensions/ar_region.rb
index 8efd2982bef..b8957ae5b36 100644
--- a/lib/extensions/ar_region.rb
+++ b/lib/extensions/ar_region.rb
@@ -9,7 +9,7 @@ module ClassMethods
     def inherited(other)
       if other == other.base_class
         other.class_eval do
-          virtual_column :region_number,      :type => :integer
+          virtual_column :region_number,      :type => :integer # This method is defined in ActiveRecord::IdRegions
           virtual_column :region_description, :type => :string
         end
       end
@@ -20,4 +20,8 @@ def inherited(other)
   def miq_region
     self.class.id_to_miq_region[region_number] || (self.class.id_to_miq_region[region_number] = MiqRegion.where(:region => region_number).first)
   end
+
+  def region_description
+    miq_region.description if miq_region
+  end
 end
diff --git a/spec/lib/extensions/ar_region_spec.rb b/spec/lib/extensions/ar_region_spec.rb
index 2813c799443..4535f6ccb87 100644
--- a/spec/lib/extensions/ar_region_spec.rb
+++ b/spec/lib/extensions/ar_region_spec.rb
@@ -23,4 +23,17 @@
       end.to match_query_limit_of(2)
     end
   end
+
+  context "#region_description" do
+    it "when the region exists" do
+      MiqRegion.seed
+      vm = FactoryGirl.create(:vm)
+      expect(vm.region_description).to eq(MiqRegion.first.description)
+    end
+
+    it "when the region does not exist" do
+      vm = FactoryGirl.create(:vm)
+      expect(vm.region_description).to be_nil
+    end
+  end
 end