card 1.99.2 → 1.100.0

data/mod/virtual/lib/card/virtual.rb

@@ -65,7 +65,7 @@ class Card
 
       def left_id card
         if card.junction?
-          card.left_id || ((l = card.left) && l.id)
+          card.left_id&.positive? ? card.left_id : card.left&.id
         else
           card.id
         end
@@ -73,9 +73,9 @@ class Card
 
       def right_id card
         if card.junction?
-          card.right_id || ((r = card.right) && r.id)
+          card.right_id&.positive? ? card.right_id : card.right&.id
         else
-          -1
+          -2
         end
       end
 

data/tmpsets/set/mod001-utility/abstract/bs_badge.rb

@@ -16,11 +16,12 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
 
   def badge_haml_opts count, label, opts
     process_badge_opts count, opts
-    { count: count, label: label, klass: opts[:klass], color: opts[:color] }
+    { count: count, label: label, klass: opts[:klass], color: opts[:color],
+      title: opts[:title] }
   end
 
   def process_badge_opts count, opts
-    if count.zero? && !opts[:zero_ok]
+    if count.try(:zero?) && !opts[:zero_ok]
       opts[:klass] = [opts[:klass], "disabled-o"].compact.join " "
     end
     opts[:color] ||= "secondary"

data/tmpsets/set/mod001-utility/abstract/filterable.rb

@@ -6,19 +6,16 @@ module Filterable;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable.rb"; end
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  def filterable key, value, opts={}
-    add_class opts, "filterable"
-    opts[:data] ||= {}
-    opts[:data].merge! filter_data(key, value)
-    wrap_with :div, yield, opts
+  def filterable filter_hash={}, html_opts={}
+    add_class html_opts, "_filterable _noFilterUrlUpdates"
+    html_opts[:data] ||= {}
+    html_opts[:data][:filter] = filter_hash
+    wrap_with :div, yield, html_opts
   end
 
-  def filter_data key, value
-    { filter: { key: key, value: value } }
-  end
-
-  def filtering
-    wrap_with :div, yield, class: "filtering"
+  def filtering selector=nil
+    selector ||= "._filter-widget:visible"
+    wrap_with :div, yield, class: "_filtering", "data-filter-selector": selector
   end
 end
 end;end;end;end;

data/tmpsets/set/mod001-utility/abstract/filterable_bar.rb

@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Abstract
+# Set: Abstract (FilterableBar)
+#
+module FilterableBar;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable_bar.rb"; end
+include_set Abstract::Filterable
+
+before :bar do
+  class_up "bar-body", "_filterable"
+  super()
+end
+
+before :expanded_bar do
+  class_up "bar", "_filterable"
+  super()
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/utility/set/abstract/filterable_bar.rb ~~

data/tmpsets/set/mod002-admin/self/admin_info.rb

@@ -5,40 +5,41 @@ class Card; module Set; class Self
 module AdminInfo;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/admin/set/self/admin_info.rb"; end
+basket :warnings
+
+# For each warning in the basket (eg :my_warning), the core view
+# will run a test by appending a question mark (eg #my_warning?).
+# If it fails it will generate a message by appending message
+# (eg #my_warning_message).
+
+add_to_basket :warnings, :no_email_delivery
+
+def no_email_delivery?
+  Card.config.action_mailer.perform_deliveries == false
+end
+
 def clean_html?
   false
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :core do
-    warnings = []
-    if Card.config.action_mailer.perform_deliveries == false
-      warnings << email_warning
-    end
-    if Card.config.recaptcha_public_key ==
-       Card::Auth::Permissions::RECAPTCHA_DEFAULTS[:recaptcha_public_key] &&
-       card.rule(:captcha) == "1"
-      warnings << recaptcha_warning
-    end
-    return "" if warnings.empty?
-    alert :warning, true do
-      warning_list warnings
+    warnings = card.warnings.map do |warning|
+      card.send("#{warning}?") ? send("#{warning}_message") : nil
     end
+    warnings.compact!
+    warnings.empty? ? "" : warning_alert(warnings)
   end
 
-  def warning_list warnings
-    # 'ADMINISTRATOR WARNING'
+  def warning_alert warnings
     admin_warn = I18n.t(:admin_warn, scope: "mod.admin.set.self.admin_info")
-    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
-  end
-
-  def warning_list_with_auto_scope warnings
     # 'ADMINISTRATOR WARNING'
-    admin_warn = tr(:admin_warn)
-    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+    alert :warning, true do
+      "<h5>#{admin_warn}</h5>" + list_tag(warnings)
+    end
   end
 
-  def email_warning
+  def no_email_delivery_message
     # "Email delivery is turned off."
     # "Change settings in config/application.rb to send sign up notifications."
     I18n.t(:email_off,
@@ -46,62 +47,10 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
            path: "config/application.rb")
   end
 
-  def recaptcha_warning
-    warning =
-      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")
-      else
-        # %(You are configured to use [[*captcha]], but for that to work
-        #   you need new recaptcha keys.)
-        process_content(I18n.t(:captcha_keys,
-                               scope: "mod.admin.set.self.admin_info"))
-      end
-    # 'Instructions'
-    instructions = I18n.t(:instructions,
-                          scope: "mod.admin.set.self.admin_info")
-    <<-HTML
-      <p>
-        #{warning}
-      </p>
-      <h5>#{instructions}</h5>
-      #{howto_add_new_recaptcha_keys}
-      #{howto_turn_captcha_off}
-    HTML
-  end
-
-  def instructions title, steps
-    steps = list_tag steps, ordered: true
-    "#{title}#{steps}"
-  end
-
-  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))
-      ]
-    )
-  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")
-      ]
-    )
+  def warning_list_with_auto_scope warnings
+    # 'ADMINISTRATOR WARNING'
+    admin_warn = tr(:admin_warn)
+    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
   end
 end
 end;end;end;end;

data/tmpsets/set/mod002-admin/self/debugger.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Self
+# Set: The card "Debugger"
+#
+module Debugger;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/admin/set/self/debugger.rb"; end
+def raw_help_text
+  "show more useful error pages"
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/admin/set/self/debugger.rb ~~

data/tmpsets/set/mod002-admin/self/trash.rb

@@ -32,7 +32,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     return unless (res_id = Env.params[:restore]) &&
                   (res_card = Card[res_id.to_i])
     alert :success, true do
-      wrap_with(:h5, "restored") + subformat(res_card).render_closed
+      wrap_with(:h5, "restored") + subformat(res_card).render_bar
     end
   end
 

data/tmpsets/set/mod002-admin/self/version.rb

@@ -3,11 +3,11 @@ class Card; module Set; class Self
 # Set: The card "Version"
 #
 # -*- encoding : utf-8 -*-
+
 module Version;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/admin/set/self/version.rb"; end
-
-require_dependency "card/version"
+# require "card/version"
 
 def ok_to_read
   true

data/tmpsets/set/mod003-core/abstract/code_file.rb

@@ -62,7 +62,7 @@ def content
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  view :editor do
+  view :input do
     "Content is stored in file and can't be edited."
   end
 

data/tmpsets/set/mod003-core/abstract/haml_file.rb

@@ -17,6 +17,10 @@ def content
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  view :input do
+    "Content is managed by code and cannot be edited"
+  end
+
   def haml_locals
     {}
   end

data/tmpsets/set/mod003-core/all/abort.rb

@@ -62,6 +62,7 @@ def with_transaction_returning_status
   status = nil
   self.class.transaction do
     add_to_transaction
+    remember_transaction_record_state
     status = abortable { yield }
     raise ActiveRecord::Rollback unless status
   end

data/tmpsets/set/mod003-core/all/actify.rb

@@ -7,7 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/actify.rb"; end
 def act &block
   @action ||= identify_action
-  if ActManager.act_card
+  if act_card
     add_to_act &block
   else
     start_new_act &block
@@ -23,13 +23,27 @@ end
 
 def add_to_act
   # 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
+  return yield if act_card? || only_storage_phase
   director.reset_stage
   director.update_card self
   self.only_storage_phase = true
   yield
 end
 
+def act_card
+  Card::ActManager.act_card
+end
+
+def act_card?
+  self == act_card
+end
+
+def clear_action_specific_attributes
+  self.class.action_specific_attributes.each do |attr|
+    instance_variable_set "@#{attr}", nil
+  end
+end
+
 module ClassMethods
   def create! opts
     card = Card.new opts

data/tmpsets/set/mod003-core/all/assign_attributes.rb

@@ -40,9 +40,9 @@ end
 protected
 
 module ClassMethods
-  def assign_or_initialize_by name, attributes, fetch_opts={}
+  def assign_or_newish name, attributes, fetch_opts={}
     if (known_card = Card.fetch(name, fetch_opts))
-      known_card.refresh.assign_attributes attributes
+      known_card.refresh.newish attributes
       known_card
     else
       Card.new attributes.merge(name: name)
@@ -54,9 +54,7 @@ def prepare_assignment_params args
   args = args.to_unsafe_h if args.respond_to?(:to_unsafe_h)
   params = ActionController::Parameters.new(args)
   params.permit!
-  if params[:db_content].is_a? Array
-    params[:db_content] = params[:db_content].join("\n")
-  end
+  params[:db_content] = standardize_content(params[:db_content]) if params[:db_content]
   params
 end
 
@@ -84,10 +82,10 @@ def assign_with_subcards args
 end
 
 def refresh_set_modules
-  reload_set_modules = @set_mods_loaded
+  reinclude_set_modules = @set_mods_loaded
   yield
   reset_patterns
-  include_set_modules if reload_set_modules
+  include_set_modules if reinclude_set_modules
 end
 
 def stash_set_specific_attributes args
@@ -98,29 +96,35 @@ def stash_set_specific_attributes args
 end
 
 def normalize_type_attributes args
-  new_type_id = extract_type_id! args unless args.delete("skip_type_lookup")
+  new_type_id = extract_type_id! args unless args.delete("type_lookup") == :skip
   args["type_id"] = new_type_id if new_type_id
 end
 
 def extract_type_id! args={}
-  type_id =
-    case
-    when args["type_id"]
-      id = args.delete("type_id").to_i
-      # type_id can come in as 0,'' or nil
-      id.zero? ? nil : id
-    when args["type_code"]
-      Card.fetch_id args.delete("type_code").to_sym
-    when args["type"]
-      Card.fetch_id args.delete("type")
-    else
-      return nil
-    end
-
-  unless type_id
-    errors.add :type, "#{args[:type] || args[:type_code]} is not a known type."
+  case
+  when (type_id = args.delete("type_id")&.to_i)
+    type_id.zero? ? nil : type_id
+  when (type_code = args.delete("type_code")&.to_sym)
+    type_id_from_codename type_code
+  when (type_name = args.delete "type")
+    type_id_from_cardname type_name
   end
-  type_id
+end
+
+def type_id_from_codename type_code
+  type_id_or_error(type_code) { Card::Codename.id type_code }
+end
+
+def type_id_from_cardname type_name
+  type_id_or_error(type_name) { Card.fetch_id type_name }
+end
+
+def type_id_or_error val
+  type_id = yield
+  return type_id if type_id
+
+  errors.add :type, "#{val} is not a known type."
+  nil
 end
 
 # 'set' refers to the noun not the verb

data/tmpsets/set/mod003-core/all/cache.rb

@@ -12,8 +12,10 @@ module ClassMethods
   end
 
   def retrieve_from_cache_by_id id, local_only=false
-    name = retrieve_from_cache "~#{id}", local_only
-    retrieve_from_cache name, local_only if name
+    key = Card::Lexicon.name(id)&.key
+    return unless key.present?
+
+    retrieve_from_cache key, local_only if key
   end
 
   def retrieve_from_cache_by_key key, local_only=false
@@ -40,15 +42,6 @@ module ClassMethods
     return unless (card = Card.cache.read key)
     card.expire
   end
-
-  def new_for_cache card, name, opts
-    return if name.is_a? Integer
-    return if name.blank? && !opts[:new]
-    return if card && (card.type_known? || skip_type_lookup?(opts))
-    new name: name,
-        skip_modules: true,
-        skip_type_lookup: skip_type_lookup?(opts)
-  end
 end
 
 def expire_pieces
@@ -68,29 +61,28 @@ def cache_class_from_type cache_type
   cache_type ? Card.cache.send(cache_type) : Card.cache
 end
 
-def register_view_cache_key cache_key
-  view_cache_keys cache_key
-  hard_write_view_cache_keys
+def view_cache_clean?
+  !db_content_changed?
 end
 
-def view_cache_keys new_key=nil
-  @view_cache_keys ||= []
-  @view_cache_keys << new_key if new_key
-  append_missing_view_cache_keys
-  @view_cache_keys.uniq!
-  @view_cache_keys
+def view_cache_keys
+  @view_cache_keys ||= hard_read_view_cache_keys || []
 end
 
-def append_missing_view_cache_keys
-  return unless Card.cache.hard
-  @view_cache_keys +=
-      (Card.cache.hard.read_attribute(key, :view_cache_keys) || [])
+def ensure_view_cache_key cache_key
+  return if view_cache_keys.include? cache_key
+
+  @view_cache_keys << cache_key
+  hard_write_view_cache_keys
+end
+
+def hard_read_view_cache_keys
+  Card.cache.hard&.read_attribute key, :view_cache_keys
 end
 
 def hard_write_view_cache_keys
   # puts "WRITE VIEW CACHE KEYS (#{name}): #{view_cache_keys}"
-  return unless Card.cache.hard
-  Card.cache.hard.write_attribute key, :view_cache_keys, view_cache_keys
+  Card.cache.hard&.write_attribute key, :view_cache_keys, view_cache_keys
 end
 
 def expire_views
@@ -99,11 +91,12 @@ def expire_views
   Array.wrap(view_cache_keys).each do |view_cache_key|
     Card::View.cache.delete view_cache_key
   end
-  @view_cache_keys = nil
+  @view_cache_keys = []
+  hard_write_view_cache_keys
 end
 
 def expire_names cache
-  [name, name_before_act].each do |name_version|
+  [name, name_before_act].uniq.each do |name_version|
     expire_name name_version, cache
   end
 end