card 1.96.0 → 1.96.1

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

@@ -14,11 +14,9 @@ def suspend_name name
   Card.where(id: id).update_all(name: tmp_name, key: tmp_name)
 end
 
-event :validate_renaming, :validate, on: :update, changed: :name do
-  if db_content_is_changing?
-    errors.add :content, "cannot change content while changing name"
-  end
-  errors.add :type, "cannot change type while changing name" if type_id_is_changing?
+event :validate_renaming, :validate, on: :update, changed: :name, skip: :allowed do
+  errors.add :content, tr(:cannot_change_content) if db_content_is_changing?
+  errors.add :type, tr(:cannot_change_type) if type_id_is_changing?
 end
 
 event :cascade_name_changes, :finalize, on: :update, changed: :name,

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

@@ -31,9 +31,7 @@ module ClassMethods
     file_ids = all_file_ids
     file_ids.each do |file_id|
       next unless trashed_card_ids.member?(file_id)
-      if Card.exists?(file_id) # double check!
-        raise Card::Error, "Narrowly averted deleting current file"
-      end
+      raise Card::Error, tr(:exception_almost_deleted) if Card.exists?(file_id)
       ::FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
     end
   end
@@ -92,7 +90,7 @@ end
 
 event :validate_delete, :validate, on: :delete do
   unless codename.blank?
-    errors.add :delete, "#{name} is is a system card. (#{codename})"
+    errors.add :delete, tr(:error_system_card, name: name, codename: codename)
   end
 
   undeletable_all_rules_tags =
@@ -101,13 +99,10 @@ event :validate_delete, :validate, on: :delete do
 
   if junction? && left&.codename == :all &&
      undeletable_all_rules_tags.member?(right.codename.to_s)
-    errors.add :delete, "#{name} is an indestructible rule"
+    errors.add :delete, tr(:error_indestructible, name: name)
   end
 
-  if account && has_edits?
-    errors.add :delete, "Edits have been made with #{name}'s user account.\n" \
-                        "Deleting this card would mess up our history."
-  end
+  errors.add :delete, tr(:error_user_edits, name: name) if account && has_edits?
 end
 
 event :validate_delete_children, after: :validate_delete, on: :delete do

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

@@ -44,16 +44,18 @@ end
 
 event :validate_type_change, :validate, on: :update, changed: :type_id do
   if (c = dup) && c.action == :create && !c.valid?
-    errors.add :type, "of #{name} can't be changed; errors creating new " \
-                      "#{type_id}: #{c.errors.full_messages * ', '}"
+    errors.add :type, tr(
+      :error_cant_change_errors,
+      name: name, type_id: type_id,
+      error_messages: c.errors.full_messages
+    )
   end
 end
 
 event :validate_type, :validate, changed: :type_id do
-  errors.add :type, "No such type" unless type_name
+  errors.add :type, tr(:error_no_such_type) unless type_name
 
   if (rt = structure) && rt.assigns_type? && type_id != rt.type_id
-    errors.add :type, "can't be changed because #{name} is hard templated " \
-                      "to #{rt.type_name}"
+    errors.add :type, tr(:error_hard_templated, name: name, type_name: rt.type_name)
   end
 end

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

@@ -31,14 +31,22 @@ module ClassMethods
   def merge name, attribs={}, opts={}
     # puts "merging #{name}"
     card = fetch name, new: {}
+    return unless mergeable? card, opts[:pristine]
+    resolve_file_attributes! attribs
+    card.update_attributes! attribs.reverse_merge(skip: :validate_renaming)
+  end
+
+  private
+
+  def resolve_file_attributes! attribs
     %i[image file].each do |attach|
       next unless attribs[attach] && attribs[attach].is_a?(String)
       attribs[attach] = ::File.open(attribs[attach])
     end
-    if opts[:pristine] && !card.pristine?
-      false
-    else
-      card.update_attributes! attribs
-    end
+  end
+
+  def mergeable? card, pristine_only
+    return true unless pristine_only
+    !card.pristine?
   end
 end

data/mod/core/spec/set/abstract/code_file_spec.rb

@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::Abstract::CodeFile do
+  specify "view bar_middle" do
+    expect_view(:bar_middle).to have_tag("i.fa")
+    expect_view(:bar_middle).to have_tag("span.text-muted")
+  end
+end

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

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::Tabs do
+  specify "view tabs" do
+    expect_view(:tabs).to have_tag("div.tabbable") do
+      with_tag "ul.nav"
+      with_tag "li.nav-item"
+      with_tag "div.tab-content"
+    end
+  end
+
+  specify "view pills" do
+    expect_view(:pills).to have_tag("div.tabbable") do
+      with_tag "ul.nav"
+      with_tag "li.nav-item"
+      with_tag "div.tab-content"
+    end
+  end
+end

data/mod/developer/spec/set/all/view_viz_spec.rb

@@ -0,0 +1,9 @@
+describe Card::Set::All::ViewViz do
+  specify "view views_by_format" do
+    expect_view(:views_by_format).to have_tag("div.card") do
+      with_tag "div.card-body"
+      with_tag "ul.list-group"
+      with_tag "li.list-group-item"
+    end
+  end
+end

data/mod/follow/spec/set/all/follow/follow_link_spec.rb

@@ -0,0 +1,7 @@
+describe Card::Set::All::Follow::FollowLink do
+  specify "view follow_link" do
+    expect_view(:follow_link).to have_tag("a") do
+      with_tag "span.follow-verb.menu-item-label"
+    end
+  end
+end

data/mod/follow/spec/set/all/notify/html_views_spec.rb

@@ -0,0 +1,7 @@
+describe Card::Set::All::Notify::HtmlViews do
+  specify "view last_action" do
+    expect_view(:last_action).to have_tag("a.known-card") do
+      with_tag "span.card-title"
+    end
+  end
+end

data/mod/follow/spec/set/right/following_spec.rb

@@ -8,4 +8,10 @@ describe Card::Set::Right::Following do
 
     check_views_for_errors :core, :status, :rule_editor
   end
+
+  specify "view core" do
+    expect_view(:core).to have_tag("div.card-slot") do
+      with_tag "div.menu-slot.nodblclick"
+    end
+  end
 end

data/mod/follow/spec/set/type/notification_template_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Card::Set::Type::NotificationTemplate do
 
   def notify
     Card::Auth.as_bot do
-      post :update, params: { id: "~#{Card['A'].id}",
+      post :update, params: { mark: "A",
                               card: { "content" => "change" } },
                     xhr: true
     end

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

@@ -169,7 +169,7 @@ def draft_acts
 end
 
 event :detect_conflict, :validate, on: :update, when: :edit_conflict? do
-  errors.add :conflict, "changes not based on latest revision"
+  errors.add :conflict, tr(:error_not_latest_revision)
 end
 
 def edit_conflict?

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

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::ActView do
+  specify "view act" do
+    expect_view(:act).to have_tag("div.card") do
+      with_tag "div.card-header"
+      with_tag "div.card-body"
+    end
+  end
+
+  specify "view act_legend" do
+    expect_view(:act_legend).to have_tag("div.row") do
+      with_tag "div"
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::ActionView do
+  # SPECSTUB
+  specify "view action_summary" do
+    expect_view(:action_summary).to have_tag("div.card-slot") do
+      with_tag "ins"
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::History do
+  # SPECSTUB
+  specify "view history" do
+    expect_view(:history).to have_tag("div.card-slot.history-view") do
+      with_tag "div.card-body"
+      with_tag "div.card-header"
+    end
+  end
+end

data/mod/item/spec/set/all/bar_spec.rb

@@ -0,0 +1,41 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::Bar do
+  specify "view thin_bar" do
+    expect_view(:thin_bar).to have_tag("div.card-slot.bar-view")
+  end
+
+  specify "view bar_left" do
+    expect_view(:bar_left).to have_tag("span.card-title")
+  end
+
+  specify "view bar_middle" do
+    expect_view(:bar_middle).to have_tag("span.labeled-badge")
+  end
+
+  specify "view bar_bottomm" do
+    expect_view(:bar_bottomm).to have_tag("strong")
+  end
+
+  specify "view bar_page_link" do
+    expect_view(:bar_page_link).to have_tag("a.text-muted") do
+      with_tag "i"
+    end
+  end
+
+  specify "view bar_expand_link" do
+    expect_view(:bar_expand_link).to have_tag("a.slotter") do
+      with_tag "i"
+    end
+  end
+
+  specify "view bar_collapse_link" do
+    expect_view(:bar_collapse_link).to have_tag("a.slotter") do
+      with_tag "i"
+    end
+  end
+
+  specify "view edit_button" do
+    expect_view(:edit_button).to have_tag("a.btn")
+  end
+end

data/mod/machines/lib/javascript/decko_slot.js.coffee

@@ -72,7 +72,7 @@ jQuery.fn.extend {
     s = @slot()
     v = $(val)[0] && $(val) || val
     if typeof(v) == "string"
-      # Needed to support "TEXT: result" pattern in success (eg deleting nested cards)
+      # needed to support unwrapped views
       s.replaceWith v
     else
       s.setSlotContentFromElement v

data/mod/pointer/set/abstract/02_pointer/other_views.rb

@@ -11,10 +11,6 @@ format do
     end
   end
 
-  def wrap_item item, _args={}
-    item # no wrap in base
-  end
-
   def nest_item_array
     card.item_cards.map do |item|
       nest_item item

data/mod/recaptcha/set/all/recaptcha.rb

@@ -1,5 +1,5 @@
 format :html do
-  def decko_variables
+  def decko_script_variables
     super.merge "decko.recaptchaKey": Card.config.recaptcha_public_key
   end
 

data/mod/search/spec/set/abstract/search_spec.rb

@@ -0,0 +1,8 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::Abstract::Search do
+  # SPECSTUB
+  specify "view no_search_results" do
+    expect_view(:no_search_results).to have_tag("div.search-no-results")
+  end
+end

data/mod/standard/set/all/error.rb

@@ -10,7 +10,7 @@ format do
   end
 
   view :unsupported_view, perms: :none, tags: :unknown_ok, error_code: 404 do
-    "view (#{voo.unsupported_view}) not supported for #{error_cardname}"
+    tr(:unsupported_view, view: voo.unsupported_view, cardname: error_cardname)
   end
 
   view :missing, perms: :none do
@@ -18,28 +18,28 @@ format do
   end
 
   view :not_found, perms: :none, error_code: 404 do
-    error_name = card.name.present? ? safe_name : "the card requested"
-    %( Could not find #{error_name}. )
+    error_name = card.name.present? ? safe_name : tr(:not_found_no_name)
+    tr(:not_found_named, cardname: error_name)
   end
 
   view :server_error, perms: :none, error_code: 500 do
-    ["Wild Card!", "500 Server Error", "Yuck, sorry about that.", ":("].join "\n\n"
+    tr(:server_error)
   end
 
   view :denial, perms: :none, error_code: 403 do
-    focal? ? "Permission Denied" : ""
+    focal? ? tr(:denial) : ""
   end
 
   view :bad_address, perms: :none, error_code: 404 do
-    %( 404: Bad Address )
+    tr(:bad_address)
   end
 
   view :too_deep, perms: :none, closed: true do
-    %{ Man, you're too deep.  (Too many levels of nests at a time) }
+    tr(:too_deep)
   end
 
   view :too_slow, perms: :none, closed: true, error_code: 408 do
-    %( Timed out! #{title_in_context} took too long to load. )
+    tr(:too_slow, showname: title_in_context)
   end
 end
 
@@ -62,7 +62,7 @@ format :html do
     debug_error exception if Auth.always_ok?
     details = Auth.always_ok? ? backtrace_link(exception) : error_cardname
     wrap_with :span, class: "render-error alert alert-danger" do
-      ["error rendering", details, "(#{view} view)"].join "\n"
+      [tr(:error_rendering), details, "(#{view} view)"].join "\n"
     end
   end
 
@@ -122,7 +122,7 @@ format :html do
 
   view :errors, perms: :none do
     return if card.errors.empty?
-    voo.title = card.name.blank? ? "Problems" : "Problems with #{card.name}"
+    voo.title = card.name.blank? ? "Problems" : tr(:problems_name, cardname: card.name)
     voo.hide! :menu
     class_up "d0-card-frame", "card card-warning card-inverse"
     class_up "alert", "card-error-msg"
@@ -145,7 +145,7 @@ format :html do
     voo.hide! :menu
     voo.title = "Not Found"
     frame do
-      [not_found_errors, sign_in_or_up_links]
+      [not_found_errors, sign_in_or_up_links("to create it")]
     end
   end
 
@@ -157,11 +157,25 @@ format :html do
     end
   end
 
-  def sign_in_or_up_links
+  def sign_in_or_up_links to_task
     return if Auth.signed_in?
-    signin_link = link_to_card :signin, "Sign in"
-    signup_link = link_to "Sign up", path: { action: :new, mark: :signup }
-    wrap_with(:div) { "#{signin_link} or #{signup_link} to create it." }
+    links = [signin_link, signup_link].compact.join " #{tr :or} "
+    wrap_with(:div) do
+      [tr(:please), links, to_task].join(" ") + "."
+    end
+  end
+
+  def signin_link
+    link_to_card :signin, tr(:sign_in_c)
+  end
+
+  def signup_link
+    return unless signup_ok?
+    link_to tr(:sign_up_c), path: { action: :new, mark: :signup }
+  end
+
+  def signup_ok?
+    Card.new(type_id: Card::SignupID).ok? :create
   end
 
   view :denial do
@@ -176,32 +190,40 @@ format :html do
 
   def loud_denial
     frame do
-      [
-        wrap_with(:h1, "Sorry!"),
-        wrap_with(:div, loud_denial_message)
-      ]
+      [wrap_with(:h1, tr(:sorry)),
+       wrap_with(:div, loud_denial_message)]
     end
   end
 
   def loud_denial_message
-    to_task = @denied_task ? "to #{@denied_task} this." : "to do that."
+    to_task = @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+
     case
-    when @denied_task != :read && Card.config.read_only
-      "We are currently in read-only mode.  Please try again later."
+    when not_denied_task_read?
+      tr(:read_only)
     when Auth.signed_in?
-      "You need permission #{to_task}"
+      tr(:need_permission_task, task: to_task)
     else
-      denial_message_with_links to_task
+      Env.save_interrupted_action request.env["REQUEST_URI"]
+      sign_in_or_up_links to_do_unauthorized_task
     end
   end
 
+  def not_denied_task_read?
+    @denied_task != :read && Card.config.read_only
+  end
+
+  def to_do_unauthorized_task
+    @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+  end
+
   def denial_message_with_links to_task
     linx = [link_to_card(:signin, "sign in")]
     if Card.new(type_id: Card::SignupID).ok?(:create)
-      linx += ["or", link_to("sign up", path: { action: "new", mark: :signup })]
+      [tr(:or), link_to(tr(:sign_up), path: { action: "new", mark: :signup })]
     end
     Env.save_interrupted_action request.env["REQUEST_URI"]
-    "Please #{linx.join ' '} #{to_task}"
+    "#{tr(:please)} #{linx.join ' '} #{to_task}"
   end
 
   view :server_error, template: :haml