card 1.17.4 → 1.18.0

data/mod/05_standard/set/type/listed_by.rb

@@ -1,25 +1,23 @@
-event :validate_listed_by_name, before: :validate, on: :save, changed: :name do
+event :validate_listed_by_name, :validate, on: :save, changed: :name do
   if !junction? || !right || right.type_id != CardtypeID
     errors.add :name, 'must have a cardtype name as right part'
   end
 end
 
-event :validate_listed_by_content,
-      before: :validate, on: :save,
-      changed: :content do
+event :validate_listed_by_content, :validate,
+      on: :save, changed: :content do
   item_cards(content: content).each do |item_card|
-    if item_card.type_id != right.id
-      errors.add(
-        :content,
-        "#{item_card.name} has wrong cardtype; " \
-        "only cards of type #{cardname.right} are allowed"
-      )
-    end
+    next unless item_card.type_id != right.id
+    errors.add(
+      :content,
+      "#{item_card.name} has wrong cardtype; " \
+      "only cards of type #{cardname.right} are allowed"
+    )
   end
 end
 
-event :update_content_in_list_cards,
-      before: :approve_subcards, on: :save, changed: :content do
+event :update_content_in_list_cards, :prepare_to_validate,
+      on: :save, changed: :content do
   if content.present?
     new_items = item_keys(content: content)
     old_items = item_keys

data/mod/05_standard/set/type/number.rb

@@ -1,19 +1,18 @@
 
-view :editor do |args|
+view :editor do |_args|
   text_field :content, class: 'card-content'
 end
 
-event :validate_number, after: :approve do
-  errors.add :content, "'#{content}' is not numeric" unless valid_number?( content )
+event :validate_number, :validate do
+  errors.add :content, "'#{content}' is not numeric" unless valid_number?(content)
 end
 
-def valid_number?( string )
+def valid_number? string
   valid = true
   begin
-    Kernel.Float( string )
+    Kernel.Float(string)
   rescue ArgumentError, TypeError
     valid = false
   end
   valid
 end
-

data/mod/05_standard/set/type/phrase.rb

@@ -1,3 +1,3 @@
-view :editor do |args|
+view :editor do |_args|
   text_field :content, class: 'card-content'
 end

data/mod/05_standard/set/type/search_type.rb

@@ -67,7 +67,7 @@ format do
 
   view :search_error do |_args|
     sr_class = search_results.class.to_s
-    %{#{sr_class} :: #{search_results.message} :: #{card.raw_content}}
+    %(#{sr_class} :: #{search_results.message} :: #{card.raw_content})
   end
 
   view :card_list do |_args|
@@ -85,7 +85,7 @@ format do
       begin
         v = {}
         v[:query] = card.query(search_params)
-        v[:item] = set_inclusion_opts args.merge(query_view: v[:query][:view])
+        v[:item] = set_nest_opts args.merge(query_view: v[:query][:view])
         v
       rescue JSON::ParserError => e
         { error: e }
@@ -124,17 +124,18 @@ format do
     end
   end
 
-  def set_inclusion_opts args
-    @inclusion_defaults = nil
-    @inclusion_opts ||= {}
-    @inclusion_opts[:view] = args[:item] || inclusion_opts[:view] ||
-                             args[:query_view] || default_item_view
-    # explicit > inclusion syntax > WQL > inclusion defaults
+  def set_nest_opts args
+    @nest_defaults = nil
+    @nest_opts ||= {}
+    @nest_opts[:view] = args[:item] || nest_opts[:view] ||
+                        args[:query_view] || default_item_view
+    # explicit > nest syntax > WQL > nest defaults
   end
 
   def page_link text, page, _current=false, options={}
     @paging_path_args[:offset] = page * @paging_limit
-    options.merge!(class: 'card-paging-link slotter', remote: true)
+    options[:class] = 'card-paging-link slotter'
+    options[:remote] = true
     link_to raw(text), path(@paging_path_args), options
   end
 
@@ -205,7 +206,7 @@ format :rss do
 
   def raw_feed_items _args
     @raw_feed_items ||= begin
-      search_params.merge!(default_limit: 25)
+      search_params[:default_limit] = 25
       search_results
     end
   end
@@ -220,21 +221,21 @@ format :html do
     else
       results =
         search_results.map do |c|
-          item_view = inclusion_defaults(c)[:view]
-          %{
-            <div class="search-result-item item-#{ item_view }">
+          item_view = nest_defaults(c)[:view]
+          %(
+            <div class="search-result-item item-#{item_view}">
               #{nest(c, size: args[:size], view: item_view)}
             </div>
-          }
+          )
         end.join "\n"
 
-      %{
-        #{ paging }
+      %(
+        #{paging}
         <div class="search-result-list">
-          #{ results }
+          #{results}
         </div>
-        #{ paging if search_results.length > 10 }
-      }
+        #{paging if search_results.length > 10}
+      )
     end
   end
 
@@ -254,12 +255,13 @@ format :html do
   view :editor, mod: Html::HtmlFormat
 
   view :no_search_results do |_args|
-    %{<div class="search-no-results"></div>}
+    %(<div class="search-no-results"></div>)
   end
 
   view :paging do |_args|
     s = card.query search_params
-    offset, limit = s[:offset].to_i, s[:limit].to_i
+    offset = s[:offset].to_i
+    limit = s[:limit].to_i
     return '' if limit < 1
     # avoid query if we know there aren't enough results to warrant paging
     return '' if offset == 0 && limit > offset + search_results.length
@@ -267,7 +269,7 @@ format :html do
     # should only happen if limit exactly equals the total
     return '' if limit >= total
 
-    @paging_path_args = { limit: limit, item: inclusion_defaults(card)[:view] }
+    @paging_path_args = { limit: limit, item: nest_defaults(card)[:view] }
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
@@ -301,7 +303,7 @@ format :html do
     next_page = current_page < total_pages ? current_page + 1 : false
     out << next_page_link(next_page)
 
-    out << %{</ul></nav>}
+    out << %(</ul></nav>)
     out.join
   end
 

data/mod/05_standard/set/type/session.rb

@@ -8,12 +8,12 @@ def followable?
   false
 end
 
-event :store_in_session, before: :approve, on: :save, changed: :content do
+event :store_in_session, :prepare_to_validate, on: :save, changed: :content do
   Env.session[key] = db_content
   self.db_content = ''
 end
 
-event :delete_in_session, after: :approve, on: :delete do
+event :delete_in_session, :validate, on: :delete do
   Env.session[key] = nil
   abort :success
 end
@@ -33,4 +33,3 @@ format :html do
     args[:item] = :name
   end
 end
-

data/mod/05_standard/set/type/set.rb

@@ -58,12 +58,12 @@ format :html do
   view :field_related_rules do |args|
     with_label_and_navbars args.merge(selected_view: :field_related_rules) do
       field_settings = [:default, :help, :structure]
-      field_settings +=  [:input, :options, :options_label] if card.type_id == PointerID
+      field_settings += [:input, :options, :options_label] if card.type_id == PointerID
       rules_table (card.visible_setting_codenames & field_settings), args
     end
   end
 
-  view :set_label do |args|
+  view :set_label do |_args|
     content_tag :h3, card.label, class: 'set-label'
   end
 
@@ -71,18 +71,18 @@ format :html do
     view group_key.to_sym do |args|
       settings = card.visible_settings group_key
       if settings.present?
-        group_name =  Card::Setting.group_names[group_key] || group.to_s
+        group_name = Card::Setting.group_names[group_key] || group.to_s
         heading_id = "heading-#{group_key}"
         collapse_id = "collapse-#{card.cardname.safe_key}-#{group_key}"
         output [
           (content_tag :div, class: 'panel panel-default' do
             content_tag :div, class: 'panel-heading', role: 'tab', id: heading_id do
               content_tag :h4, class: 'panel-title' do
-                content_tag :a, group_name, 'data-toggle'=>'collapse', 'data-parent'=>'#accordion', href: "##{collapse_id}", 'aria-expanded'=>'false', 'aria-controls'=>collapse_id
+                content_tag :a, group_name, 'data-toggle' => 'collapse', 'data-parent' => '#accordion', href: "##{collapse_id}", 'aria-expanded' => 'false', 'aria-controls' => collapse_id
               end
             end
           end),
-          (content_tag :div, id: collapse_id, class: 'panel-collapse collapse', role: 'tabpanel', 'aria-labelledby'=>heading_id do
+          (content_tag :div, id: collapse_id, class: 'panel-collapse collapse', role: 'tabpanel', 'aria-labelledby' => heading_id do
             rules_table settings.map(&:codename), args
           end)
         ]
@@ -93,7 +93,7 @@ format :html do
   def rules_table settings, args={}
     wrap_with :table, class: 'set-rules table' do
       [
-        (content_tag(:tr, class: "rule-group") do
+        (content_tag(:tr, class: 'rule-group') do
           wrap_each_with :th, %w(Trait Content Set), class: 'rule-heading'
         end),
         (settings.map do |setting|
@@ -106,31 +106,31 @@ format :html do
     end
   end
 
-  view :editor do |args|
-    'Cannot currently edit Sets' #ENGLISH
+  view :editor do |_args|
+    'Cannot currently edit Sets' # ENGLISH
   end
 
   view :template_link do |args|
     args.delete :style
     wrap args do
-      link = view_link args[:inc_syntax], :template_editor, class: 'slotter' #, 'slot-include'=>include_syntax
+      link = view_link args[:inc_syntax], :template_editor, class: 'slotter' # , 'slot-include'=>include_syntax
       "{{#{link}}}"
     end
   end
 
-  view :template_closer do |args|
+  view :template_closer do |_args|
     view_link '', :template_link, class: 'slotter glyphicon glyphicon-remove template-editor-close'
   end
 
   view :template_editor do |args|
     wrap args do
-      %{
+      %(
         <div class="template-editor-left">{{</div>
         <div class="template-editor-main">
-          #{ render_template_editor_frame args }
+          #{render_template_editor_frame args}
         </div>
         <div class="template-editor-right">}}</div>
-      }
+      )
     end
   end
 
@@ -140,29 +140,28 @@ format :html do
     end
   end
 
-  view :closed_content do |args|
+  view :closed_content do |_args|
     ''
   end
 
-
   view :set_navbar do |args|
     id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
-    related_sets =  card.related_sets(true)
+    related_sets = card.related_sets(true)
     return '' if related_sets.size <= 1
     navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
                class: 'slotter toolbar', navbar_type: 'inverse', collapsed_content: close_link(class: 'pull-right visible-xs') do
       [
-        content_tag(:span, 'Set:', class: "navbar-text hidden-xs"),
+        content_tag(:span, 'Set:', class: 'navbar-text hidden-xs'),
         (wrap_with :ul, class: 'nav navbar-nav nav-pills' do
           related_sets.map do |name, label|
             link = card_link name, text: label, remote: true,
-              path_opts: {
-                view: @slot_view,
-                slot: {subheader: showname(name), subframe: true, hide: 'header set_label rule_navbar', show: 'subheader set_navbar'}
-              }
+                                   path_opts: {
+                                     view: @slot_view,
+                                     slot: { subheader: showname(name), subframe: true, hide: 'header set_label rule_navbar', show: 'subheader set_navbar' }
+                                   }
             li_pill link, name == card.name
           end
-        end),
+        end)
       ]
     end
   end
@@ -173,35 +172,34 @@ format :html do
 
   view :rule_navbar do |args|
     id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
-    args.merge!(path_opts: {slot: {show: :rule_navbar}})
+    args[:path_opts] = { slot: { show: :rule_navbar } }
     navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
                class: 'slotter toolbar', navbar_type: 'inverse', collapsed_content: close_link(class: 'pull-right visible-xs') do
       [
-        content_tag(:span, 'Rules:', class: "navbar-text hidden-xs"),
+        content_tag(:span, 'Rules:', class: 'navbar-text hidden-xs'),
         (wrap_with :ul, class: 'nav navbar-nav nav-pills' do
           [
-            (view_link_pill( 'field', :field_related_rules, args) if card.junction?),
-            view_link_pill( 'common', :common_rules, args),
-            view_link_pill( 'by group', :grouped_rules, args),
-            view_link_pill( 'by name', :all_rules, args),
-           (view_link_pill( 'recent', :recent_rules, args) if recently_edited_settings?),
+            (view_link_pill('field', :field_related_rules, args) if card.junction?),
+            view_link_pill('common', :common_rules, args),
+            view_link_pill('by group', :grouped_rules, args),
+            view_link_pill('by name', :all_rules, args),
+            (view_link_pill('recent', :recent_rules, args) if recently_edited_settings?)
           ]
-        end),
+        end)
       ]
     end
   end
 
   def view_link_pill name, view, args
     selected_view = args[:selected_view] || @slot_view || args[:home_view]
-    opts = {class: 'slotter', role: 'pill', path_opts: args[:path_opts]}
+    opts = { class: 'slotter', role: 'pill', path_opts: args[:path_opts] }
     li_pill view_link(name, view, opts), selected_view == view
   end
 end
 
-
 include Card::Set::Type::SearchType
 
-def followed_by? user_id = nil
+def followed_by? user_id=nil
   all_members_followed_by? user_id
 end
 
@@ -217,12 +215,12 @@ end
 
 def subclass_for_set
   current_set_pattern_code = tag.codename
-  Card.set_patterns.detect do |set|
+  Card.set_patterns.find do |set|
     current_set_pattern_code == set.pattern_code
   end
 end
 
-def junction_only?()
+def junction_only?
   if @junction_only.nil?
     @junction_only = subclass_for_set.junction_only
   else
@@ -254,7 +252,7 @@ end
 
 def follow_rule_name user=nil
   if user
-    if user.kind_of? String
+    if user.is_a? String
       "#{name}+#{user}+#{Card[:follow].name}"
     else
       "#{name}+#{user.name}+#{Card[:follow].name}"
@@ -279,13 +277,12 @@ def all_user_ids_with_rule_for setting_code
   Card.all_user_ids_with_rule_for self, setting_code
 end
 
-
 def setting_codenames_by_group
   result = {}
   Card::Setting.groups.each do |group, settings|
-    visible_settings = settings.reject { |s| !s or !s.applies_to_cardtype(prototype.type_id) }
+    visible_settings = settings.reject { |s| !s || !s.applies_to_cardtype(prototype.type_id) }
     unless visible_settings.empty?
-      result[group] = visible_settings.map { |s| s.codename }
+      result[group] = visible_settings.map(&:codename)
     end
   end
   result
@@ -300,7 +297,7 @@ end
 
 def visible_settings group
   Card::Setting.groups[group].reject do |setting|
-    !setting or !setting.applies_to_cardtype(prototype.type_id)
+    !setting || !setting.applies_to_cardtype(prototype.type_id)
   end
 end
 
@@ -308,45 +305,43 @@ def all_members_followed?
   all_members_followed_by? Auth.current_id
 end
 
-def all_members_followed_by? user_id = nil
+def all_members_followed_by? user_id=nil
   if !prototype.followed_by? user_id
     return false
   elsif set_followed_by? user_id
     return true
   else
     broader_sets.each do |b_s|
-      if (set_card  = Card.fetch(b_s)) && set_card.set_followed_by?(user_id)
-       return true
+      if (set_card = Card.fetch(b_s)) && set_card.set_followed_by?(user_id)
+        return true
       end
     end
   end
-  return false
+  false
 end
 
 def set_followed?
   set_followed_by? Auth.current_id
 end
 
-def set_followed_by? user_id = nil
-  return  ( user_id && (user = Card.find(user_id)) && Card.fetch(follow_rule_name(user.name)) ) ||
-          Card.fetch(follow_rule_name)
+def set_followed_by? user_id=nil
+  (user_id && (user = Card.find(user_id)) && Card.fetch(follow_rule_name(user.name))) ||
+    Card.fetch(follow_rule_name)
 end
 
 def broader_sets
   prototype.set_names[1..-1]
 end
 
-
 def prototype
-  opts = subclass_for_set.prototype_args self.cardname.trunk_name
+  opts = subclass_for_set.prototype_args cardname.trunk_name
   Card.fetch opts[:name], new: opts
 end
 
-def related_sets with_self = false
+def related_sets with_self=false
   if subclass_for_set.anchorless?
     prototype.related_sets with_self
   else
     left(new: {}).related_sets with_self
   end
 end
-