kadmin 0.3.1 → 0.3.2

data/config/initializers/action_view.rb

@@ -1,2 +1,2 @@
-# Allow use of custom field tags for form builder
-ActionView::Base.default_form_builder = Kadmin::FormBuilder
+# Allow use of custom field tags for form builder
+ActionView::Base.default_form_builder = Kadmin::FormBuilder

data/config/initializers/assets.rb

@@ -1,5 +1,5 @@
-# Load engine assets
-# While loading images by extensions seem to work, loading JS and (S)CSS by extension seems
-# to cause issues, although loading them by filename is fine. Go figure.
-Rails.application.config.assets.precompile += %w(select2.css select2-bootstrap.css select2.js)
-Rails.application.config.assets.precompile += Dir.glob("#{Kadmin::Engine.root}/app/assets/**/*").reject { |fn| File.directory?(fn) }
+# Load engine assets
+# While loading images by extensions seem to work, loading JS and (S)CSS by extension seems
+# to cause issues, although loading them by filename is fine. Go figure.
+Rails.application.config.assets.precompile += %w(select2.css select2-bootstrap.css select2.js)
+Rails.application.config.assets.precompile += Dir.glob("#{Kadmin::Engine.root}/app/assets/**/*").reject { |fn| File.directory?(fn) }

data/config/locales/de.yml

@@ -1,25 +1,25 @@
-de:
-  kadmin:
-    auth:
-      error: Ein Fehler ist aufgetreten; bitte versuche es noch einmal
-      login_required: Eine gültige E-Mail Adresse von Google (@offerista.com) ist erforderlich
-      please_login: Bitte melde Dich an
-      unauthorized: Unberechtigter Zugriff
-      unauthorized_message: Du hast für die gewünschte Seite leider keine Zugriffsrechte; falls Du dies anders siehst, wende Dich bitte an das Apps & Services Team
-    components:
-      finder:
-        clear: Löschen
-        create: Anlegen
-        empty: Nichts zu zeigen
-        filter: Suchen
-        out_of: von %{total}
-    dash_message: Schaue Dir die Bereiche in der Navigationsleiste oben an. Sollte es irgenwelche Probleme geben, oder es Dir im Leben an Zugriffsrechten fehlen, wende Dich bitte an das Apps & Services Team
-    error: Fehler
-    errors:
-      not_found: Objekt nicht gefunden
-      params_missing: Fehlender erforderlicher Parameter
-      unexpected: Unerwartete Fehler
-      unexpected_message: Bei dem Betrieb ist ein unerwarteter Fehler aufgetreten. Bitte entweder nochmal versuchen, oder die Apps & Services Team kontaktieren.
-    forms:
-      please_correct: "Bitte die folgende Felde korrigieren:"
-    welcome: Willkommen zurück, %{user}!
+de:
+  kadmin:
+    auth:
+      error: Ein Fehler ist aufgetreten; bitte versuche es noch einmal
+      login_required: Eine gültige E-Mail Adresse von Google (@offerista.com) ist erforderlich
+      please_login: Bitte melde Dich an
+      unauthorized: Unberechtigter Zugriff
+      unauthorized_message: Du hast für die gewünschte Seite leider keine Zugriffsrechte; falls Du dies anders siehst, wende Dich bitte an das Apps & Services Team
+    components:
+      finder:
+        clear: Löschen
+        create: Anlegen
+        empty: Nichts zu zeigen
+        filter: Suchen
+        out_of: von %{total}
+    dash_message: Schaue Dir die Bereiche in der Navigationsleiste oben an. Sollte es irgenwelche Probleme geben, oder es Dir im Leben an Zugriffsrechten fehlen, wende Dich bitte an das Apps & Services Team
+    error: Fehler
+    errors:
+      not_found: Objekt nicht gefunden
+      params_missing: Fehlender erforderlicher Parameter
+      unexpected: Unerwartete Fehler
+      unexpected_message: Bei dem Betrieb ist ein unerwarteter Fehler aufgetreten. Bitte entweder nochmal versuchen, oder die Apps & Services Team kontaktieren.
+    forms:
+      please_correct: "Bitte die folgende Felde korrigieren:"
+    welcome: Willkommen zurück, %{user}!

data/config/locales/en.yml

@@ -1,25 +1,25 @@
-en:
-  kadmin:
-    auth:
-      error: An error occurred; please try again
-      login_required: A valid Google enabled email is necessary to login
-      please_login: Please authenticate yourself
-      unauthorized: Unauthorized access
-      unauthorized_message: You are not authorized to access this resource; if you think you should be, contact the Apps & Services team
-    components:
-      finder:
-        clear: Clear
-        create: Create
-        empty: Nothing to show
-        filter: Filter
-        out_of: out of %{total}
-    dash_message: See the top navigation bar for the different admin sections. If you are missing authorizations, or if there is any issue at all, contact the Apps & Services team!
-    error: Error
-    errors:
-      not_found: Requested object not found
-      params_missing: Missing required parameters
-      unexpected: Unexpected error
-      unexpected_message: An unexpected error occurred; you can try again, or contact a member of the Apps & Services team.
-    forms:
-      please_correct: "Please correct the following:"
+en:
+  kadmin:
+    auth:
+      error: An error occurred; please try again
+      login_required: A valid Google enabled email is necessary to login
+      please_login: Please authenticate yourself
+      unauthorized: Unauthorized access
+      unauthorized_message: You are not authorized to access this resource; if you think you should be, contact the Apps & Services team
+    components:
+      finder:
+        clear: Clear
+        create: Create
+        empty: Nothing to show
+        filter: Filter
+        out_of: out of %{total}
+    dash_message: See the top navigation bar for the different admin sections. If you are missing authorizations, or if there is any issue at all, contact the Apps & Services team!
+    error: Error
+    errors:
+      not_found: Requested object not found
+      params_missing: Missing required parameters
+      unexpected: Unexpected error
+      unexpected_message: An unexpected error occurred; you can try again, or contact a member of the Apps & Services team.
+    forms:
+      please_correct: "Please correct the following:"
     welcome: Moin, moin %{user}!

data/config/routes.rb

@@ -1,12 +1,12 @@
-Kadmin::Engine.routes.draw do
-  get '/', controller: :dash, action: :index
-
-  scope '/auth', controller: :auth, as: 'auth', defaults: { format: 'html' } do
-    get '/login', action: :login, as: :login
-    get '/logout', action: :logout, as: :logout
-    get '/:provider/callback', action: :save
-    post '/:provider/callback', action: :save
-    get '/failure', action: :failure, as: :failure
-    get '/unauthorized', action: :unauthorized, as: :unauthorized
-  end
-end
+Kadmin::Engine.routes.draw do
+  get '/', controller: :dash, action: :index
+
+  scope '/auth', controller: :auth, as: 'auth', defaults: { format: 'html' } do
+    get '/login', action: :login, as: :login
+    get '/logout', action: :logout, as: :logout
+    get '/:provider/callback', action: :save
+    post '/:provider/callback', action: :save
+    get '/failure', action: :failure, as: :failure
+    get '/unauthorized', action: :unauthorized, as: :unauthorized
+  end
+end

data/lib/kadmin.rb

@@ -1,22 +1,22 @@
-require 'kadmin/configuration'
-require 'kadmin/error'
-require 'kadmin/engine'
-require 'kadmin/auth'
-require 'kadmin/form'
-require 'kadmin/finder'
-require 'kadmin/pager'
-
-module Kadmin
-  class << self
-    delegate :logger, :logger=, to: :config
-
-    def config
-      return @config ||= Kadmin::Configuration.new
-    end
-
-    def configure
-      yield(config) if block_given?
-      return config
-    end
-  end
-end
+require 'kadmin/configuration'
+require 'kadmin/error'
+require 'kadmin/engine'
+require 'kadmin/auth'
+require 'kadmin/form'
+require 'kadmin/finder'
+require 'kadmin/pager'
+
+module Kadmin
+  class << self
+    delegate :logger, :logger=, to: :config
+
+    def config
+      return @config ||= Kadmin::Configuration.new
+    end
+
+    def configure
+      yield(config) if block_given?
+      return config
+    end
+  end
+end

data/lib/kadmin/auth.rb

@@ -1,31 +1,31 @@
-# Third party dependency
-require 'omniauth-google-oauth2'
-
-# Core files
-require 'kadmin/auth/unauthorized_error'
-require 'kadmin/auth/configuration'
-require 'kadmin/auth/user'
-require 'kadmin/auth/user_store'
-
-module Kadmin
-  module Auth
-    class << self
-      def users
-        @users ||= config.user_store_class.new
-      end
-
-      def config
-        return @config ||= Kadmin::Auth::Configuration.new
-      end
-
-      def configure
-        yield(config) if block_given?
-        return config
-      end
-
-      def omniauth_provider
-        return config.oauth_credentials.present? ? :google_oauth2 : :developer
-      end
-    end
-  end
-end
+# Third party dependency
+require 'omniauth-google-oauth2'
+
+# Core files
+require 'kadmin/auth/unauthorized_error'
+require 'kadmin/auth/configuration'
+require 'kadmin/auth/user'
+require 'kadmin/auth/user_store'
+
+module Kadmin
+  module Auth
+    class << self
+      def users
+        @users ||= config.user_store_class.new
+      end
+
+      def config
+        return @config ||= Kadmin::Auth::Configuration.new
+      end
+
+      def configure
+        yield(config) if block_given?
+        return config
+      end
+
+      def omniauth_provider
+        return config.oauth_credentials.present? ? :google_oauth2 : :developer
+      end
+    end
+  end
+end

data/lib/kadmin/auth/configuration.rb

@@ -1,66 +1,66 @@
-module Kadmin
-  module Auth
-    class Configuration
-      OAuthCredentials = Struct.new(:id, :secret)
-
-      # @return [Kadmin::Auth::Configuration::OAuthCredentials] credentials for OAuth2 authentication; if absent, fallback to :developer provider
-      attr_accessor :oauth_credentials
-
-      # @return [Class<Kadmin::Auth::User>] class to use for authenticated users (mostly for resource authorization)
-      attr_accessor :user_class
-
-      # @return [Class<Kadmin::Auth::UserStore>] class for user lookup/registration
-      attr_accessor :user_store_class
-
-      def initialize
-        @oauth_credentials = nil
-        @user_class = Kadmin::Auth::User
-        @user_store_class = Kadmin::Auth::UserStore
-        @enabled = false
-      end
-
-      # @return [Boolean] true if enabled, false otherwise
-      def enabled?
-        return @enabled
-      end
-
-      # Enables authentication and adds OmniAuth middlewares
-      def enable!
-        unless @enabled
-          append_omniauth_middleware
-          @enabled = true
-        end
-      end
-
-      # Disables authentication and removes OmniAuth middlewares
-      def disable!
-        if @enabled
-          delete_omniauth_middleware
-          @enabled = false
-        end
-      end
-
-      def append_omniauth_middleware
-        OmniAuth.config.logger = Kadmin.logger
-        OmniAuth.config.path_prefix = File.join(Kadmin.config.mount_path, OmniAuth.config.path_prefix)
-
-        provider_args = case Kadmin::Auth.omniauth_provider
-        when :google_oauth2
-          [:google_oauth2, @oauth_credentials.id, @oauth_credentials.secret]
-        else
-          [:developer, fields: [:email]]
-        end
-
-        Rails.application.config.middleware.use OmniAuth::Builder do
-          provider(*provider_args)
-        end
-      end
-      private :append_omniauth_middleware
-
-      def delete_omniauth_middleware
-        Rails.application.config.middleware.delete OmniAuth::Builder
-      end
-      private :delete_omniauth_middleware
-    end
-  end
-end
+module Kadmin
+  module Auth
+    class Configuration
+      OAuthCredentials = Struct.new(:id, :secret)
+
+      # @return [Kadmin::Auth::Configuration::OAuthCredentials] credentials for OAuth2 authentication; if absent, fallback to :developer provider
+      attr_accessor :oauth_credentials
+
+      # @return [Class<Kadmin::Auth::User>] class to use for authenticated users (mostly for resource authorization)
+      attr_accessor :user_class
+
+      # @return [Class<Kadmin::Auth::UserStore>] class for user lookup/registration
+      attr_accessor :user_store_class
+
+      def initialize
+        @oauth_credentials = nil
+        @user_class = Kadmin::Auth::User
+        @user_store_class = Kadmin::Auth::UserStore
+        @enabled = false
+      end
+
+      # @return [Boolean] true if enabled, false otherwise
+      def enabled?
+        return @enabled
+      end
+
+      # Enables authentication and adds OmniAuth middlewares
+      def enable!
+        unless @enabled
+          append_omniauth_middleware
+          @enabled = true
+        end
+      end
+
+      # Disables authentication and removes OmniAuth middlewares
+      def disable!
+        if @enabled
+          delete_omniauth_middleware
+          @enabled = false
+        end
+      end
+
+      def append_omniauth_middleware
+        OmniAuth.config.logger = Kadmin.logger
+        OmniAuth.config.path_prefix = File.join(Kadmin.config.mount_path, OmniAuth.config.path_prefix)
+
+        provider_args = case Kadmin::Auth.omniauth_provider
+        when :google_oauth2
+          [:google_oauth2, @oauth_credentials.id, @oauth_credentials.secret]
+        else
+          [:developer, fields: [:email]]
+        end
+
+        Rails.application.config.middleware.use OmniAuth::Builder do
+          provider(*provider_args)
+        end
+      end
+      private :append_omniauth_middleware
+
+      def delete_omniauth_middleware
+        Rails.application.config.middleware.delete OmniAuth::Builder
+      end
+      private :delete_omniauth_middleware
+    end
+  end
+end

data/lib/kadmin/auth/unauthorized_error.rb

@@ -1,14 +1,14 @@
-module Kadmin
-  module Auth
-    class UnauthorizedError < Kadmin::Error
-      # Attempts to translate message, if not found returns message as a string
-      def message
-        I18n.t(@message, default: @message)
-      end
-
-      def title
-        I18n.t('kadmin.auth.unauthorized')
-      end
-    end
-  end
-end
+module Kadmin
+  module Auth
+    class UnauthorizedError < Kadmin::Error
+      # Attempts to translate message, if not found returns message as a string
+      def message
+        I18n.t(@message, default: @message)
+      end
+
+      def title
+        I18n.t('kadmin.auth.unauthorized')
+      end
+    end
+  end
+end

data/lib/kadmin/auth/user.rb

@@ -1,15 +1,15 @@
-module Kadmin
-  module Auth
-    class User
-      attr_accessor :email
-
-      def initialize(email)
-        @email = email
-      end
-
-      def authorized?(_request)
-        return true
-      end
-    end
-  end
-end
+module Kadmin
+  module Auth
+    class User
+      attr_accessor :email
+
+      def initialize(email)
+        @email = email
+      end
+
+      def authorized?(_request)
+        return true
+      end
+    end
+  end
+end

data/lib/kadmin/auth/user_store.rb

@@ -1,21 +1,21 @@
-module Kadmin
-  module Auth
-    class UserStore
-      def initialize
-        @store = {}
-      end
-
-      def get(email)
-        return @store[email.downcase]
-      end
-
-      def set(email, user)
-        @store[email.downcase] = user
-      end
-
-      def exists?(email)
-        @store.key?(email.downcase)
-      end
-    end
-  end
-end
+module Kadmin
+  module Auth
+    class UserStore
+      def initialize
+        @store = {}
+      end
+
+      def get(email)
+        return @store[email.downcase]
+      end
+
+      def set(email, user)
+        @store[email.downcase] = user
+      end
+
+      def exists?(email)
+        @store.key?(email.downcase)
+      end
+    end
+  end
+end