generic_resources 0.1.4 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 75fb02a03d4f428710356dedbc0c1c96ae1f69f6
-  data.tar.gz: 1c90d82ee9493aaffc309e27f83ec6f0437c305b
+SHA256:
+  metadata.gz: 7f88ed11f62a29483b17c6fd68a207df9f2eb4812079052360eddbea90b54052
+  data.tar.gz: 3afb8f0ff81d5be54152b59f10f7e6ca7d56c75a619d4940748e5a8b1fa1b6cc
 SHA512:
-  metadata.gz: 47c273af29f637cdbe723b092420996bab0672cf43d2e0425efd1074c9395907af117c7c985a159599263b2ad328737a5dc350c6a49d63aa5e3d939774f8e9c2
-  data.tar.gz: e5e106baca61fa629f22ad6cd53216aa3356b8ee7a13296c8b337d000539946000eaf2d81215032ebb64332c4f8b96634fd62ed6f351db40a4585f9ccc60e769
+  metadata.gz: 5a49428c0e19c582f8241c3c68b2a586dc5dd2d3a2d89a2d87220481c38dcec5c139581b7d10e003f6005e01fa678f465b8b57e6ba9ad4a3848bcfbcf7511ae6
+  data.tar.gz: bb4ff85724bb8478ced9d60f91146d47128cc40e5b60786bdcd64d0fb4b21796efa896b687bb3d5b6f64bf1f5bc7beb802a0aa750accda2121281157b91559f5

data/app/controllers/generic_resources/resources_controller.rb

@@ -43,6 +43,13 @@ class GenericResources::ResourcesController < GenericResources.configuration.par
   end
 
   def destroy
+    if GenericResource.resources[params[:resource_name]][:resource_deleteable]
+      @resource.destroy
+      flash[:notice] = I18n.t('generic_resources.controller.flash.notice.destroyed', resource_name: @resource_class.model_name.human)
+    else
+      flash[:notice] = I18n.t('generic_resources.controller.flash.error.not_destroyed', resource_name: @resource_class.model_name.human)
+    end
+    redirect_to_index
   end
 
   private
@@ -55,10 +62,10 @@ class GenericResources::ResourcesController < GenericResources.configuration.par
   def assign_resource
     if params[:resource_name].nil?
       flash[:error] = I18n.t('generic_resources.controller.flash.error.resource_type_missing')
-      redirect_to :back
+      redirect_to action: :index
     elsif GenericResource.resources[params[:resource_name]].nil?
       flash[:error] = I18n.t('generic_resources.controller.flash.error.resource_type_not_found', resource_name: params[:resource_name])
-      redirect_to :back
+      redirect_to action: :index
     else
       @resource_class = GenericResource.resources[params[:resource_name]][:class]
 

data/app/views/generic_resources/_form.html.erb

@@ -0,0 +1,10 @@
+<div class="spacer">
+  <%= render "generic_resources/resources/forms/#{params[:resource_name]}", f: f %>
+</div>
+
+<% if defined?(CaptainHooks) %>
+  <div class="spacer"><%= render_captain_hooks_for("generic_resource_form_#{@resource_class.model_name.singular}".to_sym, { f: f} ) %></div>
+<% end %>
+
+<%= f.submit t("generic_resources.forms.save_resource", resource_name: @resource_class.model_name.human) %>
+

data/app/views/generic_resources/resources/edit.html.erb

@@ -1,5 +1,8 @@
-<%= form_for @resource, url: generic_resources.generic_resources_resource_path, html: { method: :patch} do |f| %>
-  <%= render "generic_resources/resources/forms/#{params[:resource_name]}", f: f %>
+<%= form_for @resource, url: generic_resources.generic_resources_resource_path, html: { method: :patch, multipart: true} do |f| %>
+  <%= render "/generic_resources/form", f: f %>
+<% end %>
+
+<% if GenericResource.resources[params[:resource_name]][:resource_deleteable] %>
   <br />
-  <%= f.submit t("generic_resources.forms.save_resource", resource_name: @resource_class.model_name.human) %>
+  <%= link_to t("generic_resources.forms.delete_resource"), generic_resources.generic_resources_resource_path, method: :delete, data: { confirm: t("generic_resources.forms.delete_confirm") } %>
 <% end %>

data/app/views/generic_resources/resources/new.html.erb

@@ -1,5 +1,3 @@
 <%= form_for @resource, url: generic_resources.generic_resources_resources_path, html: { method: :post} do |f| %>
-  <%= render "generic_resources/resources/forms/#{params[:resource_name]}", f: f %>
-  <br />
-  <%= f.submit t("generic_resources.forms.create_resource", resource_name: @resource_class.model_name.human) %>
+  <%= render "/generic_resources/form", f: f %>
 <% end %>

data/config/locales/generic_resources.de.yml

@@ -14,6 +14,9 @@ de:
         notice:
           created: "%{resource_name} wurde erfolgreich angelegt"
           updated: "%{resource_name} wurde erfolgreich aktualisiert"
+          destroyed: "%{resource_name} wurde erfolgreich gelöscht"
     forms:
       save_resource: "%{resource_name} speichern"
       create_resource: "%{resource_name} anlegen"
+      delete_resource: "Eintrag löschen"
+      delete_confirm: "Sicher? Das löschen kann nicht rückgängig gemacht werden"

data/lib/generic_resource.rb

@@ -2,12 +2,13 @@ module GenericResource
 
   mattr_accessor :resources
 
-  def self.register_resource!(klass, permitted_attributes: [], overview_attributes: [])
+  def self.register_resource!(klass, permitted_attributes: [], overview_attributes: [], resource_deleteable: false)
     @@resources ||= {}
     @@resources[klass.name.underscore.gsub("/","_")] = {
       class: klass,
       permitted_attributes: permitted_attributes,
-      overview_attributes: overview_attributes
+      overview_attributes: overview_attributes,
+      resource_deleteable: resource_deleteable
     }
   end
 

data/lib/generic_resources/acts_as_generic_resource.rb

@@ -8,21 +8,32 @@ module GenericResources
     end
 
     module ClassMethods
-      def acts_as_generic_resource(permitted_attributes: [], overview_attributes: [])
-        if !self.table_exists?
-          Rails.logger.warn "Try to add generic resource #{self.name} - table does not exist"
-          return false
+      def acts_as_generic_resource(permitted_attributes: [], overview_attributes: [], deleteable: false)
+
+        resource_deleteable = true if deleteable == true
+        begin
+          if !self.table_exists?
+            Rails.logger.warn "Try to add generic resource #{self.name} - table does not exist"
+            return false
+          end
+
+          if permitted_attributes.empty?
+            permitted_attributes = (self.try(:column_names) || []) - ['id', 'created_at', 'updated_at']
+          end
+
+          if overview_attributes.empty?
+            overview_attributes = permitted_attributes
+          end
+
+          GenericResource.register_resource!(self,
+            permitted_attributes: permitted_attributes, overview_attributes: overview_attributes,
+            resource_deleteable: resource_deleteable
+          )
+        rescue ActiveRecord::NoDatabaseError => e
+          puts "SKIPPING acts_as_generic_resource on #{self.name} - NoDatabase"
         end
 
-        if permitted_attributes.empty?
-          permitted_attributes = (self.try(:column_names) || []) - ['id', 'created_at', 'updated_at']
-        end
-
-        if overview_attributes.empty?
-          overview_attributes = permitted_attributes
-        end
 
-        GenericResource.register_resource!(self, permitted_attributes: permitted_attributes, overview_attributes: overview_attributes)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: generic_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.10
 platform: ruby
 authors:
 - Florian Eck
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,13 +53,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Use just one Controller to CRUD all your resources instead of having
-  lots of of scaffold controllers
+  lots of scaffold controllers
 email: florian.eck@el-digital.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/generic_resources/resources_controller.rb
+- app/views/generic_resources/_form.html.erb
 - app/views/generic_resources/resources/all.html.example.erb
 - app/views/generic_resources/resources/edit.html.erb
 - app/views/generic_resources/resources/index.example.html.erb
@@ -74,7 +75,7 @@ homepage: https://github.com/florianeck/generic_resources
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Easy CRUD Interface for Rails
 test_files: []