card 1.96.1 → 1.96.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 310b0b588949e32587e8eca8af7b585bd67dd676
-  data.tar.gz: 0c7ca66913925da38dd413b3d8ca7864a1583836
+  metadata.gz: 4c1961a2ce7d7e5934195e3002c3e7609318f6e4
+  data.tar.gz: 52b297b8c8b3a67261d147ac9dd70d1d787c5e55
 SHA512:
-  metadata.gz: dcd7057def3e26672f74881d2a4c81b94749749c72d3165ed64ffcff86a98d54bde9dfec3409ef142f04a9dd5c4f96fabbdafd6ccb376e7213829f9304afec43
-  data.tar.gz: 311ade9ea59d51ec78dc931c04c47ba55e93b9ae05cb0c99b149139c618e6a2d13fc30b9d922d4f1239336a618fe983f551f4cdaaf3b749a236fedfab6cec220
+  metadata.gz: f093ab3a76e7623d20fff9af9be1a935bb5f5aff4d047fe5fa2ae19702ff253ef69478348d5b71a71974289981f54283b212e7eba6e7a680ce4f43e37ecbbeee
+  data.tar.gz: 2f7188deb8519510247765f59306d7da32c3f03038406de03c9df421f631e135d4d48ba212e31df9b6c81d9805f707f8cb11f6a7e7909a0fdc6a8ec0e01d4d80

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/config/locales/de.yml

@@ -168,6 +168,11 @@ de:
             save_as_current: Als aktuelle Fassung speichern
             show_changes: Zeige Änderungen
             hide_changes: Verstecke Änderungen
+    :basic_formats:
+      set:
+        all:
+          base:
+            too_deep: Man, you're too deep.  (Zu viele Level von Nester auf einmal)
     :basic_types:
       set:
         abstract:
@@ -298,36 +303,15 @@ de:
             se_ticket: <a href="%{ticket_link}">Erstelle ein Support-Ticket</a> to tell us more and follow the fix.
             denial: Zugriff verweigert
             bad_address: "404: Bad Address"
-            too_deep: Man, you're too deep.  (Zu viele Level von Nester auf einmal)
             too_slow: Timed out! %{showname} hat zu lange zum Laden gebraucht.
             error_rendering: error rendering
             error_message: Fehlermeldung (nur für Administratoren sichtbar)
             add_thing: Füge %{title} hinzu
             conflict: Konflikt!
+            not_found: Nicht gefunden
             also_changes: "%{actor_link} hat gleichzeitig Änderungen gemacht."
             conflict_instruction: Bitte überprüfe den Konflikt unten, behebe ihn oben, und sende erneut.
-            problems_no_name: Probleme
-            problems_name: Probleme mit %{cardname}
-            sign_in_c: Anmelden
-            sign_up_c: Registrieren
-            sign_in: anmelden
-            sign_up: registrieren
-            not_found: Nicht gefunden
-            sign_in_or_up: "%{signin_link} oder %{signup_link} um es zu erstellen."
-            not_found_card: Konnte %{cardname} nicht finden
-            not_found_that: Konnte das nicht finden.
-            read_only: Wir sind im Moment im Nur-Lese-Modus. Versuche es später noch einmal.
-            sorry: Sorry!
-            need_permission_task: You need permission to %{task} this.
-            need_permission_no_task: You need permission to do that.
-            sign_in_up_task: Bitte %{signin_link} oder %{signup_link} um das zu %{task}.
-            sign_in_task: Bitte %{signin_link} um das zu %{task}.
-            sign_in_up_no_task: Bitte %{signin_link} oder %{signup_link} um das zu tun.
-            sign_in_no_task: Bitte %{signin_link} um das zu tun.
-            or: oder
-            please: bitte
-            denied_task: zu %{denied_task} dies
-            to_do_that: das zu tun
+
           list_changes:
             search_list_fields: list fields
             search_listed_by_fields: listed by fields
@@ -354,6 +338,17 @@ de:
               rename_update: Umbenennen und aktualisieren
               renaming: Wird umbenannt
               rename: Umbenennen
+            error:
+              problems_name: Probleme mit %{cardname}
+              please: Bitte
+              sign_in: anmelden
+              or: oder
+              sign_up: registrieren
+              read_only: Wir sind im Moment im Nur-Lese-Modus. Versuche es später noch einmal.
+              sorry: Sorry!
+              need_permission_task: You need permission to %{task} this.
+              to_do_that: das zu tun
+              denied_task: zu %{denied_task} dies
             form:
               unsupported_action_class: "unsupported card_form action class: %{actionclass}"
               submit: Speichern

data/config/locales/en.yml

@@ -178,6 +178,11 @@ en:
             save_as_current: Save as current
             show_changes: Show changes
             hide_changes: Hide changes
+    :basic_formats:
+      set:
+        all:
+          base:
+            too_deep: Man, you're too deep.  (Too many levels of nests at a time)
     :basic_types:
       set:
         abstract:
@@ -308,7 +313,6 @@ en:
             se_ticket: <a href="%{ticket_link}">Add a support ticket</a> to tell us more and follow the fix.
             denial: Permission Denied
             bad_address: "404: Bad Address"
-            too_deep: Man, you're too deep.  (Too many levels of nests at a time)
             too_slow: Timed out! %{showname} took too long to load.
             error_rendering: error rendering
             error_message: Error message (visible to admin only)
@@ -316,28 +320,8 @@ en:
             conflict: Conflict!
             also_changes: "%{actor_link} has also been making changes."
             conflict_instruction: Please examine below, resolve above, and re-submit.
-            problems_no_name: Problems
-            problems_name: Problems with %{cardname}
-            sign_in_c: Sign in
-            sign_up_c: Sign up
-            sign_in: sign in
-            sign_up: sign up
             not_found: Not Found
-            sign_in_or_up: "%{signin_link} or %{signup_link} to create it."
             not_found_card: Could not find %{cardname}
-            not_found_that: Could not find that.
-            read_only: We are currently in read-only mode.  Please try again later.
-            sorry: Sorry!
-            need_permission_task: You need permission to %{task} this.
-            need_permission_no_task: You need permission to do that.
-            sign_in_up_task: Please %{signin_link} or %{signup_link} to %{task} this.
-            sign_in_task: Please %{signin_link} to %{task} this.
-            sign_in_up_no_task: Please %{signin_link} or %{signup_link} to do that.
-            sign_in_no_task: Please %{signin_link} to do that.
-            or: or 
-            please: please
-            denied_task: to %{denied_task} this 
-            to_do_that: to do that
           list_changes:
             search_list_fields: list fields
             search_listed_by_fields: listed by fields
@@ -364,6 +348,17 @@ en:
               rename_update: Rename and Update
               renaming: Renaming
               rename: Rename
+            error:
+              problems_name: Problems with %{cardname}
+              please: Please
+              sign_in: sign in
+              or: or
+              sign_up: sign up
+              read_only: We are currently in read-only mode.  Please try again later.
+              sorry: Sorry!
+              need_permission_task: You need permission to %{task} this.
+              to_do_that: to do that
+              denied_task: to %{denied_task} this
             form:
               unsupported_action_class: "unsupported card_form action class: %{actionclass}"
               submit: Submit

data/config/locales/es.yml

@@ -178,6 +178,11 @@ es:
             save_as_current: Guardar como actual
             show_changes: Mostrar cambios
             hide_changes: Ocultar cambios
+    :basic_formats:
+      set:
+        all:
+          base:
+            too_deep: Hombre, eres muy profundo. (Demasiados niveles de nidos a la vez)
     :basic_types:
       set:
         abstract:
@@ -308,7 +313,6 @@ es:
             se_ticket: <a href="%{ticket_link}">Agregue un ticket de soporte</a> para decirnos más y seguir la solución.
             denial: Permiso denegado
             bad_address: "404: Mala direccion"
-            too_deep: Hombre, eres muy profundo. (Demasiados niveles de nidos a la vez)
             too_slow: Caducado! %{showname} tomó demasiado tiempo para cargar..
             error_rendering: procesando errores
             error_message: Mensaje de error (visible solo para el administrador)
@@ -316,28 +320,8 @@ es:
             conflict: Conflicto!
             also_changes: "%{actor_link} también ha estado haciendo cambios."
             conflict_instruction: Por favor, examine a continuación, resuelva arriba y vuelva a enviar.
-            problems_no_name: Problemas
-            problems_name: Problemas con %{cardname}
-            sign_in_c: Registrarse
-            sign_up_c: Regístrate
-            sign_in: Registrarse
-            sign_up: Regístrate
             not_found: Extraviado
-            sign_in_or_up: "%{signin_link} o %{signup_link} para crearlo."
             not_found_card: No pudo encontrar %{cardname}
-            not_found_that: No pude encontrar eso.
-            read_only: Actualmente estamos en modo de solo lectura. Por favor, inténtelo de nuevo más tarde.
-            sorry: Lo siento!
-            need_permission_task: Necesitas permiso para %{task} esto.
-            need_permission_no_task: Necesitas permiso para hacer eso.
-            sign_in_up_task: Por favor %{signin_link} o %{signup_link} a %{task} this.
-            sign_in_task: Por favor %{signin_link} a %{task} esto.
-            sign_in_up_no_task: Por favor %{signin_link} o %{signup_link} para hacer eso.
-            sign_in_no_task: Por favor %{signin_link} para hacer eso.
-            or: o
-            please: por favor
-            denied_task: a %{denied_task} esto  
-            to_do_that: para hacer eso
           list_changes:
             search_list_fields: campos de lista
             search_listed_by_fields: listado por campos
@@ -364,6 +348,17 @@ es:
               rename_update: Renombrar y actualizar
               renaming: Renombrar
               rename: Rebautizar
+            error:
+              problems_name: Problemas con %{cardname}
+              please: por favor
+              sign_in: Registrarse
+              or: o
+              sign_up: Regístrate
+              read_only: Actualmente estamos en modo de solo lectura. Por favor, inténtelo de nuevo más tarde.
+              sorry: Lo siento!
+              need_permission_task: Necesitas permiso para %{task} esto.
+              to_do_that: para hacer eso
+              denied_task: a %{denied_task} esto
             form:
               unsupported_action_class: "sin soporte card_form clase de acción: %{actionclass}"
               submit: Enviar

data/lib/card.rb

@@ -121,10 +121,8 @@ class Card < ApplicationRecord
   has_many :actions, -> { where(draft: [nil, false]).order :id }
   has_many :drafts, -> { where(draft: true).order :id }, class_name: :Action
 
-  cattr_accessor :set_patterns, :serializable_attributes, :error_codes,
-                 :set_specific_attributes
+  cattr_accessor :set_patterns, :serializable_attributes, :set_specific_attributes
   self.set_patterns = []
-  self.error_codes = {}
 
   # attributes that ActiveJob can handle
   def self.serializable_attr_accessor *args

data/lib/card/codename.rb

@@ -102,7 +102,8 @@ class Card
       # @todo remove duplicate checks here; should be caught upon creation
       def check_duplicates codehash, codename, card_id
         return unless codehash.key?(codename) || codehash.key?(card_id)
-        warn "dup codename: #{codename}, ID:#{card_id} (#{codehash[codename]})"
+        Rails.logger.debug "dup codename: #{codename}, "\
+                           "ID:#{card_id} (#{codehash[codename]})"
       end
 
       # generate Hash for @codehash and put it in the cache

data/lib/card/error.rb

@@ -5,38 +5,75 @@ class Card
   # (arguably most of these should be Card::Exception)
   class Error < StandardError
     cattr_accessor :current
+    class_attribute :status_code, :view
 
-    class BadContent < Error
+    self.view = :errors
+    self.status_code = 422
+
+    attr_accessor :card
+
+    def initialize message=nil
+      if message.is_a? Card
+        self.card = message
+        message = message_from_card
+      end
+      super message
+    end
+
+    def message_from_card
+      I18n.t :exception_for_card,
+             scope: %i[lib card error], cardname: card.name, message: card_message_text
+    end
+
+    def report
+      Rails.logger.info "exception = #{self.class}: #{message}"
+    end
+
+    def card_message_text
+      card.errors.first&.message
+    end
+
+    # error attributable to code (as opposed to card configuration)
+    class ServerError < Error
+      self.view = :server_error
+      self.status_code = 500
+
+      def report
+        super
+        card&.notable_exception_raised
+      end
     end
 
-    class BadQuery < Error
+    # error whose message can be shown to any user
+    class UserError < Error
     end
 
-    class BadAddress < Error
+    # error in WQL query
+    class BadQuery < UserError
     end
 
-    class NotFound < StandardError
+    # card not found
+    class NotFound < UserError
+      self.status_code = 404
+      self.view = :not_found
     end
 
     class CodenameNotFound < NotFound
     end
 
-    # permission errors
-    class PermissionDenied < Error
-      attr_reader :card
+    # two editors altering the same card at once
+    class EditConflict < UserError
+      self.status_code = 409
+      self.view = :conflict
+    end
 
-      def initialize message
-        if message.is_a? Card
-          super message_from_card(message)
-        else
-          super
-        end
-      end
+    # permission errors
+    class PermissionDenied < UserError
+      self.status_code = 403
+      self.view = :denial
 
-      def message_from_card card
-        I18n.t :exception_for_card, scope: [:lib, :card, :error],
-                                    cardname: card.name,
-                                    message: card.errors[:permission_denied]
+      def card_message_text
+        card.errors[:permission_denied]
       end
     end
 
@@ -52,54 +89,33 @@ class Card
 
     # associating views with exceptions
     class << self
-      ## NOTE: arguably the view and status should be handled in each error class
-      ## status is currently defined in the view
+      KEY_MAP = { permission_denied: PermissionDenied,
+                  conflict: EditConflict }.freeze
 
-      def exception_view card, exception
-        self.current = exception
-        simple_exception_view(card, exception) ||
-          problematic_exception_view(card, exception)
-      end
-
-      def simple_exception_view card, exception
-        # "simple" error messages are visible to end users and are generally not
-        # treated as software bugs (though they may be "ruler" bugs)
-        case exception
-        when BadContent, BadQuery
-          card.errors.add :exception, exception.message
-          :errors
-        when BadAddress
-          :bad_address
-        when PermissionDenied
-          :denial
-        when NotFound, ActiveRecord::RecordNotFound, ActionController::MissingFile
-          :not_found
+      def cardify_exception exception, card
+        unless exception.is_a? Card::Error
+          exception = card_error_class(exception, card).new exception.message
         end
+        exception.card ||= card
+        exception
       end
 
-      # indicates a code problem and therefore require full logging
-      def problematic_exception_view card, exception
-        card&.notable_exception_raised
-
-        if exception.is_a? ActiveRecord::RecordInvalid
-          :errors
-        elsif Rails.logger.level.zero?
-          # raise error loudly when not in production (could be a better test!)
-          raise exception
+      def card_error_class exception, card
+        case exception
+        when ActiveRecord::RecordInvalid
+          invalid_card_error_class card
+        when ActiveRecord::RecordNotFound, ActionController::MissingFile
+          Card::Error::NotFound
         else
-          :server_error
+          Card::Error::ServerError
         end
       end
 
-      # card view and HTTP status code associate with errors on card
-      # TODO: should prioritize certain error classes
-      def view_and_status card
-        card.errors.keys.each do |key|
-          if (view_and_status = Card.error_codes[key])
-            return view_and_status
-          end
+      def invalid_card_error_class card
+        KEY_MAP.each do |key, klass|
+          return klass if card.errors.key? key
         end
-        nil
+        Card::Error
       end
     end
   end

data/lib/card/format.rb

@@ -57,8 +57,8 @@ class Card
 
     cattr_accessor :registered
     self.registered = []
-    VIEW_VARS = [ :perms, :denial, :closed, :error_code ]
-    (VIEW_VARS + [ :view_tags, :aliases ]).each do |accessor_name|
+    VIEW_VARS = %i[perms denial closed].freeze
+    (VIEW_VARS + %i[view_tags aliases]).each do |accessor_name|
       cattr_accessor accessor_name
       send "#{accessor_name}=", {}
     end

data/lib/card/format/error.rb

@@ -2,35 +2,34 @@ class Card
   class Format
     module Error
       def rescue_view e, view
-        raise e if Rails.env =~ /^cucumber|test$/
-        if focal?
-          focal_error e, view
-        else
-          # TODO: consider rendering dynamic error view here.
-          nested_error e, view
-        end
-      end
-
-      def debug_error e
-        raise e if Card[:debugger]&.content == "on"
+        # make config option; don't refer directly to env
+        raise e if Rails.env =~ /^cucumber$/
+        # TODO: unify with Card::Error#report
+        Rails.logger.info "#{e.message}\n#{e.backtrace}"
+        method = focal? ? :focal_error : :rendering_error
+        send method, e, view
       end
 
-      def error_cardname
+      def error_cardname _exception
         if card&.name.present?
           safe_name
         else
-          I18n.t :no_cardname, scope: [:lib, :card, :format, :error]
+          I18n.t :no_cardname, scope: %i[lib card format error]
         end
       end
 
       def focal_error e, view
-        card.errors.add view.to_s, e.message if card.errors.empty?
-        render Card::Error.exception_view card, e
+        card.errors.add "#{view} view", rendering_error(e, view) if card.errors.empty?
+        raise e
       end
 
-      def nested_error _exception, view
-        I18n.t :error_rendering, scope: [:lib, :card, :format, :error],
-               cardname: error_cardname, view: view
+      def rendering_error exception, view
+        if exception.is_a? Card::Error::UserError
+          exception.message
+        else
+          tr :error_rendering, scope: [:lib, :card, :format, :error],
+                               cardname: error_cardname(exception), view: view
+        end
       end
     end
   end