card-mod-edit 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c1aadcdae71b37abafb105dd2d635ba8d06ca6b2f20793707744041d2fec7d
-  data.tar.gz: '01279e5c1dabf13847d565f9d2a41f20fc904d312b3a335b7ce2faff9455a7cc'
+  metadata.gz: 060450e130a1d097fe4898887562bbf3f63ffc586724461b085a0265fdc01789
+  data.tar.gz: 4ad0b9deff35af5955453f20422f9aa23a3fcf05f77e7f10ac2ecad83906d63c
 SHA512:
-  metadata.gz: '098b0b886b4dab71ac825eac10506eba393452b8f63855f14b9d05a36fb992d1ea93aba9aba5ffa246e80036d4a9a9ba6c615218b74ccb1ac6781fac4870e0e0'
-  data.tar.gz: 59f19e636b580403d624a2510b072c5a7e6951c240b77e644f33de46051ead1119eb31d135ef6c62e9a47e76e9f312619e5727e2724203b2f53b63f1bef020f7
+  metadata.gz: 357b106327c36d6dd1ddd47421b3cbfe1ce55aaef42d3ee006ba3106ec19c2218a67f791dbf64db8d356db38e82ac697e95fd1be254283420ba914ea1f6211cd
+  data.tar.gz: 4773e3bd9b7430bf8a83d8423eec6cb02fd448aeba7591d4b05227d4b4f3bdd111006aab200657dbe005a3f628ab3e5cca5f3b0de6658f9610a2b6bdec5fcea2

data/set/all/bridge/tab_visibility.rb

@@ -34,11 +34,9 @@ format :html do
   end
 
   def show_discussion?
-    d_card = discussion_card
-    return unless d_card
+    return unless (d_card = discussion_card)
 
-    permission_task = d_card.new_card? ? :update : :read
-    d_card.ok? permission_task
+    d_card.ok? discussion_permission_task(d_card)
   end
 
   def discussion_card?
@@ -50,4 +48,11 @@ format :html do
 
     card.fetch :discussion, skip_modules: true, new: {}
   end
+
+  private
+
+  def discussion_permission_task d_card=nil
+    d_card ||= discussion_card
+    d_card.new_card? ? :update : :read
+  end
 end

data/set/all/edit_type.rb

@@ -42,60 +42,78 @@ format :html do
     end
   end
 
+  def type_field args={}
+    @no_current_type = args.delete :no_current_type # just a test artifact?
+    action_view.select_tag "card[type]", type_field_options,
+                           args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  end
+
+  private
+
+  def raw_type_options
+    return @raw_type_options if @raw_type_options
+    options = Auth.createable_types
+    if !@no_current_type && card.real? && !options.include?(card.type_name)
+      # current type should be an option on existing cards,
+      # regardless of create perms
+      options.push(card.type_name).sort!
+    end
+    @raw_type_options = ::Set.new options
+  end
+
   def wrap_type_formgroup
     formgroup "Type", input: "type", class: "type-formgroup", help: false do
       output [yield, hidden_field_tag(:assign, true)]
     end
   end
 
-  def type_field args={}
-    typelist = Auth.createable_types
-    current_type = type_field_current_value args, typelist
-    action_view.select_tag "card[type]", type_field_options(current_type),
-                           args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  def type_field_options
+    if grouped_types.size == 1
+      simple_type_field_options
+    else
+      multi_type_field_options
+    end
+  end
+
+  def simple_type_field_options
+    options_for_select grouped_types.flatten[1], current_type_value
   end
 
-  def type_field_options current_type
-    types = grouped_types(current_type)
+  def multi_type_field_options
+    grouped_options_for_select grouped_types, current_type_value
+  end
 
-    if types.size == 1
-      options_for_select types.flatten[1], current_type
-    else
-      grouped_options_for_select types, current_type
-    end
+  def current_type_value
+    return if @no_current_type
+
+    @current_type_value ||= card.type_name_or_default
   end
 
-  def grouped_types current_type
+  def grouped_types
     groups = Hash.new { |h, k| h[k] = [] }
-    allowed = ::Set.new Auth.createable_types
-    allowed << current_type if current_type
 
-    visible_cardtype_groups.each_pair do |name, items|
+    visible_cardtype_groups.each_pair.with_object(groups) do |(name, items), grps|
       if name == "Custom"
-        Auth.createable_types.each do |type|
-          groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
-        end
+        custom_grouped_types grps
       else
-        items.each do |i|
-          groups[name] << i if allowed.include?(i)
-        end
+        standard_grouped_types grps, name, items
       end
     end
-    groups
   end
 
-  def visible_cardtype_groups
-    ::Card::Set::Self::Cardtype::GROUP
+  def custom_grouped_types groups
+    Auth.createable_types.each do |type|
+      groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
+    end
   end
 
-  def type_field_current_value args, typelist
-    return if args.delete :no_current_type
-
-    if !card.new_card? && !typelist.include?(card.type_name)
-      # current type should be an option on existing cards,
-      # regardless of create perms
-      typelist.push(card.type_name).sort!
+  def standard_grouped_types groups, name, items
+    items.each do |i|
+      groups[name] << i if raw_type_options.include?(i)
     end
-    card.type_name_or_default
+  end
+
+  def visible_cardtype_groups
+    ::Card::Set::Self::Cardtype::GROUP
   end
 end

data/set/all/editor.rb

@@ -24,9 +24,8 @@ format :html do
 
   # move somewhere more accessible?
   def with_card mark
-    return nil unless (card = Card[mark])
-
-    yield card
+    card = Card[mark]
+    yield card if card
   rescue Card::Error::CodenameNotFound
     nil
   end

data/set/all/form_buttons.rb

@@ -42,6 +42,8 @@ format :html do
   end
 
   def delete_button opts={}
+    return unless card.real?
+
     link_to "Delete", delete_button_opts(opts)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-edit
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.1
 description: ''
 email:
 - info@decko.org