card 1.19.4 → 1.19.5

data/mod/account/set/self/signin.rb

@@ -30,15 +30,11 @@ format :html do
     # i18n-tasks-use t(:reset_password,
     #                  scope: 'mod.standard.set.self.signin')
     args[:buttons] = button_tag sign_in, situation: "primary"
-    if Card.new(type_id: Card::SignupID).ok? :create
-      args[:buttons] += link_to(or_sign_up, card_path("account/signup"))
-    end
-    args[:buttons] += raw(
-      "<div style='float:right'>" \
-      "#{view_link reset_password, :edit,
-                   path_opts: { slot: { hide: :toolbar } }}" \
-      "</div>"
-    ) # FIXME: hardcoded styling
+    subformat(Card[:account_links]).render :sign_up, title: or_sign_up
+    reset_link = link_to_view :edit, reset_password,
+                              path: { slot: { hide: :toolbar } }
+    args[:buttons] += raw("<div style='float:right'>#{reset_link}</div>")
+    # FIXME: hardcoded styling
     args
   end
 

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

@@ -77,21 +77,28 @@ format :html do
   end
 
   def verification_links account, token_action
-    links = []
-    if account.confirm_ok?
-      links << link_to(
-        "#{token_action} verification email",
-        card_path("update/~#{card.id}?approve_with_token=true")
-      )
-      links << link_to(
-        "Approve without verification",
-        card_path("update/~#{card.id}?approve_without_token=true")
-      )
-    end
-    if card.ok? :delete
-      links << link_to("Deny and delete", card_path("delete/~#{card.id}"))
-    end
-    links
+    [
+      approve_with_token_link(account, token_action),
+      approve_without_token_link(account),
+      deny_link
+    ].compact
+  end
+
+  def approve_with_token_link account, token_action
+    return unless account.confirm_ok?
+    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?
+    link_to_card card, "Approve without verification",
+                 path: { action: :update, approve_without_token: true }
+  end
+
+  def deny_link
+    return unless card.ok? :delete
+    link_to_card card, "Deny and delete", path: { action: :delete }
   end
 end
 

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

@@ -113,7 +113,9 @@ describe Card::Set::All::Account do
     it "should not allow a user to block or unblock himself" do
       expect do
         @card.account.status_card.update_attributes! content: "blocked"
-      end.to raise_error
+      end.to raise_error(ActiveRecord::RecordInvalid,
+                         "Validation failed: Permission denied You don't have "\
+                         "permission to change the status of your own account")
       expect(@card.account.blocked?).to be_falsey
     end
   end

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

@@ -83,8 +83,8 @@ format :html do
     res = [(args[:title] || "")]
     res << "#{count(args[:count])}#{args[:unit]}"
     return res unless args[:task]
-    path = card_path("update/:admin?task=#{args[:task]}")
-    res << link_to(args[:link_text] || args[:task], path)
+    res << link_to_card(:admin, (args[:link_text] || args[:task]),
+                        path: { action: :update, task: args[:task] })
     res
   end
 
@@ -102,8 +102,8 @@ format :html do
   end
 
   def delete_sessions_link months
-    link_to months,
-            card_path("update/:admin?task=delete_old_sessions&months=#{months}")
+    link_to_card :admin, months, path: { action: :update, months: months,
+                                         task: "delete_old_sessions" }
   end
 end
 

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

@@ -70,31 +70,25 @@ format :html do
 
   def howto_add_new_recaptcha_keys
     instructions(
-      # 'How to add new recaptcha keys:'
       I18n.t(:howto_add_keys, scope: "mod.admin.set.self.admin_info"),
       [
-        # "1. Register your domain at #{web_link 'http://google.com/recaptcha'}"
         I18n.t(:howto_register,
                scope: "mod.admin.set.self.admin_info",
-               recaptcha_link: web_link("http://google.com/recaptcha")),
-        # "2. Add your keys to #{card_link :recaptcha_settings}"
+               recaptcha_link: link_to_resource("http://google.com/recaptcha")),
         I18n.t(:howto_add,
                scope: "mod.admin.set.self.admin_info",
-               recaptcha_settings: card_link(:recaptcha_settings))
+               recaptcha_settings: link_to_card(:recaptcha_settings))
       ]
     )
   end
 
   def howto_turn_captcha_off
     instructions(
-      # 'How to turn captcha off:'
       I18n.t(:howto_turn_off, scope: "mod.admin.set.self.admin_info"),
       [
-        # "1. Go to #{card_link :captcha}"
         I18n.t(:howto_go,
                scope: "mod.admin.set.self.admin_info",
-               captcha_card: card_link(:captcha)),
-        # '2. Update all *captcha rules to "no".'
+               captcha_card: link_to_card(:captcha)),
         I18n.t(:howto_update,
                scope: "mod.admin.set.self.admin_info")
       ]

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

@@ -30,27 +30,34 @@ format :html do
   end
 
   def empty_trash_link
-    button =
-      button_link "empty trash",
-                  { card: :admin, action: :update,
-                    task: :empty_trash, success: { id: "~#{card.id}" } },
+    content_tag(
+      :p,
+      button_link("empty trash",
                   btn_type: :default,
-                  "data-confirm" => "Are you sure you want to delete all "\
-                                    "cards in the trash"
-    content_tag :p, button
+                  path: { card: :admin, action: :update, task: :empty_trash,
+                          success: { id: "~#{card.id}" } },
+                  "data-confirm" => "Are you sure you want to delete "\
+                                    "all cards in the trash?")
+    )
   end
 
   def history_link trashed_card
-    card_link trashed_card, path_opts: { view: :history, look_in_trash: true },
-                            text: "history"
+    link_to_card trashed_card, "history",
+                 path: { view: :history, look_in_trash: true }
   end
 
   def restore_link trashed_card
     before_delete = trashed_card.actions[-2]
-    link_path = path id: trashed_card.id, look_in_trash: true, action: :update,
-                     view: :open, restore: trashed_card.id,
-                     action_ids: [before_delete], success: { id: "~#{card.id}" }
-    link_to "restore", link_path, method: :post, rel: "nofollow",
-                                  remote: true, class: "slotter"
+    link_to "restore", method: :post,
+                       rel: "nofollow",
+                       remote: true,
+                       class: "slotter",
+                       path: { id: trashed_card.id,
+                               view: :open,
+                               look_in_trash: true,
+                               action: :update,
+                               restore: trashed_card.id,
+                               action_ids: [before_delete],
+                               success: { id: "~#{card.id}" } }
   end
 end

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

@@ -38,16 +38,15 @@ format do
   end
 
   view :url_link, closed: true, perms: :none do
-    web_link card_url(_render_linkname)
+    link_to_resource card_url(_render_linkname)
   end
 
   view :link, closed: true, perms: :none do |args|
-    card_link(
-      card.name,
-      text: showname(args[:title]),
-      known: card.known?,
-      path_opts: { type: args[:type] }
-    )
+    title = showname args[:title]
+    known = card.known?
+    path_opts = {}
+    path_opts[:type] = args[:type] if !known && Card.known?(args[:type])
+    link_to_card card.name, title, known: known, path: path_opts
   end
 
   view(:codename, closed: true) { card.codename.to_s }

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -7,11 +7,10 @@ format :html do
     )
   end
 
-  def button_link link_text, target, html_args={}
-    html_args[:class] ||= ""
-    btn_type = html_args[:btn_type] || "primary"
-    html_args[:class] +=  " btn btn-#{btn_type}"
-    smart_link link_text, target, html_args.merge(type: "button")
+  def button_link link_text, opts={}
+    btn_type = opts.delete(:btn_type) || "primary"
+    opts[:class] = [opts[:class], "btn btn-#{btn_type}"].compact.join " "
+    smart_link_to link_text, opts.merge(type: "button")
   end
 
   def dropdown_button name, opts={}

data/mod/bootstrap/set/all/bootstrap/tabs.rb

@@ -61,10 +61,9 @@ format :html do
   end
 
   def tab_button target, text, active=false, link_attr={}
-    link = link_to(
-      fancy_title(text),
-      target,
-      link_attr.merge("role" => "tab", "data-toggle" => "tab"))
+    link = link_to fancy_title(text), link_attr.merge(
+      path: target, role: "tab", "data-toggle" => "tab"
+    )
     li_args = { role: :presentation }
     li_args[:class] = "active" if active
     content_tag :li, link, li_args

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

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 describe Card::Set::All::Bootstrap::Form  do
   describe "input" do
     it "has form-group css class" do

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

@@ -170,6 +170,9 @@ def ensure_bucket_config
   unless config.present?
     raise Card::Error, "couldn't find configuration for bucket #{bucket}"
   end
+  unless config[:credentials]
+    raise Card::Error, "couldn't find credentials for bucket #{bucket}"
+  end
   config
 end
 

data/mod/core/chunk/link.rb

@@ -59,10 +59,10 @@ module Card::Content::Chunk
 
       if @explicit_link
         @explicit_link = render_obj @explicit_link
-        format.web_link @explicit_link, text: @link_text
+        format.link_to_resource @explicit_link, @link_text
       elsif @name
-        format.card_link referee_name, text: @link_text,
-                                       known: referee_card.send_if(:known?)
+        known = referee_card.send_if :known?
+        format.link_to_card referee_name, @link_text, known: known
       end
     end
 

data/mod/core/chunk/uri.rb

@@ -80,8 +80,8 @@ module Card::Content::Chunk
     end
 
     def process_uri_chunk
-      link_opts = { text: process_text }
-      "#{format.web_link(@link_text, link_opts)}#{@trailing_punctuation}"
+      link = format.link_to_resource @link_text, process_text
+      "#{link}#{@trailing_punctuation}"
     end
   end
 

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

@@ -19,17 +19,12 @@ def abort status, msg="action canceled"
   raise Card::Error::Abort.new(status, msg)
 end
 
-def act opts={}
+def act opts={}, &block
   if ActManager.act_card
-    add_to_act opts
-    main_act_block = false
+    add_to_act opts, &block
   else
-    start_new_act opts
-    main_act_block = true
+    start_new_act opts, &block
   end
-  yield
-ensure
-  ActManager.clear if main_act_block
 end
 
 def start_new_act opts
@@ -39,11 +34,16 @@ def start_new_act opts
   if opts && opts[:success]
     Env[:success] = Env::Success.new(cardname, Env.params[:success])
   end
+  run_callbacks :act do
+    yield
+  end
+ensure
+  ActManager.clear
 end
 
 def add_to_act opts
-  # if only_storage_phase is true the card is already part of the act
-  return if ActManager.act_card == self || only_storage_phase
+  # if only_storage_phase is true then the card is already part of the act
+  return yield if ActManager.act_card == self || only_storage_phase
   director.reset_stage
   if opts && opts[:trash]
     @action = :delete
@@ -52,6 +52,7 @@ def add_to_act opts
   end
   director.update_card self
   self.only_storage_phase = true
+  yield
 end
 
 module ClassMethods

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

@@ -277,13 +277,12 @@ module Accounts
   # (without creating separate rules for each account holder) but is not yet.
 
   def permit action, verb=nil
-    if action == :comment then @action_ok = false
-    elsif action == :create  then @superleft ? true : super(action, verb)
-      # restricts account creation to subcard handling on permitted card
-      # (unless explicitly permitted)
-    elsif own_account? then true
-    else
-      super action, verb
+    case action
+    when :comment then @action_ok = false
+    when :create  then @superleft ? true : super(action, verb)
+    # restricts account creation to subcard handling on permitted card
+    # (unless explicitly permitted)
+    else own_account? ? true : super(action, verb)
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 describe "act API" do
   let(:create_card) { Card.create!(name: "main card") }
   let(:create_card_with_subcards) do

data/mod/developer/set/right/debug.rb

@@ -33,7 +33,7 @@ format :html do
   end
 
   def set_patterns_breadcrumb subject
-    links = subject.patterns.reverse.map { |pattern| card_link pattern.to_s }
+    links = subject.patterns.reverse.map { |pattern| link_to_card pattern.to_s }
     breadcrumb(links)
   end
   # rubocop:enable AccessorMethodName

data/mod/email/set/all/follow.rb

@@ -70,7 +70,8 @@ format :html do
       "data-target"    => "#modal-#{card.cardname.safe_key}"
     )
     opts[:class] = "follow-link #{opts[:class]}"
-    link_to text, hash[:path], opts
+    opts[:path] = hash[:path]
+    link_to text, opts
   end
 end
 

data/mod/email/set/right/follow.rb

@@ -43,7 +43,7 @@ format :html do
       ) do
         output [
           _optional_render(button_view, args),
-          card_link(link_target, text: text)
+          link_to_card(link_target, text)
         ]
       end
     end
@@ -54,29 +54,26 @@ format :html do
   end
 
   view :follow_status do |args|
-    delete_options =
-      wrap_with(:ul, class: "delete-list list-group") do
-        card.item_names.map do |option|
-          content_tag :li, class: "list-group-item" do
-            condition = option == "*never" ? "*always" : option
-            subformat(card).render_follow_item condition: condition
-          end
-        end.join "\n"
-      end
-
-    follow_link =
-      card_link args[:card_key],
-                text: "more options",
-                path_opts: {
-                  view: :related,
-                  related: { name: card.name, view: :edit_single_rule }
-                },
-                class: "btn update-follow-link",
-                "data-card_key" => args[:card_key]
+    ["<h4>Get notified about changes</h4>",
+     render(:follow_status_delete_options),
+     follow_status_link(card.name, args[:card_key])].join "\n\n"
+  end
 
-    header = "<h4>Get notified about changes</h4>"
+  def follow_status_link name, key
+    link_to_related key, "more options",
+                    path: { related: { name: name, view: :edit_single_rule } },
+                    class: "btn update-follow-link", "data-card_key" => key
+  end
 
-    [header, delete_options, follow_link].join "\n\n"
+  view :follow_status_delete_options do
+    wrap_with(:ul, class: "delete-list list-group") do
+      card.item_names.map do |option|
+        content_tag :li, class: "list-group-item" do
+          condition = option == "*never" ? "*always" : option
+          subformat(card).render_follow_item condition: condition
+        end
+      end.join "\n"
+    end
   end
 
   view :delete_follow_rule_button do |_args|

data/mod/email/set/type_plus_right/user/follow.rb

@@ -161,7 +161,7 @@ format :html do
         title = "Problems with #{card.name}"
         frame args.merge(panel_class: "panel panel-warning",
                          title: title, hide: "menu") do
-          "Please #{link_to 'sign in', card_url(':signin')}" # " #{to_task}"
+          "Please #{link_to_card :signin, 'sign in'}" # " #{to_task}"
         end
       else
         super(args)