Merge pull request #13 from hoppergee/fix_view_helper

Fix view helper

Author: hoppergee

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.3.1] - 2021-10-10
+
+- Make ViewHelper work in both controller and view
+
 ## [1.3.0] - 2021-10-10
 
 - Integrate with Rails default testing toolchain (Minitest + Capybara)

lib/multi_tenant_support/concern/controller_concern.rb

@@ -10,10 +10,6 @@ module ControllerConcern
 
       private
 
-      define_method(MultiTenantSupport.current_tenant_account_method) do
-        instance_variable_get("@#{MultiTenantSupport.current_tenant_account_method}")
-      end
-
       def set_current_tenant_account
         tenant_account = find_current_tenant_account
         MultiTenantSupport::Current.tenant_account = tenant_account
@@ -31,8 +27,12 @@ def find_current_tenant_account
   end
 
   module ViewHelper
-    define_method(MultiTenantSupport.current_tenant_account_method) do
-      instance_variable_get("@#{MultiTenantSupport.current_tenant_account_method}")
+    extend ActiveSupport::Concern
+
+    included do
+      define_method(MultiTenantSupport.current_tenant_account_method) do
+        instance_variable_get("@#{MultiTenantSupport.current_tenant_account_method}")
+      end
     end
   end
 end

lib/multi_tenant_support/version.rb

@@ -1,3 +1,3 @@
 module MultiTenantSupport
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end