card 1.91 → 1.92

data/mod/account/spec/set/self/signin_spec.rb

@@ -56,7 +56,7 @@ describe Card::Set::Self::Signin do
     end
 
     it "is triggered by an update" do
-      # Card['joe admin'].account.token.should be_nil FIXME - this should be t
+      # Card['joe admin'].account.token.should be_nil FIXME:  this should be t
       @card.update_attributes! "+*email" => "joe@admin.com"
       expect(Card["joe admin"].account.token).not_to be_nil
     end

data/mod/account/template/type/signup/core.haml

@@ -0,0 +1,22 @@
+.invite-links
+  - if card.creator_id == AnonymousID
+    tr(:)
+
+
+  headings = []
+  by_anon = card.creator_id == AnonymousID
+  headings << %(
+    <strong>#{card.name}</strong> #{'was' unless by_anon} signed up on
+    #{format_date card.created_at}
+  )
+  if (account = card.account)
+    headings += verification_info account
+  else
+    headings << tr(:missing_account)
+  end
+  <<-HTML
+    <div class="invite-links">
+      #{headings.map { |h| "<div>#{h}</div>" }.join "\n"}
+    </div>
+    #{process_content render_raw}
+  HTML

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

@@ -2,6 +2,16 @@
 # [task symbol, { execute_policy: block, stats_policy: block }]
 basket :tasks
 
+def run_task_from_task_basket task
+  task = task.to_sym
+  task_data = tasks.find {|h| h[:name].to_sym == task.to_sym}
+  if !irreversibles_tasks_allowed? && task_data[:irreversible]
+    not_allowed task_data[:stats][:link_text]
+  else
+    task_data[:execute_policy].call if task_data
+  end
+end
+
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task])
   raise Card::Error::PermissionDenied, self unless Auth.always_ok?
@@ -11,13 +21,25 @@ event :admin_tasks, :initialize, on: :update do
   when :repair_permissions   then Card.repair_all_permissions
   when :clear_solid_cache    then Card.clear_solid_cache
   when :clear_machine_cache  then Card.reset_all_machines
+  when :clear_history
+    not_allowed "clear history" unless irreversibles_tasks_allowed?
+    Card::Action.delete_old
   else
-    task_data = tasks.find { |h| h[:name].to_sym == task.to_sym }
-    task_data[:execute_policy].call if task_data
+    run_task_from_task_basket task
   end
   abort :success
 end
 
+def not_allowed task
+  raise Card::Error::Oops,
+        "The admin task '#{task}' is disabled for security reasons.<br>"\
+        "You can enable it with the config option 'allow_irreversible_admin_tasks'"
+end
+
+def irreversibles_tasks_allowed?
+  Cardio.config.allow_irreversible_admin_tasks
+end
+
 format :html do
   view :core do |_args|
     stats = card_stats
@@ -36,8 +58,8 @@ format :html do
         count: Card.where(trash: false) },
       { title: "actions",
         count: Card::Action,
-        link_text: "delete old",
-        task: "delete_old_revisions" },
+        link_text: "clear history",
+        task: "clear_history" },
       { title: "references",
         count: Card::Reference,
         link_text: "repair all",

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

@@ -21,11 +21,16 @@ format :html do
 
   def render_warning_list warnings
     # 'ADMINISTRATOR WARNING'
-    admin_warn = I18n.t(:admin_warn,
-                        scope: "mod.admin.set.self.admin_info")
+    admin_warn = I18n.t(:admin_warn, scope: "mod.admin.set.self.admin_info")
     "<h5>#{admin_warn}</h5>" + warnings.join("\n")
   end
 
+  def render_warning_list_with_auto_scope warnings
+      # 'ADMINISTRATOR WARNING'
+      admin_warn = tx(:admin_warn)
+      "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+    end
+
   def email_warning
     # "Email delivery is turned off."
     # "Change settings in config/application.rb to send sign up notifications."

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

@@ -9,45 +9,62 @@ describe Card::Set::Self::Admin do
   end
 
   context "#update" do
-    before do
-      @admin = Card[:admin]
-    end
+    let(:admin) {Card[:admin]}
 
-    it "triggers empty trash (with right params)" do
+    def run_admin_task task
       Card::Auth.as_bot do
-        Card["A"].delete!
+        Card::Env.params[:task] = task
+        admin.update_attributes({})
+      end
+    end
+
+    it "clearing trash is denied" do
+      expect { run_admin_task :empty_trash }
+        .to raise_error Card::Error::Oops, /The admin task 'empty trash'/
+    end
+
+    it "clearing history is denied" do
+      expect { run_admin_task :clear_history }
+        .to raise_error Card::Error::Oops, /The admin task 'clear history'/
+    end
+
+    context "irreversible tasks allowed" do
+      around(:example) do |example|
+        Cardio.config.allow_irreversible_admin_tasks = true
+        example.run
+        Cardio.config.allow_irreversible_admin_tasks = false
+      end
+
+      it "triggers empty trash (with right params)" do
+        Card::Auth.as_bot {Card["A"].delete!}
+
         expect(Card.where(trash: true)).not_to be_empty
-        Card::Env.params[:task] = :empty_trash
-        @admin.update_attributes({})
+        run_admin_task :empty_trash
         expect(Card.where(trash: true)).to be_empty
       end
-    end
 
-    # NOTE: I removed this functionality for now, because I don't think we
-    # should have web access to admin functions that can incur actual data loss.
+      it "triggers deleting old revisions (with right params)" do
+        Card::Auth.as_bot do
+          a = Card["A"]
+          a.update_attributes! content: "a new day"
+          a.update_attributes! content: "another day"
+          expect(a.actions.count).to eq(3)
+          run_admin_task :clear_history
+          expect(a.actions.count).to eq(1)
+        end
+      end
+    end
 
-    # it "triggers deleting old revisions (with right params)" do
+    # it 'is trigger reference repair' do
     #   Card::Auth.as_bot do
-    #     a = Card["A"]
-    #     a.update_attributes! content: "a new day"
-    #     a.update_attributes! content: "another day"
-    #     expect(a.actions.count).to eq(3)
-    #     Card::Env.params[:task] = :delete_old_revisions
-    #     @admin.update_attributes({})
-    #     expect(a.actions.count).to eq(1)
+    #     a = Card['A']
+    #     puts a.references_out.count
+    #     Card::Env.params[:task] = :repair_references
+    #     puts a.references_out.count
+    #     @all.update_attributes({})
+    #     puts a.references_out.count
+    #
     #   end
     # end
-
-    #     it 'is trigger reference repair' do
-    #       Card::Auth.as_bot do
-    #         a = Card['A']
-    #         puts a.references_out.count
-    #         Card::Env.params[:task] = :repair_references
-    #         puts a.references_out.count
-    #         @all.update_attributes({})
-    #         puts a.references_out.count
-    #
-    #       end
-    #     end
   end
 end

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

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

data/mod/basic_formats/format/css_format.rb

@@ -4,6 +4,15 @@ class Card
   class Format
     class CssFormat < Format
       register :css
+
+      def mime_type
+        "text/css"
+      end
+
+      def view_caching?
+        false
+      end
+
     end
   end
 end

data/mod/basic_formats/format/csv_format.rb

@@ -4,6 +4,16 @@ class Card
   class Format
     class CsvFormat < TextFormat
       register :csv
+
+      def mime_type
+        "text/comma-separated-values"
+      end
+
+      def view_caching?
+        # TODO: make view caching handle non-strings
+        # (specifically stub_render)
+        false
+      end
     end
   end
 end

data/mod/basic_formats/format/js_format.rb

@@ -4,6 +4,10 @@ class Card
   class Format
     class JsFormat < Format
       register :js
+
+      def mime_type
+        "text/javascript"
+      end
     end
   end
 end

data/mod/basic_formats/format/json_format.rb

@@ -4,6 +4,21 @@ class Card
   class Format
     class JsonFormat < DataFormat
       register :json
+
+      def mime_type
+        "text/json"
+      end
+
+      def expand_stubs content, &block
+        case content
+        when Hash
+          content.each { |k, v| content[k] = expand_stubs v, &block }
+        when Array
+          content.map { |item| expand_stubs item, &block }
+        else
+          super
+        end
+      end
     end
   end
 end

data/mod/basic_formats/format/xml_format.rb

@@ -4,6 +4,10 @@ class Card
   class Format
     class XmlFormat < DataFormat
       register :xml
+
+      def mime_type
+        "text/xml"
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ format :csv  do
   end
 
   def default_item_view
-    @depth.zero? ? :csv_row : :name
+    depth.zero? ? :csv_row : :name
   end
 
   view :csv_row do

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

@@ -6,7 +6,11 @@ format do
 
   # NAME VIEWS
   view :name, closed: true, perms: :none do
-    voo.variant ? card.cardname.vary(voo.variant) : card.name
+    name_variant card.cardname
+  end
+
+  def name_variant name
+    voo.variant ? name.to_name.vary(voo.variant) : name
   end
 
   view(:key,      closed: true, perms: :none) { card.key }
@@ -14,8 +18,7 @@ format do
   view(:url,      closed: true, perms: :none) { card_url _render_linkname }
 
   view :title, closed: true, perms: :none do
-    raw_title = voo.title || card.name
-    voo.variant ? raw_title.to_name.vary(voo.variant) : raw_title
+    name_variant title_in_context(voo.title)
   end
 
   view :url_link, closed: true, perms: :none do
@@ -31,12 +34,15 @@ format do
   end
 
   def link_view opts={}
-    title = showname voo.title
     opts[:known] = card.known?
-    opts[:path] = { card: { type: voo.type } } if voo.type && !opts[:known]
-    link_to_card card.name, title, opts
+    specify_type_in_link! opts
+    link_to_card card.name, _render_title, opts
   end
 
+  def specify_type_in_link! opts
+    return if opts[:known] || !voo.type
+    opts[:path] = { card: { type: voo.type } }
+  end
 
 
   view(:codename, closed: true) { card.codename.to_s }
@@ -77,7 +83,9 @@ format do
   end
 
   view :closed_content, closed: true do
-    Card::Content.smart_truncate _render_core
+    with_nest_mode :closed do
+      Card::Content.smart_truncate _render_core
+    end
   end
 
   view :blank, closed: true, perms: :none do
@@ -113,7 +121,7 @@ format do
 
   view :template_rule, cache: :never, tags: :unknown_ok do
     return "" unless voo.nest_name
-    if voo.nest_name.to_name.simple_relative?
+    if voo.nest_name.to_name.field_only?
       set_card = Card.fetch template_link_set_name
       subformat(set_card).render_template_link
     else
@@ -137,7 +145,7 @@ format do
       (tmpl_set_name = parent.card.cardname.trunk_name) &&
       (tmpl_set_class_name = tmpl_set_name.tag_name) &&
       (tmpl_set_class_card = Card[tmpl_set_class_name]) &&
-      (tmpl_set_class_card.codename == "type")
+      (tmpl_set_class_card.codename == :type)
 
     tmpl_set_name.left_name
   end

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

@@ -64,7 +64,7 @@ format :json 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 if @depth < max_depth
+    h[:value] = _render_core if depth < max_depth
     h
   end
 

data/mod/basic_formats/set/self/01_head/javascript.rb

@@ -24,14 +24,14 @@ format :html do
     "<![endif]-->"
   end
 
-  def wagn_variables
-    varvals = ["window.wagn={rootPath:'#{Card.config.relative_url_root}'}"]
+  def decko_variables
+    varvals = ["window.decko={rootPath:'#{Card.config.relative_url_root}'}"]
     card.have_recaptcha_keys? &&
-      varvals << "wagn.recaptchaKey='#{Card.config.recaptcha_public_key}'"
+      varvals << "decko.recaptchaKey='#{Card.config.recaptcha_public_key}'"
     (c = Card[:double_click]) && !Card.toggle(c.content) &&
-      varvals << "wagn.noDoubleClick=true"
+      varvals << "decko.noDoubleClick=true"
     @css_path &&
-      varvals << "wagn.cssPath='#{@css_path}'"
+      varvals << "decko.cssPath='#{@css_path}'"
     javascript_tag { varvals * ";" }
   end
 
@@ -65,9 +65,13 @@ format :html do
   end
 
   def mod_configs
-    mod_js_config.map do |codename, js_wagn_function|
+    mod_js_config.map do |codename, js_decko_function|
       config_json = escape_javascript Card.global_setting(codename)
-      javascript_tag { "wagn.#{js_wagn_function}('#{config_json}')" }
+      javascript_tag { "decko.#{js_decko_function}('#{config_json}')" }
     end
   end
+
+  def recaptcha
+    javascript_include_tag "https://www.google.com/recaptcha/api.js", async: "", defer: ""
+  end
 end

data/mod/basic_formats/set/self/head.rb

@@ -53,12 +53,13 @@ format :html do
 
   def head_javascript
     output [
-      wagn_variables,
+      decko_variables,
       script_rule,
       ie9,
       mod_configs,
       trigger_slot_ready,
-      google_analytics
+      google_analytics,
+      # recaptcha
     ]
   end
 

data/{db/migrate_core_cards/20170719163708_update_bootswatch_themes.rb → mod/bootstrap/db/migrate_cards/20170719163701_update_bootswatch_themes.rb}

@@ -71,7 +71,7 @@ class UpdateBootswatchThemes < Card::Migration::Core
     end
 
     def resource_path resource
-      subdir = "b4_themes/#{@theme_name.downcase.tr(" ","_")}/#{resource}"
+      subdir = "b4_beta_themes/#{@theme_name.downcase.tr(" ","_")}/#{resource}"
       Card::Migration::Core.data_path subdir
     end
   end