card-mod-format 0.11.7 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb7a02d7b66e39f50886eb18dd3a4c3d5fb168b0448251777c70f853c275e0b
-  data.tar.gz: 634f343beb787ffd794e27caebb78ba95f0cf2ca7f63206365cffa9fb88a4c20
+  metadata.gz: 0b5eba52fcc743e248f18a00a831e82ff2c26c7b39971e4cbf51157e526e570c
+  data.tar.gz: c384fb08ea3a69ee0403ce37f3f388b2ec70bc31af3152158d4feff719f4b702
 SHA512:
-  metadata.gz: 8561c041d4050418217258a3311994892a1356dada9550c63099d1540c4044a8824895d9787a6e02866b1f576f783ec63798f847985b360701ddfb5bd18a32bc
-  data.tar.gz: 79efb8df8fd8b0b583a82320b5ea9a6fada477801c14e270f1737f8e536f0da066fadbbe51c422e8adc95f05953db9a99eeec56a161d79c865932380cc16da0d
+  metadata.gz: 49e90f15050ccc0b22bc8cb36785c0e97c0ae92ba1f973db21dba261e4d175f5af39fc2af944aea7bb90fc0347062c59e70ce5bbf5ace98230e78728b53c29d0
+  data.tar.gz: caed17f4e4161215445a67e0f9a15ed38dd772b54ea1deb909935211446c965d0fb239f037e87c8a5d7815619f9360790d024456b09d8a574a2db4ea5fddb7ae

data/lib/card/format/html_format.rb

@@ -40,6 +40,10 @@ class Card
         rendered = super
         rendered.is_a?(Array) ? output(rendered) : rendered
       end
+
+      def stylesheet_link_tag path
+        tag "link", href: path, media: "all", rel: "stylesheet", type: "text/css"
+      end
     end
   end
 end

data/locales/en.yml

@@ -0,0 +1,23 @@
+en:
+  format_add_card: Add %{cardname}
+  format_bad_address: "404: Bad Address"
+  format_close: Close
+  format_configure_card: Configure %{cardname}
+  format_denial: Permission Denied
+  format_denied_task: to %{denied_task} this
+  format_invalid_json: invalid json
+  format_need_permission_task: "You need permission %{task}."
+  format_not_found_named: Could not find %{cardname}.
+  format_not_found_no_name: the card requested
+  format_not_numeric: "'%{content}' is not numeric"
+  format_or: "or"
+  format_please: Please
+  format_problems_name: Problems with %{cardname}
+  format_read_only: We are currently in read-only mode.  Please try again later.
+  format_server_error: "\nWagn Hitch!  Server Error. Yuck, sorry about that.\nTo tell us more and follow the fix,\nadd a support ticket at %{ticket_link}\n"
+  format_sorry: Sorry!
+  format_to_do_that: to do that
+  format_toggle_no: "no"
+  format_toggle_yes: "yes"
+  format_too_deep: Man, you're too deep.  (Too many levels of nests at a time)
+  format_unsupported_view: view (%{view}) not supported for %{cardname}

data/set/all/head.rb

@@ -18,8 +18,6 @@ format :html do
 
   def views_in_head
     %i[meta_tags page_title_tag favicon_tag head_stylesheet
-       decko_script_variables head_javascript html5shiv_tag
-       script_config_and_initiation
        universal_edit_button rss_links]
   end
 
@@ -28,10 +26,6 @@ format :html do
     haml :meta_tags
   end
 
-  view :html5shiv_tag, unknown: true, perms: :none do
-    nest :script_html5shiv_printshiv, view: :script_tag
-  end
-
   view :page_title_tag, unknown: true, perms: :none do
     content_tag(:title) { render :page_title }
   end
@@ -56,40 +50,6 @@ format :html do
     tag "link", href: href, media: "all", rel: "stylesheet", type: "text/css"
   end
 
-  view :head_javascript, unknown: true, cache: :never, perms: :none do
-    Array.wrap(head_javascript_paths).map do |path|
-      javascript_include_tag path
-    end
-  end
-
-  view :decko_script_variables, unknown: true, cache: :never, perms: :none do
-    string = ""
-    decko_script_variables.each do |k, v|
-      string += "#{k}=#{script_variable_to_js v};\n"
-    end
-    javascript_tag { string }
-  end
-
-  def decko_script_variables
-    {
-      "window.decko": { rootUrl: card_url("") },
-      "decko.doubleClick": Card.config.double_click,
-      "decko.cssPath": head_stylesheet_path,
-      "decko.currentUserId": (Auth.current_id if Auth.signed_in?)
-
-    }
-  end
-
-  def script_variable_to_js value
-    if value.is_a? Hash
-      string = "{"
-      value.each { |k, v| string += "#{k}:#{script_variable_to_js v}" }
-      "#{string}}"
-    else
-      "'#{value}'"
-    end
-  end
-
   def param_or_rule_card setting
     if params[setting]
       Card[params[setting]]
@@ -98,10 +58,10 @@ format :html do
     end
   end
 
-  def debug_or_machine_path setting, &block
+  def debug_or_machine_path setting, debug_lambda, machine_path_lambda
     return unless (asset_card = param_or_rule_card setting)
-
-    debug_path(setting, asset_card, &block) || asset_card.machine_output_url
+    debug_path(setting, asset_card, &debug_lambda) ||
+      machine_path_lambda.call(asset_card.machine_output_url)
   end
 
   def debug_path setting, asset_card
@@ -110,37 +70,6 @@ format :html do
     yield asset_card
   end
 
-  def head_stylesheet_path
-    debug_or_machine_path :style do |style_card|
-      path mark: style_card.name, item: :import, format: :css
-    end
-  end
-
-  def head_javascript_paths
-    debug_or_machine_path :script do |script_card|
-      script_card.item_cards.map do |script|
-        script.format(:js).render :source
-      end
-    end
-  end
-
-  view :script_config_and_initiation, unknown: true, perms: :none do
-    javascript_tag do
-      (mod_js_configs << trigger_slot_ready).join "\n\n"
-    end
-  end
-
-  def mod_js_configs
-    mod_js_config.map do |codename, js_decko_function|
-      config_json = escape_javascript Card::Rule.global_setting(codename)
-      "decko.#{js_decko_function}('#{config_json}')"
-    end
-  end
-
-  def trigger_slot_ready
-    "$('document').ready(function() { $('.card-slot').trigger('slotReady'); })"
-  end
-
   # TODO: move to rss mod
   view :rss_links, unknown: true, perms: :none do
     render :rss_link_tag if rss_link?
@@ -149,4 +78,12 @@ format :html do
   def rss_link?
     Card.config.rss_enabled && respond_to?(:rss_link_tag)
   end
+
+  def head_stylesheet_path
+    debug_or_machine_path(
+      :style,
+      ->(style_card) { path mark: style_card.name, item: :import, format: :css },
+      ->(machine_path) { machine_path }
+    )
+  end
 end

data/set/all/json.rb

@@ -9,7 +9,7 @@ format :json do
   end
 
   def default_item_view
-    params[:item] || :name
+    :name
   end
 
   def max_depth
@@ -41,7 +41,7 @@ format :json do
   def page_details obj
     return obj unless obj.is_a? Hash
 
-    obj.merge url: request_url, timestamp: Time.now.to_s
+    obj.merge url: request_url, requested_at: Time.now.to_s
   end
 
   view :status, unknown: true, perms: :none do
@@ -84,7 +84,7 @@ format :json do
   # NOCACHE because sometimes item_cards is dynamic.
   # could be safely cached for non-dynamic lists
   view :items, cache: :never do
-    listing item_cards, view: :atom
+    listing item_cards, view: (voo_items_view || :atom)
   end
 
   view :links do
@@ -155,7 +155,9 @@ format :json do
                links: _render_links,
                ancestors: _render_ancestors,
                html_url: path,
-               type: nest(card.type_card, view: :nucleus)
+               type: nest(card.type_card, view: :nucleus),
+               created_at: card.created_at,
+               updated_at: card.updated_at
   end
 end
 

data/set/all/links.rb

@@ -73,7 +73,7 @@ format do
   def clean_resource resource, resource_type
     if resource_type == "internal-link"
       # remove initial slash; #contextualize_path handles relative root
-      contextualize_path resource[1..-1].sub %r{^/}, ""
+      contextualize_path resource.sub(%r{^/}, "")
     else
       resource
     end

data/set/all/menu.rb

@@ -102,7 +102,7 @@ format :html do
 
   def edit_link view=:edit, opts={}
     link_to_view view, opts.delete(:link_text) || menu_icon,
-                 edit_link_opts(opts.reverse_merge(modal: :lg))
+                 edit_link_opts(modal: (opts[:modal] || :lg))
   end
 
   # @param modal [Symbol] modal size

data/set/all/rss.rb

@@ -1,3 +1,5 @@
+require "builder"
+
 format :rss do
   attr_accessor :xml
 

data/set/all/text.rb

@@ -1,3 +1,5 @@
+require "htmlentities"
+
 format :text do
   view :core do
     HTMLEntities.new.decode strip_tags(super()).to_s

data/set/type/json.rb

@@ -1,4 +1,4 @@
-# include_set Abstract::Pointer
+require "coderay"
 
 event :validate_json, :validate, on: :save, changed: :content do
   check_json_syntax if content.present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.13.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-06 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.7
+        version: 1.103.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.7
+        version: 1.103.2
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.13.2
 description: ''
 email:
 - info@decko.org
@@ -59,6 +59,7 @@ files:
 - lib/card/format/xml_format.rb
 - lib/card/path.rb
 - lib/card/path/cast_params.rb
+- locales/en.yml
 - set/all/active_card.rb
 - set/all/base.rb
 - set/all/content.rb