card 1.96.7 → 1.96.8

data/mod/bootstrap/db/migrate_core_cards/20180423160231_migrate_customized_bootstrap_skin.rb

@@ -27,7 +27,7 @@ class Skin
   #   Card.search(refer_to: skin_name).each do |ref|
   #     new_content = ref.content.gsub(/#{theme_name}[ _]skin/i,
   #       "#{skin_name} customized")
-  #     card.update_attributes! content: new_content
+  #     card.update! content: new_content
   #   end
   # end
 end
@@ -59,7 +59,7 @@ class MigrateCustomizedBootstrapSkin < Card::Migration::Core
   def replace_old_skin referers
     referers.each do |ref|
       new_content = ref.content.gsub(/customizable[ _]bootstrap[ _]skin/i, NEW_SKIN)
-      ref.update_attributes! content: new_content
+      ref.update! content: new_content
     end
   end
 

data/mod/bootstrap/db/migrate_core_cards/20180423170283_add_type_bootswatch_skin.rb

@@ -25,7 +25,7 @@ class AddTypeBootswatchSkin < Card::Migration::Core
       puts "updating #{skin_name}"
       card = Card.fetch(skin_name)
       next puts "card not found" unless card
-      card.update_attributes! type_id: Card::BootswatchSkinID
+      card.update! type_id: Card::BootswatchSkinID
     end
   end
 end

data/mod/bootstrap/db/migrate_core_cards/20180601133753_migrate_skins.rb

@@ -4,7 +4,7 @@ class MigrateSkins < Card::Migration::Core
   def up
     Card.search(link_to: "bootstrap default skin", type_id: Card::SkinID) do |card|
       card.drop_item! "bootstrap default skin"
-      card.update_attributes! type_id: Card::CustomizedBootswatchSkinID
+      card.update! type_id: Card::CustomizedBootswatchSkinID
     end
   end
 end

data/mod/bootstrap/db/migrate_core_cards/data/20181108181219_migrate_classic_skins_to_bootstrap.rb

@@ -17,11 +17,11 @@ class MigrateClassicSkinsToBootstrap < ActiveRecord::Migration[5.2]
   def change
     style_rule = Card[:all, :style]
     if style_rule.item_names.first.key.in? UNSUPPORTED_SKINS
-      style_rule.update_attributes! content: DEFAULT_SKIN
+      style_rule.update! 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
+    layout_rule.update! content: DEFAULT_LAYOUT
   end
 end

data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss

@@ -393,6 +393,9 @@ body.mceContentBody {
 
 .bar {
   border-left: 3px solid $bar_stripe_color !important;
+  .bar-nav {
+    min-width: 36px;
+  }
 }
 
 .box {

data/mod/bootstrap/set/abstract/bootswatch_theme.rb

@@ -75,7 +75,7 @@ end
 # Don't create "+*machine output" file card
 # instead save the the output as the card's content is
 def after_engine output
-  Card::Auth.as_bot { update_attributes! db_content: output }
+  Card::Auth.as_bot { update! db_content: output }
 end
 
 # needed to make the refresh_script_and_style method work with these cards

data/mod/bootstrap/spec/set/type/bootswatch_skin_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe Card::Set::Type::BootswatchSkin do
 
   context "when stylesheets item content changed" do
     it "updates output of related machine card", as_bot: true do
-      customized_skin.field(:bootswatch).update_attributes! content: CUSTOM_CSS
+      customized_skin.field(:bootswatch).update! content: CUSTOM_CSS
       expect(generated_css).to include CUSTOM_CSS
     end
   end

data/mod/bootstrap/spec/set/type/customized_bootswatch_skin_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Card::Set::Type::CustomizedBootswatchSkin do
   example "update old skin", as_bot: true do
     create_skin "old skin", content: ["bootstrap default skin", "custom css"]
     card = Card["old skin"]
-    card.update_attributes! type_id: Card::CustomizedBootswatchSkinID
+    card.update! type_id: Card::CustomizedBootswatchSkinID
 
     expect_card("old skin")
       .to have_a_field(:stylesheets).refering_to "custom css"

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

@@ -47,7 +47,7 @@ module CarrierWave
   #               remote_file_url: "http://a.file.in/the.web"
   #
   # @example Updating a image card using a remote url
-  #   card.update_attributes remote_image_url: "http://a.image/somewhere.png"
+  #   card.update remote_image_url: "http://a.image/somewhere.png"
   #
   # ## Storage types
   # You can choose between four different storage options
@@ -93,7 +93,7 @@ module CarrierWave
   #   }
   #
   #   # wagn console or rake task:
-  #   card.update_attributes storage_type: :cloud, bucket: :aws_bucket
+  #   card.update storage_type: :cloud, bucket: :aws_bucket
   #
   # @example Creating a file card with fixed external link
   #   Card.create name: "file card", type_id: Card::FileID,

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

@@ -20,7 +20,7 @@ end
 
 event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_to_save? do
   return unless @current_action
-  @current_action.update_attributes! comment: original_filename
+  @current_action.update! comment: original_filename
 end
 
 event :validate_file_exist, :validate, on: :save do

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

@@ -31,8 +31,8 @@ event :validate_storage_type_update, :validate, on: :update do
   # FIXME: make it possible to retrieve the file from cloud storage
   #   to store it somewhere else. Currently, it only works to change the
   #   storage type if a new file is provided
-  #   i.e. `update_attributes storage_type: :local` fails but
-  #        `update_attributes storage_type: :local, file: [file handle]` is ok
+  #   i.e. `update storage_type: :local` fails but
+  #        `update storage_type: :local, file: [file handle]` is ok
   if cloud? && storage_type_changed? && !attachment_is_changing?
     errors.add :storage_type, tr(:moving_files_is_not_supported)
   end

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

@@ -14,7 +14,7 @@ event :prepare_attachment, :prepare_to_validate, on: :save, when: :preliminary_u
   # finalize_action         # create Card::Change entry for db_content
 
   card_id = new_card? ? upload_cache_card.id : id
-  @current_action.update_attributes! draft: true, card_id: card_id
+  @current_action.update! draft: true, card_id: card_id
   success << {
     target: (new_card? ? upload_cache_card : self),
     type: type_name,
@@ -42,7 +42,7 @@ end
 def assign_attachment file, original_filename
   send "#{attachment_name}=", file
   write_identifier
-  @current_action.update_attributes! comment: original_filename if @current_action
+  @current_action&.update! comment: original_filename
 end
 
 event :delete_cached_upload_file_on_create, :integrate,

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

@@ -226,8 +226,7 @@ RSpec.describe Card::Set::Type::File do
           Card::Mod.dirs.mods.delete "test_mod"
         end
         subject do
-          create_file_card :coded, test_file,
-                           codename: "mod_file", mod: "test_mod"
+          create_file_card :coded, test_file, codename: "mod_file", mod: "test_mod"
         end
 
         let(:file_path) { File.join mod_path, "file", "mod_file", "file.txt" }
@@ -329,7 +328,7 @@ RSpec.describe Card::Set::Type::File do
   context "updating" do
     subject do
       card = protected_file
-      card.update_attributes! file: test_file(2)
+      card.update! file: test_file(2)
       card
     end
 
@@ -357,20 +356,19 @@ RSpec.describe Card::Set::Type::File do
       end
 
       subject do
-        create_file_card :coded, test_file,
-                         codename: "mod_file", mod: "test_mod"
+        create_file_card :coded, test_file, codename: "mod_file", mod: "test_mod"
       end
 
       it "changes storage type to default" do
         storage_config :local
-        subject.update_attributes! file: test_file(2)
+        subject.update! file: test_file(2)
         expect(subject.storage_type).to eq :local
         expect(subject.db_content)
           .to eq "~#{subject.id}/#{subject.last_action_id}.txt"
       end
       it "keeps storage type coded if explicitly set" do
         storage_config :local
-        subject.update_attributes! file: test_file(2), storage_type: :coded
+        subject.update! file: test_file(2), storage_type: :coded
         expect(subject.storage_type).to eq :coded
         expect(subject.db_content)
           .to eq ":#{subject.codename}/test_mod.txt"
@@ -432,7 +430,7 @@ RSpec.describe Card::Set::Type::File do
       after { Cardio.config.file_storage = :local }
       it "copies file to local file system" do
         # not yet supported
-        expect { Card[subject.name].update_attributes!(storage_type: :local) }
+        expect { Card[subject.name].update!(storage_type: :local) }
           .to raise_error(ActiveRecord::RecordInvalid)
         # expect(subject.content)
         #   .to eq "~#{subject.id}/#{subject.last_action_id - 1}.txt"
@@ -454,8 +452,7 @@ RSpec.describe Card::Set::Type::File do
         expect(subject.db_content)
           .to eq "~#{subject.id}/#{subject.last_action_id}.txt"
         Card::Auth.as_bot do
-          subject.update_attributes! storage_type: :coded, mod: "test_mod",
-                                     codename: "mod_file"
+          subject.update! storage_type: :coded, mod: "test_mod", codename: "mod_file"
         end
         expect(subject.db_content)
           .to eq ":#{subject.codename}/test_mod.txt"
@@ -469,7 +466,7 @@ RSpec.describe Card::Set::Type::File do
       it "copies file to mod" do
         @storage_type = :local
         Card::Auth.as_bot do
-          subject.update_attributes! storage_type: :local
+          subject.update! storage_type: :local
         end
         expect(subject.db_content)
           .to eq "~#{subject.id}/#{subject.last_action_id}.png"
@@ -481,7 +478,7 @@ RSpec.describe Card::Set::Type::File do
         @storage_type = :local
         expect(subject.db_content)
           .to eq "~#{subject.id}/#{subject.last_action_id}.txt"
-        subject.update_attributes! storage_type: :cloud
+        subject.update! storage_type: :cloud
 
         expect(subject.db_content).to eq(
           "(test_bucket)/#{subject.id}/#{subject.last_action_id}.txt"

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

@@ -77,7 +77,7 @@ describe Card::Set::Type::Image do
 
     context "updated file card" do
       before do
-        subject.update_attributes!(
+        subject.update!(
           image: File.new(File.join(CARD_TEST_SEED_PATH, "rails.gif"))
         )
       end
@@ -111,7 +111,7 @@ describe Card::Set::Type::Image do
 
     it "becomes a regular file when changed" do
       Card::Auth.as_bot do
-        subject.update_attributes!(
+        subject.update!(
           image: File.new(File.join(CARD_TEST_SEED_PATH, "rails.gif"))
         )
       end

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

@@ -53,10 +53,13 @@ def valid?(*)
   act { super }
 end
 
-def update_attributes *args
+def update *args
   act { super }
 end
 
-def update_attributes! *args
+def update! *args
   act { super }
 end
+
+alias_method :update_attributes, :update
+alias_method :update_attributes!, :update!

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

@@ -113,4 +113,4 @@ end
 def expire_id cache
   return unless id.present?
   cache.delete "~#{id}"
-end
+end

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

@@ -19,37 +19,10 @@ def structured_content
   structure && template.db_content
 end
 
-def context_card
-  @context_card || self
-end
-
-def with_context context_card
-  old_context = @context_card
-  @context_card = context_card if context_card
-  yield
-ensure
-  @context_card = old_context
-end
-
 format do
   def chunk_list # override to customize by set
     :default
   end
-
-  def context_card
-    card.context_card
-  end
-
-  def with_context context_card
-    card.with_context context_card do
-      yield
-    end
-  end
-
-  def contextual_content context_card, options={}
-    view = options.delete(:view) || :core
-    with_context(context_card) { render! view, options }
-  end
 end
 
 format :html do
@@ -83,7 +56,7 @@ def last_draft_content
 end
 
 event :set_content, :store, on: :save do
-  self.db_content = prepare_content
+  self.db_content = prepare_db_content
   @selected_action_id = @selected_content = nil
   clear_drafts
   reset_patterns_if_rule true
@@ -104,11 +77,20 @@ def draft?
   Env.params["draft"] == "true"
 end
 
-def prepare_content
-  cont = standard_content || "" # necessary?
+def prepare_db_content
+  cont = standard_db_content || "" # necessary?
   clean_html? ? Card::Content.clean!(cont) : cont
 end
 
+def standard_db_content
+  if structure
+    # do not override db_content with content from structure
+    db_content
+  else
+    standard_content
+  end
+end
+
 def clean_html?
   true
 end

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

@@ -0,0 +1,28 @@
+def context_card
+  @context_card || self
+end
+
+def with_context context_card
+  old_context = @context_card
+  @context_card = context_card if context_card
+  yield
+ensure
+  @context_card = old_context
+end
+
+format do
+  def context_card
+    card.context_card
+  end
+
+  def with_context context_card
+    card.with_context context_card do
+      yield
+    end
+  end
+
+  def contextual_content context_card, options={}
+    view = options.delete(:view) || :core
+    with_context(context_card) { render! view, options }
+  end
+end

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

@@ -16,7 +16,7 @@ module ClassMethods
   end
 
   def rename! oldname, newname
-    Card[oldname].update_attributes! name: newname, update_referers: true
+    Card[oldname].update! name: newname, update_referers: true
   end
 end
 

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

@@ -67,6 +67,7 @@ def is_standard_rule?
     l.type_id == Card::SetID
 end
 
+# TODO: abstract so account doesn't have to have User type.
 def is_preference?
   name.parts.length > 2 &&
     (r = right(skip_modules: true)) &&

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

@@ -50,13 +50,13 @@ end
 
 def delete args={}
   add_to_trash args do |delete_args|
-    update_attributes delete_args
+    update delete_args
   end
 end
 
 def delete! args={}
   add_to_trash args do |delete_args|
-    update_attributes! delete_args
+    update! delete_args
   end
 end
 

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

@@ -54,11 +54,11 @@ end
 # sepaarte name and other attributes
 def safe_update! attribs
   separate_name_update! attribs.delete("name") unless new?
-  update_attributes! attribs if attribs.present?
+  update! attribs if attribs.present?
 end
 
 def separate_name_update! new_name
   return if new_name.to_s == name.to_s
 
-  update_attributes! name: new_name
+  update! name: new_name
 end

data/mod/core/spec/set/all/actify_spec.rb

@@ -10,6 +10,49 @@ RSpec.describe "act API" do
                 }
   end
 
+  describe "#act" do
+    let(:card) { Card["A"] }
+
+    before do
+      allow(card).to receive(:act).and_return nil
+    end
+
+    it "is called by valid?" do
+      card.valid?
+      expect(card).to have_received :act
+    end
+
+    it "is called by #save!" do
+      card.save!
+      expect(card).to have_received :act
+    end
+
+    it "is called by #save" do
+      card.save
+      expect(card).to have_received :act
+    end
+
+    it "is called by #update" do
+      card.update content: "A"
+      expect(card).to have_received :act
+    end
+
+    it "is called by #update!" do
+      card.update! content: "A"
+      expect(card).to have_received :act
+    end
+
+    it "is called by #update_attributes" do
+      card.update_attributes content: "A"
+      expect(card).to have_received :act
+    end
+
+    it "is called by #update_attributes!" do
+      card.update_attributes! content: "A"
+      expect(card).to have_received :act
+    end
+  end
+
   describe "add subcards" do
     def save_transaction
       @trans = ActiveRecord::Base.connection.current_transaction
@@ -149,7 +192,7 @@ RSpec.describe "act API" do
           expect(name_before_act).to eq("A")
           expect(db_content_before_act).to eq("Alpha [[Z]]")
         end
-        Card["A"].update_attributes! name: "new name"
+        Card["A"].update! name: "new name"
         Delayed::Worker.new.work_off
       end
     end
@@ -173,7 +216,7 @@ RSpec.describe "act API" do
         test_event :integrate_with_delay, changed: :content do
           event_called :iwd_content
         end
-        Card["A"].update_attributes! name: "new name"
+        Card["A"].update! name: "new name"
         Delayed::Worker.new.work_off
         expect(@called_events).to eq(%i[i_name iwd_name])
       end