card-mod-format 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6d2c7a456c6e35591c10a980bc93de5b970d87d88bc6af9518acc0f314a6cc
-  data.tar.gz: d1f9e4f0ce72e65f79d8bf35391e95954317647628cbb342eb7617304fe9966c
+  metadata.gz: e0ec4687a3f1ddc276d8f326e2bb80d2d30138d36c4032cb9e1caf1fa8e92f53
+  data.tar.gz: b21dc49fe93590a7eb083d141f0b92d4e4ffebcbf69175fc10b32a5e36407e01
 SHA512:
-  metadata.gz: 53c0aef92bdd7fded5ff0a237d6d95aa1460a3612a9ec56a43e232be697ce627fffc69542ccdd3f2554d1f16df01f58459a85f575dc791981a906267b5d72c96
-  data.tar.gz: 74a7614d7a49a49e46fedc2f2064f523de67f98a88a9f06740dbe8f024edfa9a3dc3658a5e4cc4a7c0c137a8eebc783e3d9e4d6987aba658526d68d2d032992e
+  metadata.gz: acc027016400a2ac9f6bfe6e64b14bba11e24fb0779e71215c4bef1685bf21b617c89d8dc7e7879644cf34442a7664f0399779629addd1ac3622d2a6d1c37e79
+  data.tar.gz: 18ecf41a28035e9630d0ec5a3a8f1a7570fa279e4af94e29bf8f11316e04b78b19dbd89a649b25e280bdeb12268b324e4a024f5d3b764b1c37d7b340104fc094

data/lib/card/path.rb

@@ -1,8 +1,7 @@
 class Card
   # Generate standard card paths.
   class Path
-    cattr_accessor :cast_params
-    self.cast_params = { slot: { hide: :array, show: :array, wrap: :array } }.freeze
+    include CastParams
 
     def initialize card, opts
       @card = card
@@ -60,7 +59,7 @@ class Card
       name = handle_unknown do
         opts[:mark] ? Card::Name[opts.delete(:mark)] : @card.name
       end
-      name.url_key
+      (name&.url_key).to_s
     end
 
     def markless?
@@ -81,40 +80,19 @@ class Card
       query_opts.empty? ? "" : "?#{query_opts.to_param}"
     end
 
-    # normalizes certain path opts to specified data types
-    def cast_path_hash hash, cast_hash=nil
-      return hash unless hash.is_a? Hash
-      cast_each_path_hash hash, (cast_hash || self.class.cast_params)
-      hash
-    end
-
-    def cast_each_path_hash hash, cast_hash
-      hash.each do |key, value|
-        next unless (cast_to = cast_hash[key])
-        hash[key] = cast_path_value value, cast_to
-      end
-    end
-
-    def cast_path_value value, cast_to
-      if cast_to.is_a? Hash
-        cast_path_hash value, cast_to
-      else
-        send "cast_path_value_as_#{cast_to}", value
-      end
-    end
-
-    def cast_path_value_as_array value
-      Array.wrap value
-    end
-
     def handle_unknown
       yield.tap do |name|
-        return name if name_specified? || name_standardish?(name) || Card.known?(name)
+        return name if name.nil? || known_name?(name)
+
         opts[:card] ||= {}
         opts[:card][:name] = name
       end
     end
 
+    def known_name? name
+      name_specified? || name_standardish?(name) || Card.known?(name)
+    end
+
     def name_specified?
       opts.dig :card, :name
     end

data/lib/card/path/cast_params.rb

@@ -0,0 +1,36 @@
+class Card
+  class Path
+    cattr_accessor :cast_params
+    self.cast_params = { slot: { hide: :array, show: :array, wrap: :array } }.freeze
+
+    # normalizes certain path opts to specified data types
+    module CastParams
+      private
+
+      def cast_path_hash hash, cast_hash=nil
+        return hash unless hash.is_a? Hash
+        cast_each_path_hash hash, (cast_hash || self.class.cast_params)
+        hash
+      end
+
+      def cast_each_path_hash hash, cast_hash
+        hash.each do |key, value|
+          next unless (cast_to = cast_hash[key])
+          hash[key] = cast_path_value value, cast_to
+        end
+      end
+
+      def cast_path_value value, cast_to
+        if cast_to.is_a? Hash
+          cast_path_hash value, cast_to
+        else
+          send "cast_path_value_as_#{cast_to}", value
+        end
+      end
+
+      def cast_path_value_as_array value
+        Array.wrap value
+      end
+    end
+  end
+end

data/set/all/demo.rb

@@ -0,0 +1,36 @@
+format :html do
+  view :demo do
+    frame do
+      [view_select, wrap_with(:div, view_demo, class: "demo-slot")]
+    end
+  end
+
+  view :view_list do
+    %i[bar box info_bar open closed titled labeled content content_panel].map do |v|
+      wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
+    end.flatten.join ""
+  end
+
+  def demo_view
+    Env.params[:demo_view] || :core
+  end
+
+  def view_demo
+    wrap(true) do
+      render demo_view
+    end
+  end
+
+  def view_select
+    card_form :get, success: { view: :demo } do
+      select_tag :demo_view,
+                 options_for_select(all_views, demo_view),
+                 class: "_submit-on-select"
+    end
+  end
+
+  def all_views
+    Card::Set::Format::AbstractFormat::ViewDefinition
+      .views.slice(*self.class.ancestors).values.map(&:keys).flatten.uniq
+  end
+end

data/set/all/error.rb

@@ -56,24 +56,17 @@ end
 
 format :json do
   view :errors do
-    format_error error_list
+    {
+      error_status: error_status,
+      errors: card.errors.each_with_object({}) { |e, h| h[e.attribute] = e.message }
+    }
   end
 
   view :server_error, :errors
   view :denial, :errors
   view :not_found, :errors
-
   view :bad_address do
-    format_error super()
-  end
-
-  def format_error error
-    { error_status: error_status, errors: error }
-  end
-
-  def error_list
-    card.errors.each_with_object([]) do |(field, message), list|
-      list << { field: field, message: message }
-    end
+    card.errors.add :address, super()
+    render_error
   end
 end

data/set/all/rich_html.rb

@@ -1,4 +1,16 @@
 format :html do
   delegate :class_up, :class_down, :with_class_up, :without_upped_class, :classy,
            to: :voo
+
+  view :type, unknown: true do
+    link_to_card card.type_card, nil, class: "cardtype"
+  end
+
+  view :type_info do
+    return unless card.type_code != :basic
+
+    wrap_with :span, class: "type-info float-right" do
+      link_to_card card.type_name, nil, class: "navbar-link"
+    end
+  end
 end

data/set/type/cardtype.rb

@@ -0,0 +1,89 @@
+format :html do
+  view :type, unknown: true do
+    link_to_card card.type_card, nil, class: "cardtype"
+  end
+
+  def type_formgroup args={}
+    if card.cards_of_type_exist?
+      wrap_with :div, tr(:cards_exist, cardname: safe_name)
+    else
+      super
+    end
+  end
+
+  view :add_link do
+    add_link
+  end
+
+  view :add_button do
+    add_link class: "btn btn-secondary"
+  end
+
+  def add_link opts={}
+    voo.title ||= tr(:add_card, cardname: safe_name)
+    link_to render_title, add_link_opts(opts)
+  end
+
+  def add_link_opts opts
+    modal = opts.delete :modal
+    if modal.nil? || modal
+      modal_link_opts opts.merge(path: add_path(:new_in_modal))
+    else
+      opts.merge path: add_path(:new)
+    end
+  end
+
+  view :add_url do
+    card_url _render_add_path
+  end
+
+  def add_path view
+    path_args = { mark: card.name }
+    process_voo_params(path_args) if voo.params
+    if view == :new
+      path_args[:action] = :new
+    else
+      path_args[:action] = :type
+      path_args[:view] = view
+    end
+    path path_args
+  end
+
+  # don't cache because it depends on update permission for another card
+  view :configure_link, cache: :never, perms: ->(fmt) { fmt.can_configure? } do
+    configure_link
+  end
+
+  def can_configure?
+    Card.fetch(card, :type, :structure, new: {}).ok? :update
+  end
+
+  view :configure_button, cache: :never,
+                          denial: :blank,
+                          perms: ->(fmt) { fmt.can_configure? } do
+    configure_link "btn btn-secondary"
+  end
+
+  def configure_link css_class=nil
+    return "" unless Card.fetch(card, :type, :structure, new: {}).ok? :update
+
+    voo.title ||= tr(:configure_card, cardname: safe_name.pluralize)
+    title = _render_title
+    link_to_card card, title,
+                 path: { view: :bridge,
+                         bridge: { tab: :rules_tab },
+                         set: Card::Name[safe_name, :type] },
+                 class: css_classes("configure-type-link ml-3", css_class)
+  end
+
+  private
+
+  def process_voo_params path_args
+    context = ((@parent&.card) || card).name
+    Rack::Utils.parse_nested_query(voo.params).each do |key, value|
+      value = value.to_name.absolute(context) if value
+      key = key.to_name.absolute(context)
+      path_args[key] = value
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 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,28 +18,28 @@ 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
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 description: ''
 email:
 - info@decko.org
@@ -58,10 +58,12 @@ files:
 - lib/card/format/text_format.rb
 - lib/card/format/xml_format.rb
 - lib/card/path.rb
+- lib/card/path/cast_params.rb
 - set/all/active_card.rb
 - set/all/base.rb
 - set/all/css.rb
 - set/all/csv.rb
+- set/all/demo.rb
 - set/all/error.rb
 - set/all/export.rb
 - set/all/file.rb
@@ -89,6 +91,7 @@ files:
 - set/all/rss.rb
 - set/all/text.rb
 - set/self/home.rb
+- set/type/cardtype.rb
 - set/type/html.rb
 - set/type/json.rb
 - set/type/number.rb