card-mod-rules 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d61d9cb8d905355b6698991b9131e5ba19c07f7aac88c22dcddfb295508d0417
-  data.tar.gz: 496c7a0bb956e2c81b22875c3acd994ff57fa7e66373f245c7d4ec3338a882de
+  metadata.gz: 3725c08f7adc9b0be2cc977b0d2012277b083cc92f8f801084a72420de073d68
+  data.tar.gz: d5fda4c435c25b4de016ff58ca57c2a4d19e7f5cc8ce1532fbd616d55bb33acf
 SHA512:
-  metadata.gz: 81f63580006fc27ef34284144a56eac21a7196bd6da67778982fff3717a138bfdf1eaf7a6239d104d391f713f563300ead63e3fba52aeeac1e0087b07fe0147a
-  data.tar.gz: 3c7608d144d0fe8a1d6dbd092dba3785ab8bbdca06e3c75ca0b0936d79d46b4859484fa974d8704ceafb62c8e38039abe9025fb87ebc594877937668517147f9
+  metadata.gz: 94d0fbccca550036185be9c5ae2cf5862269b34e289c6a9f82bf9e7e8dd2365df88b905a4262344f1e3393cbe7867e54fa31d146df881f6cd1447d9496f7143d
+  data.tar.gz: ee8ac0a72663ea9160f7f342b996a4694295948693d12ef42c6416f5495b98a630e2fd67d11d08d7ac465aa4e382a2d5e90168f43fdd01fae69ee9a5763d9ea7

data/set/all/related_sets.rb

@@ -0,0 +1,25 @@
+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

data/set/rstar/rule_user.rb

@@ -1,8 +1,7 @@
-
 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

data/set/rule/bar_view.rb

@@ -54,8 +54,9 @@ format :html do
   def rule_short_content
     return "" unless existing_rule_card
 
-    nest existing_rule_card, { view: :one_line_content },
-         set_context: card.name.trunk_name
+    nest existing_rule_card,
+         { view: :one_line_content },
+         { set_context: card.name.trunk_name }
   end
 
   def bar_title

data/set/rule/editor.rb

@@ -1,7 +1,7 @@
 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/set/rule/rule_form.rb

@@ -41,7 +41,7 @@ format :html do
 
   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
@@ -51,7 +51,6 @@ format :html do
   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

data/set/rule/rule_form/buttons.rb

@@ -19,8 +19,7 @@ format :html do
 
     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"
     }

data/set/rule/rule_form/form_elements.rb

@@ -32,10 +32,10 @@ format :html do
     set_context && Card.fetch(set_context).prototype.related_sets
   end
 
-  def option_list title
+  def option_list title, &block
     formgroup title, input: "set", class: "col-xs-6", help: false do
       wrap_with :ul do
-        wrap_each_with(:li, class: "radio") { yield }
+        wrap_each_with(:li, class: "radio", &block)
       end
     end
   end

data/set/rule/rule_form/rule_set_radio.rb

@@ -1,6 +1,7 @@
 #! no set module
 class RuleSetRadio
   attr_reader :format
+
   delegate :link_to_card, :radio_button, :wrap_with, :icon_tag,
            to: :format
 

data/set/rule/rules.rb

@@ -10,7 +10,7 @@ def rule_set_key
 end
 
 def rule_set_name
-  if is_preference?
+  if preference?
     name.trunk_name.trunk_name
   else
     name.trunk_name
@@ -22,7 +22,7 @@ def rule_set_pattern_name
 end
 
 def rule_set
-  if is_preference?
+  if preference?
     self[0..-3]
   else
     trunk
@@ -46,7 +46,7 @@ def rule_setting_title
 end
 
 def rule_user_setting_name
-  if is_preference?
+  if preference?
     "#{rule_user_name}+#{rule_setting_name}"
   else
     rule_setting_name
@@ -71,7 +71,7 @@ def first_set_option_index candidates
 end
 
 def set_prototype
-  if is_preference?
+  if preference?
     self[0..-3].prototype
   else
     trunk.prototype
@@ -101,7 +101,7 @@ def state_of_existing_set
 end
 
 def state_of_nonexisting_set
-  @sets_with_existing_rules == 1 ? :current : :overwritten
+  @sets_with_existing_rules.positive? ? :overwritten : :available
 end
 
 def rule_for_set? set_name

data/set/type/set.rb

@@ -17,7 +17,7 @@ def pattern
 end
 
 def inheritable?
-  junction_only? || (anchor_name&.junction? && self_set?)
+  junction_only? || (anchor_name&.compound? && self_set?)
 end
 
 def self_set?

data/set/type/set/html_views/group_panel.haml

@@ -3,7 +3,7 @@
 .card
   .card-header{ role: "tab", id: heading_id }
     %h5.mb-0
-      = link_to (Card::Setting.group_names[group_key] || group_key.to_s),
+      = link_to (t("rules_#{group_key}") || group_key.to_s),
                 href: "##{collapse_id}",
                 "data-toggle": "collapse",   "aria-expanded": "false",
                 "data-parent": "#accordion", "aria-controls": collapse_id

data/set/type/set/setting_lists.rb

@@ -9,7 +9,7 @@ format :html do
 
   def setting_options
     [["Categories", SETTING_OPTIONS],
-     ["Groups", Card::Setting.group_names.keys],
+     ["Groups", Card::Setting.groups.keys],
      ["Single rules", card.visible_setting_codenames]]
   end
 

data/set/type/setting.rb

@@ -1,13 +1,11 @@
 # require "json"
 
 def self.member_names
-  @@member_names ||= begin
-    Card.search(
-      { type_id: SettingID, return: "key" },
-      "all setting cards"
-    ).each_with_object({}) do |card_key, hash|
-      hash[card_key] = true
-    end
+  @@member_names ||= Card.search(
+    { type_id: SettingID, return: "key" },
+    "all setting cards"
+  ).each_with_object({}) do |card_key, hash|
+    hash[card_key] = true
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-rules
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
 - !ruby/object:Gem::Dependency
   name: card-mod-search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
 description: ''
 email:
 - info@decko.org
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/javascript/script_rules.js.coffee
+- set/all/related_sets.rb
 - set/right/self.rb
 - set/right/type_plus_right.rb
 - set/rstar/rule_user.rb
@@ -91,10 +92,15 @@ files:
 - set/type/set/rules_filter.rb
 - set/type/set/setting_lists.rb
 - set/type/setting.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: rules
 post_install_message:
 rdoc_options: []
@@ -111,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: rules