lib/gon/helpers.rb in gon-5.1.1 vs lib/gon/helpers.rb in gon-5.1.2

@@ -1,43 +1,33 @@
 class Gon
-  module Helpers
-
-    def self.included base
-      base.send(:include, InstanceMethods)
+  module ViewHelpers
+    def include_gon(options = {})
+      if variables_for_request_present?
+        Gon::Base.render_data(options)
+      elsif Gon.global.all_variables.present?
+        Gon.clear
+        Gon::Base.render_data(options)
+      elsif options[:init].present?
+        Gon.clear
+        Gon::Base.render_data(options)
+      else
+        ''
+      end
     end
 
-    module InstanceMethods
+    private
 
-      def include_gon(options = {})
-        if variables_for_request_present?
-          Gon::Base.render_data(options)
-        elsif Gon.global.all_variables.present?
-          Gon.clear
-          Gon::Base.render_data(options)
-        elsif options[:init].present?
-          Gon.clear
-          Gon::Base.render_data(options)
-        else
-          ''
-        end
-      end
+    def variables_for_request_present?
+      current_gon && current_gon.gon
+    end
 
-      private
-
-      def variables_for_request_present?
-        current_gon && current_gon.gon
-      end
-
-      def current_gon
-        RequestStore.store[:gon]
-      end
-
+    def current_gon
+      RequestStore.store[:gon]
     end
   end
 
-  module GonHelpers
-
+  module ControllerHelpers
     def gon
       if wrong_gon_request?
         gon_request = Request.new(env)
         gon_request.id = gon_request_uuid
         RequestStore.store[:gon] = gon_request
@@ -56,11 +46,10 @@
     end
 
     def gon_request_uuid
       request.uuid
     end
-
   end
 end
 
-ActionView::Base.send :include, Gon::Helpers
-ActionController::Base.send :include, Gon::GonHelpers
+ActionView::Base.send :include, Gon::ViewHelpers
+ActionController::Base.send :include, Gon::ControllerHelpers