card 1.96.5 → 1.96.6

data/db/seed/test/fixtures/schema_migrations_core_cards.yml

@@ -183,3 +183,7 @@ schema_migrations_core_cards_091:
   version: '20180601133753'
 schema_migrations_core_cards_092:
   version: '20181108181219'
+schema_migrations_core_cards_093:
+  version: '20181120200937'
+schema_migrations_core_cards_094:
+  version: '20181129140917'

data/db/version_core_cards.txt

@@ -1 +1 @@
-20181108181219
+20181129140917

data/lib/card/format.rb

@@ -126,7 +126,7 @@ class Card
     end
 
     def mime_type
-      "text/text"
+      "text/plain"
     end
 
     def to_sym

data/lib/card/format/permission.rb

@@ -24,7 +24,7 @@ class Card
 
       def unknown_disqualifies_view? view
         # view can't handle unknown cards (and card is unknown)
-        return if tagged view, :unknown_ok
+        return false if tagged view, :unknown_ok
         card.unknown?
       end
 

data/lib/card/set/event/callbacks.rb

@@ -10,11 +10,19 @@ class Card
         end
 
         def set_event_callback object_method, kind
-          Card.class_exec(self) do |event|
-            set_callback object_method, kind, event.name,
-                         prepend: true, if: proc { |c| c.event_applies?(event) }
+          valid_event_callback kind, object_method do
+            Card.class_exec(self) do |event|
+              set_callback object_method, kind, event.name,
+                           prepend: true, if: proc { |c| c.event_applies?(event) }
+            end
           end
         end
+
+        def valid_event_callback kind, method
+          yield
+        rescue NoMethodError
+          raise "invalid event callback: `#{kind}: #{method}`"
+        end
       end
     end
   end

data/mod/bootstrap/db/migrate_core_cards/20181129140917_fix_skin_images.rb

@@ -0,0 +1,12 @@
+
+require_relative "lib/skin"
+
+class FixSkinImages < ActiveRecord::Migration[5.2]
+  def change
+    Card::Auth.as_bot do
+      Skin.themes.each do |theme_name|
+        Skin.new(theme_name).update_thumbnail
+      end
+    end
+  end
+end

data/{db/migrate_core_cards → mod/bootstrap/db/migrate_core_cards/data}/20181108181219_migrate_classic_skins_to_bootstrap.rb

@@ -1,5 +1,5 @@
+# fix sites still using no-longer supported skins and layouts
 class MigrateClassicSkinsToBootstrap < ActiveRecord::Migration[5.2]
-
   UNSUPPORTED_SKINS = %w[
     classic_skin
     customized_classic_skin
@@ -10,10 +10,18 @@ class MigrateClassicSkinsToBootstrap < ActiveRecord::Migration[5.2]
 
   DEFAULT_SKIN = "yeti skin".freeze
 
+  UNSUPPORTED_LAYOUT = "classic_layout".freeze
+
+  DEFAULT_LAYOUT = "Default Layout".freeze
+
   def change
     style_rule = Card[:all, :style]
     if style_rule.item_names.first.key.in? UNSUPPORTED_SKINS
       style_rule.update_attributes! content: DEFAULT_SKIN
     end
+
+    layout_rule = Card[:all, :layout]
+    return unless layout_rule.item_names.first.key == UNSUPPORTED_LAYOUT
+    layout_rule.update_attributes! content: DEFAULT_LAYOUT
   end
 end

data/mod/bootstrap/db/migrate_core_cards/lib/skin.rb

@@ -60,7 +60,7 @@ class Skin
   end
 
   def update_thumbnail
-    update_card "#{@skin_name}+Image", thumbnail_args
+    ensure_card "#{@skin_name}+Image", thumbnail_args
   end
 
   private

data/mod/carrierwave/lib/carrier_wave/cardmount.rb

@@ -17,7 +17,8 @@ module CarrierWave
       super
 
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        event :store_#{column}_event, :finalize, on: :save do
+        event :store_#{column}_event, :finalize,
+              on: :save, when: :store_#{column}_event? do
           store_#{column}!
         end
 
@@ -39,6 +40,11 @@ module CarrierWave
           remove_previously_stored_#{column}
         end
 
+        # don't attempt to store coded images unless ENV specifies it
+        def store_#{column}_event?
+          !coded? || ENV["STORE_CODED_FILES"]
+        end
+
         def attachment
           #{column}
         end
@@ -68,6 +74,7 @@ module CarrierWave
           assign_file(url) { super }
         end
 
+
         def assign_file file
           db_column = _mounter(:#{column}).serialization_column
           send(:"\#{db_column}_will_change!") # unless attribute_is_changing? db_column

data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb

@@ -205,6 +205,7 @@ module CarrierWave
       end
     end
 
+    # @option opts [Symbol] :absolute - return absolute url
     def url opts={}
       if model.cloud?
         file&.url
@@ -216,8 +217,12 @@ module CarrierWave
     end
 
     def local_url opts={}
-      "%s/%s/%s" % [card_path(Card.config.files_web_path), file_dir,
-                    full_filename(url_filename(opts))]
+      "%s/%s/%s" % [local_url_base(opts), file_dir, full_filename(url_filename(opts))]
+    end
+
+    def local_url_base opts={}
+      web_path = Card.config.files_web_path
+      opts.delete(:absolute) ? card_url(web_path) : card_path(web_path)
     end
 
     def public_path

data/mod/carrierwave/spec/set/type/file_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe Card::Set::Type::File do
   DIRECTORY = "deckodev-test"
+  ENV["STORE_CODED_FILES"] = "true"
 
   def test_file no=1
     File.new(File.join(CARD_TEST_SEED_PATH, "file#{no}.txt"))

data/mod/core/spec/format/html_format_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Card::Format::HtmlFormat do
       it "renders top menu" do
         is_expected.to have_tag "header" do
           with_tag 'a.nav-link.internal-link[href="/"]', text: "Home"
-          with_tag 'a.nav-link.internal-link[href=":recent"]', text: "Recent"
+          with_tag 'a.nav-link.internal-link[href="/:recent"]', text: "Recent"
           with_tag 'form.navbox-form[action="/*search"]' do
             with_tag 'select[name="query[keyword]"]'
           end

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

@@ -122,7 +122,7 @@ class Card
       def act_accordion
         context = @act.main_action.draft ? :warning : :default
         <<-HTML
-        <div class="card card-#{context}">
+        <div class="card card-#{context} nodblclick">
           #{act_accordion_panel}
         </div>
         HTML
@@ -131,7 +131,6 @@ class Card
       def accordion_expand_options
         {
           "data-toggle" => "collapse",
-          "data-parent" => "#accordion-#{collapse_id}",
           "data-target" => ".#{collapse_id}",
           "aria-expanded" => true,
           "aria-controls" => collapse_id
@@ -154,7 +153,8 @@ class Card
 
       def act_accordion_body
         wrap_with :div, id: collapse_id,
-                  class: "collapse #{collapse_id}" do
+                        class: "collapse #{collapse_id}",
+                        "data-parent": ".act-accordion-group" do
           wrap_with :div, details, class: "card-body"
         end
       end

data/mod/history/lib/card/action.rb

@@ -70,9 +70,24 @@ class Card
     # each action is associated with on and only one card
     # @return [Card]
     def card
-      res = Card.fetch card_id, look_in_trash: true, skip_modules: true
-      return res unless res && res.type_id.in?([FileID, ImageID])
-      res.include_set_modules
+      Card.fetch card_id, look_in_trash: true
+
+      # I'm not sure what the rationale for the following was/is, but it was causing
+      # problems in cases where slot attributes are overridden (eg see #wrap_data in
+      # sources on wikirate).  The problem is the format object had the set modules but
+      # the card didn't.
+      #
+      # My guess is that the need for the following had something to do with errors
+      # associated with changed types. If so, the solution probably needs to handling
+      # including the set modules associated with the type at the time of the action
+      # rather than including no set modules at all.
+      #
+      # What's more, we _definitely_ don't want to hard code special behavior for
+      # specific types in here!
+
+      # , skip_modules: true
+      # return res unless res && res.type_id.in?([FileID, ImageID])
+      # res.include_set_modules
     end
 
     # remove action from action cache