card 1.96.0 → 1.96.1

data/mod/account/spec/set/all/account_spec.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 RSpec.describe Card::Set::All::Account do
   describe "accountable?" do
     it "is false for cards with *accountable rule off" do

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

@@ -96,8 +96,7 @@ RSpec.describe Card::Set::Right::Account do
       ["/update/#{@account.left.name.url_key}",
        "token=#{token}",
        "live_token=true",
-       "event=reset_password"].each do |url_part|
-
+       "card%5Btrigger%5D=reset_password"].each do |url_part|
         expect(raw_source).to include(url_part)
       end
     end
@@ -133,13 +132,14 @@ RSpec.describe Card::Set::Right::Account do
       @account.send_reset_password_token
       @token = @account.token
       Card::Env.params[:token] = @token
-      Card::Env.params[:event] = "reset_password"
       Card::Auth.current_id = Card::AnonymousID
     end
 
+    let(:trigger_reset) { @account.update_attributes! trigger: :reset_password }
+
     it "authenticates with correct token" do
       expect(Card::Auth.current_id).to eq(Card::AnonymousID)
-      expect(@account.save).to eq(true)
+      trigger_reset
       expect(Card::Auth.current_id).to eq(@account.left_id)
       @account = @account.refresh true
       # expect(@account.fetch(trait: :token)).to be_nil
@@ -149,10 +149,8 @@ RSpec.describe Card::Set::Right::Account do
       @account.token_card.update_column :updated_at,
                                         3.days.ago.strftime("%F %T")
       @account.token_card.expire
-      result = @account.save
 
-      expect(result).to eq(true)
-      # successfully completes save
+      trigger_reset
 
       expect(@account.token).not_to eq(@token)
       # token gets updated
@@ -163,8 +161,7 @@ RSpec.describe Card::Set::Right::Account do
 
     it "does not work if token is wrong" do
       Card::Env.params[:token] = @token + "xxx"
-      Card::Env.params[:event] = "reset_password"
-      @account.save
+      trigger_reset
       expect(@account.errors[:incorrect_token].first).to match(/mismatch/)
     end
   end

data/mod/account/spec/set/self/signin_spec.rb

@@ -51,10 +51,6 @@ RSpec.describe Card::Set::Self::Signin do
   end
 
   context "#reset password" do
-    before do
-      Card::Env.params[:reset_password] = true
-    end
-
     it "is triggered by an update" do
       # Card['joe admin'].account.token.should be_nil FIXME:  this should be t
       @card.update_attributes! "+*email" => "joe@admin.com"
@@ -62,7 +58,8 @@ RSpec.describe Card::Set::Self::Signin do
     end
 
     it "returns an error if email is not found" do
-      @card.update_attributes "+*email" => "schmoe@admin.com"
+      @card.update_attributes! "+*email" => "schmoe@admin.com",
+                               trigger: :send_reset_password_token
       expect(@card.errors[:email].first).to match(/not recognized/)
     end
   end

data/mod/admin/set/self/admin_info.rb

@@ -26,10 +26,10 @@ format :html do
   end
 
   def warning_list_with_auto_scope warnings
-      # 'ADMINISTRATOR WARNING'
-      admin_warn = tx(:admin_warn)
-      "<h5>#{admin_warn}</h5>" + warnings.join("\n")
-    end
+    # 'ADMINISTRATOR WARNING'
+    admin_warn = tr(:admin_warn)
+    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+  end
 
   def email_warning
     # "Email delivery is turned off."

data/mod/admin/spec/set/self/admin_info_spec.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Self::AdminInfo do
+  specify "view core" do
+    expect_view(:core).to have_tag("div.alert.alert-warning.alert-dismissible") do
+      with_tag "button.close"
+      with_tag "a.external-link"
+    end
+  end
+end

data/mod/admin/spec/set/self/trash_spec.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::Self::Trash do
+  specify "view core" do
+    expect_view(:core).to have_tag("table")
+  end
+end

data/mod/basic_formats/set/all/json.rb

@@ -97,9 +97,7 @@ format :json do
   end
 
   view :items, cache: :never do
-    item_cards.map do |i_card|
-      nest i_card
-    end
+    listing item_cards
   end
 
   view :links, cache: :never do
@@ -139,6 +137,12 @@ format :json do
     }
   end
 
+  view :export_item do
+    item = { name: card.name, type: card.type_name, content: card.content }
+    item[:codename] = card.codename if card.codename
+    item
+  end
+
   view :essentials do
     if voo.show? :marks
       render_marks.merge(essentials)

data/mod/basic_formats/spec/set/all/head_spec.rb

@@ -0,0 +1,33 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::Head do
+  specify "view head" do
+    expect_view(:head).to have_tag("title"), "A - WikiRate"
+    expect_view(:head).to have_tag("link")
+    expect_view(:head).to have_tag("script")
+  end
+
+  specify "view meta_tags" do
+    expect_view(:meta_tags).to have_tag("meta")
+  end
+
+  specify "view page_title_tag" do
+    expect_view(:page_title_tag).to have_tag("title")
+  end
+
+  specify "view favicon_tag" do
+    expect_view(:favicon_tag).to have_tag("link")
+  end
+
+  specify "view universal_edit_button" do
+    expect_view(:universal_edit_button).to have_tag("link")
+  end
+
+  specify "view head_stylesheet" do
+    expect_view(:head_stylesheet).to have_tag("link")
+  end
+
+  specify "view decko_script_variables" do
+    expect_view(:decko_script_variables).to have_tag("script")
+  end
+end

data/mod/basic_types/set/type/json.rb

@@ -5,7 +5,7 @@ end
 def check_json_syntax
   JSON.parse content
 rescue JSON::ParserError => e
-  errors.add "invalid json", e.message.sub(/^\d+: /, "").to_s
+  errors.add tr(:invalid_json), e.message.sub(/^\d+: /, "").to_s
 end
 
 format :html do

data/mod/basic_types/spec/set/type/plain_text_spec.rb

@@ -9,4 +9,10 @@ describe Card::Set::Type::PlainText do
     expect(render_card(:core, type: "Plain Text", content: "<b></b>"))
       .to eq "&lt;b&gt;&lt;/b&gt;"
   end
+
+  specify "view core" do
+    expect_view(:core).to have_tag("a.known-card") do
+      with_tag "span.card-title"
+    end
+  end
 end

data/mod/bootstrap/set/type/customized_bootswatch_skin.rb

@@ -47,9 +47,9 @@ end
 event :validate_theme_template, :validate, on: :create do
   if theme_name
     if Card.fetch_type_id(theme_card_name) != Card::BootswatchSkinID
-      errors.add :abort, "not a valid theme: #{theme_name}"
+      errors.add :abort, tr(:not_valid_theme, theme_name: theme_name)
     elsif !Dir.exist?(source_dir)
-      errors.add :abort, "can't find source for theme \"#{theme_name}\""
+      errors.add :abort, tr(:cannot_source_theme, theme_name: theme_name)
     end
   end
 end

data/mod/bootstrap/spec/set/type/customized_bootswatch_skin/html_views_spec.rb

@@ -0,0 +1,5 @@
+RSpec.describe Card::Set::Type::CustomizedBootswatchSkin::HtmlViews do
+  specify "view core" do
+    expect_view(:core).to have_tag("h5")
+  end
+end

data/mod/bootstrap/spec/set/type_plus_right/customized_bootswatch_skin/colors_spec.rb

@@ -15,4 +15,12 @@ RSpec.describe Card::Set::TypePlusRight::CustomizedBootswatchSkin::Colors do
     expect(card.colors_card.theme_colors)
       .to include("card-cap-bg": "rgba($black, .03)")
   end
+
+  specify "view bar_middle" do
+    expect_view(:bar_middle).to have_tag("div.colorpicker-element") do
+      with_tag "div.input-group-addon"
+      with_tag "span"
+      with_tag "i"
+    end
+  end
 end

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

@@ -16,15 +16,14 @@ end
 
 event :validate_storage_type, :validate, on: :save do
   if will_become_coded?
-    unless mod || @new_mod
-      errors.add :storage_type, "mod argument needed to save card as coded"
-    end
-    if codename.blank?
-      errors.add :storage_type, "codename needed for storage type coded"
-    end
+    errors.add :storage_type, tr(:mod_argument_needed_to_save) unless mod || @new_mod
+    errors.add :storage_type, tr(:codename_needed_for_storage) if codename.blank?
   end
   unless known_storage_type? will_be_stored_as
-    errors.add :storage_type, "unknown storage type: #{@new_storage_type}"
+    errors.add :storage_type, tr(
+      :unknown_storage_type,
+      new_storage_type: @new_storage_type
+    )
   end
 end
 
@@ -35,8 +34,7 @@ event :validate_storage_type_update, :validate, on: :update do
   #   i.e. `update_attributes storage_type: :local` fails but
   #        `update_attributes storage_type: :local, file: [file handle]` is ok
   if cloud? && storage_type_changed? && !attachment_is_changing?
-    errors.add :storage_type, "moving files from cloud elsewhere "\
-                              "is not supported"
+    errors.add :storage_type, tr(:moving_files_is_not_supported)
   end
 end
 
@@ -199,7 +197,7 @@ end
 def load_bucket_config_from_env config
   config ||= {}
   CarrierWave::FileCardUploader::CONFIG_OPTIONS.each do |key|
-    next if key.in? [:attributes, :credentials]
+    next if key.in? %i[attributes credentials]
     replace_with_env_variable config, key
   end
   config[:credentials] ||= {}
@@ -232,7 +230,7 @@ end
 
 def bucket_from_config
   Cardio.config.file_default_bucket ||
-    (Cardio.config.file_buckets && Cardio.config.file_buckets.keys.first)
+    (Cardio.config.file_buckets&.keys&.first)
 end
 
 def storage_type
@@ -308,7 +306,7 @@ end
 def with_storage_options opts={}
   old_values = {}
   validate_temporary_storage_type_change opts[:storage_type]
-  [:storage_type, :mod, :bucket].each do |opt_name|
+  %i[storage_type mod bucket].each do |opt_name|
     next unless opts[opt_name]
     old_values[opt_name] = instance_variable_get "@#{opt_name}"
     instance_variable_set "@#{opt_name}", opts[opt_name]
@@ -330,8 +328,9 @@ def validate_temporary_storage_type_change new_storage_type=nil
   new_storage_type ||= @new_storage_type
   return unless new_storage_type
   unless known_storage_type? new_storage_type
-    raise Error, "unknown storage type: #{new_storage_type}"
+    raise Error, tr(:unknown_storage_type, new_storage_type: new_storage_type)
   end
+
   if new_storage_type == :coded && codename.blank?
     raise Error, "codename needed for storage type :coded"
   end

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

@@ -19,6 +19,11 @@ def abort status, msg="action canceled"
   raise Card::Error::Abort.new(status, msg)
 end
 
+def aborting
+  yield
+  errors.any? ? abort(:failure) : abort(:success)
+end
+
 def act opts={}, &block
   opts ||= {}
   @action ||= identify_action(opts[:trash])

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

@@ -15,11 +15,11 @@ private
 
 def validate_codename_permission
   return if Auth.always_ok?
-  errors.add :codename, "only admins can set codename"
+  errors.add :codename, tr(:only_admins_codename)
 end
 
 def validate_codename_uniqueness
   return (self.codename = nil) if codename.blank?
   return if errors.present? || !Card.find_by_codename(codename)
-  errors.add :codename, "codename #{codename} already in use"
+  errors.add :codename, tr(:error_code_in_use, codename: codename)
 end

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

@@ -20,6 +20,7 @@ def on_condition_applies? _event, actions
 end
 
 def changed_condition_applies? _event, db_columns
+  return true unless @action == :update
   db_columns = Array(db_columns).compact
   return true if db_columns.empty?
   db_columns.any? { |col| single_changed_condition_applies? col }
@@ -51,7 +52,7 @@ def single_changed_condition_applies? db_column
     when :type    then "type_id"
     else db_column.to_s
     end
-  @action != :delete && attribute_is_changing?(db_column)
+  attribute_is_changing?(db_column)
 end
 
 def wrong_stage opts

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

@@ -26,7 +26,7 @@ module ClassMethods
   private
 
   def standard_controller_fetch args, card_opts
-    mark = args[:id] || card_opts[:name]
+    mark = args[:mark] || card_opts[:name]
     card = Card.fetch mark, look_in_trash: args[:look_in_trash], new: card_opts
     card.assign_attributes card_opts if args[:assign] && card&.real?
     card
@@ -36,7 +36,7 @@ module ClassMethods
     opts = safe_param args[:card]
     opts[:type] ||= args[:type] if args[:type]
     # for /new/:type shortcut.  we should handle in routing and deprecate this
-    opts[:name] ||= Card::Name.url_key_to_standard(args[:id])
+    opts[:name] ||= Card::Name.url_key_to_standard(args[:mark])
     opts
   end
 

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

@@ -1,6 +1,6 @@
 
 def tr key, args={}
-  ::I18n.t key, args.merge(scope: Card::Set.scope(caller))
+  ::I18n.t key, args.reverse_merge(scope: Card::Set.scope(caller))
 end
 
 format do

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

@@ -102,6 +102,12 @@ format do
     end
   end
 
+  def wrap_item item, _args={}
+    item # no wrap in base
+  end
+end
+
+format :html do
   def wrap_item rendered, item_view
     %(<div class="item-#{item_view}">#{rendered}</div>)
   end

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

@@ -1,8 +1,19 @@
 event :discard_deleted_locations, in: :finalize, on: :delete do
   Env.discard_locations_for self
-  success.target = :previous if success.target == self
+  configure_successful_deletion if success.target == self
 end
 
 event :save_current_location, before: :show_page, on: :read do
   Env.save_location self
 end
+
+# TO DISCUSS: should this default behavior be directly in the controller?
+# Or at least in decko?
+def configure_successful_deletion
+  if Env.ajax?
+    success.card = self
+    success.view = :missing unless success.view
+  else
+    success.target = :previous
+  end
+end

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

@@ -22,30 +22,29 @@ event :validate_uniqueness_of_name do
   rel = Card.where key: name.key, trash: false
   rel = rel.where "id <> ?", id if id
   if (existing = rel.take)
-    errors.add :name, "must be unique; '#{existing.name}' already exists."
+    errors.add :name, tr(:error_name_exists, name: existing.name)
   end
 end
 
 event :validate_legality_of_name do
   if name.length > 255
-    errors.add :name, "is too long (255 character maximum)"
+    errors.add :name, tr(:error_too_long, length: name.length)
   elsif name.blank?
-    errors.add :name, "can't be blank"
+    errors.add :name, tr(:error_blank_name)
   elsif name.parts.include? ""
-    errors.add :name, "is incomplete"
+    errors.add :name, tr(:is_incomplete)
   elsif !name.valid?
-    errors.add :name, "may not contain any of the following characters: " \
-                      "#{Card::Name.banned_array * ' '}"
+    errors.add :name, tr(:error_banned_characters, banned: Card::Name.banned_array * " ")
   elsif changing_existing_tag_to_junction?
-    errors.add :name, "#{name} in use as a tag"
+    errors.add :name, tr(:error_name_tag, name: name)
   end
 end
 
 event :validate_key, after: :validate_name, on: :save do
   if key.empty?
-    errors.add :key, "cannot be blank" if errors.empty?
+    errors.add :key, tr(:error_blank_key) if errors.empty?
   elsif key != name.key
-    errors.add :key, "wrong key '#{key}' for name #{name}"
+    errors.add :key, tr(:error_wrong_key, key: key, name: name)
   end
 end
 

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

@@ -95,7 +95,7 @@ def require_permission_rule! rule_id, action
   return if rule_id
   # RULE missing.  should not be possible.
   # generalize this to handling of all required rules
-  errors.add :permission_denied, "No #{action} rule for #{name}"
+  errors.add :permission_denied, tr(:error_no_action_rule, action: action, name: name)
   raise Card::Error::PermissionDenied, self
 end