card-mod-follow 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89536b57eb136690674e4762d7d4663c82ad42000449ff2986de9d12cdfee49f
-  data.tar.gz: 04fcbfb3fe979582c5a81598909d7a285065a0496c58ddaa284e08836ec77120
+  metadata.gz: b19692968a1b12d79cd8f2359364048ea3f845cd2d0f9f069f2e94447dd3262e
+  data.tar.gz: 7848e9787ba3e6e9609bef392a7f60054547948fcdc58bc6bdf4163a22e2ebe9
 SHA512:
-  metadata.gz: d8d85edc90e6cd9251612ad3e993a5b8d24feb939fb18d77d3cb4ca1b3d9dd650b070ebd78cea7e8627ce9dc60e10ae3b83908730a5e032d8e5eb7ab246954f7
-  data.tar.gz: 890213ca1c68626f756d7160945ab3b4754ff52144d7fbf78a6eca9677d8ed38261a9ea9e21804a72d3bd93bba9879c285ca9973726cf15c7c1dfdd7a0b32d44
+  metadata.gz: 9b9e543d4da82f42ff82e53f03f02da8fda6b18bacd7822bb1ec8629819b485d2238066903aa729d0552e1b98d71303a6f5daf30f211352e61e93062e06c00ac
+  data.tar.gz: 8510f87f53fe882ca415757e6c2d15ca7062e6cf153fdc643f4e3ad8b73df32f1639b1a36a84a454570ecf952e153ba448d0b263697797d775e72583b23f8f9c

data/README.md

@@ -32,10 +32,10 @@ Special views include:
 
 Each follow preference can point to one or more of the following follow options.
 
-- _always:_ notify user after every create, update, and delete 
-- _never:_ do not notify user
-- _created:_ notify user when a card is created
-- _edited:_ notify user when a card is created or updated
+- _always:_ notify user of changes to all cards in set 
+- _never:_ do not notify user of changes to card in set
+- _created:_ notify user of changes to cards user has created
+- _edited:_ notify user of changes to cards user has edited 
 
 ### Follow dashboard
 
@@ -112,7 +112,7 @@ Useful views added by this mod include:
 These rules rules are advanced configuration that let sharks determine which of a card’s fields
 are automatically followed when a user follow that card.
 
-The default value is `:includes`, which means that nested cards are followed by default.
+The default value is `:nests`, which means that nested cards are followed by default.
 
 ## Lib
 

data/assets/script/follow.js.coffee

@@ -0,0 +1,19 @@
+$(window).ready ->
+  $('body').on 'click', '.btn-item', ->
+    $(this).find('i').html('hourglass_full')
+
+  $('body').on 'mouseenter', '.btn-item-delete', ->
+    $(this).find('i').html('remove')
+    $(this).addClass("btn-danger").removeClass("btn-primary")
+
+  $('body').on 'mouseleave', '.btn-item-delete', ->
+    $(this).find('i').html('check')
+    $(this).addClass("btn-primary").removeClass("btn-danger")
+
+  $('body').on 'submit', '.edit-view.SELF-Xfollow_default .card-form', ->
+    confirmer = $(this).find '.confirm_update_all-view'
+    if confirmer.is ':hidden'
+      $(this).find('.follow-updater').show()
+
+      confirmer.show 'blind'
+      false

data/assets/style/follow.scss

@@ -0,0 +1,7 @@
+.TYPE_PLUS_RIGHT-user-Xfollow .tab-pane {
+  margin-top: 15px;
+}
+
+.follow-updater {
+  display: none;
+}

data/data/files/mod_follow_script_asset_output/file.js

@@ -0,0 +1,2 @@
+// follow.js.coffee
+(function(){$(window).ready(function(){return $("body").on("click",".btn-item",function(){return $(this).find("i").html("hourglass_full")}),$("body").on("mouseenter",".btn-item-delete",function(){return $(this).find("i").html("remove"),$(this).addClass("btn-danger").removeClass("btn-primary")}),$("body").on("mouseleave",".btn-item-delete",function(){return $(this).find("i").html("check"),$(this).addClass("btn-primary").removeClass("btn-danger")}),$("body").on("submit",".edit-view.SELF-Xfollow_default .card-form",function(){var n;if((n=$(this).find(".confirm_update_all-view")).is(":hidden"))return $(this).find(".follow-updater").show(),n.show("blind"),!1})})}).call(this);

data/data/real.yml

@@ -0,0 +1,99 @@
+---
+- :name: Notification template
+  :type: :cardtype
+  :codename: notification_template
+
+
+- :name: "*follow"
+  :type: :setting
+  :codename: follow
+  :fields:
+    :right:
+      :fields:
+        :input_type: radio
+        :help: Get notified about changes.
+
+- :name: "*following"
+  :type: :list
+  :codename: following
+  :fields:
+    :right:
+      :fields:
+        :create: _left
+        :update: _left
+
+
+- :name: "*followers"
+  :codename: followers
+- :name: "*follow fields"
+  :type: :setting
+  :codename: follow_fields
+- :name: "*always"
+  :codename: always
+- :name: "*never"
+  :codename: never
+- :name: "*follow defaults"
+  :type: :list
+  :codename: follow_defaults
+
+- :name: follow suggestions
+  :type: :list
+  :codename: follow_suggestions
+
+- :name:
+    - :all
+    - :follow_fields
+  :content: "*nests"
+
+- :name: "*contextual class"
+  :codename: contextual_class
+  :fields:
+    :right:
+      :fields:
+        :input_type: radio
+        :content_options: |-
+          success
+          info
+          warning
+          danger
+- :name: "*message"
+  :codename: message
+- :name: "*disappear"
+  :codename: disappear
+
+
+- :name: follower notification email
+  :type: :email_template
+  :codename: follower_notification_email
+  :fields:
+    :from: Decko Bot
+    :subject: '{{_user|name}} {{_|last_action_verb}} "{{_|name}}"'
+    :html_message: |-
+      <p>
+        {{_|link}} was just <a href="{{_|url}}?view=history">{{_|last_action_verb}}</a> 
+        by {{_user|link}}
+      </p>
+      <blockquote>{{_|list_of_changes}}</blockquote>
+      <p>{{_|subedits}}</p>
+
+      <p>
+        You received this email because you're following <strong>{{_|followed}}</strong>.
+      </p>
+  
+      <p>
+        <em>
+          <a href="{{_|unfollow_url}}">Unfollow</a> to stop receiving these emails.
+        </em>
+      </p>
+    :text_message: |-
+      "{{_|name}}" was just {{_|last_action_verb}} by {{_user|name}}.
+  
+      {{_|list_of_changes}}
+
+      {{_|subedits}}
+
+      See the card: {{_|url}}
+  
+      You received this email because you're following "{{_|followed}}".
+  
+      Use this link to unfollow {{_|unfollow_url}}

data/data/test/rules.yml

@@ -0,0 +1,125 @@
+---
+- :name:
+    - Google glass
+    - :self
+    - :follow_fields
+  :type: :list
+- :name:
+    - Sunglasses
+    - :self
+    - :follow_fields
+  :type: :list
+  :content: |-
+    *nests
+    _self+price
+    _self+producer
+
+
+- :name:
+    - John Following
+    - :self
+    - John
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - All Eyes On Me
+    - :self
+    - John
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Sara Following
+    - :self
+    - Sara
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - All Eyes On Me
+    - :self
+    - Sara
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Optic
+    - :type
+    - Sara
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Google glass
+    - :self
+    - Sara
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - All Eyes On Me
+    - :self
+    - Big Brother
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Look At Me
+    - :self
+    - Big Brother
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Optic
+    - :type
+    - Big Brother
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - lens
+    - :right
+    - Big Brother
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Optic
+    - tint
+    - :type_plus_right
+    - Big Brother
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - :all
+    - Big Brother
+    - :follow
+  :type: :list
+  :content: |-
+    *created
+    *edited
+- :name:
+    - Optic
+    - :type
+    - Optic fan
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - Sunglasses
+    - :self
+    - Sunglasses fan
+    - :follow
+  :type: :list
+  :content: "*always"
+- :name:
+    - :all
+    - Narcissist
+    - :follow
+  :type: :list
+  :content: |-
+    *created
+    *edited

data/data/test/users.yml

@@ -0,0 +1,53 @@
+---
+# users use "conflict: :defer" because otherwise Card#ensure detects false
+# changes in the +:password card (because the encrypted version is compared to the
+# the unencrypted one. A deeper fix would address the change detection in the
+# +:password cards
+- :name: John
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: john@user.com
+        :password: john_pass
+- :name: Sara
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: sara@user.com
+        :password: sara_pass
+- :name: Big Brother
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: big-brother@user.com
+        :password: big-brother_pass
+- :name: Optic fan
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: optic-fan@user.com
+        :password: optic-fan_pass
+- :name: Sunglasses fan
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: sunglasses-fan@user.com
+        :password: sunglasses-fan_pass
+- :name: Narcissist
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: narcissist@user.com
+        :password: narcissist_pass

data/data/test/with_fields.yml

@@ -0,0 +1,56 @@
+---
+- :name: card with fields
+  :content: main content {{+field 1}}  {{+field 2}}
+  :user: Joe User
+  :fields:
+    field 1: content of field 1
+    field 2: content of field 2
+- :name: card with fields and admin fields
+  :content: main content {{+field 1}}  {{+admin field 1}}
+  :user: Joe User
+  :fields:
+    field 1: content of field 1
+    admin field 1: content of admin field 1
+- :name: admin card with fields and admin fields
+  :content: main content {{+field 1}}  {{+admin field 1}}
+  :user: Joe User
+  :fields:
+    field 1: content of field 1
+    admin field 1: content of admin field 1
+- :name: admin card with admin fields
+  :content: main content {{+admin field 1}}  {{+admin field 2}}
+  :user: Joe User
+  :fields:
+    admin field 1: content of admin field 1
+    admin field 2: content of admin field 2
+
+- :name:
+    - admin card with fields and admin fields
+    - :self
+    - :read
+  :type: :pointer
+  :content: Administrator
+- :name:
+    - admin card with admin fields
+    - :self
+    - :read
+  :type: :pointer
+  :content: Administrator
+- :name:
+    - admin field 1
+    - :right
+    - :read
+  :type: :pointer
+  :content: Administrator
+- :name:
+    - admin field 2
+    - :right
+    - :read
+  :type: :pointer
+  :content: Administrator
+- :name:
+    - field 1
+    - :right
+    - :read
+  :type: :pointer
+  :content: Anyone

data/data/test.yml

@@ -0,0 +1,39 @@
+---
+- users
+- :name: Optic
+  :type: :cardtype
+- :name: All Eyes On Me
+- :name: No One Sees Me
+- :name: Look At Me
+- :name: Sara Following
+- :name: John Following
+  :content: "{{+her}}"
+- :name:
+  - John Following
+  - her
+- :name:
+  - Magnifier
+  - lens
+- :name:
+  - Magnifier
+  - lens
+  :content: zoom in
+  :user: Narcissist
+- :name: Sunglasses
+  :type: Optic
+  :content: "{{+tint}}{{+lens}}"
+  :user: Narcissist
+- :name: Google glass
+  :type: Optic
+  :user: Optic fan
+  :content: "{{+price}}"
+- :name:
+  - Sunglasses
+  - tint
+- :name:
+  - Sunglasses
+  - price
+- :name: Created card
+  :content: new content
+- rules
+- with_fields

data/set/all/follow/follow_link.rb

@@ -12,8 +12,8 @@ class FollowLink
   def modal_link icon=false
     opts = link_opts.merge(
       "data-path": link_opts[:path],
-      "data-toggle": "modal",
-      "data-target": "#modal-#{card.name.safe_key}",
+      "data-bs-toggle": "modal",
+      "data-bs-target": "#modal-#{card.name.safe_key}",
       class: css_classes("follow-link", link_opts[:class])
     )
     link_to render_link_text(icon), opts

data/set/all/follow/followed_by.rb

@@ -50,7 +50,7 @@ def all_follow_rule_options follower_id
 end
 
 def follow_rule_option_applies? follower_id, option
-  option_code = option.to_name.code
+  option_code = option.to_name.codename
   candidate_ids = follower_candidate_ids_for_option option_code
   follow_rule_option_applies_to_candidates? follower_id, option_code, candidate_ids
 end

data/set/all/notify/base_views.rb

@@ -88,7 +88,7 @@ format do
   def edit_info_for field, action
     return nil unless (value = action.value field)
 
-    value = action.previous_value if action.action_type == :delete
+    value = action.previous_value(field) if action.action_type == :delete
     wrap_list_item "  #{notification_action_label action} #{field}: #{value}"
   end
 

data/set/all/notify.rb

@@ -10,8 +10,8 @@ def silence_notifications?
   !(Card::Env.controller || force_notifications)
 end
 
-event :notify_followers_after_save,
-      :integrate_with_delay, on: :save, when: :notable_change? do
+event :notify_followers_after_save, :integrate_with_delay,
+      on: :save, priority: 20, when: :notable_change? do
   notify_followers
 end
 

data/set/right/contextual_class.rb

@@ -0,0 +1 @@
+assign_type :list

data/set/right/disappear.rb

@@ -0,0 +1 @@
+assign_type :toggle

data/set/right/follow.rb

@@ -2,6 +2,8 @@
 # While the user follow dashboard ([User]+:follow`) is also in this Set, its
 # customizations are handled in TypePlusRight::User::Follow
 
+assign_type :list
+
 event :cache_expired_for_new_preference, :integrate, when: :preference? do
   Card.follow_caches_expired
 end
@@ -34,6 +36,10 @@ def ok_to_delete
   permit :delete
 end
 
+def raw_help_text
+  "Get notified about changes"
+end
+
 def permit action, verb=nil
   if %i[create delete update].include?(action) && allowed_to_change_follow_status?
     true

data/set/right/follow_fields.rb

@@ -1,3 +1,5 @@
+assign_type :list
+
 event :follow_fields_changed, :integrate do
   Card.follow_caches_expired
 end

data/set/right/followers.rb

@@ -2,7 +2,7 @@
 
 # X+*followers provides a list of all users following X.
 
-include_set Abstract::Pointer
+include_set Abstract::List
 
 format :html do
   view :core, cache: :never do

data/set/right/following.rb

@@ -1,3 +1,5 @@
+assign_type :list
+
 def virtual?
   new?
 end

data/set/right/message.rb

@@ -0,0 +1 @@
+assign_type :phrase

data/set/self/follow_defaults.rb

@@ -14,7 +14,7 @@
 # - if you truly want to override existing follow rules, that may be monkey territory?
 # - we will delete "*follow defaults" after the above are completed
 
-event :update_follow_rules, :finalize, on: :save, when: :update_all_users do
+event :update_follow_rules, :finalize, on: :save, trigger: :required do
   Auth.as_bot do
     Card.search(type: "user").each do |user|
       follow_defaults.each do |set_card, option|
@@ -46,24 +46,16 @@ def follow_option item
 end
 
 format :html do
-  view :edit, perms: :update, unknown: true do
-    frame_and_form :update, hidden: { card: { update_all_users: false } } do
-      [
-        _render_content_formgroups,
-        _render_confirm_update_all,
-        _render_edit_buttons
-      ]
-    end
-  end
-
   view :edit_buttons do
-    button_formgroup do
-      [submit_and_update_button, simple_submit_button, cancel_to_edit_button]
-    end
+    render_confirm_update_all +
+      button_formgroup do
+        [submit_and_update_button, simple_submit_button, cancel_to_edit_button]
+      end
   end
 
   def submit_and_update_button
     submit_button text: "Submit and update all users",
+                  name: "card[trigger]", value: "update_follow_rules",
                   disable_with: "Updating", class: "follow-updater"
   end
 

data/set/type/notification_template.rb

@@ -29,5 +29,5 @@ def disappear?
 end
 
 def alert_class
-  contextual_class.present? ? contextual_class_card.item_name : :success
+  contextual_class.present? ? contextual_class_card.first_name : :success
 end

data/set/type/set.rb

@@ -37,8 +37,8 @@ def all_members_followed_by? user_id=nil
 end
 
 def broader_set_followed_by? user_id
-  broader_sets.find do |set_name|
-    Card.fetch(set_name)&.directly_followed_by? user_id
+  broader_sets.find do |set_card|
+    set_card&.directly_followed_by? user_id
   end
 end
 

data/set/type_plus_right/user/follow.rb

@@ -4,7 +4,7 @@ FOLLOW_TABS = { "Follow" => { view: "follow_tab" },
 # a virtual pointer to the sets that a user is following.
 # (data is stored in preferences: `[Set]+[User]+:follow`)
 
-include_set Abstract::Pointer
+include_set Abstract::List
 def virtual?
   new?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-follow
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
 - !ruby/object:Gem::Dependency
   name: card-mod-carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -48,6 +48,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- assets/script/follow.js.coffee
+- assets/style/follow.scss
+- data/files/mod_follow_script_asset_output/file.js
+- data/real.yml
+- data/test.yml
+- data/test/rules.yml
+- data/test/users.yml
+- data/test/with_fields.yml
 - lib/card/follow_option.rb
 - lib/card/follower_stash.rb
 - set/abstract/follow_option.rb
@@ -62,11 +70,14 @@ files:
 - set/all/notify/base_views.rb
 - set/all/notify/html_views.rb
 - set/right/account.rb
+- set/right/contextual_class.rb
+- set/right/disappear.rb
 - set/right/follow.rb
 - set/right/follow/follow_status.haml
 - set/right/follow_fields.rb
 - set/right/followers.rb
 - set/right/following.rb
+- set/right/message.rb
 - set/self/always.rb
 - set/self/created.rb
 - set/self/edited.rb
@@ -91,6 +102,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: follow
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -106,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: follower notifications