effective_classifieds 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b922833fe51ff1291c85c0708b708120ab0d87c25ff96185c62b105b53fb1fe7
-  data.tar.gz: 7bbb631c54607a94616f8493234dbab069c1446b6d6256ed8758cba5b9c2dd2e
+  metadata.gz: '02458792301648b01098c825a54d2fa92267599f520340ac347f6ab7417cbcfb'
+  data.tar.gz: 92dbdd7f35880a95007e71827d3245ba97855ce4b1ee96cb5cb444a7710d8d5c
 SHA512:
-  metadata.gz: c0945747f72335c70181f4f63f89467b936974ad166a938a70e6b97ce23201b42c034997c4279d7f7372662b6afe15e1101759e3551e6d9a495612a9aa3fa148
-  data.tar.gz: c7dea63e19d5d077ba9c83f0cfaf7bace041f2aa82fdfa173fb5b8d75a5d8358a7380cc759769f75ce308d8b2c698ff88255791ea060e5fb705664d1ee3e209a
+  metadata.gz: 53f7ffcdfbf0b0213249c8d5ac4dc8ce3a519702776706e5e4bfeb09cb50e73d0ecba3c55057db19ce392fe44a51864adb02079ab8d4e295ba03e2d0e69fa08f
+  data.tar.gz: f70627b5a9963d3e5cd0832448441c2e6288c8c0fc591f414b77bc5c0790cd425d1cfc38d2436d184ac909800289f7a17829e5f24cbf550bc2ba95a61f58b673

data/app/controllers/effective/classified_wizards_controller.rb

@@ -6,26 +6,5 @@ module Effective
 
     resource_scope -> { EffectiveClassifieds.ClassifiedWizard.deep.where(owner: current_user) }
 
-    # Allow only 1 in-progress application at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      existing = resource_scope.in_progress.where.not(id: resource).first
-
-      if existing.present?
-        flash[:success] = "You have been redirected to your in-progress classified ad submission"
-        redirect_to effective_classifieds.classified_wizard_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      model = (params.key?(:effective_classified_wizard) ? :effective_classified_wizard : :classified_wizard)
-      params.require(model).permit!.except(:status, :status_steps, :wizard_steps, :submitted_at)
-    end
-
   end
 end

data/app/controllers/effective/classifieds_controller.rb

@@ -26,7 +26,7 @@ module Effective
     private
 
     def permitted_params
-      params.require(:effective_classified).permit!.except(:status, :status_steps)
+      params.require(:effective_classified).except(:status, :status_steps).permit!
     end
 
   end

data/app/datatables/admin/effective_classified_wizards_datatable.rb

@@ -16,7 +16,7 @@ class Admin::EffectiveClassifiedWizardsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveSubmissions.ClassifiedWizard.all.deep.done.joins(:classified)
+    EffectiveClassifieds.ClassifiedWizard.all.deep.done.joins(:classified)
   end
 
 end

data/app/mailers/effective/classifieds_mailer.rb

@@ -2,7 +2,7 @@ module Effective
   class ClassifiedsMailer < EffectiveClassifieds.parent_mailer_class
 
     default from: -> { EffectiveClassifieds.mailer_sender }
-    layout -> { EffectiveClassifieds.mailer_layout || 'effective_classifieds_mailer_layout' }
+    layout -> { EffectiveClassifieds.mailer_layout }
 
     def classified_submitted(resource, opts = {})
       raise('expected an Effective::Classification') unless resource.kind_of?(Effective::Classified)

data/config/effective_classifieds.rb

@@ -24,22 +24,18 @@ EffectiveClassifieds.setup do |config|
   # Automatically approve classified ad submissions, otherwise require admin approval
   config.auto_approve = false
 
-  # Mailer Configuration
+  # Mailer Settings
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
+  #
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Effective::ClassifiedsMailer'
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # 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_admin = nil       # Default To value for Admin correspondence
 
-  # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
-
-  # Default deliver method
-  # config.deliver_method = :deliver_later
-
-  # Default layout
-  # config.mailer_layout = 'effective_classifieds_mailer_layout'
-
-  # Default From
-  config.mailer_sender = "no-reply@example.com"
-
-  # Send Admin correspondence To
-  config.mailer_admin = "admin@example.com"
 end

data/db/migrate/01_create_effective_classifieds.rb.erb

@@ -33,8 +33,8 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.timestamps
     end
 
-    add_index :classifieds, [:owner_id, :owner_type]
-    add_index :classifieds, :slug
+    add_index <%= @classifieds_table_name %>, [:owner_id, :owner_type]
+    add_index <%= @classifieds_table_name %>, :slug
 
     create_table <%= @classified_wizards_table_name %> do |t|
       t.string :token
@@ -56,7 +56,7 @@ class CreateEffectiveClassifieds < ActiveRecord::Migration[6.1]
       t.datetime :created_at
     end
 
-    add_index :classified_wizards, [:owner_id, :owner_type]
-    add_index :classified_wizards, :token
+    add_index <%= @classified_wizards_table_name %>, [:owner_id, :owner_type]
+    add_index <%= @classified_wizards_table_name %>, :token
   end
 end

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,7 +213,6 @@ files:
 - app/views/effective/classifieds/index.html.haml
 - app/views/effective/classifieds/show.html.haml
 - app/views/effective/classifieds_mailer/classified_submitted.html.haml
-- app/views/layouts/effective_classifieds_mailer_layout.html.haml
 - config/effective_classifieds.rb
 - config/routes.rb
 - db/migrate/01_create_effective_classifieds.rb.erb

data/app/views/layouts/effective_classifieds_mailer_layout.html.haml

@@ -1,7 +0,0 @@
-!!!
-%html{style: 'background: #fff;'}
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
-
-  %body{style: 'background: #fff;'}
-    = yield