wobapphelpers 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5af48b4d13534d6728ad14474163cbd02cda0b6e
-  data.tar.gz: 51f77953886d1a0e800b3101836a05529aeb1881
+SHA256:
+  metadata.gz: 12c301fa73d2bc6e7ed490e0c4705e97fe958cecadab3cd603bb00c6bc9f43e0
+  data.tar.gz: b2c5d81eb33f8f8cca05c2a51e5c835394db40a31f04304ecb4db9a0ac8712c8
 SHA512:
-  metadata.gz: c742fc336988cf36311a1c434192acd4c6f9b4c8f62655772510439cbcdf150151e0a6032fac018b226724ccbd1182305fd87a8a068776756026a6090adee142
-  data.tar.gz: 89077a16afca966a5229b4baffb209077c5f2107dc46bf87ddf1ccc9e0f15ffce33fa31a43df6919dd23f366b0317948fdd2ba01985e9066eb9283f94827b74a
+  metadata.gz: 5761d19b7170a14b1e870b938773dedc4eae005ff3a4be9d59f90e85c1d5b15263319b9b8610ac6035ed43aeb85f034ba00de04f335f093a6e433c45ef8950eb
+  data.tar.gz: d3799fb2cb12d6706491f8e1e323bdb762f4f891201d65fe3c3a587a175b922a95769a7d4b6cc4a13f61122126a9171dadaf10d418d1503c1c83f0d1fd2e97f0

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2018 Wolfgang Barth
+Copyright (c) 2014-2019 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:
+
+  * rails g wobapphelpers:install
 
-This is the ''master'' branch, for use with rails 5.1.
+
+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  |
 
@@ -149,7 +155,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-2019  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/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/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

data/lib/wobapphelpers/helpers/icon_helper.rb

@@ -11,7 +11,7 @@ module Wobapphelpers
         delete:     'trash',
         document:   'file',
         download:   'download',
-        edit:       'pencil',
+        edit:       'pencil-alt',
         help:       'question',
         info:       'info',
         left:       'arrow-left',
@@ -26,7 +26,7 @@ module Wobapphelpers
       }
       
       def icon(what)
-        raw(%Q[<i class="fa fa-#{what} fa-fw" aria-hidden="true"></i>])
+        raw(%Q[<i class="fas fa-#{what} fa-fw" aria-hidden="true"></i>])
       end
 
       PREDEFINED_ICONS.each do |key,value| 

data/lib/wobapphelpers/version.rb

@@ -1,4 +1,4 @@
 module Wobapphelpers
-  VERSION = "3.1.1".freeze
-  RELEASEDATE = "2018-07-27".freeze
+  VERSION = "4.0.0".freeze
+  RELEASEDATE = "2019-11-28".freeze
 end

data/test/breadcrumbs/breadcrumb_helper_test.rb

@@ -10,8 +10,8 @@ class BreadcrumbHelperHelperTest < ActionDispatch::IntegrationTest
     get home_path
     get posts_path
     assert_select "div#breadcrumbs" do
-      assert_select "[href='/home?bci=0']", title: "Home"
-      assert_select "[href='/posts?bci=1']", title: "Postings"
+      assert_select "[href='/home']", title: "Home"
+      assert_select "[href='/posts']", title: "Postings"
     end
   end
 
@@ -22,7 +22,7 @@ class BreadcrumbHelperHelperTest < ActionDispatch::IntegrationTest
     get home_path, headers: {'HTTP_REFERER' => 'http://example.org'}
     get posts_path
     assert_select "[class=?]", "btn btn-secondary" do
-      assert_select "[href='/home?bci=2']", text: /.*Zurück/
+      assert_select "[href='/home']", text: /.*Zurück/
     end
   end
 

data/test/helpers/action_view_helper_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'sass'
 require 'jquery-rails'
 require 'shoulda-context'
 
@@ -28,12 +27,12 @@ class ActionViewHelperTest < ActionDispatch::IntegrationTest
 	     "No back button found"
     end
 
-    should "cancel_button renders i with class fa" do
+    should "cancel_button renders i with class fas" do
       visit new_post_path
-      assert page.has_text?('Post/new')
+      assert page.has_text?('Posting erstellen')
       within('form') do
 	assert page.has_link?('Abbrechen'), "button submit not found"
-	assert find('a.btn.btn-secondary i.fa.fa-trash'), 
+	assert find('a.btn.btn-secondary i.fas.fa-trash'), 
 	       "button cancel not found"
      end
     end

data/test/helpers/can_view_helper_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'sass'
 require 'jquery-rails'
 require 'shoulda-context'
 

data/test/helpers/form_legend_test.rb

@@ -12,7 +12,7 @@ class FormLegendTest < ActionController::TestCase
     get :new
     assert_select "div.row" do
       assert_select "div" do
-        assert_select "legend", text: "Post/new"
+        assert_select "legend", text: "Posting erstellen"
       end
     end
   end
@@ -21,7 +21,7 @@ class FormLegendTest < ActionController::TestCase
     get :edit, params: { id: @p1 }
     assert_select "div.row" do
       assert_select "div" do
-        assert_select "legend", text: "Post/edit"
+        assert_select "legend", text: "Posting bearbeiten"
       end
     end
   end

data/test/helpers/icon_helper_test.rb

@@ -1,21 +1,20 @@
 require 'test_helper'
-require 'sass'
 
 class IconHelperTest < ActionView::TestCase
   include Wobapphelpers::Helpers::IconHelper
 
-  test "icon() renders i with class fa" do
+  test "icon() renders i with class fas" do
     render plain: icon('search')
 
-    assert_select 'i.fa.fa-search.fa-fw', 1 
-    assert_select 'i.fa.fa-quark', 0
+    assert_select 'i.fas.fa-search.fa-fw', 1 
+    assert_select 'i.fas.fa-quark', 0
   end
 
   Wobapphelpers::Helpers::IconHelper::PREDEFINED_ICONS.each do |key,value|
     test "icon_#{key} renders i with class fa-#{value}" do
       render plain: send("icon_#{key}")
  
-      assert_select "i.fa.fa-#{value}", 1 
+      assert_select "i.fas.fa-#{value}", 1 
     end
   end
 end

data/test/helpers/show_edit_delete_link_helper_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'sass'
 
 class ShowEditDeleteLinkHelperTest < ActionView::TestCase
   include Wobapphelpers::Helpers::All

data/test/integration/helper_delivery_test.rb

@@ -11,7 +11,7 @@ class HelperDeliveryTest < ActionDispatch::IntegrationTest
     get home_path
     assert_response :success
     Wobapphelpers::Helpers::IconHelper::PREDEFINED_ICONS.each do |key,value|
-      assert_match "<i class=\"fa fa-#{value} fa-fw\" aria-hidden=\"true\"></i>", response.body
+      assert_match "<i class=\"fas fa-#{value} fa-fw\" aria-hidden=\"true\"></i>", response.body
     end
   end
 

data/test/tmp/config/initializers/wobapphelpers.rb

@@ -0,0 +1,18 @@
+Wobapphelpers.setup do |config|
+  #
+  # exclude some controllers from breadcrumbs
+  # the given string must match controller.controller_name
+  #
+  # example:
+  # config.breadcrumb_controller_blacklist = ["user_sessions"]
+  # default:
+  # config.breadcrumb_controller_blacklist = []
+  #
+  # show action links only if has ability to execute the action
+  # * :none : always present action links
+  # * :cancan1 : for cancancan '~>1.7.0' or cancan '~>1.6.0'
+  # * :cancan2 : for cancan '~>2.0.0', untested
+  #
+  # default:
+  # config.cancan = :none
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: wobapphelpers
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Wolfgang Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: responders
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,32 +26,18 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +100,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +292,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - app/assets/stylesheets/wobapphelpers/breadcrumbs.scss
 - config/locales/de.yml
 - config/locales/en.yml
@@ -363,7 +364,7 @@ files:
 - test/integration/helper_delivery_test.rb
 - test/responders/flash_test.rb
 - test/test_helper.rb
-- test/tmp/lib/templates/rails/scaffold_controller/controller.rb
+- test/tmp/config/initializers/wobapphelpers.rb
 - test/translate_test.rb
 - test/wobapphelpers_test.rb
 homepage: http://github.com/swobspace/wobapphelpers
@@ -385,13 +386,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails helpers and more shared between wob's rails applications
 test_files:
-- test/tmp/lib/templates/rails/scaffold_controller/controller.rb
+- test/tmp/config/initializers/wobapphelpers.rb
 - test/wobapphelpers_test.rb
 - test/helpers/can_view_helper_test.rb
 - test/helpers/action_view_helper_test.rb

data/test/tmp/lib/templates/rails/scaffold_controller/controller.rb

@@ -1,66 +0,0 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_file_path %>/application_controller"
-
-<% end -%>
-<% module_namespacing do -%>
-class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
-  before_action :add_breadcrumb_show, only: [:show]
-
-  # GET <%= route_url %>
-  def index
-    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
-    respond_with(@<%= plural_table_name %>)
-  end
-
-  # GET <%= route_url %>/1
-  def show
-    respond_with(@<%= singular_table_name %>)
-  end
-
-  # GET <%= route_url %>/new
-  def new
-    @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-    respond_with(@<%= singular_table_name %>)
-  end
-
-  # GET <%= route_url %>/1/edit
-  def edit
-  end
-
-  # POST <%= route_url %>
-  def create
-    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
-
-    @<%= orm_instance.save %>
-    respond_with(@<%= singular_table_name %>)
-  end
-
-  # PATCH/PUT <%= route_url %>/1
-  def update
-    @<%= orm_instance.update("#{singular_table_name}_params") %>
-    respond_with(@<%= singular_table_name %>)
-  end
-
-  # DELETE <%= route_url %>/1
-  def destroy
-    @<%= orm_instance.destroy %>
-    respond_with(@<%= singular_table_name %>)
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
-    end
-
-    # Only allow a trusted parameter "white list" through.
-    def <%= "#{singular_table_name}_params" %>
-      <%- if attributes_names.empty? -%>
-      params[:<%= singular_table_name %>]
-      <%- else -%>
-      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
-      <%- end -%>
-    end
-end
-<% end -%>