wobapphelpers 3.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5af48b4d13534d6728ad14474163cbd02cda0b6e
-  data.tar.gz: 51f77953886d1a0e800b3101836a05529aeb1881
+SHA256:
+  metadata.gz: b461d0fd48b611986501332be4b0867efd73430b40a7ad2ca8093c459e917d76
+  data.tar.gz: 642ee767f5d72db56976c34a53f27a152108dde5f41846b4851891d7e81238a0
 SHA512:
-  metadata.gz: c742fc336988cf36311a1c434192acd4c6f9b4c8f62655772510439cbcdf150151e0a6032fac018b226724ccbd1182305fd87a8a068776756026a6090adee142
-  data.tar.gz: 89077a16afca966a5229b4baffb209077c5f2107dc46bf87ddf1ccc9e0f15ffce33fa31a43df6919dd23f366b0317948fdd2ba01985e9066eb9283f94827b74a
+  metadata.gz: c763a9d9103fbfc9f5bd378b7738319a59d8532036d003bb4ffc694f0d285cda136f83187121cafebc5b3fc4aad2459647db84e35f623ad48c9a0e40453ebfad
+  data.tar.gz: 1914eb04aec1dc9237fecaf44360eded2cab93d53bb19947fcc78cd156e8b30ed052947da52557bebd66d5999312bc450327fc935aea6ae9fa90437e5aac75fc

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2018 Wolfgang Barth
+Copyright (c) 2014-2021 Wolfgang Barth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,16 +1,22 @@
 wobapphelpers
 =============
 
-Rails helpers and more shared between common wob rails applications. Depends on twitter bootstrap. 
+This is the ''master'' branch, for use with rails >= 5.2.
+
+BREAKING CHANGE between 3-0 -> master: please reinstall wobapphelpers locales with:
 
-This is the ''master'' branch, for use with rails 5.1.
+  * rails g wobapphelpers:install
+
+
+Rails helpers and more shared between common wob rails applications. Depends on twitter bootstrap. 
 
 Requirements
 ------------
 
 | branch     | rails | ruby   | bootstrap | icons       | 
 |------------|-------|--------|-----------|-------------|
-| master     | 5.1   | >= 2.3 | v4        | fontawesome |
+| master     | >=5.2 | >= 2.3 | v4        | fontawesome |
+| 3-0-stable | 5.1   | >= 2.3 | v4        | fontawesome |        
 | 2-0-stable | 5.0   | >= 2.2 | v3        | glyphicons  |        
 | 1-0-stable | 4.2   | >= 2.0 | v3        | glyphicons  |
 
@@ -19,9 +25,10 @@ Requirements
 Installation
 ------------
 
+    gem 'wobapphelpers', github: 'swobspace/wobapphelpers', branch: "master"
+    gem 'wobapphelpers', github: 'swobspace/wobapphelpers', branch: "3-0-stable"
     gem 'wobapphelpers', github: 'swobspace/wobapphelpers', branch: "2-0-stable"
     gem 'wobapphelpers', github: 'swobspace/wobapphelpers', branch: "1-0-stable"
-    gem 'wobapphelpers', github: 'swobspace/wobapphelpers', branch: "master"
 
 Generators
 ----------
@@ -149,7 +156,7 @@ other variable names you have to use :add_breadcrumbs_for, i.e.
 Licence
 -------
 
-Wobapphelpers Copyright (C) 2014-2018  Wolfgang Barth
+Wobapphelpers Copyright (C) 2014-2021  Wolfgang Barth
 
 MIT License, see [LICENSE](LICENSE)
 

data/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/config/locales/de.yml

@@ -1,9 +1,14 @@
 de:
   wobapphelpers:
     helpers:
-      back: "Zurück"
-      cancel: "Abbrechen"
-    controller:
-      new:  "%{name} erstellen"
-      edit:  "%{name} bearbeiten"
-      update:  "%{name} bearbeiten"
+      back: Zurück
+      cancel: Abbrechen
+    actions:
+      new:  "%{model} erstellen"
+      create:  "%{model} erstellen"
+      show:  "%{model} anzeigen"
+      edit:  "%{model} bearbeiten"
+      copy:  "%{model} kopieren"
+      update:  "%{model} bearbeiten"
+      destroy:  "%{model} löschen"
+      destroy_confirm:  "Der Datensatz kann nicht wieder hergestellt werden!"

data/config/locales/en.yml

@@ -3,7 +3,12 @@ en:
     helpers:
       back: Back
       cancel: Cancel
-    controller:
-      new:  "create %{name}"
-      edit:  "update %{name}"
-      update:  "update %{name}"
+    actions:
+      new:  "create %{model}"
+      create: "create %{model}"
+      show: "show %{model}"
+      edit: "update %{model}"
+      update: "update %{model}"
+      copy: "copy %{model}"
+      destroy: "destroy %{model}"
+      destroy_confirm: "record would be finally destroyed, no recovery possible!"

data/lib/generators/templates/erb/scaffold/_form.html.erb

@@ -1,26 +1,18 @@
-<%%= simple_form_for(@<%= singular_table_name %>,
-  html: { class: 'form-horizontal well' },
-  wrapper: :horizontal_form,
-  wrapper_mappings: {
-    check_boxes: :horizontal_radio_and_checkboxes,
-    radio_buttons: :horizontal_radio_and_checkboxes,
-    file: :horizontal_file_input,
-    boolean: :horizontal_boolean
-  }) do |f| %>
+<div class="container">
+  <%%= simple_form_for(@<%= singular_table_name %>,
+    html: { class: 'form-horizontal card' }) do |f| %>
 
-  <fieldset>
-    <%%= form_legend %>
-
-    <div class="form-inputs">
-    <%- attributes.each do |attribute| -%>
-      <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %><% (attribute.field_type == :date_select) ? ', as: :string' : '' %>
-       %>
-    <%- end -%>
+    <div class="card-header">
+      <%%= form_legend %>
     </div>
+    <div class="card-body">
+     <%- attributes.each do |attribute| -%>
+      <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %><% (attribute.field_type == :date_select) ? ', as: :string' : '' %>
+	 %>
+     <%- end -%>
 
-    <div class="col-sm-9 col-sm-offset-3">
       <%%= f.button :submit, class: 'btn btn-primary' %>
       <%%= cancel_button %>
     </div>
-  </fieldset>
-<%% end %>
+  <%% end %>
+</div>

data/lib/generators/templates/erb/scaffold/index.html.erb

@@ -1,30 +1,49 @@
-<h1><%%= t('controller.<%= plural_table_name %>') %></h1>
+<%% content_for :head do %>
+  <meta name="turbolinks-cache-control" content="no-cache">
+<%% end %>
 
-<table id="dataTable" class="table table-bordered table-striped dataTable">
-<thead>
-  <tr>
-<% attributes.each do |attribute| -%>
-    <th><%%= t('attributes.<%= attribute.name %>') %></th>
-<% end -%>
-    <th></th>
-  </tr>
-</thead>
-<tbody>
+<h1><%%= t('controller.<%= plural_table_name %>') %></h1>
 
-<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-  <%%= content_tag_for(:tr, <%= singular_table_name %>) do %>
-<% attributes.each do |attribute| -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
-<% end -%>
-    <td class="nowrap">
-      <%%= show_link <%= singular_table_name %> %>
-      <%%= edit_link <%= singular_table_name %> %>
-      <%%= delete_link <%= singular_table_name %> %>
-    </td>
+<div data-controller="datatables">
+  <%%= content_tag :table, role: :datatable,
+        id: "<%= plural_table_name + "_table" %>",
+        class: "table table-bordered table-responsive-xl",
+        data: {
+          'datatables-target': 'datatable',
+          order: [[0, 'desc']].to_json
+        } do %>
+    <thead>
+      <tr class="search">
+    <% attributes.each do |attribute| -%>
+        <th><%%= t('attributes.<%= attribute.name %>') %></th>
+    <% end -%>
+        <th class="nosort"><%%= t('daisy.action') %></th>
+      </tr>
+    </thead>
+    <tfoot>
+      <tr>
+    <% attributes.each do |attribute| -%>
+        <th></th>
+    <% end -%>
+        <th></th>
+      </tr>
+    </tfoot>
+    <tbody>
+      <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+        <%%= content_tag_for(:tr, <%= singular_table_name %>) do %>
+      <% attributes.each do |attribute| -%>
+          <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+      <% end -%>
+          <td class="text-nowrap">
+            <%%= show_link <%= singular_table_name %> %>
+            <%%= edit_link <%= singular_table_name %> %>
+            <%%= delete_link <%= singular_table_name %> %>
+          </td>
+        <%% end %>
+      <%% end %>
+    </tbody>
   <%% end %>
-<%% end %>
-</tbody>
-</table>
+</div>
 
 <br />
 

data/lib/generators/templates/erb/scaffold/show.html.erb

@@ -1,15 +1,22 @@
-<table class="table table-bordered table-hover autowidth">
-<% attributes.each do |attribute| %>
-  <tr>
-    <th><%%= t('attributes.<%= attribute.name %>')%>:</th>
-    <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
-  </tr>
-<% end -%>
-</table>
+<div class="card">
+  <div class="card-header">
+    <h4><%%= t('activerecord.models.<%= singular_table_name %>') %></h4>
+  </div>
+  <div class="card-body">
+    <table class="table table-bordered table-hover autowidth">
+    <% attributes.each do |attribute| %>
+      <tr>
+        <th><%%= t('attributes.<%= attribute.name %>')%>:</th>
+        <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
+      </tr>
+    <% end -%>
+    </table>
 
-<div role="toolbar">
-  <%%= back_link %>
-  <%%= edit_link(@<%= singular_table_name %>) %>
-  <%%= delete_link(@<%= singular_table_name %>) %>
-  <%%= new_link <%= class_name %> %>
+    <div role="toolbar">
+      <%%= back_link %>
+      <%%= edit_link(@<%= singular_table_name %>) %>
+      <%%= delete_link(@<%= singular_table_name %>) %>
+      <%%= new_link <%= class_name %> %>
+    </div>
+  </div>
 </div>

data/lib/wobapphelpers/breadcrumbs/action_controller.rb

@@ -3,11 +3,6 @@ module Wobapphelpers
     module ActionController
       def add_breadcrumb(name, url)
         breadcrumbs ||= (session[:breadcrumbs] || [] )
-        if params[:bci]
-          # this a back link of an existing breadcrumb entry,
-          # shorten the list
-          breadcrumbs = breadcrumbs.first(params[:bci].to_i)
-        end
         if breadcrumbs.size == 0 || url != breadcrumbs.last[1]
           breadcrumbs << [name, url]
         end

data/lib/wobapphelpers/breadcrumbs/breadcrumbs_helper.rb

@@ -5,21 +5,16 @@ module Wobapphelpers
 	return if Wobapphelpers.breadcrumb_controller_blacklist.include?(controller.controller_path)
 	return if session[:breadcrumbs].nil? || session[:breadcrumbs].size == 0
 	track = ""
-	session[:breadcrumbs].each_with_index do |b, idx|
-	  track += "> #{breadcrumb_idx(b[0], b[1], idx)} "
+	session[:breadcrumbs].each do |b|
+	  track += "> #{set_breadcrumb(b[0], b[1])} "
 	end
 	%Q[<div id="breadcrumbs" class="visible-desktop">#{track}</div>].html_safe
       end
 
-      def breadcrumb_idx(name, url, idx, html_class=nil)
+      def set_breadcrumb(name, url, options = {})
+        options.symbolize_keys!
         uri = URI.parse(url)
-        query = uri.query || ""
-        if query =~ /bci=(\d+)/
-          uri.query.gsub!(/bci=(\d+)/, "bci=#{idx}")
-        else
-          uri.query = query + "&bci=#{idx}"
-        end
-        link_to name, uri.to_s.gsub('?&','?'), :class => html_class
+        link_to name, uri.to_s, options
       end
     end
   end

data/lib/wobapphelpers/helpers.rb

@@ -2,11 +2,13 @@ module Wobapphelpers
   module Helpers
     autoload :IconHelper, 'wobapphelpers/helpers/icon_helper.rb'
     autoload :ActionViewHelper, 'wobapphelpers/helpers/action_view_helper.rb'
+    autoload :PolymorphicHelper, 'wobapphelpers/helpers/polymorphic_helper.rb'
 
     # one module to rule all
     module All
       include IconHelper
       include ActionViewHelper
+      # PolymorphicHelper must be explicit included
     end
   end
 end

data/lib/wobapphelpers/helpers/action_view_helper.rb

@@ -19,11 +19,9 @@ module Wobapphelpers
         mypoly, obj = get_parts(poly)
         if _can?(:create, obj)
           options.symbolize_keys!
-          link_to obj.model_name.human + " erstellen",
-            new_polymorphic_path(mypoly),
-            remote: options.fetch(:remote, false),
-            title: options.fetch(:title, title(obj) + " hinzufügen"),
-            class: options.fetch(:class, 'btn btn-secondary')
+          link_to title(obj, :new),
+            new_polymorphic_path(mypoly), 
+              default_options(obj, :new).merge(options)
         end
       end
 
@@ -31,10 +29,8 @@ module Wobapphelpers
         mypoly, obj = get_parts(poly)
         if _can?(:read, obj)
           options.symbolize_keys!
-          link_to icon_show, polymorphic_path(mypoly),
-            remote: options.fetch(:remote, false),
-            title:  options.fetch(:title, title(obj) + " anzeigen"),
-            class:  options.fetch(:class, 'btn btn-secondary')
+          link_to icon_show, polymorphic_path(mypoly), 
+            default_options(obj, :show).merge(options)
         end
       end
 
@@ -42,10 +38,8 @@ module Wobapphelpers
         mypoly, obj = get_parts(poly)
         if _can?(:edit, obj)
           options.symbolize_keys!
-          link_to icon_edit, edit_polymorphic_path(mypoly),
-            remote: options.fetch(:remote, false),
-            title:  options.fetch(:title, title(obj) + " bearbeiten"),
-            class:  options.fetch(:class, 'btn btn-secondary')
+          link_to icon_edit, edit_polymorphic_path(mypoly), 
+            default_options(obj, :edit).merge(options)
         end
       end
 
@@ -53,15 +47,11 @@ module Wobapphelpers
         mypoly, obj = get_parts(poly)
         if _can?(:destroy, obj)
           options.symbolize_keys!
-          verify = options.has_key?(:verify) ? { verify: options.fetch(:verify) } : {}
-          link_to icon_delete, mypoly,
-            remote: options.fetch(:remote, false),
-            data: {
-              confirm: options.fetch(:confirm, "Sie wollen das Objekt löschen.\nSind Sie sicher?")
-            }.merge(verify),
-            method: :delete,
-            title:  options.fetch(:title, title(obj) + " löschen"),
-            class:  options.fetch(:class, 'btn btn-danger')
+          options = delete_options(obj).merge(options)
+          if options[:data][:confirm].blank?
+            options[:data][:confirm] = confirm_message(obj)
+          end
+          link_to icon_delete, mypoly, options
         end
       end
 
@@ -76,7 +66,7 @@ module Wobapphelpers
 	    idx   =  session[:breadcrumbs].size - 2
 	    title = bc[0]
 	    goto  = bc[1]
-	    breadcrumb_idx(label, goto, idx, 'btn btn-secondary')
+	    set_breadcrumb(label, goto, class: 'btn btn-secondary')
 	  else
 	    link_to label, url_for(:back), :class => 'btn btn-secondary'
 	  end
@@ -134,13 +124,14 @@ module Wobapphelpers
         end
       end
 
-      def title(obj)
+      def title(obj, action)
         if obj.kind_of? Class
           model = obj
         else
           model = obj.class
         end
-        t('activerecord.models.' + model.model_name.i18n_key.to_s)
+        t(action.to_s, scope: "wobapphelpers.actions".to_sym,
+          model: t('activerecord.models.' + model.model_name.i18n_key.to_s))
       end
 
       def controlleraction
@@ -148,8 +139,8 @@ module Wobapphelpers
         namespace     = controller.controller_path
         resource_name = t("activerecord.models.#{namespace.singularize}")
         search_for    = [namespace, action].join(".").to_sym
-        t(search_for, scope: "wobapphelpers.controller".to_sym,
-          default: action.to_sym, name: resource_name)
+        t(search_for, scope: "wobapphelpers.actions".to_sym,
+          default: action.to_sym, model: resource_name)
       end
 
       def _can?(action, obj)
@@ -165,6 +156,28 @@ module Wobapphelpers
           model
         end
       end
+
+      def default_options(obj, action)
+        {
+          title: title(obj, action),
+          remote: false,
+          class: 'btn btn-secondary',
+        }
+      end
+
+      def delete_options(obj)
+        {
+          title: title(obj, :destroy),
+          remote: false,
+          class: 'btn btn-danger',
+          data: {},
+          method: :delete,
+        }
+      end
+
+      def confirm_message(obj)
+       "#{title(obj, :destroy)}?\n" + t('wobapphelpers.actions.destroy_confirm')
+      end
     end
   end
 end