effective_reports 0.2.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ea0d7fe4f751e038952802d79ac6df299468d4a2bc23de1f80e2c6877ed381
-  data.tar.gz: 53acffd7f4d1cf599b94565494307088a062b4e91c04555e9ef50da36e3c8010
+  metadata.gz: bc5e577b9e0f7dbcd5425889023bc698c029deda52104a0a36e9ab3c5eb4a353
+  data.tar.gz: 01ebdb1ecff80758de3a495dee72919e514ded99b4c831e1995ab1f6ca7b28d3
 SHA512:
-  metadata.gz: 2ccc75d73cc7e7be22b8aa935c9781d90c974a842ecd21ec7240b4db97e83caa1e2e1419485645f936740b9a068e846321fb5f1e231c71cab264e9681da0ad75
-  data.tar.gz: 728c067c863fb3c30b88716e5b3c6bbe46f3d9a29366b6e3f506e1089200d20e295de8dc61521ec10fd526515d1b5f6cc68e47e7c438773b4137423e8fe6e627
+  metadata.gz: fed92ce6f5d9c049fae81dea487c1f061c4b05aed86202042fcbd5f4eb01de6b2bb2662d89b73fb9917fc79e188e500e3ab76be94e5c845f5005cad77734e6ff
+  data.tar.gz: 7b90bca9c8cc801a7cdf5cb4e25603e94ee313a8a6ae607e30fedbe0c95dfc134f832af88467b2c7b3bbf348c1cad62370f789d98d014d9945a025bef9e66a8e

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

@@ -35,7 +35,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
 

data/app/models/effective/report.rb

@@ -1,6 +1,6 @@
 module Effective
   class Report < ActiveRecord::Base
-    self.table_name = EffectiveReports.reports_table_name.to_s
+    self.table_name = (EffectiveReports.reports_table_name || :reports).to_s
 
     belongs_to :created_by, polymorphic: true, optional: true
 

data/app/models/effective/report_column.rb

@@ -1,6 +1,6 @@
 module Effective
   class ReportColumn < ActiveRecord::Base
-    self.table_name = EffectiveReports.report_columns_table_name.to_s
+    self.table_name = (EffectiveReports.report_columns_table_name || :report_columns).to_s
 
     belongs_to :report
 

data/app/models/effective/report_scope.rb

@@ -1,6 +1,6 @@
 module Effective
   class ReportScope < ActiveRecord::Base
-    self.table_name = EffectiveReports.report_scopes_table_name.to_s
+    self.table_name = (EffectiveReports.report_scopes_table_name || :report_scopes).to_s
 
     belongs_to :report
 

data/config/effective_reports.rb

@@ -1,8 +1,4 @@
 EffectiveReports.setup do |config|
-  config.reports_table_name = :reports
-  config.report_columns_table_name = :report_columns
-  config.report_scopes_table_name = :report_scopes
-
   # Layout Settings
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }
@@ -29,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/db/migrate/{01_create_effective_reports.rb.erb → 101_create_effective_reports.rb}

@@ -1,6 +1,6 @@
 class CreateEffectiveReports < ActiveRecord::Migration[6.0]
   def change
-    create_table <%= @reports_table_name %> do |t|
+    create_table :reports do |t|
       t.integer :created_by_id
       t.string :created_by_type
 
@@ -12,7 +12,7 @@ class CreateEffectiveReports < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @report_columns_table_name %> do |t|
+    create_table :report_columns do |t|
       t.integer :report_id
 
       t.string :name
@@ -34,7 +34,7 @@ class CreateEffectiveReports < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @report_scopes_table_name %> do |t|
+    create_table :report_scopes do |t|
       t.integer :report_id
 
       t.string :name

data/lib/effective_reports/version.rb

@@ -1,3 +1,3 @@
 module EffectiveReports
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.4.0'.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.2.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -194,7 +194,7 @@ files:
 - app/views/admin/reports/_report.html.haml
 - config/effective_reports.rb
 - config/routes.rb
-- db/migrate/01_create_effective_reports.rb.erb
+- db/migrate/101_create_effective_reports.rb
 - db/seeds.rb
 - lib/effective_reports.rb
 - lib/effective_reports/engine.rb