card 1.19.6 → 1.20.0

data/mod/account/spec/set/type/signup_spec.rb

@@ -6,14 +6,13 @@ describe Card::Set::Type::Signup do
   end
 
   context "signup form form" do
-    before do
-      card = Card.new type_id: Card::SignupID
-      @form = card.format.render_new
+    subject do
+      Card.new(type_id: Card::SignupID).format.render :new
     end
 
     it "prompts to signup" do
       Card::Auth.as :anonymous do
-        expect(@form.match(/Sign up/)).to be_truthy
+        expect(subject.match(/Sign up/)).to be_truthy
       end
     end
   end
@@ -106,7 +105,7 @@ describe Card::Set::Type::Signup do
       @account = @signup.account
     end
 
-    it "should create all the necessary cards, but no token" do
+    it "creates all the necessary cards, but no token" do
       expect(@signup.type_id).to eq(Card::SignupID)
       expect(@account.email).to eq("wolf@wagn.org")
       expect(@account.status).to eq("pending")
@@ -114,7 +113,7 @@ describe Card::Set::Type::Signup do
       expect(@account.password.length).to be > 10 # encrypted
     end
 
-    it "should not create a token" do
+    it "does not create a token" do
       expect(@account.token).not_to be_present
     end
 
@@ -133,7 +132,7 @@ describe Card::Set::Type::Signup do
     end
 
     context "approval with token" do
-      it "should create token" do
+      it "creates token" do
         Card::Env.params[:approve_with_token] = true
         Card::Auth.as "joe_admin"
 
@@ -144,7 +143,7 @@ describe Card::Set::Type::Signup do
     end
 
     context "approval without token" do
-      it "should create token" do
+      it "creates token" do
         Card::Env.params[:approve_without_token] = true
         Card::Auth.as "joe_admin"
 

data/mod/ace_editor/set/abstract/ace_editor.rb

@@ -1,9 +1,6 @@
 format :html do
-  def default_editor_args args
-    args[:ace_mode] ||= "html"
-  end
-
   view :editor do |args|
+    args[:ace_mode] ||= "html"
     text_area :content, rows: 5,
                         class: "card-content ace-editor-textarea",
                         "data-ace-mode" => args[:ace_mode]

data/mod/admin/set/self/admin.rb

@@ -8,7 +8,7 @@ event :admin_tasks, :initialize, on: :update do
   case task.to_sym
   when :clear_cache          then Card::Cache.reset_all
   when :repair_references    then Card::Reference.repair_all
-  when :clear_view_cache     then Card::Cache::ViewCache.reset
+#  when :clear_view_cache     then Card::View.reset
   when :delete_old_revisions then Card::Action.delete_old
   when :repair_permissions   then Card.repair_all_permissions
   when :clear_solid_cache    then Card.clear_solid_cache
@@ -60,7 +60,7 @@ format :html do
     ]
     return stats unless Card.config.view_cache
     stats << { title: "view cache",
-               count: Card::Cache::ViewCache,
+               count: Card::View,
                link_text: "clear view cache",
                task: "clear_view_cache" }
   end

data/mod/admin/set/self/admin_info.rb

@@ -14,7 +14,7 @@ format :html do
       warnings << recaptcha_warning
     end
     return "" if warnings.empty?
-    alert :warning, dismissible: true do
+    alert :warning, true do
       render_warning_list warnings
     end
   end

data/mod/admin/set/self/recaptcha_private_key.rb

@@ -0,0 +1,3 @@
+event :set_recaptcha_private_key, :finalize do
+  Card.config.recaptcha_public_key = content
+end

data/mod/admin/set/self/recaptcha_proxy.rb

@@ -0,0 +1,3 @@
+event :set_recaptcha_proxy, :finalize do
+  Card.config.recaptcha_proxy = content
+end

data/mod/admin/set/self/recaptcha_public_key.rb

@@ -0,0 +1,3 @@
+event :set_recaptcha_public_key, :finalize do
+  Card.config.recaptcha_public_key = content
+end

data/mod/admin/set/self/trash.rb

@@ -24,17 +24,17 @@ format :html do
   def restored
     return unless (res_id = Env.params[:restore]) &&
                   (res_card = Card[res_id.to_i])
-    alert :success, dismissible: true do
-      content_tag(:h5, "restored") + subformat(res_card).render_closed
+    alert :success, true do
+      wrap_with(:h5, "restored") + subformat(res_card).render_closed
     end
   end
 
   def empty_trash_link
-    content_tag(
+    wrap_with(
       :p,
       button_link("empty trash",
                   btn_type: :default,
-                  path: { card: :admin, action: :update, task: :empty_trash,
+                  path: { mark: :admin, action: :update, task: :empty_trash,
                           success: { id: "~#{card.id}" } },
                   "data-confirm" => "Are you sure you want to delete "\
                                     "all cards in the trash?")

data/mod/admin/spec/set/self/admin_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Self::Admin do
-  it "should render a table" do
+  it "renders a table" do
     Card::Auth.as_bot do
       @core = render_card :core, name: :admin
     end
@@ -13,7 +13,7 @@ describe Card::Set::Self::Admin do
       @admin = Card[:admin]
     end
 
-    it "should trigger empty trash (with right params)" do
+    it "triggers empty trash (with right params)" do
       Card::Auth.as_bot do
         Card["A"].delete!
         expect(Card.where(trash: true)).not_to be_empty
@@ -23,7 +23,7 @@ describe Card::Set::Self::Admin do
       end
     end
 
-    it "should trigger deleting old revisions (with right params)" do
+    it "triggers deleting old revisions (with right params)" do
       Card::Auth.as_bot do
         a = Card["A"]
         a.update_attributes! content: "a new day"
@@ -35,7 +35,7 @@ describe Card::Set::Self::Admin do
       end
     end
 
-    #     it 'should be trigger reference repair' do
+    #     it 'is trigger reference repair' do
     #       Card::Auth.as_bot do
     #         a = Card['A']
     #         puts a.references_out.count

data/mod/admin/spec/set/self/version_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Self::Version do
-  it "should have an X.X.X version" do
+  it "has an X.X.X version" do
     expect(render_card(:raw, name: "*version") =~ /\d\.\d+\.\w+/).to be_truthy
   end
 end

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

@@ -1,7 +1,7 @@
 
 format :css do
-  def get_nest_defaults _nested_card
-    { view: :raw }
+  def default_nest_view
+    :raw
   end
 
   def show view, args
@@ -22,7 +22,7 @@ format :css do
   end
 
   view :import do |_args|
-    %{\n@import url("#{_render_url item: :import}");\n}
+    %{\n@import url("#{_render_url items: { view: :import }}");\n}
   end
 
   view :url, perms: :none do |args|

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

@@ -1,12 +1,12 @@
 require "csv"
 
 format :csv  do
-  def get_nest_defaults _nested_card
-    { view: :core }
+  def default_nest_view
+    :core
   end
 
   def default_item_view
-    @depth == 0 ? :csv_row : :name
+    @depth.zero? ? :csv_row : :name
   end
 
   view :csv_row do |_args|
@@ -25,19 +25,19 @@ format :csv  do
   view :csv_title_row do |_args|
     # NOTE: assumes all cards have the same structure!
     begin
-      card1 = search_results.first
+      card1 = search_with_params.first
 
       parsed_content = Card::Content.new card1.raw_content, self
       if parsed_content.__getobj__.is_a? String
         ""
       else
         titles = parsed_content.map do |chunk|
-          next if chunk.class != Card::Content::Chunk::Include
+          next if chunk.class != Card::Content::Chunk::Nest
           opts = chunk.options
           if %w(name link).member? opts[:view]
             opts[:view]
           else
-            opts[:inc_name].to_name.tag
+            opts[:nest_name].to_name.tag
           end
         end.compact
         CSV.generate_line titles.map { |title| title.to_s.upcase }

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

@@ -1,5 +1,9 @@
 
 format :js do
+  def default_item_view
+    :core
+  end
+
   view :include_tag do |_args|
     %(\n#{javascript_include_tag page_path(card.cardname)}\n )
   end

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

@@ -5,48 +5,27 @@ format do
   end
 
   # NAME VIEWS
-  view :name, closed: true, perms: :none do |args|
-    return card.name unless args[:variant]
-    args[:variant].split(/[\s,]+/).inject(card.name) do |name, variant|
-      case variant.to_sym
-      when :capitalized
-        name.capitalize
-      when :singular
-        name.singularize
-      when :plural
-        name.pluralize
-      when :title
-        name.titleize
-      else
-        if ::Set.new([
-                       :downcase, :upcase, :swapcase, :reverse, :succ
-                     ]).include?(variant.to_sym)
-          name.send variant
-        else
-          name
-        end
-      end
-    end
+  view :name, closed: true, perms: :none do
+    voo.variant ? card.cardname.vary(voo.variant) : card.name
   end
 
   view(:key,      closed: true, perms: :none) { card.key }
   view(:linkname, closed: true, perms: :none) { card.cardname.url_key }
   view(:url,      closed: true, perms: :none) { card_url _render_linkname }
 
-  view :title, closed: true, perms: :none do |args|
-    args[:title] || card.name
+  view :title, closed: true, perms: :none do
+    raw_title = voo.title || card.name
+    voo.variant ? raw_title.to_name.vary(voo.variant) : raw_title
   end
 
   view :url_link, closed: true, perms: :none do
     link_to_resource card_url(_render_linkname)
   end
 
-  view :link, closed: true, perms: :none do |args|
-    title = showname args[:title]
+  view :link, closed: true, perms: :none do
+    title = showname voo.title
     opts = { known: card.known? }
-    if args[:type] && !opts[:known]
-      opts[:path] = { card: { type: args[:type] } }
-    end
+    opts[:path] = { card: { type: voo.type } } if voo.type && !opts[:known]
     link_to_card card.name, title, opts
   end
 
@@ -62,25 +41,25 @@ format do
 
   # CONTENT VIEWS
 
-  view :raw do |args|
-    scard = args[:structure] ? Card[args[:structure]] : card
+  view :raw do
+    scard = voo.structure ? Card[voo.structure] : card
     scard ? scard.raw_content : _render_blank
   end
 
-  view :core do |args|
-    process_content _render_raw(args)
+  view :core, closed: true do
+    process_content _render_raw
   end
 
-  view :content do |args|
-    _render_core args
+  view :content do
+    _render_core
   end
 
-  view :open_content do |args|
-    _render_core args
+  view :open_content do
+    _render_core
   end
 
-  view :closed_content, closed: true do |args|
-    Card::Content.smart_truncate _render_core(args)
+  view :closed_content, closed: true do
+    Card::Content.smart_truncate _render_core
   end
 
   view :blank, closed: true, perms: :none do
@@ -94,45 +73,44 @@ format do
 
   # NAME + CONTENT VIEWS
 
-  view :titled do |args|
-    "#{card.name}\n\n#{_render_core args}"
+  view :titled do
+    "#{card.name}\n\n#{_render_core}"
   end
   view :open, :titled
 
-  view :labeled do |args|
-    "#{card.name}: #{_render_closed_content args}"
+  view :labeled do
+    "#{card.name}: #{_render_closed_content}"
   end
   view :closed, :labeled
 
   # SPECIAL VIEWS
 
-  view :array do |args|
+  view :array, cache: :never do
     card.item_cards(limit: 0).map do |item_card|
-      subformat(item_card)._render_core(args)
+      subformat(item_card)._render_core
     end.inspect
   end
 
   # none of the below belongs here!!
 
-  view :template_rule, tags: :unknown_ok do |args|
-    # FIXME: - relativity should be handled in smartname
-    return "" unless args[:inc_name]
-    name = args[:inc_name].to_name
-    stripped = name.stripped
+  view :template_rule, cache: :never, tags: :unknown_ok do
+    return "" unless voo.nest_name
+    if voo.nest_name.to_name.simple_relative?
+      set_card = Card.fetch template_link_set_name
+      subformat(set_card).render_template_link
+    else
+      "{{#{voo.nest_syntax}}}"
+    end
+  end
 
-    if name.relative? && !stripped.to_name.starts_with_joint?
-      # not a simple relative name; just return the original syntax
-      "{{#{args[:inc_syntax]}}}"
+  def template_link_set_name
+    name = voo.nest_name.to_name
+    if name.absolute?
+      name.trait_name :self
+    elsif (type = on_type_set)
+      [type, name].to_name.trait_name :type_plus_right
     else
-      set_name =
-        if name.absolute?
-          "#{name}+#{Card[:self].name}" # *self set
-        elsif (type = on_type_set)
-          "#{type}#{name}+#{Card[:type_plus_right].name}" # *type plus right
-        else
-          "#{stripped.gsub(/^\+/, '')}+#{Card[:right].name}" # *right
-        end
-      subformat(Card.fetch(set_name)).render_template_link args
+      name.stripped.gsub(/^\+/, "").to_name.trait_name :right
     end
   end
 

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

@@ -1,7 +1,6 @@
-
 format :json do
-  def get_nest_defaults _nested_card
-    { view: :atom }
+  def default_nest_view
+    :atom
   end
 
   def default_item_view
@@ -15,55 +14,51 @@ format :json do
   def show view, args
     view ||= :content
     raw = render view, args
-    if raw.is_a?(String)
-      raw
-    elsif params[:compress]
-      JSON(raw)
-    else
-      JSON.pretty_generate raw
-    end
+    return raw if raw.is_a? String
+    method = params[:compress] ? :generate : :pretty_generate
+    JSON.send method, raw
   end
 
-  view :name_complete do |_args|
-    card.item_cards complete: params["term"], limit: 8, sort: "name",
-                    return: "name", context: ""
+  view :name_complete, cache: :never do
+    # context is "" so that term will not be interpreted in the context
+    # of search card name.  However, this can break searches where the
+    # search card name is required (eg found_by)
+    card.search complete: params["term"], limit: 8, sort: "name",
+                return: "name", context: ""
   end
 
-  view :status, tags: :unknown_ok, perms: :none do |_args|
-    status =
-      case
-      when !card.known?     then :unknown
-      # do we want the following to prevent fishing?  of course, they can always
-      # post...
-      when !card.ok?(:read) then :unknown
-      when card.real?       then :real
-      when card.virtual?    then :virtual
-      else :wtf
-      end
-
-    hash = { key: card.key, url_key: card.cardname.url_key, status: status }
+  view :status, tags: :unknown_ok, perms: :none, cache: :never do
+    status = card.state
+    hash = { key: card.key,
+             url_key: card.cardname.url_key,
+             status: status }
     hash[:id] = card.id if status == :real
-
     hash
   end
 
-  view :content do |_args|
+  view :content, cache: :never do
     req = controller.request
-    {
-      url:       (req && req.original_url),
+    { url:       (req && req.original_url),
       timestamp: Time.now.to_s,
-      card:      _render_atom
-    }
+      card:      _render_atom }
   end
 
-  view :atom do |args|
-    h = {
-      name: card.name,
-      type: card.type_name
-    }
+  view :atom, cache: :never do
+    h = { name: card.name, type: card.type_name }
     h[:content]  = card.content  unless card.structure
-    h[:codename] = card.codename     if card.codename
-    h[:value]    = _render_core args if @depth < max_depth
+    h[:codename] = card.codename if card.codename
+    h[:value]    = _render_core  if @depth < max_depth
     h
   end
+
+  # minimum needed to re-fetch card
+  view :cast, cache: :never do
+    card.cast
+  end
+end
+
+# TODO: perhaps this should be in a general "data" module.
+def cast
+  real? ? { id: id } : { name: name, type_id: type_id, content: db_content }
 end
+