card-mod-format 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5eba52fcc743e248f18a00a831e82ff2c26c7b39971e4cbf51157e526e570c
-  data.tar.gz: c384fb08ea3a69ee0403ce37f3f388b2ec70bc31af3152158d4feff719f4b702
+  metadata.gz: d6bc5c14f0ec7df2e36dd111eacec69023ac27fc017250594a312838f8431c5a
+  data.tar.gz: 3f9a6b4ff18f3abe16a46a0de6c3636d73a246addbc52c2ff489a038dcbacfa0
 SHA512:
-  metadata.gz: 49e90f15050ccc0b22bc8cb36785c0e97c0ae92ba1f973db21dba261e4d175f5af39fc2af944aea7bb90fc0347062c59e70ce5bbf5ace98230e78728b53c29d0
-  data.tar.gz: caed17f4e4161215445a67e0f9a15ed38dd772b54ea1deb909935211446c965d0fb239f037e87c8a5d7815619f9360790d024456b09d8a574a2db4ea5fddb7ae
+  metadata.gz: fa560ad5e026d85d61da079fce1fadfabe9a7529c6ad421dfa61e6572ba82e9823e81393c0d875268ee6a5b2a011130ef46ee927f2fa75d0589aef7d087658d3
+  data.tar.gz: 74238ca4571c1957a26d354f2f71129a39f21a1ed491f37c40c16c9ab35888172876789ed811fc50118dea47a17fe7870ec96b2fb267d9fa0db9619bd41da981

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/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.2
+  version: 0.13.3
 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.2
+        version: 1.103.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.103.3
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 description: ''
 email:
 - info@decko.org
@@ -74,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