refactor issue* patches #50

Author: jkraemer

lib/redmine_gtt.rb

@@ -1,11 +1,6 @@
 # Global Hooks
 require 'redmine_gtt/hooks/view_layouts_base_html_head_hook'
 
-# Issue Hooks
-require 'redmine_gtt/patches/issue_patch.rb'
-require 'redmine_gtt/patches/issues_controller_patch.rb'
-require 'redmine_gtt/patches/issues_helper_patch.rb'
-
 
 # API Template Hooks
 # Seems like this is not necessary
@@ -24,9 +19,13 @@
 module RedmineGtt
 
   def self.setup
+    RedmineGtt::Patches::IssuesHelperPatch.apply
+
+    RedmineGtt::Patches::IssuePatch.apply
     RedmineGtt::Patches::ProjectPatch.apply
     RedmineGtt::Patches::UserPatch.apply
 
+    RedmineGtt::Patches::IssuesControllerPatch.apply
     RedmineGtt::Patches::ProjectsControllerPatch.apply
     RedmineGtt::Patches::ProjectsHelperPatch.apply
     RedmineGtt::Patches::UsersControllerPatch.apply
@@ -35,7 +34,6 @@ def self.setup
     # 	IssueQuery.send(:include, RedmineGtt::Patches::IssueQueryPatch)
     # end
 
-    # IssuesController.send(:prepend, RedmineGtt::Patches::IssuesControllerPatch)
 
     #Redmine::Views::ApiTemplateHandler.send(:prepend, RedmineGtt::Patches::ApiTemplateHandlerPatch)
   end

lib/redmine_gtt/patches/issue_patch.rb

@@ -2,53 +2,44 @@ module RedmineGtt
   module Patches
 
     module IssuePatch
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-        base.class_eval do
-          unloadable
+
+      def self.apply
+        Issue.prepend self unless Issue < self
+        Issue.class_eval do
           safe_attributes "geom" if lambda {|issue, user| user.allowed_to?(:edit_issues, issue.project)}
         end
       end
 
-      module ClassMethods
-      end
-
-      module InstanceMethods
-        def geojson
-          unless self.geom.nil?
-            factory = RGeo::GeoJSON::EntityFactory.instance
-            wkb = RGeo::WKRep::WKBParser.new().parse(self.geom)
-            RGeo::GeoJSON.encode factory.feature(wkb, self.id, self.as_json)
-          else
-            nil
-          end
+      def geojson
+        unless self.geom.nil?
+          factory = RGeo::GeoJSON::EntityFactory.instance
+          wkb = RGeo::WKRep::WKBParser.new().parse(self.geom)
+          RGeo::GeoJSON.encode factory.feature(wkb, self.id, self.as_json)
+        else
+          nil
         end
+      end
 
-        def geom=(g)
-          # Turn geometry attribute into WKB for database use
-          if (g.present?)
-            begin
-              geojson = JSON.parse(g)
-              feature = RGeo::GeoJSON.decode(geojson, json_parser: :json)
-              wkb = RGeo::WKRep::WKBGenerator.new(
-                :hex_format => true
-              )
-              self[:geom] = wkb.generate(feature.geometry)
-            rescue
-              # The Gemetry is likely to be already in WKB format
-              self[:geom] = g
-            end
-          else
-            self[:geom] = nil
+      def geom=(g)
+        # Turn geometry attribute into WKB for database use
+        if (g.present?)
+          begin
+            geojson = JSON.parse(g)
+            feature = RGeo::GeoJSON.decode(geojson, json_parser: :json)
+            wkb = RGeo::WKRep::WKBGenerator.new(
+              :hex_format => true
+            )
+            self[:geom] = wkb.generate(feature.geometry)
+          rescue
+            # The Gemetry is likely to be already in WKB format
+            self[:geom] = g
           end
+        else
+          self[:geom] = nil
         end
       end
-
     end
+
   end
 end
 
-unless Issue.included_modules.include?(RedmineGtt::Patches::IssuePatch)
-  Issue.send(:include, RedmineGtt::Patches::IssuePatch)
-end

lib/redmine_gtt/patches/issues_controller_patch.rb

@@ -2,58 +2,44 @@ module RedmineGtt
   module Patches
 
     module IssuesControllerPatch
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-        base.class_eval do
-          unloadable
-          alias_method_chain :show, :geojson
-          alias_method_chain :index, :geojson
-        end
+      def self.apply
+        IssuesController.prepend self unless IssuesController < self
       end
 
-      module ClassMethods
+      def show
+        respond_to do |format|
+          format.geojson { send_data(
+            @issue.geojson.to_json,
+            :type => 'application/json; header=present',
+            :filename => "#{@issue.id}.geojson")
+          }
+          format.any { super }
+        end
       end
 
-      module InstanceMethods
-        def show_with_geojson
-          respond_to do |format|
-            format.geojson { send_data(
-              @issue.geojson.to_json,
-              :type => 'application/json; header=present',
-              :filename => "#{@issue.id}.geojson")
-            }
-            format.any { show_without_geojson }
-          end
-        end
 
-        def index_with_geojson
-          # It's not so great to have to copy the whole "index" method to add
-          # another output format (geojson). Hopefully this isn't too annoying
-          # to maintain. See the previous alias how it would be much nicer.
-          retrieve_query
+      def index
+        retrieve_query
 
-          if @query.valid?
-            respond_to do |format|
-              format.geojson { send_data(
+        if @query.valid?
+          respond_to do |format|
+            format.geojson {
+              send_data(
+                # TODO move that method somewhere else:
                 IssuesHelper.get_geojson(@issues).to_json,
                 :type => 'application/json; header=present',
                 :filename => "issues.geojson")
-              }
-              format.any { index_without_geojson }
-            end
-          else
-            respond_to do |format|
-              format.any { index_without_geojson }
-            end
+            }
+            format.any { super }
           end
+        else
+          super
         end
+      rescue ActiveRecord::RecordNotFound
+        render_404
       end
 
     end
   end
 end
 
-unless IssuesController.included_modules.include?(RedmineGtt::Patches::IssuesControllerPatch)
-  IssuesController.send(:include, RedmineGtt::Patches::IssuesControllerPatch)
-end

lib/redmine_gtt/patches/issues_helper_patch.rb

@@ -2,14 +2,11 @@ module RedmineGtt
   module Patches
 
     module IssuesHelperPatch
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.send(:include, InstanceMethods)
-        base.class_eval do
-          unloadable
-        end
+      def self.apply
+        IssuesHelper.extend(ClassMethods)
       end
 
+      # FIXME move that method somewhere else
       module ClassMethods
         def get_geojson(issues)
           unless issues.nil?
@@ -35,13 +32,7 @@ def get_geojson(issues)
         end
       end
 
-      module InstanceMethods
-      end
-
     end
   end
 end
 
-unless IssuesHelper.included_modules.include?(RedmineGtt::Patches::IssuesHelperPatch)
-  IssuesHelper.send(:include, RedmineGtt::Patches::IssuesHelperPatch)
-end