card 1.101.5 → 1.101.6

data/tmpsets/set/mod002-core/type/cardtype.rb

@@ -0,0 +1,37 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Type
+# Set: All "Cardtype" cards
+#
+module Cardtype;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/type/cardtype.rb"; end
+def cards_of_type_exist?
+  !new_card? && Card.where(trash: false, type_id: id).exists?
+end
+
+def create_ok?
+  Card.new(type_id: id).ok? :create
+end
+
+def was_cardtype?
+  type_id_before_act == Card::CardtypeID
+end
+
+event :check_for_cards_of_type, after: :validate_delete do
+  errors.add :cardtype, t(:core_cards_exist, cardname: name) if cards_of_type_exist?
+end
+
+event :check_for_cards_of_type_when_type_changed,
+      :validate, changing: :type, when: :was_cardtype? do
+  if cards_of_type_exist?
+    errors.add :cardtype, t(:core_error_cant_alter, name: name_before_act)
+  end
+end
+
+event :validate_cardtype_name, :validate, on: :save, changed: :name do
+  if %r{[<>/]}.match?(name)
+    errors.add :name, t(:core_error_invalid_character_in_cardtype, banned: "<, >, /")
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/type/cardtype.rb ~~

data/tmpsets/set/{mod005-card-mod-email → mod004-card-mod-email}/abstract/email_field.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Abstract
 module EmailField;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-email/set/abstract/email_field.rb"; end
-
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   # turn off autodetection of uri's
   def chunk_list
@@ -34,7 +33,7 @@ module EmailTextFormat; module_parent.send :register_set_format, Card::Format::E
   end
 
   def email_address? string
-    string =~ /.+\@.+\..+/
+    string =~ /.+@.+\..+/
   end
 
   def email_address_from_card name, context

data/tmpsets/set/{mod005-card-mod-email → mod004-card-mod-email}/abstract/test_context.rb

@@ -8,6 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-email/set/abstrac
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :core do
     return super() if voo.hide? :test_context
+
     card.with_context test_context_card do
       super()
     end

data/tmpsets/set/{mod005-card-mod-email → mod004-card-mod-email}/all/email_text.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module EmailText;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-email/set/all/email_text.rb"; end
-
 module EmailTextFormat; module_parent.send :register_set_format, Card::Format::EmailTextFormat, self; extend Card::Set::AbstractFormat
   view :unknown do
     ""

data/tmpsets/set/{mod005-card-mod-email → mod004-card-mod-email}/right/html_message.rb

@@ -15,6 +15,7 @@ module EmailHtmlFormat; module_parent.send :register_set_format, Card::Format::E
   def email_content context
     content = contextual_content context
     return unless content.present?
+
     Card::Mailer.layout content
   end
 end

data/tmpsets/set/{mod005-card-mod-email → mod004-card-mod-email}/type/email_template.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Type
 module EmailTemplate;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-email/set/type/email_template.rb"; end
-
 def clean_html?
   false
 end
@@ -13,8 +12,8 @@ end
 def deliver context=nil, fields={}, opts={}
   mail = format.mail context, fields, opts
   mail.deliver
-rescue Net::SMTPError => exception
-  errors.add :exception, exception.message
+rescue Net::SMTPError => e
+  errors.add :exception, e.message
 end
 
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
@@ -79,6 +78,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def add_attachments mail, list
     return unless list.present?
+
     each_valid_attachment list do |file, index|
       mail.add_file filename: attachment_name(file, index),
                     content: File.read(file.path)
@@ -88,6 +88,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   def each_valid_attachment list
     list.each_with_index do |cardname, index|
       next unless (file = Card[cardname]&.try(:attachment))
+
       yield file, index
     end
   end

data/tmpsets/set/{mod005-card-mod-email → mod004-card-mod-email}/type/email_template/email_config.rb

@@ -29,6 +29,7 @@ end
 
 def email_field_from_card field, auth, format_opts
   return unless (field_card = fetch(field))
+
   auth ||= field_card.updater
   special_email_field_method(field, field_card, auth, format_opts) ||
     standard_email_field(field, field_card, auth, format_opts)
@@ -37,6 +38,7 @@ end
 def special_email_field_method field, field_card, auth, format_opts
   method = "email_#{field}_field"
   return unless respond_to? method
+
   send method, field_card, auth, format_opts
 end
 
@@ -80,7 +82,7 @@ def email_from_field_value conf_name, conf_email, actual_email
 end
 
 def configured_from_name_and_email raw_string
-  if raw_string =~ /(.*)\<(.*)>/
+  if raw_string =~ /(.*)<(.*)>/
     [Regexp.last_match(1).strip, Regexp.last_match(2)]
   else
     [nil, raw_string]

data/tmpsets/set/{mod006-card-mod-collection → mod005-card-mod-collection}/abstract/items.rb

@@ -32,6 +32,7 @@ end
 
 def first_card args={}
   return unless (name = first_name)
+
   fetch_item_card name, args
 end
 
@@ -46,7 +47,7 @@ end
 # @return [Array] list of integers (card ids of items)
 # @param args [Hash] see #item_names
 def item_ids args={}
-  item_names(args).map { |name| Card.fetch_id name }.compact
+  item_names(args).map(&:card_id).compact
 end
 
 # @return [Array] list of Card objects
@@ -57,6 +58,7 @@ end
 def item_cards args={}
   return item_cards_search(args) if args[:complete]
   return known_item_cards(args) if args[:known_only]
+
   all_item_cards args
 end
 
@@ -160,6 +162,7 @@ def item_type
   opt = options_rule_card
   # FIXME: need better recursion prevention
   return if !opt || opt == self
+
   opt.item_type
 end
 
@@ -196,6 +199,7 @@ end
 def clean_item_name item, context
   item = item.to_name
   return item if context == :raw
+
   context ||= context_card.name
   item.absolute_name context
 rescue Card::Error::NotFound

data/tmpsets/set/{mod006-card-mod-collection → mod005-card-mod-collection}/abstract/paging.rb

@@ -26,6 +26,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def total_pages
     return 1 if limit.zero?
+
     ((count_with_params - 1) / limit).to_i
   end
 

data/tmpsets/set/{mod006-card-mod-collection → mod005-card-mod-collection}/abstract/paging/paging_links.rb

@@ -69,6 +69,7 @@ class PagingLinks
 
   def direct_page_link page
     return unless page >= 0 && page <= @total
+
     paging_item page + 1, page
   end
 

data/tmpsets/set/{mod006-card-mod-collection → mod005-card-mod-collection}/abstract/paging/paging_views.rb

@@ -16,6 +16,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   view :paging, cache: :never do
     return "" unless paging_needed?
+
     <<-HTML
       <nav>
         <ul class="pagination paging">

data/tmpsets/set/{mod006-card-mod-collection → mod005-card-mod-collection}/all/extended.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Extended;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-collection/set/all/extended.rb"; end
-
 def extended_item_cards context=nil
   items = item_cards limit: "", context: (context || self).name
   list = []
@@ -27,6 +26,7 @@ private
 def extend_item_list items, list, book
   item = items.shift
   return if already_extended? item, book
+
   if item.collection?
     # keep items in order
     items.unshift(*item.item_cards)
@@ -37,6 +37,7 @@ end
 
 def already_extended? item, book
   return true if book.include? item
+
   book << item
   false
 end

data/tmpsets/set/{mod006-card-mod-collection → mod005-card-mod-collection}/all/item.rb

@@ -9,7 +9,8 @@ def item_names _args={}
   format._render_raw.split(/[,\n]/)
 end
 
-def item_cards _args={} # FIXME: this is inconsistent with item_names
+# FIXME: this is inconsistent with item_names
+def item_cards _args={}
   [self]
 end
 
@@ -42,12 +43,14 @@ end
 
 def add_item item
   return if include_item? item
+
   items_to_content(items_strings << item)
 end
 
 def drop_item item
   item = Card::Name[item]
   return unless include_item? item
+
   items_to_content(item_names.reject { |i| i == item })
 end
 
@@ -60,6 +63,7 @@ end
 
 def replace_item old, new
   return unless include_item? old
+
   drop_item old
   add_item new
 end
@@ -96,6 +100,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def voo_items_view
     return unless voo && (items = voo.items)
+
     items[:view]
   end
 
@@ -113,6 +118,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def determine_item_view_options_type options
     return if options[:type]
+
     type_from_rule = card.item_type
     options[:type] = type_from_rule if type_from_rule
   end

data/tmpsets/set/{mod007-card-mod-content → mod006-card-mod-content}/abstract/code_file.rb

@@ -6,7 +6,6 @@ module CodeFile;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-content/set/abstract/code_file.rb"; end
 class << self
-
   def included host_class
     track_mod_name host_class, caller
   end

data/tmpsets/set/{mod007-card-mod-content → mod006-card-mod-content}/abstract/haml_file.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Abstract
 module HamlFile;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-content/set/abstract/haml_file.rb"; end
-
 def self.included host_class
   host_class.mattr_accessor :template_path
   host_class.extend Card::Set::Format::HamlPaths

data/tmpsets/set/{mod007-card-mod-content → mod006-card-mod-content}/abstract/lock.rb

@@ -8,6 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-content/set/abstr
 def lock
   was_already_locked = locked?
   return if was_already_locked
+
   Auth.as_bot do
     lock!
     yield

data/tmpsets/set/{mod007-card-mod-content → mod006-card-mod-content}/all/chunk.rb

@@ -5,26 +5,24 @@ class Card; module Set; class All
 module Chunk;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-content/set/all/chunk.rb"; end
-
-def chunks content, type, named=false
+def chunks content, type=nil, named=false
   content ||= self.content
-  type ||= Card::Content::Chunk
   all_chunks = Card::Content.new(content, self).find_chunks type
   named ? all_chunks.select(&:referee_name) : all_chunks
 end
 
 def reference_chunks content=nil, named=true
-  chunks content, Card::Content::Chunk::Reference, named
+  chunks content, :Reference, named
 end
 
 # named=true rejects commented nests
 def nest_chunks content=nil, named=true
-  chunks content, Card::Content::Chunk::Nest, named
+  chunks content, :Nest, named
 end
 
 # named=true rejects external links (since the don't refer to a card name)
 def link_chunks content=nil, named=false
-  chunks content, Card::Content::Chunk::Link, named
+  chunks content, :Link, named
 end
 
 def each_item_name_with_options content=nil
@@ -83,6 +81,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def each_nested_chunk content: nil, fields: false, uniq: true, virtual: true, &block
     return unless block_given?
+
     chunks = prepare_nested_chunks content, fields, uniq
     process_nested_chunks chunks, virtual, &block
   end
@@ -124,8 +123,8 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
     end
   end
 
-  def process_virtual_chunk chunk
-    subformat(chunk.referee_card).each_nested_field_chunk { |sub_chunk| yield sub_chunk }
+  def process_virtual_chunk chunk, &block
+    subformat(chunk.referee_card).each_nested_field_chunk(&block)
   end
 
   def explicit_edit_fields_config
@@ -144,6 +143,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   def normalized_edit_field_mark cardish, options
     return cardish if cardish.is_a?(Card) ||
                       (options.is_a?(Hash) && options.delete(:absolute))
+
     card.name.field cardish
   end
 end

data/tmpsets/set/{mod007-card-mod-content → mod006-card-mod-content}/all/templating.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Templating;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-content/set/all/templating.rb"; end
-
 def is_template?
   return @is_template unless @is_template.nil?
 
@@ -53,6 +52,7 @@ end
 
 def assign_type_to? structure
   return if type_id == structure.type_id
+
   structure.assigns_type?
 end
 

data/tmpsets/set/{mod007-card-mod-content → mod006-card-mod-content}/right/structure.rb

@@ -7,6 +7,10 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-content/set/right/structure.rb"; end
 include_set Abstract::TemplatedNests
 
+def item_names args={}
+  item_strings(args).compact.map(&:to_name)
+end
+
 module RssFormat; module_parent.send :register_set_format, Card::Format::RssFormat, self; extend Card::Set::AbstractFormat
   def raw_feed_items
     [card]
@@ -58,7 +62,7 @@ def structuree_names
 end
 
 def update_structurees args
-  # note that this is not smart about overriding templating rules
+  # NOTE: that this is not smart about overriding templating rules
   # for example, if someone were to change the type of a
   # +*right+*structure rule that was overridden
   # by a +*type plus right+*structure rule, the override would not be respected.

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/active_card.rb

@@ -2,11 +2,10 @@
 class Card; module Set; class All
 # Set: All cards (ActiveCard)
 #
+# FIXME: -this needs a better home!
 module ActiveCard;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/active_card.rb"; end
-
-# FIXME: -this needs a better home!
 def format opts={}
   opts = { format: opts.to_sym } if [Symbol, String].member? opts.class
   Card::Format.new self, opts