card-mod-history 0.13.2 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e656932c0d75271870f82de3245afcc55b7c0863085b05d5848ef663136396
-  data.tar.gz: 59d2c6d853965a555455729297efba5d0b59d071e4783aca631b1fcdeb479195
+  metadata.gz: effd8939e9e0f5c613e28c66b4a305532d3bc7716cbdc334125c6dbaf43ec03f
+  data.tar.gz: 87e3698768122493be322d770402d2b9edf82e5ffd89feb5d341df70717eb7c6
 SHA512:
-  metadata.gz: ba312b16580e7ab77e428e46ffdb96d412de83b1c39aef2f2a36c255b28cbc296dfc9fb8433c154a84e51d50ed560bdb3816fd8716ab1260c234724e2cd3aafb
-  data.tar.gz: f70b6b9ed64c1a52f03221f6f8bf54e1bb4ca69f8da9c9c31352d100aa8927e8a20c5a96c02d815995be7811af4d6bada1c5dbf9cba329868a261e29efe34a93
+  metadata.gz: 24d1a7d332a940f196f61ad03bee8345d35840fc8b1646471bb93ecdacf625be376aeb2b7af4deb842bafb7512aed457008152444018f0be170a1cd5a52e12a9
+  data.tar.gz: 808133e07ca2a6592e9e187922ec053195ceb4a676a960b7a3d857039d75cc0a3d20aceef77f9967d4978bff7b4e3881603250d8ecd36d9f7a9e176fee4947e2

data/lib/card/act.rb

@@ -72,16 +72,15 @@ class Card
       Card.fetch actor_id
     end
 
+    # sometimes Object#card_id interferes with default ActiveRecord attribute def
+    def card_id
+      _read_attribute "card_id"
+    end
+
     # the act's primary card
     # @return [Card]
     def card
-      Card.fetch card_id, look_in_trash: true # , skip_modules: true
-
-      # FIXME: if the following is necessary, we need to document why.
-      # generally it's a very bad idea to have type-specific code here.
-
-      # return res unless res&.type_id&.in?([Card::FileID, Card::ImageID])
-      # res.include_set_modules
+      Card.fetch card_id, look_in_trash: true
     end
 
     # list of all actions that are part of the act

data/lib/card/action/changes.rb

@@ -0,0 +1,114 @@
+class Card
+  class Action
+    # methods for relating Card::Action to Card::Change
+    module Changes
+      # value set by action's {Change} to given field
+      # @see #interpret_field #interpret_field for field param
+      # @see #interpret_value #interpret_value for return values
+      def value field
+        return unless (change = change field)
+
+        interpret_value field, change.value
+      end
+
+      # value of field set by most recent {Change} before this one
+      # @see #interpret_field #interpret_field for field param
+      # @see #interpret_field  #interpret_field for field param
+      def previous_value field
+        return if action_type == :create
+        return unless (previous_change = previous_change field)
+
+        interpret_value field, previous_change.value
+      end
+
+      # action's {Change} object for given field
+      # @see #interpret_field #interpret_field for field param
+      # @return [Change]
+      def change field
+        changes[interpret_field field]
+      end
+
+      # most recent change to given field before this one
+      # @see #interpret_field #interpret_field for field param
+      # @return [Change]
+      def previous_change field
+        return nil if action_type == :create
+
+        field = interpret_field field
+        if @previous_changes&.key?(field)
+          @previous_changes[field]
+        else
+          @previous_changes ||= {}
+          @previous_changes[field] = card.last_change_on field, before: self
+        end
+      end
+
+      def all_changes
+        self.class.cache.fetch("#{id}-changes") do
+          # using card_changes causes caching problem
+          Card::Change.where(card_action_id: id).to_a
+        end
+      end
+
+      # all action {Change changes} in hash form. { field1: Change1 }
+      # @return [Hash]
+      def changes
+        @changes ||=
+          if sole?
+            current_changes
+          else
+            all_changes.each_with_object({}) do |change, hash|
+              hash[change.field.to_sym] = change
+            end
+          end
+      end
+
+      # all changed values in hash form. { field1: new_value }
+      def changed_values
+        @changed_values ||= changes.transform_values(&:value)
+      end
+
+      # @return [Hash]
+      def current_changes
+        return {} unless card
+
+        @current_changes ||=
+          Card::Change::TRACKED_FIELDS.each_with_object({}) do |field, hash|
+            hash[field.to_sym] = Card::Change.new field: field,
+                                                  value: card.send(field),
+                                                  card_action_id: id
+          end
+      end
+
+      private
+
+      # translate field into fieldname as referred to in database
+      # @see Change::TRACKED_FIELDS
+      # @param field [Symbol] can be :type_id, :cardtype, :db_content, :content,
+      #     :name, :trash
+      # @return [Symbol]
+      def interpret_field field
+        case field
+        when :content then :db_content
+        when :cardtype then :type_id
+        else field.to_sym
+        end
+      end
+
+      # value in form prescribed for specific field name
+      # @param value [value of {Change}]
+      # @return [Integer] for :type_id
+      # @return [String] for :name, :db_content, :content, :cardtype
+      # @return [True/False] for :trash
+      def interpret_value field, value
+        case field.to_sym
+        when :type_id
+          value&.to_i
+        when :cardtype
+          Card.fetch_name(value&.to_i)
+        else value
+        end
+      end
+    end
+  end
+end

data/lib/card/action/differ.rb

@@ -19,7 +19,7 @@ class Card
       # @return [rendered diff]
       # compare action's cardtype value with previous cardtype value
       def cardtype_diff opts={}
-        return unless new_type?
+        return unless card && new_type?
 
         diff_object(:cardtype, opts).complete
       end

data/lib/card/action.rb

@@ -22,6 +22,7 @@ class Card
   #
   class Action < Cardio::Record
     include Differ
+    include Changes
     extend Admin
 
     belongs_to :act, foreign_key: :card_act_id, inverse_of: :ar_actions
@@ -67,6 +68,11 @@ class Card
       end
     end
 
+    # sometimes Object#card_id interferes with default ActiveRecord attribute def
+    def card_id
+      _read_attribute "card_id"
+    end
+
     # each action is associated with on and only one card
     # @return [Card]
     def card
@@ -114,112 +120,6 @@ class Card
       Card::Action.where("id < ? AND card_id = ?", id, card_id).last
     end
 
-    # value set by action's {Change} to given field
-    # @see #interpret_field #interpret_field for field param
-    # @see #interpret_value #interpret_value for return values
-    def value field
-      return unless (change = change field)
-
-      interpret_value field, change.value
-    end
-
-    # value of field set by most recent {Change} before this one
-    # @see #interpret_field #interpret_field for field param
-    # @see #interpret_field  #interpret_field for field param
-    def previous_value field
-      return if action_type == :create
-      return unless (previous_change = previous_change field)
-
-      interpret_value field, previous_change.value
-    end
-
-    # action's {Change} object for given field
-    # @see #interpret_field #interpret_field for field param
-    # @return [Change]
-    def change field
-      changes[interpret_field field]
-    end
-
-    # most recent change to given field before this one
-    # @see #interpret_field #interpret_field for field param
-    # @return [Change]
-    def previous_change field
-      return nil if action_type == :create
-
-      field = interpret_field field
-      if @previous_changes&.key?(field)
-        @previous_changes[field]
-      else
-        @previous_changes ||= {}
-        @previous_changes[field] = card.last_change_on field, before: self
-      end
-    end
-
-    def all_changes
-      self.class.cache.fetch("#{id}-changes") do
-        # using card_changes causes caching problem
-        Card::Change.where(card_action_id: id).to_a
-      end
-    end
-
-    # all action {Change changes} in hash form. { field1: Change1 }
-    # @return [Hash]
-    def changes
-      @changes ||=
-        if sole?
-          current_changes
-        else
-          all_changes.each_with_object({}) do |change, hash|
-            hash[change.field.to_sym] = change
-          end
-        end
-    end
-
-    # all changed values in hash form. { field1: new_value }
-    def changed_values
-      @changed_values ||= changes.transform_values(&:value)
-    end
-
-    # @return [Hash]
-    def current_changes
-      return {} unless card
-
-      @current_changes ||=
-        Card::Change::TRACKED_FIELDS.each_with_object({}) do |field, hash|
-          hash[field.to_sym] = Card::Change.new field: field,
-                                                value: card.send(field),
-                                                card_action_id: id
-        end
-    end
-
-    # translate field into fieldname as referred to in database
-    # @see Change::TRACKED_FIELDS
-    # @param field [Symbol] can be :type_id, :cardtype, :db_content, :content,
-    #     :name, :trash
-    # @return [Symbol]
-    def interpret_field field
-      case field
-      when :content then :db_content
-      when :cardtype then :type_id
-      else field.to_sym
-      end
-    end
-
-    # value in form prescribed for specific field name
-    # @param value [value of {Change}]
-    # @return [Integer] for :type_id
-    # @return [String] for :name, :db_content, :content, :cardtype
-    # @return [True/False] for :trash
-    def interpret_value field, value
-      case field.to_sym
-      when :type_id
-        value&.to_i
-      when :cardtype
-        Card.fetch_name(value&.to_i)
-      else value
-      end
-    end
-
     def sole?
       all_changes.empty? &&
         (action_type == :create || Card::Action.where(card_id: card_id).count == 1)

data/locales/de.yml

@@ -0,0 +1,2 @@
+de:
+  history_error_not_latest_revision: Änderungen basieren nicht auf der letzten Revision

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-history
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.104.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.104.1
 description: ''
 email:
 - info@decko.org
@@ -41,8 +41,10 @@ files:
 - lib/card/action.rb
 - lib/card/action/action_renderer.rb
 - lib/card/action/admin.rb
+- lib/card/action/changes.rb
 - lib/card/action/differ.rb
 - lib/card/change.rb
+- locales/de.yml
 - locales/en.yml
 - set/all/history.rb
 - set/all/history/act_listing.rb
@@ -79,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Revision histories in acts, actions, and changes