wobauth 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036ba4d2f604909cb8d224f27fc1570723520ddcdbe0f830e26f3f2eecdb93ae
-  data.tar.gz: 781621423c2cccdff5f9c1477eae55cfe9517d6e21f814bfbe67f8c4b0e04d6a
+  metadata.gz: 4a1e15fe42e6ce8fcc8274e264e6b6ff4411b465b78203a2afe1dc9050c934e3
+  data.tar.gz: fc1141b984c94361f6d697b022b68de04ec794caea6f337218f2dc4be65c9315
 SHA512:
-  metadata.gz: c2615f3b762673ab9697f2d2619d2965269f2763daa246517c0039e63e52e7309f2b71cab759e5900e843401f88eee5e71994f43d209bbfa44cacbf817640b43
-  data.tar.gz: 0af1198085fb8ef517204d41990cfb64b9d280b85b478d0ea3ca4b36b804e11075a4e3b129dbe480c4f90ebe26add903bf20ed88a10b85b6e79ccd5e17a93af2
+  metadata.gz: 8d3c9edcd37cb311eb8586c73797157b40b6904d88f31e503bddad4b33e4eb2d715a8b1e8476f82ecfa0851afe2d26eda54ffa5c7aa7586c4bf9e7baf77f733f
+  data.tar.gz: bdfd6aa3a3cf02f59b4ddc6c890bf4b76bb9e5a4463ce522dc2f14c58c9cbeb578c33eafc45c50baaade0ea2f3f983ea81c62faf82850534208f75a15ce7df41

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License (MIT)
 
-Copyright (c) 2014-2019 Wolfgang Barth
+Copyright (c) 2014-2020 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

@@ -29,13 +29,22 @@ wobauth 1.x is for Rails 4, wobauth 2.x will support Rails 5.
 wobauth 3.x uses bootstrap v4 and font-awesome, starting with Rails 5.1 
 (may work with Rails 5.0, but not tested)
 wobauth 4.x works with sprockets v4.
+wobauth 5.x works with rails 6.x and is designed for autoloading via zeitwerk.
 
 Requirements
 ------------
 
+### Rails >= 6.0, autoload = :zeitwerk
+
+| branch     | rails | ruby   | bootstrap | icons           | wobapphelpers |
+|------------|-------|--------|-----------|-----------------|---------------|
+| master(5.x)| >=6.0 | >= 2.6 |  v4       | fontawesome 5.x | master (4.x)  |
+
+### Rails <= 5.2, autoload = :classic
+
 | branch     | rails | ruby   | bootstrap | icons           | wobapphelpers |
 |------------|-------|--------|-----------|-----------------|---------------|
-| master(4.x)| >=5.1 | >= 2.3 |  v4       | fontawesome 5.x | master (4.x)  |
+| 4-0-stable | >=5.1 | >= 2.3 |  v4       | fontawesome 5.x | master (4.x)  |
 | 3-0-stable | >=5.1 | >= 2.3 |  v4       | fontawesome 4.7 | 3-0-stable    |
 | 2-0-stable |  5.0  | >= 2.2 |  v3       | glyphicons      | 2-0-stable    |
 | 1-0-stable |  4.2  | >= 2.0 |  v3       | glyphicons      | 1-0-stable    |
@@ -48,6 +57,7 @@ Installation
 Add wobauth to your Gemfile:
 
 ```ruby
+gem 'wobauth', '~> 5.0.0'
 gem 'wobauth', '~> 4.0.0'
 gem 'wobauth', '~> 3.4.8'
 gem 'wobauth', git: 'https://github.com/swobspace/wobauth.git', branch: '3-0-stable'
@@ -171,7 +181,7 @@ included in this rails engine.
 Licence
 -------
 
-wobauth Copyright (C) 2014-2019  Wolfgang Barth
+wobauth Copyright (C) 2014-2020  Wolfgang Barth
 
 MIT license, see [LICENSE](LICENSE)
 

data/app/models/wobauth/user.rb

@@ -1,7 +1,8 @@
+require_dependency 'wobauth/concerns/models/user_concerns'
 module Wobauth
   class User < ActiveRecord::Base
     # dependencies within wobauth models
-    include Wobauth::Concerns::Models::User
+    include UserConcerns
 
     # Include default devise modules. Others available are:
     # :confirmable, :lockable, :timeoutable and :omniauthable

data/app/views/wobauth/users/index.html.erb

@@ -49,4 +49,4 @@
 
 <%= back_link %>
 <%= new_link [wobauth, Wobauth::User] %>
-<%= link_to t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary' %>
+<%= link_to(t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary') if can? :create, Wobauth::User %>

data/app/views/wobauth/users/show.html.erb

@@ -94,7 +94,7 @@
       <%= edit_link([wobauth, @user]) %>
       <%= delete_link([wobauth, @user]) %>
       <%= new_link [wobauth, Wobauth::User] %>
-      <%= link_to t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary' %>
+      <%= link_to(t('wobauth.new_user_from_ad'), wobauth.ad_users_path, class: 'btn btn-secondary') if can? :create, Wobauth::User %>
     </div>
 
   </div>

data/config/ldap.yml.example

@@ -0,0 +1,9 @@
+ldap_options:
+  host: 1.2.3.4
+  port: 3268
+  base: dc=example,dc=com
+  auth:
+    method: :simple
+    username: myusername
+    password: mysecretpassword
+

data/config/locales/wobapphelpers.de.yml

@@ -1,10 +1,14 @@
 de:
   wobapphelpers:
     helpers:
-      back: "Zurück"
-      cancel: "Abbrechen"
-    controller:
-      new:  "%{name} erstellen"
-      create:  "%{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/wobapphelpers.en.yml

@@ -3,6 +3,12 @@ en:
     helpers:
       back: Back
       cancel: Cancel
-    controller:
-      new:  "create %{name}"
-      edit:  "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/wobauth/concerns/models/user_concerns.rb

@@ -0,0 +1,40 @@
+module UserConcerns
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :authorities, as: :authorizable, dependent: :destroy
+    has_many :roles,       through: :authorities
+    has_many :memberships, dependent: :destroy
+    has_many :groups, -> { distinct }, through: :memberships
+    has_many :group_roles, through: :groups, source: :roles
+    has_many :group_authorities, through: :groups, source: :authorities
+
+    validates :username, presence: true, uniqueness: true
+  end
+
+
+  def to_s
+    if sn.blank? and givenname.blank?
+      "#{username}" 
+    elsif title.blank?
+      "#{sn}, #{givenname} (#{username})"
+    else
+      "#{sn}, #{title} #{givenname} (#{username})"
+    end
+  end
+
+  def name
+    to_s
+  end
+
+  def is_admin?
+    role?(:admin)
+  end
+
+  def role?(role)
+    (self.authorities.joins(:role)
+     .where("wobauth_roles.name = ?", role.to_s.camelize).present?) ||
+    (self.group_authorities.joins(:role)
+     .where("wobauth_roles.name = ?", role.to_s.camelize).present?)
+  end
+end

data/lib/wobauth/version.rb

@@ -1,4 +1,4 @@
 module Wobauth
-  VERSION = "4.0.0".freeze
-  RELEASEDATE = "2019-11-28".freeze
+  VERSION = "5.0.0".freeze
+  RELEASEDATE = "2020-01-19".freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wobauth
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Wolfgang Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -636,6 +636,7 @@ files:
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/initializers/wobapphelpers.rb
+- config/ldap.yml.example
 - config/locales/de.yml
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
@@ -650,7 +651,6 @@ files:
 - db/migrate/20140504143328_create_wobauth_authorities.rb
 - db/migrate/20140508120810_devise_create_wobauth_users.rb
 - db/migrate/20171231084355_additional_fields_to_wobauth_user.rb
-- lib/concerns/models/user.rb
 - lib/generators/templates/initializers/wobauth.rb
 - lib/generators/wobauth/install_generator.rb
 - lib/tasks/wobauth_tasks.rake
@@ -661,6 +661,7 @@ files:
 - lib/templates/erb/scaffold/show.html.erb
 - lib/templates/rails/scaffold_controller/controller.rb
 - lib/wobauth.rb
+- lib/wobauth/concerns/models/user_concerns.rb
 - lib/wobauth/engine.rb
 - lib/wobauth/version.rb
 - spec/factories.rb

data/lib/concerns/models/user.rb

@@ -1,44 +0,0 @@
-module Wobauth
-  module Concerns
-    module Models::User
-      extend ActiveSupport::Concern
-
-      included do
-	has_many :authorities, as: :authorizable, dependent: :destroy
-	has_many :roles,       through: :authorities
-	has_many :memberships, dependent: :destroy
-	has_many :groups, -> { distinct }, through: :memberships
-	has_many :group_roles, through: :groups, source: :roles
-	has_many :group_authorities, through: :groups, source: :authorities
-
-        validates :username, presence: true, uniqueness: true
-      end
-
-
-      def to_s
-        if sn.blank? and givenname.blank?
-          "#{username}" 
-        elsif title.blank?
-          "#{sn}, #{givenname} (#{username})"
-        else
-          "#{sn}, #{title} #{givenname} (#{username})"
-        end
-      end
-  
-      def name
-        to_s
-      end
-
-      def is_admin?
-        role?(:admin)
-      end
-
-      def role?(role)
-        (self.authorities.joins(:role)
-         .where("wobauth_roles.name = ?", role.to_s.camelize).present?) ||
-        (self.group_authorities.joins(:role)
-         .where("wobauth_roles.name = ?", role.to_s.camelize).present?)
-      end
-    end
-  end
-end