card 1.94.0 → 1.94.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8108ea9c272fbf1d35f39674c2fabc4f422154b9
-  data.tar.gz: 1c554ea42be6ddfded470c10d9c32baf1ddd686a
+  metadata.gz: f3ca3b7eaa9bd81779580b0bd0af44962626f33f
+  data.tar.gz: 00afc9df0235f7fabb5bf9251f5fe5b67cb7d0b7
 SHA512:
-  metadata.gz: '019228759816d0c42326e921ecfbd1393328b6e20c7e01fcc5f894593699481b87b604976b5a9ffaf23bbcee9295aa1d2c059089a6db0f6b43b87ff8c0a0cf8d'
-  data.tar.gz: 0c75e8da55c96f4b98f43e26c23666eeb8d832b434993f60cd55f541f79590ba3cd1bff1ab9e562474b7afc62ab68d2b75e6940fe1bd383fe03555d7b64695a0
+  metadata.gz: 9a01438a0367485b3fbecb1fa1e3287b569bb55809057a88ed0b7b33c9db75d9e062bc0d59b6d1a83a1783103730a545ae7eefa105434a10692aaef89306d509
+  data.tar.gz: a7c69a3a943ccd49feee5e7772260dee852a9d4d0a6ccc2e669e2f26cc7ed6161c426906cd98a8d59d0b9a4c1ae4f6f5add6024b9ddd121498c1fb73c2261531

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/db/migrate_core_cards/data/cards.yml

@@ -3,9 +3,7 @@
 - :name: "*header"
   :type: HTML
   :key: "*header"
-  :merged: 2017-11-28 20:30:36 UTC
 - :name: "*main menu"
   :type: HTML
   :key: "*main_menu"
-  :merged: 2017-11-28 20:30:36 UTC
 :remotes: {}

data/lib/card/act_manager/stage_director.rb

@@ -110,6 +110,19 @@ class Card
         run_subdirector_stages :integrate_with_delay
       end
 
+      def rerun_up_to_current_stage
+        old_stage = @stage
+        reset_stage
+        catch_up_to_stage old_stage if old_stage
+      end
+
+      def replace_card card
+        card.action = @card.action
+        card.director = self
+        @card = card
+        rerun_up_to_current_stage
+      end
+
       def reset_stage
         @stage = -1
       end

data/lib/card/act_manager/subdirector_array.rb

@@ -19,6 +19,7 @@ class Card
         card = card.card if card.is_a? StageDirector
         each { |dir| return dir if dir.card == card }
         dir = ActManager.fetch card, parent: @parent
+        dir.replace_card card if dir.card != card
         dir.main = false
         dir.parent = @parent
         dir.transact_in_stage = opts[:transact_in_stage]

data/lib/card/format/context_names.rb

@@ -32,8 +32,10 @@ class Card
       end
 
       def title_in_context title=nil
+        keep_safe = title&.html_safe?
         title = title ? title.to_name.absolute_name(card.name) : card.name
-        title.from *context_names
+        newtitle = title.from *context_names
+        keep_safe ? newtitle.html_safe : newtitle
       end
     end
   end

data/lib/card/migration/import/import_data/card_attributes.rb

@@ -31,6 +31,9 @@ class Card
 
          def write_attributes
            File.write @path, @data.to_yaml
+         rescue SystemCallError
+           false
+           # card.yml not written
          end
 
          def read_attributes

data/mod/basic_formats/set/all/base.rb

@@ -5,8 +5,9 @@ format do
   end
 
   # NAME VIEWS
+
   view :name, closed: true, perms: :none do
-    name_variant card.name
+    name_variant safe_name
   end
 
   def safe_name

data/mod/core/set/all/item.rb

@@ -23,7 +23,7 @@ end
 
 def add_item item
   return if include_item? item
-  self.content = "#{content}\n#{name}"
+  self.content = "#{content}\n#{item}"
 end
 
 def drop_item item

data/mod/standard/set/all/rich_html/title.rb

@@ -1,6 +1,6 @@
 format :html do
   view :title do
-    title = wrapped_title(super())
+    title = wrapped_title super()
     title = link_to_card card.name, title if show_view? :title_link, :hide
     add_name_context
     title
@@ -14,22 +14,17 @@ format :html do
     link_to_card card.name, link_text
   end
 
-  view :name do
-    h(super())
-  end
-
   def safe_name
     h super
   end
 
-  def title_in_context title=nil
+  def title_in_context _title=nil
     h super
   end
 
   def wrapped_title title
     wrap_with :span, class: classy("card-title") do
-      escaped_parts = title.to_name.parts.map { |part| h part }
-      escaped_parts.join wrapped_joint
+      title.to_name.parts.join wrapped_joint
     end
   end
 

data/mod/standard/set/type/listed_by.rb

@@ -48,8 +48,6 @@ def add_items items
   end
 end
 
-
-
 def content
   Card::Cache[Card::Set::Type::ListedBy].fetch(key) do
     generate_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.94.0
+  version: 1.94.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.11.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 12.3.0
 description: Cards are wiki-inspired data atoms."Carditects" use links, nests, types,
   patterned names, queries, views, events, and rules to create rich structures.
 email: