card 1.101.5 → 1.101.6

data/lib/card/query/act_query.rb

@@ -11,11 +11,11 @@ class Card
       end
 
       def action_on card
-        tie :action, { action_on: card }, to: :card_act_id
+        tie :action, { action_on: card }, { to: :card_act_id }
       end
 
       def update_action_on card
-        tie :action, { update_action_on: card }, to: :card_act_id
+        tie :action, { update_action_on: card }, { to: :card_act_id }
       end
 
       def act_by card

data/lib/card/query/action_query.rb

@@ -11,7 +11,7 @@ class Card
       end
 
       def action_by card
-        tie :act, { act_by: card }, from: :card_act_id
+        tie :act, { act_by: card }, { from: :card_act_id }
       end
 
       def update_action_by card

data/lib/card/query/card_query/conjunctions.rb

@@ -15,7 +15,7 @@ class Card
         alias_method :in, :any
 
         def not val
-          tie :card, val, { id: :id }, negate: true
+          tie :card, val, { id: :id }, { negate: true }
         end
 
         def current_conjunction

data/lib/card/query/card_query/reference_attributes.rb

@@ -7,7 +7,7 @@ class Card
           define_method methodname do |val|
             tie :reference,
                 { ref_method => { reftype: reftype, card: val } },
-                to: ref_field
+                { to: ref_field }
           end
         end
 

data/lib/card/query/card_query/relational_attributes.rb

@@ -74,11 +74,11 @@ class Card
         private
 
         def tie_action action, val
-          tie :action, { action => val }, to: :card_id
+          tie :action, { action => val }, { to: :card_id }
         end
 
         def tie_act action, val
-          tie :act, { action => val }, to: :actor_id
+          tie :act, { action => val }, { to: :actor_id }
         end
 
         def junction val, side, field

data/lib/card/set/advanced_api.rb

@@ -30,8 +30,7 @@ class Card
         add_attributes name, "remote_#{name}_url".to_sym,
                        :action_id_of_cached_upload, :empty_ok,
                        :storage_type, :bucket, :mod
-        uploader_class = args[:uploader] || ::CarrierWave::FileCardUploader
-        mount_uploader name, uploader_class
+        mount_uploader name, (args[:uploader] || ::CarrierWave::FileCardUploader)
         Card.define_dirty_methods name
       end
 

data/lib/card/set/event.rb

@@ -70,7 +70,7 @@ class Card
         # @option opts [Symbol] :stage alternate representation for specifying stage
         # @option opts [True/False] :after_subcards run event after running subcard events
         def event event, stage_or_opts={}, opts={}, &final
-          Event.new(event, stage_or_opts, opts, self, &final).register
+          Event.new(event, self).register stage_or_opts, opts, &final
         end
       end
 
@@ -82,15 +82,19 @@ class Card
 
       attr_reader :set_module, :opts
 
-      def initialize event, stage_or_opts, opts, set_module, &final
+      def initialize event, set_module
         @event = event
         @set_module = set_module
+      end
+
+      def register stage_or_opts, opts, &final
         @opts = event_opts stage_or_opts, opts
         @event_block = final
+        validate_conditions
+        define
       end
 
-      def register
-        validate_conditions
+      def define
         Card.define_callbacks @event
         define_event
         set_event_callbacks

data/lib/cardio/mod.rb

@@ -51,7 +51,7 @@ module Cardio
   #   - {Card::Set} provides an overview of how set modules work
   #   - {Card::Set::Format} explains the basics of the format API
   #   - {Card::Set::Format::AbstractFormat} explains the basics of the view definition API
-  #   - {Card::Set::Event:Api} explains the basics of the event API
+  #   - {Card::Set::Event::Api} explains the basics of the event API
   #
   # ## Other Directories
   #

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

@@ -63,72 +63,3 @@ end
 def updater
   Card[updater_id]
 end
-
-format do
-  ONE_LINE_CHARACTER_LIMIT = 60
-
-  # override to customize by set
-  def chunk_list
-    :default
-  end
-
-  view :one_line_content do
-    with_nest_mode :compact do
-      one_line_content
-    end
-  end
-
-  # DEPRECATED
-  view :closed_content, :one_line_content
-
-  view :raw_one_line_content do
-    raw_one_line_content
-  end
-
-  view :label do
-    card.label.to_s
-  end
-
-  view :smart_label, cache: :never, unknown: true do
-    label_with_description render_label, label_description
-  end
-
-  def label_with_description label, description
-    return label unless description
-
-    "#{label} #{popover_link description}"
-  end
-
-  # TODO: move this into a nest once popovers are stub safe
-  def label_description
-    return unless (desc = card.field :description)
-
-    desc.format.render_core
-  end
-
-  def raw_one_line_content
-    cut_with_ellipsis render_raw
-  end
-
-  def one_line_content
-    Card::Content.smart_truncate render_core
-  end
-
-  def cut_with_ellipsis text, limit=one_line_character_limit
-    if text.size <= limit
-      text
-    else
-      "#{text[0..(limit - 3)]}..."
-    end
-  end
-
-  def one_line_character_limit
-    voo.size || ONE_LINE_CHARACTER_LIMIT
-  end
-end
-
-format :html do
-  view :hidden_content_field, unknown: true, cache: :never do
-    hidden_field :content, class: "d0-card-content"
-  end
-end

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

@@ -3,21 +3,18 @@ def to_s
 end
 
 def inspect
-  tags = []
-  tags << "trash"    if trash
-  tags << "new"      if new_card?
-  tags << "frozen"   if frozen?
-  tags << "readonly" if readonly?
-  tags << "virtual"  if @virtual
-  tags << "set_mods_loaded" if @set_mods_loaded
-
   error_messages = errors.any? ? "<E*#{errors.full_messages * ', '}*>" : ""
-
-  "#<Card##{id}[#{debug_type}](#{name})#{error_messages}{#{tags * ','}}"
+  "#<Card##{id}[#{debug_type}](#{name})#{error_messages}{#{inspect_tags * ','}}"
 end
 
 private
 
+def inspect_tags
+  %w[trash new frozen readonly virtual set_mods_loaded].map do |tag|
+    tag if send "#{tag}?"
+  end.compact
+end
+
 def debug_type
   "#{type_code || ''}:#{type_id}"
 end

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

@@ -71,6 +71,10 @@ def include_set_modules
   self
 end
 
+def set_mods_loaded?
+  @set_mods_loaded == true
+end
+
 def uncacheable?
   @uncacheable == true
 end

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

@@ -52,6 +52,10 @@ module ClassMethods
   end
 end
 
+def trash?
+  trash
+end
+
 def delete args={}
   add_to_trash args do |delete_args|
     update delete_args

data/mod/core/set/self/version.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# require "card/version"
-
 def ok_to_read
   true
 end
@@ -9,5 +7,3 @@ end
 def content
   Card::Version.release
 end
-
-# view :core, :raw

data/tmpsets/set/mod001-admin/self/admin.rb

@@ -11,17 +11,18 @@ basket :tasks
 
 def run_task_from_task_basket task
   task = task.to_sym
-  task_data = tasks.find {|h| h[:name].to_sym == task.to_sym}
+  task_data = tasks.find { |h| h[:name].to_sym == task.to_sym }
   if !irreversibles_tasks_allowed? && task_data[:irreversible]
     not_allowed task_data[:stats][:link_text]
-  else
-    task_data[:execute_policy].call if task_data
+  elsif task_data
+    task_data[:execute_policy].call
   end
 end
 
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task])
   raise Card::Error::PermissionDenied, self unless Auth.always_ok?
+
   case task.to_sym
   when :clear_cache          then Card::Cache.reset_all
   when :repair_references    then Card::Reference.repair_all
@@ -102,6 +103,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
         link_text: "clear cache", task: "clear_cache" }
     ]
     return stats unless oldmem
+
     stats << { title: "memory prev", count: oldmem, unit: "M" }
     stats << { title: "memory diff", count: newmem - oldmem, unit: "M" }
     stats
@@ -111,6 +113,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     res = [(args[:title] || "")]
     res << "#{count(args[:count])}#{args[:unit]}"
     return res unless args[:task]
+
     res << link_to_card(:admin, (args[:link_text] || args[:task]),
                         path: { action: :update, task: args[:task] })
     res

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

@@ -32,25 +32,20 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def warning_alert warnings
-    admin_warn = I18n.t(:admin_warn, scope: "mod.admin.set.self.admin_info")
     # 'ADMINISTRATOR WARNING'
     alert :warning, true do
-      "<h5>#{admin_warn}</h5>" + list_tag(warnings)
+      "<h5>#{t :admin_warn}</h5>" + list_tag(warnings)
     end
   end
 
   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,
-           scope: "mod.admin.set.self.admin_info",
-           path: "config/application.rb")
+    t :admin_email_off, path: "config/application.rb"
   end
 
   def warning_list_with_auto_scope warnings
-    # 'ADMINISTRATOR WARNING'
-    admin_warn = tr(:admin_warn)
-    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+    "<h5>#{t :admin_warn}</h5>" + warnings.join("\n")
   end
 end
 end;end;end;end;

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

@@ -2,15 +2,14 @@
 class Card; module Set; class All
 # Set: All cards (Abort)
 #
-module Abort;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/abort.rb"; end
-
 # The Card#abort method is for cleanly exiting an action without continuing
 # to process any further events.
 #
 # Three statuses are supported:
 #
+module Abort;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/abort.rb"; end
 #   failure: adds an error, returns false on save
 #   success: no error, returns true on save
 #   triumph: similar to success, but if called on a subcard
@@ -40,9 +39,10 @@ end
 private
 
 def handle_abort_error e
-  if e.status == :triumph
+  case e.status
+  when :triumph
     @supercard ? raise(e) : true
-  elsif e.status == :success
+  when :success
     abort_success
   end
 end
@@ -58,12 +58,12 @@ end
 
 # this is an override of standard rails behavior that rescues abort
 # makes it so that :success abortions do not rollback
-def with_transaction_returning_status
+def with_transaction_returning_status &block
   status = nil
   self.class.transaction do
     add_to_transaction
     remember_transaction_record_state
-    status = abortable { yield }
+    status = abortable(&block)
     raise ActiveRecord::Rollback unless status
   end
   status

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

@@ -5,14 +5,14 @@ class Card; module Set; class All
 module AssignAttributes;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/assign_attributes.rb"; end
+include Card::Subcards::Args
 
 def assign_attributes args={}
   args = prepare_assignment_args args
 
   assign_with_subcards args do
     assign_with_set_modules args do
-      params = prepare_assignment_params args
-      super params
+      super prepare_assignment_params(args)
     end
   end
 end
@@ -23,20 +23,6 @@ def assign_set_specific_attributes
   end
 end
 
-def extract_subcard_args! args
-  subcards = args.delete("subcards") || args.delete(:subcards) || {}
-  if (subfields = args.delete("subfields") || args.delete(:subfields))
-    subfields.each_pair do |key, value|
-      subcards[name.field(key)] = value
-    end
-  end
-  args.keys.each do |key|
-    subcards[key] = args.delete(key) if key =~ /^\+/
-  end
-  subcards = subcards.to_unsafe_h if subcards.respond_to?(:to_unsafe_h)
-  subcards
-end
-
 protected
 
 module ClassMethods
@@ -60,15 +46,15 @@ end
 
 def prepare_assignment_args args
   return {} unless args
-  args = args.stringify_keys
+
+  args = args.symbolize_keys
   normalize_type_attributes args
   stash_set_specific_attributes args
   args
 end
 
 def assign_with_set_modules args
-  set_changed = args["name"] || args["type_id"]
-  return yield unless set_changed
+  return yield unless args[:name] || args[:type_id]
 
   refresh_set_modules { yield }
 end
@@ -76,9 +62,7 @@ end
 def assign_with_subcards args
   subcard_args = extract_subcard_args! args
   yield
-  # name= must come before process subcards
-  return unless subcard_args.present?
-  subcards.add subcard_args
+  subcards.add subcard_args if subcard_args.present?
 end
 
 def refresh_set_modules
@@ -96,17 +80,17 @@ def stash_set_specific_attributes args
 end
 
 def normalize_type_attributes args
-  new_type_id = extract_type_id! args unless args.delete("type_lookup") == :skip
-  args["type_id"] = new_type_id if new_type_id
+  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={}
   case
-  when (type_id = args.delete("type_id")&.to_i)
+  when (type_id = args.delete(:type_id)&.to_i)
     type_id.zero? ? nil : type_id
-  when (type_code = args.delete("type_code")&.to_sym)
+  when (type_code = args.delete(:type_code)&.to_sym)
     type_id_from_codename type_code
-  when (type_name = args.delete "type")
+  when (type_name = args.delete :type)
     type_id_from_cardname type_name
   end
 end
@@ -116,7 +100,7 @@ def type_id_from_codename type_code
 end
 
 def type_id_from_cardname type_name
-  type_id_or_error(type_name) { Card.fetch_id type_name }
+  type_id_or_error(type_name) { type_name.card_id }
 end
 
 def type_id_or_error val