effective_reports 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cced3e68526e1530349ac707cdfc6be8464c375c2f6cd3c6ebe2533ddfd7b06
-  data.tar.gz: 40086ff7a170ce7e7271c672523248367457fe4986d9fa79743d82c4359aced4
+  metadata.gz: 70923b082133448581e40494e8a68f93c231a8441fd7bbeda0281554ffe9f78b
+  data.tar.gz: 554d4e33b48736d92dbfed175a3aea01009f7fed5eda4c5f7bfcba8fe5c2c46e
 SHA512:
-  metadata.gz: f3b6fe097d2ae0f7a168ba9daa53df29f2528a56b02b5e6ed88b87c8f08686924dcfb36b3483b67a36ad38d26e705719d09e8b8bbd1278038631a2399a41f031
-  data.tar.gz: 9b96c0c343fd4bd32e379dbd85cddddfb22df466ef1dec680aeba7a3d294effe912d3784cedebe522c5f36ad3deee3b0050755723fc8cf70fc600f32e11fd73a
+  metadata.gz: 122a4720d2e2c3e883a53138ac7bcf954885b85d27ac486f92ee887471e9ae50be45a28e2bb1118cf57cffdd125557d499c09a1d4a4ff456bc7049f4c15f5659
+  data.tar.gz: da2fce3831d715481f6180e9a73882fd79ca3604ff061269a5542316669038f43cffcac4bbf8d41e124d8ac7de5304c118d9af070ae37edadd145dfd944c3b7d

data/app/mailers/effective/reports_mailer.rb

@@ -2,7 +2,7 @@ module Effective
   class ReportsMailer < EffectiveReports.parent_mailer_class
 
     include EffectiveMailer
-    include EffectiveEmailTemplatesMailer if EffectiveReports.use_effective_email_templates
+    #include EffectiveEmailTemplatesMailer
 
     # def reports_submitted(resource, opts = {})
     #   @assigns = assigns_for(resource)

data/app/models/concerns/acts_as_reportable.rb

@@ -6,6 +6,7 @@ module ActsAsReportable
   extend ActiveSupport::Concern
 
   PRICE_NAME_ATTRIBUTES = ['price', 'subtotal', 'tax', 'total', 'current_revenue', 'current_revenue_subtotal', 'current_revenue_tax', 'deferred_revenue', 'deferred_revenue_subtotal', 'deferred_revenue_tax', 'amount_owing', 'surcharge']
+  DENY_LIST = [:logged_changes, :password, :encrypted_password]
 
   module Base
     def acts_as_reportable(options = nil)
@@ -35,7 +36,11 @@ module ActsAsReportable
   end
 
   # Used for the notifications mailer
-  def reportable_view_assigns(view)
+  # This should be a view_context that you can call urls on
+  # But it's a bit weird and sometimes it's just nil (like on an update action in the validation)
+  # Be careful when you code stuff for it
+  # Always return all the keys, and leave the value blank if view is blank
+  def reportable_view_assigns(view = nil)
     {}
   end
 
@@ -76,7 +81,7 @@ module ActsAsReportable
       end; h
     end
 
-    atts.merge(associated)
+    atts.merge(associated).except(*DENY_LIST)
   end
 
 end

data/app/models/effective/report.rb

@@ -36,6 +36,16 @@ module Effective
     validates :title, presence: true, uniqueness: true
     validates :reportable_class_name, presence: true
 
+    validate do
+      error = begin
+        collection().to_sql; nil
+      rescue StandardError => e
+        e.message
+      end
+
+      errors.add(:base, "Invalid Report: #{error}") if error.present?
+    end
+
     def to_s
       title.presence || 'report'
     end
@@ -107,7 +117,7 @@ module Effective
 
       # Apply Scopes
       report_scopes.each do |scope|
-        collection = (scope.value.nil? ? collection.send(scope.name) : collection.send(scope.name, scope.value))
+        collection = scope.apply_scope(collection)
       end
 
       # Apply Includes

data/app/models/effective/report_scope.rb

@@ -37,9 +37,19 @@ module Effective
     end
 
     validate(if: -> {report&.reportable }) do
-      unless report.reportable.new.reportable_scopes.key?(name.to_sym)
-        errors.add(:name, "acts_as_reportable #{report.reportable} reportable_scopes() missing :#{name} scope")
+      reportable = report.reportable
+
+      if reportable.new.reportable_scopes.key?(name.to_sym) == false
+        errors.add(:name, "acts_as_reportable #{reportable} reportable_scopes() missing :#{name} scope")
+      end
+
+      scope_error = begin
+        apply_scope(reportable.all).to_sql; nil
+      rescue StandardError => e
+        e.message
       end
+
+      self.errors.add(:name, scope_error) if scope_error.present?
     end
 
     def to_s
@@ -54,5 +64,9 @@ module Effective
       return '=' if advanced?
     end
 
+    def apply_scope(collection)
+      value.nil? ? collection.send(name) : collection.send(name, value)
+    end
+
   end
 end

data/app/views/admin/reports/_report.html.haml

@@ -1,23 +1,24 @@
-- if report.description.present?
-  %p= simple_format(report.description)
+= card do
+  - if report.description.present?
+    %p= simple_format(report.description)
 
-- if report.filtered_report_columns.present? || report.report_scopes.present?
-  %p The results of this report have been filtered by the following:
+  - if report.filtered_report_columns.present? || report.report_scopes.present?
+    %p The results of this report have been filtered by the following:
 
-- if report.filtered_report_columns.present?
-  %p= badges(report.filtered_report_columns.map(&:to_s))
+  - if report.filtered_report_columns.present?
+    %p= badges(report.filtered_report_columns.map(&:to_s))
 
-- if report.report_scopes.present?
-  %p= badges(report.report_scopes.map(&:to_s))
+  - if report.report_scopes.present?
+    %p= badges(report.report_scopes.map(&:to_s))
 
-= collapse('Show SQL') do
-  %p= report.collection.to_sql
+  = collapse('Show SQL') do
+    %p= report.collection.to_sql
 
-- if (notifications = report.try(:notifications)).present?
-  %p.mt-3
-    The following notifications are sent based on this report:
-    - notifications.each do |notification|
-      = link_to(notification, effective_messaging.edit_admin_notification_path(notification), target: '_blank')
+  - if (notifications = report.try(:notifications)).present?
+    %p.mt-3
+      The following notifications are sent based on this report:
+      - notifications.each do |notification|
+        = link_to(notification, effective_messaging.edit_admin_notification_path(notification), target: '_blank')
 
-- datatable = EffectiveReportDatatable.new(report: report)
-= render_datatable(datatable)
+  - datatable = EffectiveReportDatatable.new(report: report)
+  = render_datatable(datatable)

data/config/effective_reports.rb

@@ -25,9 +25,7 @@ EffectiveReports.setup do |config|
   # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
   # config.mailer_layout = nil      # Default mailer layout
   # config.mailer_sender = nil      # Default From value
+  # config.mailer_froms = nil       # Default Froms collection
   # config.mailer_admin = nil       # Default To value for Admin correspondence
   # config.mailer_subject = nil     # Proc.new method used to customize Subject
-
-  # Will work with effective_email_templates gem
-  config.use_effective_email_templates = true
 end

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lib/effective_reports.rb

@@ -14,7 +14,7 @@ module EffectiveReports
 
       # Effective Gem
       :layout,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_reports
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails