use prepend for user* patches #50

Author: jkraemer

lib/redmine_gtt.rb

@@ -6,10 +6,6 @@
 require 'redmine_gtt/patches/issues_controller_patch.rb'
 require 'redmine_gtt/patches/issues_helper_patch.rb'
 
-# User Hooks
-require 'redmine_gtt/patches/user_patch.rb'
-require 'redmine_gtt/patches/users_controller_patch.rb'
-
 
 # API Template Hooks
 # Seems like this is not necessary
@@ -29,9 +25,11 @@ module RedmineGtt
 
   def self.setup
     RedmineGtt::Patches::ProjectPatch.apply
+    RedmineGtt::Patches::UserPatch.apply
 
     RedmineGtt::Patches::ProjectsControllerPatch.apply
     RedmineGtt::Patches::ProjectsHelperPatch.apply
+    RedmineGtt::Patches::UsersControllerPatch.apply
 
     # unless IssueQuery.included_modules.include?(RedmineGtt::Patches::IssueQueryPatch)
     # 	IssueQuery.send(:include, RedmineGtt::Patches::IssueQueryPatch)

lib/redmine_gtt/patches/user_patch.rb

@@ -2,58 +2,48 @@ module RedmineGtt
   module Patches
 
     module UserPatch
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-        base.class_eval do
-          unloadable
+      def self.apply
+        User.prepend self unless User < self
+        User.class_eval do
           safe_attributes "geom"
         end
       end
 
-      module ClassMethods
-      end
-
-      module InstanceMethods
-        def geojson
-          unless self.geom.nil?
-            factory = RGeo::GeoJSON::EntityFactory.instance
-            wkb = RGeo::WKRep::WKBParser.new(
-              :support_ewkb => true,
-              :default_srid => 4326
-            ).parse(self.geom)
-            properties = self.as_json({except: [
-              :hashed_password, :hashed_password, :salt, :must_change_passwd,
-              :passwd_changed_on, :auth_source_id, :geom
-            ]})
-            RGeo::GeoJSON.encode factory.feature(wkb, self.id, properties)
-          else
-            nil
-          end
+      def geojson
+        unless self.geom.nil?
+          factory = RGeo::GeoJSON::EntityFactory.instance
+          wkb = RGeo::WKRep::WKBParser.new(
+            :support_ewkb => true,
+            :default_srid => 4326
+          ).parse(self.geom)
+          properties = self.as_json({except: [
+            :hashed_password, :hashed_password, :salt, :must_change_passwd,
+            :passwd_changed_on, :auth_source_id, :geom
+          ]})
+          RGeo::GeoJSON.encode factory.feature(wkb, self.id, properties)
+        else
+          nil
         end
+      end
 
-        def geom=(g)
-          # Turn geometry attribute into WKB for database use
-          if (g.present?)
-            geojson = JSON.parse(g)
-            feature = RGeo::GeoJSON.decode(geojson, json_parser: :json)
+      def geom=(g)
+        # Turn geometry attribute into WKB for database use
+        if (g.present?)
+          geojson = JSON.parse(g)
+          feature = RGeo::GeoJSON.decode(geojson, json_parser: :json)
 
-            ewkb = RGeo::WKRep::WKBGenerator.new(
-              :type_format => :ewkb,
-              :emit_ewkb_srid => true,
-              :hex_format => true
-            )
-            self[:geom] = ewkb.generate(feature.geometry)
-          else
-            self[:geom] = nil
-          end
+          ewkb = RGeo::WKRep::WKBGenerator.new(
+            :type_format => :ewkb,
+            :emit_ewkb_srid => true,
+            :hex_format => true
+          )
+          self[:geom] = ewkb.generate(feature.geometry)
+        else
+          self[:geom] = nil
         end
       end
 
     end
   end
 end
 
-unless User.included_modules.include?(RedmineGtt::Patches::UserPatch)
-  User.send(:include, RedmineGtt::Patches::UserPatch)
-end

lib/redmine_gtt/patches/users_controller_patch.rb

@@ -2,35 +2,22 @@ module RedmineGtt
   module Patches
 
     module UsersControllerPatch
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-        base.class_eval do
-          unloadable
-          alias_method_chain :show, :geojson
-        end
-      end
-
-      module ClassMethods
+      def self.apply
+        UsersController.prepend self unless UsersController < self
       end
 
-      module InstanceMethods
-        def show_with_geojson
-          respond_to do |format|
-            format.geojson { send_data(
-              @user.geojson.to_json,
-              :type => 'application/json; header=present',
-              :filename => "#{@user.login}.geojson")
-            }
-            format.any { show_without_geojson }
-          end
+      def show
+        respond_to do |format|
+          format.geojson { send_data(
+            @user.geojson.to_json,
+            :type => 'application/json; header=present',
+            :filename => "#{@user.login}.geojson")
+          }
+          format.any { super }
         end
       end
-
     end
+
   end
 end
 
-unless UsersController.included_modules.include?(RedmineGtt::Patches::UsersControllerPatch)
-  UsersController.send(:include, RedmineGtt::Patches::UsersControllerPatch)
-end