card-mod-rules 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b8315524faf1938694a93343e56cabd63826089e6c04992f15b29cd7d24668
-  data.tar.gz: 3bd47066dcf360e2984382bd4ceb7278f5a7aea0a91844cc6f9cbfb6f96b54ef
+  metadata.gz: 387c51433be17159462a4b5b8f5cc72e10f4601d1f856a2a7ebe345b8339e5fb
+  data.tar.gz: a6efeb0c649072d4de487514a23a5a863f59849f06f2cc5c9f522775ffb7d996
 SHA512:
-  metadata.gz: bcbb569cecc57eeaf79413ec4b4cbcb69605751d7755c1c5c82dcdda254d1321e302ae182f3c8c7897192ca20452b965487fc285d74a8d68d409e6667604e39b
-  data.tar.gz: 0a4697dae9fb43e30797f6de3807fc64fedde7547508a37c57c1a0801b3cb815595920a6aeea16c280916d886f3548dfdd2e23227669eb84a2952d6564619e26
+  metadata.gz: 91a2f8cb1a81453049f2f15d2a1b0efc732c05f822b2ba012bf855b4ba323f1a2bb892f9da026cb1f7c84d052682a8462fb6b0dea89755325d68ab12d3cf5139
+  data.tar.gz: 97f9c9aa8a06953edeb1148678aa6184bb07c05b586629d6517302f2d0d9dd3513b6f39e8df6c9140ea24f431ecea2615a78fa8e09c322cfbc85c3b315f47c3f

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 (tr(group_key, scope: "card-mod-rules") || 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/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.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 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.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: card-mod-search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 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
@@ -116,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.2.15
 signing_key:
 specification_version: 4
 summary: rules