card 1.96.8 → 1.97.0

data/lib/card/view/layout.rb

@@ -0,0 +1,14 @@
+class Card
+  class View
+    # method to render views with layouts
+    module Layout
+      # def with_layout &render_block
+      #   binding.pry
+      #   return yield unless layout.present?
+      #
+      #   format.rendered_main_nest = format.wrap_main(&render_block)
+      #   ::Card::Layout.render layout, self
+      # end
+    end
+  end
+end

data/lib/card/view/options.rb

@@ -3,24 +3,26 @@ class Card
     # Manages options for card views, including those used in nest syntax
     module Options
       # the keymap represents a 2x2 matrix, where the factors are
-      # (a) whether an option's value can be set by a Carditect via nests, and
+      # (a) whether an option's value can be set by a shark via nests, and
       # (b) whether nested views can inherit the option from a parent view.
       #
-      #                  for rulers  | not for rulers
+      #                  for sharks  | not for sharks
       #                 ________________________________
       #       inherit  | both        | heir
-      # don't inherit  | ruler       | none
+      # don't inherit  | shark       | none
       #
       # (note: each option will likely some day merit its own object)
       @keymap = {
-        ruler: [
+        shark: [
           :view,           # view to render
           :nest_name,      # name as used in nest
           :nest_syntax,    # full nest syntax
           :show,           # render these views when optional
-          :hide            # do not render these views when optional
+          :hide,            # do not render these views when optional
+          :wrap,            # wrap the nest with a wrapper
+          :edit
         ],                 #   show/hide can be view (Symbol), list of views (Array),
-                           #   or comma separated views (String)
+        #   or comma separated views (String)
         # NOTE: although show and hide are in this non-inheriting group, they are
         # actually inherited, just not through the standard mechanism. Because, well,
         # they're weird. (See process_visibility options)
@@ -37,7 +39,8 @@ class Card
           :help,           # cue text when editing
           :structure,      # overrides the content of the card
           :title,          # overrides the name of the card
-          :variant,        # override the canonical version of the name with a different variant
+          :variant,        # override the canonical version of the name with a different
+                           # variant
           :editor,         # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size
@@ -57,7 +60,8 @@ class Card
         attr_reader :keymap
 
         def add_option name, type
-          raise "invalid option type" unless @keymap.key?(type)
+          raise "invalid option type: #{type}" unless @keymap.key?(type)
+
           @keymap[type] << name
           reset_key_lists
         end

data/lib/card/view/options/key_lists.rb

@@ -10,8 +10,8 @@ class Card
 
         # keys whose values can be set by Deckers in card nests
         # @return [Array]
-        def ruler_keys
-          @ruler_keys ||= ::Set.new(keymap[:both]) + keymap[:ruler]
+        def shark_keys
+          @shark_keys ||= ::Set.new(keymap[:both]) + keymap[:shark]
         end
 
         # keys that follow simple standard inheritance pattern from parent views
@@ -25,14 +25,14 @@ class Card
         def accessible_keys
           all_keys - [   # (all but the following)
             :view,       # view is accessed as requested_view or ok_view and cannot be
-                         # directly manipulated
+            # directly manipulated
             :show, :hide # these have a more extensive API (see Card::View::Visibility)
           ]
         end
 
         def reset_key_lists
           @all_keys = nil
-          @ruler_keys = nil
+          @shark_keys = nil
           @heir_keys = nil
         end
       end

data/lib/card/view/options/voo_api.rb

@@ -25,15 +25,13 @@ class Card
 
           def define_getter option_key
             define_method option_key do
-              norm_method = "normalize_#{option_key}"
-              value = live_options[option_key]
-              try(norm_method, value) || value
+              live_options[option_key]
             end
           end
 
           def define_setter option_key
             define_method "#{option_key}=" do |value|
-              live_options[option_key] = value
+              live_options[option_key] = special_option_value(option_key, value) || value
             end
           end
         end
@@ -69,6 +67,17 @@ class Card
         # methods that follow the normalize_#{key} pattern are called by accessors
         # (arguably that should be done during normalization!)
 
+        def normalize_special_options! opts
+          opts.each do |option_key, value|
+            new_value = special_option_value option_key, value
+            opts[option_key] = new_value if new_value
+          end
+        end
+
+        def special_option_value option_key, value
+          try "normalize_#{option_key}", value
+        end
+
         def normalize_editor value
           value&.to_sym
         end
@@ -77,6 +86,11 @@ class Card
           value&.to_sym
         end
 
+        def normalize_wrap value
+          value = value.split(",").map(&:strip) if value.is_a? String
+          Array.wrap(value).compact.flatten
+        end
+
         protected
 
         # - @live_options are dynamic and can be altered by the "voo" API at any time.
@@ -93,6 +107,7 @@ class Card
         # handling for main_views.
         def normalize_options
           @normalized_options = opts = options_to_hash @raw_options.clone
+          normalize_special_options! opts
           @optional = opts.delete(:optional) || false
           add_implicit_options!
           inherit_options_from_parent!
@@ -122,6 +137,7 @@ class Card
         # standard inheritance from parent view object
         def inherit_options_from_parent!
           return unless parent
+
           Options.heir_keys.each do |option_key|
             inherit_from_parent! option_key
           end
@@ -129,18 +145,16 @@ class Card
 
         def inherit_from_parent! option_key
           return unless (parent_value = parent.live_options[option_key])
+
           @normalized_options[option_key] ||= parent_value
         end
 
         def process_live_options
           @live_options = normalized_options.clone
-          if @live_options[:main_view]
-            @live_options.merge! format.main_nest_options
-          end
-          # main_nest_options are not processed in normalize_options so that
-          # they're NOT locked in the stub.
+          process_main_nest_options
           process_before_view
           process_visibility_options
+          process_view_wrappers
           @live_options
         end
 
@@ -150,8 +164,31 @@ class Card
           format.before_view requested_view
         end
 
+        # adds the wrappers that
+        def process_view_wrappers
+          view_wrappers = format.view_setting(:wrap, ok_view)
+          return unless view_wrappers.present?
+
+          @live_options[:wrap] = Array.wrap(@live_options[:wrap])
+          if view_wrappers.is_a? ::Hash
+            view_wrappers.each_pair do |name, opts|
+              @live_options[:wrap] << [name, opts]
+            end
+          else
+            @live_options[:wrap] += Array.wrap(view_wrappers)
+          end
+        end
+
+        # merge the options of the main nest into the @live_options
+        # They are not processed in normalize_options so that
+        # they're NOT locked in the stub.
+        def process_main_nest_options
+          @live_options.merge! format.main_nest_options if @live_options[:main_view]
+        end
+
         def validate_options! opts
           return unless (foreign_opts = foreign_options_in opts)
+
           raise Card::Error, "illegal view options: #{foreign_opts}"
         end
 

data/lib/card/view/stub.rb

@@ -9,7 +9,6 @@ class Card
     # A stub must contain all the information necessary to produce the view as intended.
     #
     module Stub
-
       class << self
         def escape stub_json
           stub_json.gsub "(", "_OParEN_"
@@ -36,7 +35,8 @@ class Card
           view_opts: normalized_options,
           format_opts: { nest_mode: format.nest_mode, override: root? } }
         # nest mode handling:
-        # typically modes only override views on nests, but stubs create non-standard nests
+        # typically modes only override views on nests, but stubs create non-standard
+        # nests
         # mode-based view overrides should NOT apply to standard render calls that have
         # been replaced with stubs - only to standard nest calls. therefore modes are not
         # stored in non-standard nest stubs

data/lib/card/view/visibility.rb

@@ -40,20 +40,19 @@ class Card
 
       # advanced write method
       VIZ_SETTING = { show: :show, true => :show,
-                      hide: :hide, false => :hide, nil => :hide }
+                      hide: :hide, false => :hide, nil => :hide }.freeze
 
       def viz views, setting, force=false
         Array.wrap(views).flatten.each do |view|
           view = view.to_sym
           next if !force && viz_hash[view]
+
           viz_hash[view] = VIZ_SETTING[setting]
         end
       end
 
       def visible? view
-        unless viz_hash[view]
-          viz view, yield
-        end
+        viz view, yield unless viz_hash[view]
         show? view
       end
 
@@ -74,7 +73,7 @@ class Card
 
       # takes an options_hash and processes it to update viz_hash
       def process_visibility options_hash
-        [:hide, :show].each do |setting|
+        %i[hide show].each do |setting|
           list = viz_view_list options_hash.delete(setting)
           viz list, setting, true
         end

data/lib/card/view/wrapper.rb

@@ -0,0 +1,28 @@
+class Card
+  class View
+    # method to render views with layouts
+    module Wrapper
+      def with_wrapper
+        if layout.present?
+          self.wrap ||= []
+          wrap.push layout.to_name.key
+        end
+
+        format.rendered = yield
+        return format.rendered unless wrap.present?
+
+        wrap.reverse_each do |wrapper|
+          format.rendered = render_wrapper wrapper
+        end
+        format.rendered
+      end
+
+      private
+
+      def render_wrapper wrapper
+        format.try("wrap_with_#{wrapper}") { format.rendered } ||
+          Card::Layout::CardLayout.new(wrapper, format).render
+      end
+    end
+  end
+end

data/lib/cardio.rb

@@ -73,7 +73,8 @@ module Cardio
 
         allow_irreversible_admin_tasks: false,
         raise_all_rendering_errors:     false,
-        rescue_all_in_controller:       true
+        rescue_all_in_controller:       true,
+        navbox_match_start_only:        true
       }
     end
 

data/mod/Modfile

@@ -19,6 +19,8 @@ mod 'developer'
 mod 'carrierwave'
 mod 'search'
 mod 'standard'
+mod 'rules'
+mod 'edit'
 mod 'date'
 mod 'account'
 mod 'bootstrap'

data/mod/account/set/right/account.rb

@@ -125,10 +125,8 @@ end
 def reset_password_success
   token_card.used!
   Auth.signin left_id
-  { id: left.name,
-    view: :related,
-    slot: { items: { nest_name: :account.cardname.prepend_joint,
-                     view: :edit } } }
+  { id: name,
+    view: :edit }
 end
 
 def reset_password_try_again
@@ -176,8 +174,8 @@ format :html do
     # Problem: when you do that then the fields are missing in the sign up form:
     # output( [field_nest(:email, view: :titled, title: "email"),
     #          field_nest(:password, view: :titled, title: "password")])
-    %({{+#{:email.cardname}|titled;title:email}}
-      {{+#{:password.cardname}|titled;title:password}})
+    %({{+#{:email.cardname}|edit_row;title:email}}
+      {{+#{:password.cardname}|edit_row;title:password}})
   end
 
   before :content_formgroup do

data/mod/account/set/right/password.rb

@@ -38,8 +38,8 @@ view :raw do
 end
 
 format :html do
-  view :core do
-    "<em>#{render_raw}</em"
+  view :core, wrap: :em do
+    render_raw
   end
 
   view :editor do

data/mod/account/set/self/signin.rb

@@ -31,8 +31,7 @@ end
 # and aborts (does not sign in)
 event :send_reset_password_token, before: :signin, on: :update, trigger: :required do
   email = subfield(:email)&.content
-  account = Auth.find_account_by_email email
-  send_reset_password_email_or_fail account
+  send_reset_password_email_or_fail email
 end
 
 def consider_recaptcha?
@@ -44,7 +43,8 @@ def i18n_signin key
 end
 
 def authenticate_or_abort email, pword
-  abort :failure, i18n_signin(:abort_bad_signin_args) unless email && pword
+  abort :failure, i18n_signin(:email_missing) unless email
+  abort :failure, i18n_signin(:password_missing) unless pword
   if (account = Auth.authenticate(email, pword))
     Auth.signin account.left_id
   else
@@ -62,9 +62,11 @@ def signin_error_message account
   end
 end
 
-def send_reset_password_email_or_fail account
+def send_reset_password_email_or_fail email
   aborting do
-    if account && account.active?
+    break errors.add :email, i18n_signin(:error_blank) if email.blank?
+
+    if (account = Auth.find_account_by_email(email))&.active?
       account.send_reset_password_token
     elsif account
       errors.add :account, i18n_signin(:error_not_active)
@@ -121,15 +123,20 @@ format :html do
 
   # FORGOT PASSWORD
   view :edit do
+    reset_password_voo
+    Auth.as_bot { super() }
+  end
+
+  def reset_password_voo
     voo.title ||= card.i18n_signin(:forgot_password)
     voo.edit_structure = [signin_field(:email)]
     voo.hide :help
-    Auth.as_bot { super() }
   end
 
+
   view :edit_buttons do
     text = I18n.t :reset_my_password, scope: "mod.account.set.self.signin"
-    button_tag text, situation: "primary"
+    button_tag text, situation: "primary", class: "_close-modal-on-success"
   end
 
   def hidden_signin_fields
@@ -148,9 +155,9 @@ format :html do
 
   def reset_password_link
     text = I18n.t :reset_password, scope: "mod.account.set.self.signin"
-    reset_link = link_to_view :edit, text, path: { slot: { hide: :toolbar } }
+    link = link_to_view :edit, text, path: { slot: { hide: :bridge_link } }
     # FIXME: inline styling
-    raw("<div style='float:right'>#{reset_link}</div>")
+    raw("<div style='float:right'>#{link}</div>")
   end
 
   def edit_view_hidden

data/mod/account/set/type/signup.rb

@@ -26,7 +26,7 @@ format :html do
 
   view :new_buttons do
     button_formgroup do
-      [standard_submit_button, invite_button].compact
+      [standard_create_button, invite_button].compact
     end
   end
 

data/mod/account/spec/set/right/password_spec.rb

@@ -1,39 +1,46 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Right::Password do
-  before do
-    @account = Card::Auth.find_account_by_email("joe@user.com")
+RSpec.describe Card::Set::Right::Password do
+  let(:account)  { Card::Auth.find_account_by_email("joe@user.com") }
+  let(:password_card) { account.password_card }
+  let(:password) { account.password }
+
+  specify "view: core" do
+    expect(password_card.format.render_core).to have_tag :em, "encrypted"
+  end
+
+  def card_subject
+    password_card
   end
 
+  check_html_views_for_errors
+
   describe "#update" do
-    it "encrypts password" do
-      @account.password_card.update! content: "new password"
-      expect(@account.password).not_to eq("new password")
+    it "encrypts password", aggregate_failures: true do
+      password_card.update! content: "new password"
+      expect(password).not_to eq("new password")
       authenticated = Card::Auth.authenticate "joe@user.com", "new password"
-      assert_equal @account, authenticated
+      expect(account).to eq authenticated
     end
 
     it "validates password" do
-      password_card = @account.password_card
+      password_card = account.password_card
       password_card.update content: "2b"
       expect(password_card.errors[:password]).not_to be_empty
     end
 
     context "blank password" do
-      it "does not change the password" do
-        acct = @account
-        original_pw = acct.password
+      it "does not change the password", aggregate_failures: true do
+        original_pw = account.password
         expect(original_pw.size).to be > 10
-        pw_card = acct.password_card
-        pw_card.content = ""
-        pw_card.save
-        expect(original_pw).to eq(pw_card.refresh(_force = true).db_content)
+        password_card.update! content: ""
+        expect(original_pw).to eq(password_card.refresh(_force = true).db_content)
       end
 
-      it "does not break email editing" do
-        @account.update! subcards: { "+*password" => "", "+*email" => "joe2@user.com" }
-        expect(@account.email).to eq("joe2@user.com")
-        expect(@account.password).not_to be_empty
+      it "does not break email editing", aggregate_failures: true do
+        account.update! subcards: { "+*password" => "", "+*email" => "joe2@user.com" }
+        expect(account.email).to eq("joe2@user.com")
+        expect(account.password).not_to be_empty
       end
     end
   end