generic_resources 0.1.3 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: abfad9c3605db6df5852b517a3cad3d0e04e74f9
-  data.tar.gz: 61f2d05e6e14eba7b16051e776834bec3521241f
+SHA256:
+  metadata.gz: ed552a3f0febc777983aea38b7cf711769bf4af6ef392efa5b833f98f19a8888
+  data.tar.gz: 9f16feb1bb26233ab89334375f8a81d2ea929e2a69f241d35506abadff913209
 SHA512:
-  metadata.gz: f32a3124adc5da16ec6b47a14baff3f97d4203afff83527a07b3f3f511a31bc84a61c6b5b3dbcdcc4c988030cd3f65a6729e5a7ba6bbeb2b9ede1f6d95bf7033
-  data.tar.gz: fd48459591ac491543e2b1450d696d9bd07ea2260f899ab06bc7d1511ee8067f59ccc2822d5b310bb46c771c955cf3eca44c0e52a817982fe395ce7a107f80aa
+  metadata.gz: 752101b594364f1b58aa58c066886348ceb64448058bc16a859e9358206e921b10b5168904c97623163c6132b7002e914c3eae3d87a9462ff8d46646001558b0
+  data.tar.gz: e4fd97ddf30f90b1eb5a2ff7069078f7ccb43cd1504f56f56148cbf89c86e50543cef120c0f324ab9b8642656ea752932f33573f5ebd8aefcfc5ee8bd735ca0f

data/app/controllers/generic_resources/resources_controller.rb

@@ -1,6 +1,6 @@
 class GenericResources::ResourcesController < GenericResources.configuration.parent_controller.to_s.constantize
 
-  before_filter :assign_resource, except: [:all]
+  before_action :assign_resource, except: [:all]
 
   def all
 
@@ -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

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

@@ -0,0 +1,9 @@
+<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.create_resource", resource_name: @resource_class.model_name.human) %>

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

@@ -1,5 +1,3 @@
-<%= 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 %>
-  <br />
-  <%= f.submit t("generic_resources.forms.save_resource", resource_name: @resource_class.model_name.human) %>
+<%= form_for @resource, url: generic_resources.generic_resources_resource_path, html: { method: :patch, multipart: true} do |f| %>
+  <%= render "/generic_resources/form", f: f %>
 <% 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/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.3
+  version: 0.1.9
 platform: ruby
 authors:
 - Florian Eck
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2021-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,6 +60,7 @@ 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: []