card 1.101.5 → 1.101.6

data/tmpsets/set/{mod033-card-mod-prosemirror_editor → mod034-card-mod-prosemirror_editor}/all/prosemirror_editor.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module ProsemirrorEditor;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-prosemirror_editor/set/all/prosemirror_editor.rb"; end
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def prosemirror_editor_input
     wrap_with :div, id: unique_id, class: "prosemirror-editor" do

data/tmpsets/set/{mod034-card-mod-recaptcha → mod035-card-mod-recaptcha}/all/recaptcha.rb

@@ -40,9 +40,9 @@ def add_recaptcha_errors error_codes
 end
 
 def recaptcha_success? result
-  result['success'] &&
-    (result['score'].to_f >= Cardio.config.recaptcha_minimum_score) &&
-    (result['action'].to_sym == action.to_sym)
+  result["success"] &&
+    (result["score"].to_f >= Cardio.config.recaptcha_minimum_score) &&
+    (result["action"].to_sym == action.to_sym)
 end
 
 def recaptcha_response
@@ -62,16 +62,16 @@ event :recaptcha, :validate, when: :validate_recaptcha? do
 end
 
 def handle_recaptcha_config_errors
-  if Env.params[:recaptcha_token] == "grecaptcha-undefined"
+  case Env.params[:recaptcha_token]
+  when "grecaptcha-undefined"
     errors.add "recaptcha", "needs correct v3 configuration" # LOCALILZE
-  elsif Env.params[:recaptcha_token] == "recaptcha-token-field-missing"
+  when "recaptcha-token-field-missing"
     raise Card::Error, "recaptcha token field missing" # LOCALILZE
   else
     yield
   end
 end
 
-
 def validate_recaptcha?
   !@supercard && !Env[:recaptcha_used] && recaptcha_on?
 end

data/tmpsets/set/{mod034-card-mod-recaptcha → mod035-card-mod-recaptcha}/self/admin_info.rb

@@ -13,28 +13,23 @@ end
 
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def recaptcha_config_issues_message
-    warning =
+    wrap_with :p do
       if Card::Env.localhost?
         # %(Your captcha is currently working with temporary settings.
         #   This is fine for a local installation, but you will need new
         #   recaptcha keys if you want to make this site public.)
-        I18n.t(:captcha_temp, scope: "mod.admin.set.self.admin_info",
-                              recaptcha_link: add_recaptcha_keys_link)
+        t :recaptcha_captcha_temp, recaptcha_link: add_recaptcha_keys_link
       else
         # %(You are configured to use [[*captcha]], but for that to work
         #   you need new recaptcha keys.)
-        I18n.t(:captcha_keys, scope: "mod.admin.set.self.admin_info",
-                              recaptcha_link: add_recaptcha_keys_link,
-                              captcha_link: link_to_card(:captcha))
+        t :recaptcha_captcha_keys, recaptcha_link: add_recaptcha_keys_link,
+                                   captcha_link: link_to_card(:captcha)
       end
-    <<-HTML
-        <p>#{warning}</p>
-    HTML
+    end
   end
 
   def add_recaptcha_keys_link
-    link_text = I18n.t :recaptcha_keys, scope: "mod.admin.set.self.admin_info"
-    Card[:recaptcha_settings]&.format&.edit_link link_text: link_text
+    Card[:recaptcha_settings]&.format&.edit_link link_text: t(:recaptcha_captcha_keys)
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod011-card-mod-account → mod035-card-mod-recaptcha}/self/captcha.rb

@@ -4,11 +4,11 @@ class Card; module Set; class Self
 #
 module Captcha;
 extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-account/set/self/captcha.rb"; end
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-recaptcha/set/self/captcha.rb"; end
 setting_opts group: :permission,
              position: 5,
              help_text: "Anti-spam setting.  Requires non-signed-in users to complete a "\
                         "[[http://decko.org/captcha|captcha]] before adding or editing "\
                         "cards (where permitted)."
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-account/set/self/captcha.rb ~~
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-recaptcha/set/self/captcha.rb ~~

data/tmpsets/set/{mod034-card-mod-recaptcha → mod035-card-mod-recaptcha}/self/recaptcha_settings.rb

@@ -19,34 +19,21 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   # end
   #
   #       <h5>#{instructions}</h5>
-  #       #{howto_add_new_recaptcha_keys}
+  #       #{howto_add_keys}
   #       #{howto_turn_captcha_off}
   #
   # def howto_add_new_recaptcha_keys
-  #   instructions(
-  #     I18n.t(:howto_add_keys, scope: "mod.admin.set.self.admin_info"),
-  #     [
-  #       I18n.t(:howto_register,
-  #              scope: "mod.admin.set.self.admin_info",
-  #              recaptcha_link: link_to_resource("http://google.com/recaptcha")),
-  #       I18n.t(:howto_add,
-  #              scope: "mod.admin.set.self.admin_info",
-  #              recaptcha_settings: link_to_card(:recaptcha_settings))
-  #     ]
-  #   )
+  #   instructions t(:recaptcha_howto_add_keys),
+  #                [t(:recaptcha_howto_register,
+  #                   recaptcha_link: link_to_resource("http://google.com/recaptcha")),
+  #                 t(:recaptcha_howto_add,
+  #                   recaptcha_settings: link_to_card(:recaptcha_settings))]
   # end
   #
   # def howto_turn_captcha_off
-  #   instructions(
-  #     I18n.t(:howto_turn_off, scope: "mod.admin.set.self.admin_info"),
-  #     [
-  #       I18n.t(:howto_go,
-  #              scope: "mod.admin.set.self.admin_info",
-  #              captcha_card: link_to_card(:captcha)),
-  #       I18n.t(:howto_update,
-  #              scope: "mod.admin.set.self.admin_info")
-  #     ]
-  #   )
+  #   instructions t(:recaptcha_howto_turn_off),
+  #                [t(:recaptcha_howto_go, captcha_card: link_to_card(:captcha)),
+  #                 t(:recaptcha_howto_update)]
   # end
 end
 end;end;end;end;

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/abstract/02_search_params.rb

@@ -34,9 +34,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   end
 
   def extra_paging_path_args
-    return {} unless (vars = query_params)
-
-    { query: vars }
+    (vars = query_params) ? { query: vars } : {}
   end
 end
 

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/abstract/03_filter/form_helper.rb

@@ -14,7 +14,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def select_filter field, default=nil, options=nil
     options ||= filter_options field
-    options.unshift(["--", ""]) unless default
+    options = [["--", ""]] + options unless default
     select_filter_tag field, default, options
   end
 

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/abstract/05_search.rb

@@ -67,6 +67,10 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
     @count_with_params ||= search_with_rescue search_params.merge(return: :count)
   end
 
+  view :filtered_count, cache: :never do
+    count_with_params
+  end
+
   def search_with_rescue query_args
     rescuing_bad_query query_args do
       card.cached_search query_args

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/abstract/05_search/views.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Abstract; module Search;
 module Views;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-search/set/abstract/05_search/views.rb"; end
-
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   view :search_count, cache: :never do
     search_with_params.to_s
@@ -62,6 +61,7 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
 
     remaining_slots = limit - starts_with.size
     return starts_with if remaining_slots.zero?
+
     starts_with + match_search(not_names: starts_with, limit: remaining_slots)
   end
 
@@ -152,12 +152,10 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def search_result_list klass
+  def search_result_list klass, &block
     with_paging do
       wrap_with :div, class: klass do
-        search_with_params.map do |item_card|
-          yield item_card
-        end
+        search_with_params.map(&block)
       end
     end
   end

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/abstract/06_cql_search.rb

@@ -21,6 +21,7 @@ end
 def item_type
   type = cql_hash[:type]
   return if type.is_a?(Array) || type.is_a?(Hash)
+
   type
 end
 
@@ -51,6 +52,7 @@ def search args={}
     # forces explicit limiting
     # can be 0 or less to force no limit
     raise "OH NO.. no limit" unless query.mods[:limit]
+
     query.run
   end
 end

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/self/search.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Self
 module Search;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-search/set/self/search.rb"; end
-
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   view :search_error, cache: :never do
     sr_class = search_with_params.class.to_s
@@ -41,6 +40,7 @@ end
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :title, cache: :never do
     return super() unless (title = keyword_search_title)
+
     voo.title = title
   end
 
@@ -69,12 +69,14 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
                   exact.name.valid? &&
                   !exact.virtual? &&
                   exact.ok?(:create)
+
     [h(exact.name), URI.escape(exact.name)]
   end
 
   def new_item_of_type exact
     return unless (exact.type_id == CardtypeID) &&
                   Card.new(type_id: exact.id).ok?(:create)
+
     [exact.name, "new/#{exact.name.url_key}"]
   end
 

data/tmpsets/set/{mod035-card-mod-search → mod036-card-mod-search}/type/search_type.rb

@@ -30,6 +30,7 @@ end
 module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFormat, self; extend Card::Set::AbstractFormat
   def items_for_export
     return [] if card.content.empty? || unexportable_tag?(card.name.tag_name.key)
+
     card.item_cards
   end
 

data/tmpsets/set/mod037-card-mod-rules/all/related_sets.rb

@@ -0,0 +1,34 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class All
+# Set: All cards (RelatedSets)
+#
+module RelatedSets;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-rules/set/all/related_sets.rb"; end
+def related_sets with_self=false
+  # refers to sets that users may configure from the current card -
+  # NOT to sets to which the current card belongs
+
+  [].tap do |sets|
+    sets << [self_set_name, self_set_label] if with_self
+    sets << [right_set_name, right_set_label] if known? && simple?
+  end
+end
+
+def self_set_name
+  Name[name, :self]
+end
+
+def self_set_label
+  Card::Set::Self.label name
+end
+
+def right_set_name
+  Name[name, :right]
+end
+
+def right_set_label
+  Card::Set::Right.label name
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-rules/set/all/related_sets.rb ~~

data/tmpsets/set/{mod036-card-mod-rules → mod037-card-mod-rules}/rstar/rule_user.rb

@@ -5,13 +5,12 @@ class Card; module Set; class Rstar
 module RuleUser;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-rules/set/rstar/rule_user.rb"; end
-
 def rule_user_name
-  is_preference? ? name.trunk_name.tag : nil
+  preference? ? name.trunk_name.tag : nil
 end
 
 def rule_user
-  is_preference? ? self[-2] : nil
+  preference? ? self[-2] : nil
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-rules/set/rstar/rule_user.rb ~~

data/tmpsets/set/{mod036-card-mod-rules → mod037-card-mod-rules}/rule/editor.rb

@@ -8,7 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-rules/set/rule/ed
 def left_type_for_nest_editor_set_selection
   return super unless is_template?
 
-  case Card.fetch_id rule_set_pattern_name
+  case rule_set_pattern_name.card_id
   when TypeID
     rule_set.anchor_name
   when SelfID

data/tmpsets/set/{mod036-card-mod-rules → mod037-card-mod-rules}/rule/rule_form.rb

@@ -48,7 +48,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def edit_rule_form success_view, &block
     @rule_context ||= card
-    @edit_rule_success = edit_rule_success(success_view)
+    @edit_rule_success = edit_rule_success success_view
     action_args = { action: :update, no_mark: true }
     card_form action_args, rule_form_args, &block
   end
@@ -58,8 +58,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def edit_rule_success view="overlay_rule"
-    { id: @rule_context.name.url_key,
-      view: view }
+    { mark: @rule_context.name.url_key, view: view }
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod036-card-mod-rules → mod037-card-mod-rules}/rule/rule_form/buttons.rb

@@ -26,8 +26,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
     delete_opts = {
       confirm: delete_confirm(args[:fallback_set]),
-      # success: @edit_rule_success,
-      no_success: true,
+      success: {},
       "data-slotter-mode": "silent-success",
       class: "_close-#{form_type}-on-success"
     }