card-mod-format 0.13.0 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4d77f208c27acef729baedd337735e80be21270337e26b406d27af14638983
-  data.tar.gz: d299289e4b5dd0b622a614bdebee3d25ec0b9135b0bfe4bd576367b36c7bc745
+  metadata.gz: 5b4dd4ae369f0c9e764aeb948706c605bed3c2ddc86b6fac71c4d4c7fd58612d
+  data.tar.gz: ae219bb99536a3a5918d7ebee812e74e23104b6f86f8c84687441303188244ad
 SHA512:
-  metadata.gz: 6463aa97132bf67c91146a19ee245530497a2c1a7fbe9bd1cfe732e289ff764c9d34df54e64db2f72f0824df487c9f570aa5f837fb4465d81acb343174a999b4
-  data.tar.gz: 0f44f37aab77229428c58dd2e666d4556a67e0a9bf3773b780b014491fcc80c1fb42aa299f9d58c48c69f2ff5d14911b0d11c2d68d5961b3ddee4bf8544e1b95
+  metadata.gz: 89d87eeb2a93e165a29c71a1a222fc7a04367e97c1a3f8f5e3984672f0b034dbd0314a75771238354b350f66bb77403531086be4d30d3b0e24dcf9784321d99c
+  data.tar.gz: cb552a6412329764be04205f585b9ec6bf6a9ef12112d91aaae44f59e5ef817bb4e07c5d364d0b2b3779ee1a87e34ef48d26a22ba9a03ee789f9eca9e814e274

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,11 +7,6 @@ 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

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/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.13.0
+  version: 0.13.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 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.103.0
+        version: 1.103.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: 1.103.4
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.4
 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