card 1.92 → 1.92.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47455178df73a19b8c9a200fb6ffc996f5303489
-  data.tar.gz: fb7046e99420ee3cc2af2dc47723a1d3ad17ad73
+  metadata.gz: f28f43edfef2752d5cfefbfed009278c4852af46
+  data.tar.gz: 4f94927063af307286622bf14c9c21738720c3fd
 SHA512:
-  metadata.gz: 8d6a3bdc814d7f8ca80b0a5c08f0e0b6f9cff85ebd35737c09104bc3a6c5b35779b71ed982d692f05a2d1955ea6d5cd355fba17a12915f878ffbb55f68377451
-  data.tar.gz: 7d962a151eeebaa50d17df1b7e25883209a62744395669190f78ac02afc627cca3da72646d7f53b63f7b13785fa81279d7de1edafc44e4119c0b4ecb52aa0847
+  metadata.gz: 685d0d0cf2e26a2237ac3d0869321e5dcfa403fd7063599e6b458fa971e7279cf05b40c91370ef4c34717fa41a7f1256f7cb5f93cdf70a286a3e82d3363aa4b1
+  data.tar.gz: 211059237c2230c26de7e3e2e53bf06d68af128d7b7dd66efd3cacb926510fcd1cddf9da70e34d094eec4fa253bf5b112a341dd0b926bb50d24bbef7d4a42b82

data/VERSION

@@ -1 +1 @@
-0.2
+0.2.1

data/config/initializers/02_patches/active_job.rb

@@ -1,33 +1,81 @@
 module Patches
   module ActiveJob
-    # monkeypatch ActiveJob so that it can handle more types of arguments
+    # Monkeypatch ActiveJob so that it can handle more types of arguments.
+    # Add Integer hash keys and Symbol, Time, DateTime hash values and
+    # ActionController::Parameters
     module Arguments
       CLASS_NAME_KEY = "_aj_class_name_key".freeze
+      VALUE_KEY = "_aj_value_key".freeze
+      INTEGER_KEYS_KEY = "_aj_integer_keys".freeze
 
       private
 
       def serialize_argument argument
         case argument
         when Symbol, Time, DateTime
-          { value: argument.to_s, CLASS_NAME_KEY => argument.class.to_s }
+          { VALUE_KEY => argument.to_s, CLASS_NAME_KEY => argument.class.to_s }
         when ActionController::Parameters
-          { value: serialize_argument(argument.to_unsafe_h),
-            CLASS_NAME_KEY: argument.class.to_s }
+          { VALUE_KEY => serialize_argument(argument.to_unsafe_h),
+            CLASS_NAME_KEY => argument.class.to_s }
+        when Hash
+          integer_keys = argument.each_key.grep(Integer).map(&:to_s)
+          result = super
+          result[INTEGER_KEYS_KEY] = integer_keys
+          result
         else
           super
         end
       end
 
-      def deserialize_argument argument
-        return super unless argument.is_a?(Hash) &&
-                            argument[CLASS_NAME_KEY]
-        case argument[CLASS_NAME_KEY]
+      def serialize_hash_key key
+        case key
+        when Integer
+          key.to_s
+        else
+          super
+        end
+      end
+
+      # all custom serialized arguments become hashes
+      # hence for deserializing we only have to check hashes
+      def deserialize_hash serialized_hash
+        if serialized_hash[CLASS_NAME_KEY]
+          deserialize_object serialized_hash
+        else
+          handle_integer_keys super
+        end
+      end
+
+      def handle_integer_keys result
+        if (integer_keys = result.delete(INTEGER_KEYS_KEY) && integer_keys.present?)
+          result = transform_integer_keys(result, integer_keys)
+        end
+        result
+      end
+
+      def deserialize_object hash
+        value = hash[VALUE_KEY]
+        class_name = hash[CLASS_NAME_KEY]
+        case class_name
         when "Symbol"
-          argument[:value].to_sym
+          value.to_sym
         when "Time", "DateTime"
-          Object.const_get(argument[CLASS_NAME_KEY]).parse argument[:value]
+          Object.const_get(class_name).parse value
+        when "ActionController::Parameters"
+          # TODO: handle the permitted status
+          ActionController::Parameters.new deserialize_hash(value)
         else
-          argument[:value]
+          value
+        end
+      end
+
+      def transform_integer_keys(hash, integer_keys)
+        hash.transform_keys do |key|
+          if integer_keys.include?(key)
+            key.to_i
+          else
+            key
+          end
         end
       end
     end

data/lib/card/act_manager/stage_director.rb

@@ -133,7 +133,7 @@ class Card
 
       def to_s level=1
         str = @card.name.to_s.clone
-        if @subdirectors
+        if @subdirectors.present?
           subs = subdirectors.map { |d| "  " * level + d.to_s(level + 1) }.join "\n"
           str << "\n#{subs}"
         end

data/lib/card/act_manager/stage_director/phases.rb

@@ -27,6 +27,7 @@ class Card
         rescue => e # don't rollback
           Card::Error.current = e
           warn "exception in integrate stage: #{e.message}"
+          warn e.backtrace.join "\n"
           @card.notable_exception_raised
           return false
         ensure

data/lib/card/cache.rb

@@ -44,7 +44,7 @@ class Card
     extend Card::Cache::Prepopulate
 
     @prepopulating = %w(test cucumber).include? Rails.env
-    @no_rails_cache = %w(test cucumber).include?(Rails.env) ||
+    @no_rails_cache = %w(test).include?(Rails.env) ||
                       ENV["NO_RAILS_CACHE"]
     @@cache_by_class = {}
     cattr_reader :cache_by_class

data/lib/card/format/render.rb

@@ -87,7 +87,7 @@ class Card
       def prepare_stub_nest stub_hash
         stub_card = Card.fetch_from_cast stub_hash[:cast]
         stub_options = stub_hash[:options]
-        if stub_card.key.present? && stub_card.key == card.key
+        if stub_card&.key.present? && stub_card.key == card.key
           stub_options[:nest_name] ||= "_self"
         end
         yield stub_card, stub_hash[:mode], stub_options, stub_hash[:override]

data/lib/card/mod/load_strategy.rb

@@ -1,14 +1,13 @@
-require_relative "load_strategy/eval"
-require_relative "load_strategy/pattern_tmp_files"
-require_relative "load_strategy/set_binding_magic"
-require_relative "load_strategy/set_tmp_files"
-require_relative "load_strategy/tmp_files"
-
 class Card
   module Mod
+    require_dependency "card/mod/load_strategy/eval"
+    require_dependency "card/mod/load_strategy/pattern_tmp_files"
+    require_dependency "card/mod/load_strategy/set_binding_magic"
+    require_dependency "card/mod/load_strategy/set_tmp_files"
+    require_dependency "card/mod/load_strategy/tmp_files"
+
     # Shared code for the three different load strategies: Eval, TmpFiles and BindingMagic
     class LoadStrategy
-
       def self.klass symbol
         case symbol
           when :tmp_files     then TmpFiles

data/mod/account/set/right/account.rb

@@ -104,12 +104,12 @@ event :set_default_status, :prepare_to_validate, on: :create do
   add_subfield :status, content: default_status
 end
 
-def confirm_ok?
+def can_approve?
   Card.new(type_id: Card.default_accounted_type_id).ok? :create
 end
 
 event :generate_confirmation_token,
-      :prepare_to_store, on: :create, when: :confirm_ok? do
+      :prepare_to_store, on: :create, when: :can_approve? do
   add_subfield :token, content: generate_token
 end
 

data/mod/account/set/type/signup.rb

@@ -2,7 +2,7 @@ format :html do
   def invitation?
     return @invitation unless @invitation.nil?
     @invitation = Auth.signed_in? &&
-                  (card.fetch trait: :account, new: {}).confirm_ok?
+                  (card.fetch trait: :account, new: {}).can_approve?
     # consider making account a card_accessor?
   end
 
@@ -87,13 +87,13 @@ format :html do
   end
 
   def approve_with_token_link account, token_action
-    return unless account.confirm_ok?
+    return unless account.can_approve?
     link_to_card card, "#{token_action} verification email",
                  path: { action: :update, approve_with_token: true }
   end
 
   def approve_without_token_link account
-    return unless account.confirm_ok?
+    return unless account.can_approve?
     link_to_card card, "Approve without verification",
                  path: { action: :update, approve_without_token: true }
   end
@@ -139,7 +139,7 @@ end
 event :approve_with_token, :validate,
       on: :update,
       when: proc { Env.params[:approve_with_token] } do
-  abort :failure, "illegal approval" unless account.confirm_ok?
+  abort :failure, "illegal approval" unless account.can_approve?
   account.reset_token
   account.send_account_verification_email
 end
@@ -147,7 +147,7 @@ end
 event :approve_without_token, :validate,
       on: :update,
       when: proc { Env.params[:approve_without_token] } do
-  abort :failure, "illegal approval" unless account.confirm_ok?
+  abort :failure, "illegal approval" unless account.can_approve?
   activate_account
 end
 

data/mod/bootstrap/lib/bootstrap/component/carousel.rb

@@ -11,7 +11,7 @@ class Bootstrap
         @items = []
         instance_exec &block
 
-        @html.div class: "carousel slide", id: id, data: { ride: "carousel" } do
+        @html.div class: "carousel slide", id: id, "data-ride" => "carousel" do
           indicators
           items
           control_prev
@@ -30,7 +30,7 @@ class Bootstrap
             add_class html_opts, "active" if index == @active_item_index
             @html.div html_opts do
               item = item.call if item.respond_to?(:call)
-              @html.text!(item) if item.is_a?(String)
+              @html << item if item.is_a?(String)
             end
           end
         end
@@ -38,7 +38,7 @@ class Bootstrap
 
       def control_prev
         @html.a class: "carousel-control-prev", href: "##{@id}", role: "button",
-                data: { slide: "prev" } do
+                "data-slide" => "prev" do
           @html.span class: "carousel-control-prev-icon", "aria-hidden" => "true"
           @html.span "Previous", class: "sr-only"
         end
@@ -46,7 +46,7 @@ class Bootstrap
 
       def control_next
         @html.a class: "carousel-control-next", href: "##{@id}", role: "button",
-                data: { slide: "next" } do
+                "data-slide": "next"  do
           @html.span class: "carousel-control-next-icon", "aria-hidden" => "true"
           @html.span "Next", class: "sr-only"
         end

data/mod/bootstrap/lib/bootstrap/component/form.rb

@@ -40,7 +40,7 @@ class Bootstrap
       def input type, text: nil, label: nil, id: nil
         @html.input id: id, class: "form-control", type: type do
           @html.label label, for: id if label
-          @html.text! text if text
+          @html << text if text
         end
       end
 
@@ -56,7 +56,7 @@ class Bootstrap
         define_method tag do |text: nil, id:, label: |
           @html.input id: id, class: "form-control", type: tag do
             @html.label label, for: id if label
-            @html.text! text
+            @html << text
           end
         end
       end

data/mod/bootstrap/spec/set/all/bootstrap/carousel_spec.rb

@@ -62,4 +62,13 @@ describe Bootstrap::Component::Carousel do
       end
     end
   end
+
+  it "doesn't escape markup" do
+    carousel = subject.bs_carousel "csID", 0 do
+        item "<strong>item 2</strong>"
+    end
+    expect(carousel).to have_tag "div.carousel-item" do
+      with_tag :strong, text: "item 2"
+    end
+  end
 end

data/mod/carrierwave/set/abstract/attachment/upload_cache.rb

@@ -8,7 +8,6 @@ end
 event :upload_attachment, :prepare_to_validate,
       on: :save, when: proc { |c| c.preliminary_upload? } do
   save_original_filename  # save original filename as comment in action
-  # binding.pry
   write_identifier        # set db_content
   # (needs original filename to determine extension)
   store_attachment!

data/mod/carrierwave/set/type/file.rb

@@ -107,11 +107,7 @@ format :html do
         <table role="presentation" class="table table-striped">
           <tbody class="files">
             <tr class="template-download fade show">
-              <td>
-                <span class="preview">
-                  #{preview}
-                </span>
-              </td>
+              <td><span class="preview">#{preview}</span></td>
               <td>
                 <p class="name">
                   #{card.original_filename}

data/mod/core/format/html_format.rb

@@ -53,8 +53,7 @@ class Card
       end
 
       def layout_from_card_or_code name
-        layout_card = Card.fetch name.to_s, skip_virtual: true,
-                                            skip_modules: true
+        layout_card = Card.quick_fetch name
         if layout_card && layout_card.ok?(:read)
           layout_card.content
         elsif (hardcoded_layout = LAYOUTS[name])

data/mod/core/set/all/cache.rb

@@ -54,6 +54,7 @@ def view_cache_keys new_key=nil
   @view_cache_keys << new_key if new_key
   append_missing_view_cache_keys
   @view_cache_keys.uniq!
+  @view_cache_keys
 end
 
 def append_missing_view_cache_keys
@@ -63,15 +64,15 @@ def append_missing_view_cache_keys
 end
 
 def hard_write_view_cache_keys
-  #  puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
+  # puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
   return unless Card.cache.hard
-  Card.cache.hard.write_attribute key, :view_cache_keys, @view_cache_keys
+  Card.cache.hard.write_attribute key, :view_cache_keys, view_cache_keys
 end
 
 def expire_views
-  #  puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
+  # puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
   return unless view_cache_keys.present?
-  Array.wrap(@view_cache_keys).each do |view_cache_key|
+  Array.wrap(view_cache_keys).each do |view_cache_key|
     Card::View.cache.delete view_cache_key
   end
   @view_cache_keys = nil

data/mod/core/set/all/collection.rb

@@ -294,9 +294,9 @@ format :html do
   end
 
   view :carousel do
-    bs_carousel unique_id do
+    bs_carousel unique_id, 0 do
       nest_item_array.each do |rendered_item|
-        item rendered_item
+        item(rendered_item)
       end
     end
   end

data/mod/history/lib/card/act/act_renderer.rb

@@ -35,7 +35,7 @@ class Card
           row 10, 2 do
             column do
               html title
-              tag(:span, "text-muted pl-1 badge") {summary}
+              tag(:span, "text-muted pl-1 badge") { summary }
             end
             column act_links, class: "text-right"
           end
@@ -93,7 +93,7 @@ class Card
       def count_types
         @count_types ||=
           approved_actions.each_with_object(
-            Hash.new {|h, k| h[k] = 0}
+            Hash.new { |h, k| h[k] = 0 }
           ) do |action, type_cnt|
             type_cnt[action.action_type] += 1
           end
@@ -186,18 +186,19 @@ class Card
 
       def revert_link
         revert_actions_link "revert to this", revert_to: :this,
-                                              slot_selector: ".card-slot.history-view"
+                            slot_selector: ".card-slot.history-view"
       end
 
-      def revert_actions_link link_text, revert_to: :this, slot_selector:
+      def revert_actions_link link_text, revert_to: :this, slot_selector: nil, html_args: {}
         return unless card.ok? :update
-        args = { remote: true, method: :post, rel: "nofollow",
-                    path: { action: :update, view: :open, look_in_trash: true,
-                            revert_actions: @act.actions.map(&:id),
-                            "data-slot-selector" => slot_selector } }
-        add_class args, "slotter"
-        args[:path][:revert_to] = revert_to
-        link_to link_text, args
+        html_args.merge! remote: true, method: :post, rel: "nofollow",
+                         path: { action: :update, view: :open, look_in_trash: true,
+                                 revert_actions: @act.actions.map(&:id),
+                                 revert_to: revert_to }
+
+        html_args[:path]["data-slot-selector"] = slot_selector if slot_selector
+        add_class html_args, "slotter"
+        link_to link_text, html_args
       end
 
       def deletion_act?

data/mod/history/set/all/history.rb

@@ -30,7 +30,7 @@ event :finalize_action, :finalize, when: :finalize_action? do
     @current_action.update_attributes! card_id: id
 
     # Note: #last_change_on uses the id to sort by date
-    # so the changes for the create changes have to be created befire the first change
+    # so the changes for the create changes have to be created before the first change
     store_card_changes_for_create_action if first_change?
     store_card_changes if @current_action.action_type != :create
   elsif @current_action.card_changes.reload.empty?
@@ -77,15 +77,19 @@ end
 event :finalize_act,
       after: :finalize_action,
       when: proc { |c|  c.act_card? } do
-  # removed subcards can leave behind actions without card id
-  if @current_act.actions.reload.empty?
-    @current_act.delete
-    @current_act = nil
-  else
-    @current_act.update_attributes! card_id: id
+  @current_act.update_attributes! card_id: id
+end
+
+event :remove_empty_act,
+      :integrate_with_delay_final,
+      when: proc { |c|  c.act_card? } do
+  if @current_act&.actions&.reload&.empty?
+      @current_act.delete
+      @current_act = nil
   end
 end
 
+
 def act_card?
   self == Card::ActManager.act_card
 end