foreman_column_view 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95da9455cf65da4a8e2944bb57f9bd77521e1ca5
-  data.tar.gz: 3c892aaceb8c2a1a69daaf84559160d77730a2c6
+  metadata.gz: b9b33311126673ce073f9d8dc8da89c55f08f8a7
+  data.tar.gz: 235bf44a424fd53d85d678975dec4ae6fc42a390
 SHA512:
-  metadata.gz: 81478c69c4a0dbd9b69f07874b94bf2578716cb99a0ffe73a7f80f092fd6a3a167744008f88029b937e3fc581cc6328c364269a037ab329f67efd957b8475eaf
-  data.tar.gz: 273371f2927e7ff22541cf9f8bdbbe6acb8abd780ff2a18d768e82a4c50437cf878b0f58c2b745b9baf371c5d0cc77f6116f76b55eb3e4be83df9fe6306f4f2e
+  metadata.gz: 3f047f1ecdcf6cbb52c6c0cc09fa8d851a82391fcef2b557d764a1d2498f0e6e54936edf8037cfab9dfc7c376c18446adb7b4b4720e938adaa2b40eeeb6102ac
+  data.tar.gz: 4022b58d4f20a5db80e7c1af0b9cd1e6b3e7a39e0836e9cce535d6be9a5d926460aec82ed2d5d96cd878ec88cf21f0b70f5527b45621e135c0182387e8f49bf1

data/README.md

@@ -4,6 +4,14 @@ A small plugin to showcase the awesome [Deface](https://github.com/spree/deface)
 library. It simply adds a column to the Hosts list or properties table. It also
 serves as a simple example of including a new Helper in the plugin.
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| <= 1.15         | ~> 0.3         |
+| == 1.16         | untested       |
+| >= 1.17         | ~> 0.4         |
+
 # Installation
 
 Require the gem in Foreman (you may need extra dependencies such as libxml or libxslt

data/app/helpers/foreman_column_view/hosts_helper_extension.rb

@@ -1,41 +1,46 @@
 module ForemanColumnView
   module HostsHelperExtension
-    def self.included(base)
-      base.send :alias_method_chain, :overview_fields, :fcv
-    end
+    extend ActiveSupport::Concern
 
-    # Extend core HostsHelper to add rows to Properties on hosts/show
-    def overview_fields_with_fcv host
-      fields = overview_fields_without_fcv(host)
-      return fields unless SETTINGS[:column_view]
-
-      valid_views = [:hosts_properties]
-      SETTINGS[:column_view].reject { |k,v| !valid_views.include?(v[:view]) }.keys.sort.map do |k|
-        after       = SETTINGS[:column_view][k.to_sym][:after]
-        conditional = SETTINGS[:column_view][k.to_sym][:conditional]
-        if conditional.present?
-          method = conditional[0].to_sym
-          args   = conditional.drop(1)
-        end
+    module Overrides
+      # Extend core HostsHelper to add rows to Properties on hosts/show
+      def overview_fields(host)
+        fields = super
+        return fields unless SETTINGS[:column_view]
 
-        begin
-          next unless (conditional.present? && host.respond_to?(method) && host.send(method, *args)) ||
-                      (conditional.nil?)
-        rescue ArgumentError
-          Rails.logger.warn("Foreman_column_view: Your are supplying the wrong kind/number of arguments to your conditional method. Host #{host} , method - #{method} - arguments - #{args.join(', ')} ")
-          next
-        end
+        valid_views = [:hosts_properties]
+        SETTINGS[:column_view].reject { |k,v| !valid_views.include?(v[:view]) }.keys.sort.map do |k|
+          after       = SETTINGS[:column_view][k.to_sym][:after]
+          conditional = SETTINGS[:column_view][k.to_sym][:conditional]
+          if conditional.present?
+            method = conditional[0].to_sym
+            args   = conditional.drop(1)
+          end
+
+          begin
+            next unless (conditional.present? && host.respond_to?(method) && host.send(method, *args)) ||
+              (conditional.nil?)
+          rescue ArgumentError
+            Rails.logger.warn("Foreman_column_view: Your are supplying the wrong kind/number of arguments to your conditional method. Host #{host} , method - #{method} - arguments - #{args.join(', ')} ")
+            next
+          end
 
-        # This won't work well with i18n, use row numbers instead
-        after = fields.find_index { |r| r[0].include? after } unless after.is_a? Fixnum
-        eval_content = SETTINGS[:column_view][k.to_sym][:eval_content]
-        content = eval_content ? eval(SETTINGS[:column_view][k.to_sym][:content]) :
-                                 fcv_content(host, k)
+          # This won't work well with i18n, use row numbers instead
+          after = fields.find_index { |r| r[0].include? after } unless after.is_a? Fixnum
+          eval_content = SETTINGS[:column_view][k.to_sym][:eval_content]
+          content = eval_content ? eval(SETTINGS[:column_view][k.to_sym][:content]) :
+            fcv_content(host, k)
 
-        fields.insert(after || -1, [fcv_title(k), content])
+          fields.insert(after || -1, [fcv_title(k), content])
+        end
+
+        fields
       end
+    end
 
-      fields
+    included do
+      prepend Overrides
     end
+
   end
 end

data/lib/foreman_column_view/engine.rb

@@ -1,15 +1,16 @@
 require 'deface'
-require 'foreman_column_view'
-require 'deface'
 
 module ForemanColumnView
-  #Inherit from the Rails module of the parent app (Foreman), not the plugin.
-  #Thus, inhereits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
+    engine_name 'foreman_column_view'
+
+    config.autoload_paths += Dir['#{config.root}/app/helpers']
+    config.autoload_paths += Dir['#{config.root}/app/overrides']
 
     initializer 'foreman_column_view.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_column_view do
-      end if (Rails.env == "development" or defined? Foreman::Plugin)
+        requires_foreman '>= 1.17'
+      end
     end
 
     initializer 'foreman_column_view.helper' do |app|

data/lib/foreman_column_view/version.rb

@@ -1,3 +1,3 @@
 module ForemanColumnView
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_column_view
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -46,7 +46,7 @@ files:
 - lib/foreman_column_view/version.rb
 homepage: http://github.com/GregSutcliffe/foreman_column_view
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []