card-mod-format 0.12.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a14a87f7d666f6e68411e159ea14f4b217fa6e8e3002dd69186dec8a0b9daeb
-  data.tar.gz: bdfe37143e119215126613981e2892002bdd254b0a8f6ea58f639cec5727b87b
+  metadata.gz: d6bc5c14f0ec7df2e36dd111eacec69023ac27fc017250594a312838f8431c5a
+  data.tar.gz: 3f9a6b4ff18f3abe16a46a0de6c3636d73a246addbc52c2ff489a038dcbacfa0
 SHA512:
-  metadata.gz: 874d45d7ab14d8bba368fbf31c461eeeacf59dff1e2b6cfc1904a055a77727a8d39304fb037690e1b5573db446690b2cb7212f5839185a712544d06dd84e8230
-  data.tar.gz: 664bd91c44a1f20f2dbdee671fdb405c02454524508d8a77e024ee1712295dc846d2f6725a23a6674ca18e5b575b2adc808ec7337c8e98a9778b1bd220c0ae5d
+  metadata.gz: fa560ad5e026d85d61da079fce1fadfabe9a7529c6ad421dfa61e6572ba82e9823e81393c0d875268ee6a5b2a011130ef46ee927f2fa75d0589aef7d087658d3
+  data.tar.gz: 74238ca4571c1957a26d354f2f71129a39f21a1ed491f37c40c16c9ab35888172876789ed811fc50118dea47a17fe7870ec96b2fb267d9fa0db9619bd41da981

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/lib/card/path.rb

@@ -35,7 +35,8 @@ class Card
     end
 
     def standard
-      base + extension + query
+      anch = anchor
+      base + extension + query + anch
     end
 
     def base
@@ -75,6 +76,11 @@ class Card
       extension ? ".#{extension}" : ""
     end
 
+    def anchor
+      anchor = opts.delete :anchor
+      anchor ? "##{anchor}" : ""
+    end
+
     def query
       query_opts = cast_path_hash opts
       query_opts.empty? ? "" : "?#{query_opts.to_param}"

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

@@ -7,19 +7,12 @@ format do
 end
 
 format :html do
-  # add tuples containing a
-  #  - the codename of a card with javascript config (usually in json format)
-  #  - the name of a javascript method that handles the config
-  basket :mod_js_config
-
   view :head, unknown: true, perms: :none do
     views_in_head.map { |viewname| render viewname }.flatten.compact.join "\n"
   end
 
   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 +21,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 +45,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 +53,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 +65,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 +73,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/html_show.rb

@@ -13,7 +13,7 @@ format :html do
   def show_without_page_layout view, args
     @main = true if params[:is_main] || args[:main]
     args.delete(:layout)
-    view ||= args[:home_view] || :open # default_nest_view
+    view ||= args[:home_view] || default_page_view
     render! view, args
   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/text.rb

@@ -1,8 +1,25 @@
 require "htmlentities"
 
+format do
+  def to_text html
+    HTMLEntities.new.decode strip_tags(html).to_s
+  end
+
+  def nestless_content
+    content_obj = content_object card.content
+    content_obj.strip_nests
+    content_obj.process_chunks
+    content_obj.to_s
+  end
+
+  view :text_without_nests do
+    to_text nestless_content
+  end
+end
+
 format :text do
+  # TODO: override this in cards without html content
   view :core do
-    HTMLEntities.new.decode strip_tags(super()).to_s
-    # need this string method to get out of html_safe mode
+    to_text super()
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        version: 1.103.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        version: 1.103.3
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 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
@@ -73,14 +74,14 @@ files:
 - set/all/head.rb
 - set/all/header.rb
 - set/all/header/header_wrap.haml
-- set/all/html_content.rb
-- set/all/html_content/labeled.haml
 - set/all/html_error.rb
 - set/all/html_error/debug_server_error.haml
 - set/all/html_error/not_found.haml
 - set/all/html_error/server_error.haml
 - set/all/html_show.rb
 - set/all/html_title.rb
+- set/all/html_views.rb
+- set/all/html_views/labeled.haml
 - set/all/html_wrapper.rb
 - set/all/js.rb
 - set/all/json.rb
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: format