inline_forms 5.2.6 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ea65a4e20e753d86681a5727edb61b32a2daf53
-  data.tar.gz: 06855e03cdda0a75eb7c286ffe755d9909e91d89
+  metadata.gz: b40118b734934f94ff113855156c0c1ab98b49f5
+  data.tar.gz: e9fdf7451053f33a6d3618068d1e777a329f6a15
 SHA512:
-  metadata.gz: 4cec5c41cba5e1fa6331348171e9ab7d5de514b407fb179577f283cc52a329e387f2129b0441e84a69af8b32a0df219e479d86a6a8c4f88a07e5ef2ab8fde8ac
-  data.tar.gz: 51564154e2ff4cae7f4c47a7ec5846a8be99670d3cecffe7b3703ca204a55d41a313e2f79c6135355b8f8ebede3e40ec0be50c228a134e16f60ce07f46095740
+  metadata.gz: 5e11c687acfd2d4d3b3542f822f0b9659626dab8f0495badf4a382a9b7e90254b0cfb9cb80063fcf4a9d5624cb96642413f6464332cf42325ba8ba8a66f0aafc
+  data.tar.gz: f70a535591c7505033a6efcd5ba91c32e6cede9038aff2d95a56a34b1ef0b966f73b23f268d0c4c390ed82d6335d3b86ba7246f596be0b2efaaf82ee17270d59

data/app/controllers/inline_forms_controller.rb

@@ -185,13 +185,21 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     @object = referenced_object
     if current_user.role? :superadmin
-      @object.destroy
-      respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :show_undo }
+      if (@Klass.soft_deletable? rescue false)
+        @object.soft_delete(current_user)
+        respond_to do |format|
+          format.html { } unless @Klass.not_accessible_through_html?
+          format.js { render :close }
+        end
+      elsif
+        @object.destroy
+        respond_to do |format|
+          format.html { } unless @Klass.not_accessible_through_html?
+          format.js { render :show_undo }
+        end
       end
-    elsif (@Klass.safe_deletable? rescue false)
-      @object.safe_delete(current_user)
+    elsif (@Klass.soft_deletable? rescue false)
+      @object.soft_delete(current_user)
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }
@@ -204,17 +212,26 @@ class InlineFormsController < ApplicationController
   def revert
     @update_span = params[:update]
     if current_user.role? :superadmin
-      @version = PaperTrail::Version.find(params[:id])
-      @version.reify.save!
-      @object = @Klass.find(@version.item_id)
-      authorize!(:revert, @object) if cancan_enabled?
-      respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :close }
+      if (@Klass.soft_deletable? rescue false)
+        @object = referenced_object
+        @object.soft_restore
+        respond_to do |format|
+          format.html { } unless @Klass.not_accessible_through_html?
+          format.js { render :close }
+        end
+      elsif
+        @version = PaperTrail::Version.find(params[:id])
+        @version.reify.save!
+        @object = @Klass.find(@version.item_id)
+        authorize!(:revert, @object) if cancan_enabled?
+        respond_to do |format|
+          format.html { } unless @Klass.not_accessible_through_html?
+          format.js { render :close }
+        end
       end
-    elsif (@Klass.safe_deletable? rescue false)
+    elsif (@Klass.soft_deletable? rescue false)
       @object = referenced_object
-      @object.safe_restore
+      @object.soft_restore
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }

data/app/models/concerns/inline_forms/soft_deletable.rb

@@ -0,0 +1,35 @@
+module SoftDeletable
+  extend ActiveSupport::Concern
+
+# you need to put this in the model:
+#  include InlineForms::SoftDeletable
+#  enum deleted: { active: 1, deleted: 2 }
+
+# you need a migration like this:
+# class AddDeletedAtColumnToUser < ActiveRecord::Migration[6.0]
+#   def change
+#     add_column :users, :deleted_at, :datetime, default: nil
+#     add_column :users, :deleted, :integer, default: 1
+#     add_column :users, :deleted_by, :integer, default: nil
+#   end
+# end
+
+  def soft_deletable?
+    true
+  end
+
+  def soft_delete(current_user)
+    deleted = 2
+    deleter = current_user
+    deleted_at = Time.current
+    save
+  end
+
+  def soft_restore
+    deleted = 1
+    deleted_by = nil
+    deleted_at = nil
+    save
+  end
+
+end

data/bin/inline_forms_installer_core.rb

@@ -592,7 +592,7 @@ if ENV['install_example'] == 'true'
     end
   END_EXAMPLE_TEST
 
-  run "rspec" if ENV['runtest']
+  #run "rspec" if ENV['runtest']
   remove_file 'public/index.html'
   route "root :to => 'apartments#index'"
 
@@ -602,7 +602,7 @@ if ENV['install_example'] == 'true'
   run 'bundle exec rails s'
 else
   # run tests
-  run "rspec" if ENV['runtest']
+  #run "rspec" if ENV['runtest']
   say "- Don't forget: add your secret key base in config/application.yml \n"
 end
 # done!

data/inline_forms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rvm')
   s.add_dependency('thor')
   s.add_dependency('validation_hints')
-  s.add_dependency('rails', '>= 5.0')
+  s.add_dependency('rails', '>= 6.0')
   s.add_dependency('rails-i18n')
 
   s.add_development_dependency(%q<rspec-rails>)

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "5.2.6"
+  VERSION = "6.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 6.0.3
 platform: ruby
 authors:
 - Ace Suares
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,7 @@ files:
 - app/helpers/form_elements/text_field.rb
 - app/helpers/form_elements/time.rb
 - app/helpers/inline_forms_helper.rb
+- app/models/concerns/inline_forms/soft_deletable.rb
 - app/models/geo_code_curacao.rb
 - app/validators/curacao_id_number_validator.rb
 - app/validators/is_curacao_phone_validator.rb