card 1.93.13 → 1.94.0

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

@@ -77,6 +77,7 @@ format :json do
     {
       id: card.id,
       name: card.name,
+      key: card.key,
       url: path
     }
   end

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

@@ -23,10 +23,9 @@ format :html do
   end
 
   def head_title
-    title = root.card && root.card.name
-    title = nil if title.blank?
+    title = root.safe_name
     title = params[:action] if title == "*placeholder"
-    %(<title>#{title ? "#{title} - " : ''}#{Card.global_setting :title}</title>)
+    %(<title>#{title.present? ? "#{title} - " : ''}#{Card.global_setting :title}</title>)
   end
 
   def head_buttons

data/mod/bootstrap/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 
+require_relative "lib/skin"
+
 class UpdateBootswatchThemesTo4Beta < Card::Migration::Core
   def up
     remove_old_stuff
@@ -49,101 +51,6 @@ class UpdateBootswatchThemesTo4Beta < Card::Migration::Core
       Card["themeless bootstrap skin"].add_item! name.tr("_", " ")
     end
   end
-
-  class Skin
-    include ::Card::Model::SaveHelper
-
-    class << self
-      def vendor_path
-        File.expand_path "../../../vendor", __FILE__
-      end
-
-      def bootstrap_scss_path filename
-        File.join vendor_path, "bootstrap", "scss", "_#{filename}.scss"
-      end
-
-      def themes
-        json = File.read File.join(vendor_path, "bootswatch", "docs", "api", "4.json")
-        JSON.parse(json)["themes"].map { |theme| theme["name"] }
-      end
-    end
-
-    def initialize theme_name
-      @theme_name = theme_name.downcase
-      @skin_name = "#{theme_name} skin"
-      @skin_codename = @skin_name.downcase.tr(" ", "_")
-    end
-
-    def create_or_update
-      Card.exists?(@skin_name) ? update_skin : create_skin
-    end
-
-    def create_skin
-      Card.create! name: @skin_name,
-                   codename: @skin_codename,
-                   type_id: Card::SkinID,
-                   content: "[[themeless bootstrap skin]]\n[[+bootswatch theme]]",
-                   subcards: create_subcard_args
-    end
-
-    def update_skin
-      update_css file_name: "bootstrap.css", field_name: "bootswatch theme"
-      update_tumbnail
-    end
-
-    def update_scss file_name:, field_name: file_name
-      update_card "#{@skin_name}+#{field_name}", style_args(file_name)
-    end
-
-    def update_css file_name:, field_name: file_name
-      ensure_card "#{@skin_name}+#{field_name}", style_args(file_name, Card::CssID)
-    end
-
-    def update_tumbnail
-      update_card "#{@skin_name}+Image", thumbnail_args
-    end
-
-    private
-
-    def create_subcard_args
-      {
-        "+bootswatch theme" => style_args("bootstrap.css", Card::CssID),
-        "+Image" => thumbnail_args
-      }
-    end
-
-    def style_args file_name, type_id=Card::ScssID
-      paths = Array.wrap(file_name).map { |fn| resource_path(fn) }
-      content = paths.map { |p| File.read(p) }.join "\n"
-      { type_id: type_id, content: content }
-    end
-
-    def thumbnail_args
-      {
-        codename: "#{@skin_codename}_image",
-        type_id: Card::ImageID,
-        mod: :bootstrap, storage_type: :coded,
-        image: File.open(thumbnail_path)
-      }
-    end
-
-    def resource_path resource
-      resource = "_#{resource}.scss" unless resource.include? "."
-      if resource.include? File::SEPARATOR
-        resource
-      else
-        File.join base_resource_dir, resource
-      end
-    end
-
-    def thumbnail_path
-      File.join Skin.vendor_path, "bootswatch", "docs", @theme_name, "thumbnail.png"
-    end
-
-    def base_resource_dir
-      File.join Skin.vendor_path, "bootswatch", "dist", @theme_name
-    end
-  end
 end
 
 

data/mod/bootstrap/db/migrate_core_cards/lib/skin.rb

@@ -0,0 +1,94 @@
+# Update or create a bootstrap skin
+class Skin
+  include ::Card::Model::SaveHelper
+
+  class << self
+    def vendor_path
+      File.expand_path "../../../../vendor", __FILE__
+    end
+
+    def bootstrap_scss_path filename
+      File.join vendor_path, "bootstrap", "scss", "_#{filename}.scss"
+    end
+
+    def themes
+      json = File.read File.join(vendor_path, "bootswatch", "docs", "api", "4.json")
+      JSON.parse(json)["themes"].map { |theme| theme["name"] }
+    end
+  end
+
+  def initialize theme_name
+    @theme_name = theme_name.downcase
+    @skin_name = "#{theme_name} skin"
+    @skin_codename = @skin_name.downcase.tr(" ", "_")
+  end
+
+  def create_or_update
+    Card.exists?(@skin_name) ? update_skin : create_skin
+  end
+
+  def create_skin
+    Card.create! name: @skin_name,
+                 codename: @skin_codename,
+                 type_id: Card::SkinID,
+                 content: "[[themeless bootstrap skin]]\n[[+bootswatch theme]]",
+                 subcards: create_subcard_args
+  end
+
+  def update_skin
+    update_css file_name: "bootstrap.css", field_name: "bootswatch theme"
+    # don't update thumbnails since they are stored as coded files in the gem
+    # there's a script for doing that
+    # update_tumbnail
+  end
+
+  def update_scss file_name:, field_name: file_name
+    update_card "#{@skin_name}+#{field_name}", style_args(file_name)
+  end
+
+  def update_css file_name:, field_name: file_name
+    ensure_card "#{@skin_name}+#{field_name}", style_args(file_name, Card::CssID)
+  end
+
+  def update_thumbnail
+    update_card "#{@skin_name}+Image", thumbnail_args
+  end
+
+  private
+
+  def create_subcard_args
+    { "+bootswatch theme" => style_args("bootstrap.css", Card::CssID) }
+  end
+
+  def style_args file_name, type_id=Card::ScssID
+    paths = Array.wrap(file_name).map { |fn| resource_path(fn) }
+    content = paths.map { |p| File.read(p) }.join "\n"
+    { type_id: type_id, content: content }
+  end
+
+  def thumbnail_args
+    {
+      codename: "#{@skin_codename}_image",
+      type_id: Card::ImageID,
+      mod: :bootstrap, storage_type: :coded,
+      image: File.open(thumbnail_path)
+    }
+  end
+
+  def resource_path resource
+    resource = "_#{resource}.scss" unless resource.include? "."
+    if resource.include? File::SEPARATOR
+      resource
+    else
+      File.join base_resource_dir, resource
+    end
+  end
+
+  def thumbnail_path
+    File.join Skin.vendor_path, "bootswatch", "docs", @theme_name, "thumbnail.png"
+  end
+
+  def base_resource_dir
+    File.join Skin.vendor_path, "bootswatch", "dist", @theme_name
+  end
+end

data/mod/bootstrap/script/update_skin_thumbnails.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+require_relative "../db/migrate_core_cards/lib/skin"
+
+puts "Updating bootstrap themes ..."
+Skin.themes.each do |theme_name|
+  puts theme_name
+  Skin.new(theme_name).update_thumbnail
+end

data/mod/carrierwave/set/type/image.rb

@@ -63,7 +63,7 @@ format :html do
       if source.blank? || source == "missing"
         # FIXME - these images should be "broken", not "missing"
         # ("missing" is the view for "unknown" now, so we shouldn't further confuse things)
-        "<!-- image missing #{@card.name} -->"
+        "<!-- image missing #{safe_name} -->"
       else
         image_tag source
       end

data/mod/core/chunk/query_reference.rb

@@ -23,7 +23,7 @@ module Card::Content::Chunk
         Card::Query::ATTRIBUTES.keys +
         Card::Query::CONJUNCTIONS.keys +
         %w[desc asc count]
-      ).map(&:to_name)
+      ).map(&:to_s)
     )
 
     Card::Content::Chunk.register_class(
@@ -53,10 +53,17 @@ module Card::Content::Chunk
 
     class << self
       def full_match content, prefix
+        # matches cardnames that are not keywords
+        # FIXME: would not match cardnames that are keywords
         match, offset = super(content, prefix)
-        return unless match && !QUERY_KEYWORDS.include?(match[1].to_name)
+        return if !match || keyword?(match[1])
         [match, offset]
       end
+
+      def keyword? str
+        return unless str
+        QUERY_KEYWORDS.include?(str.tr(" ", "_").downcase)
+      end
     end
 
     def interpret match, _content

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

@@ -1,30 +1,30 @@
-EVENT_CONDITIONS = %i[set on changed when].freeze
+EVENT_CONDITIONS = %i[set on changed when optional].freeze
 
-def event_applies? opts
+def event_applies? event, opts
   EVENT_CONDITIONS.all? do |key|
-    send "#{key}_condition_applies?", opts[key]
+    send "#{key}_condition_applies?", event, opts[key]
   end
 end
 
 private
 
-def set_condition_applies? set_module
+def set_condition_applies? _event, set_module
   singleton_class.include?(set_module)
 end
 
-def on_condition_applies? actions
+def on_condition_applies? _event, actions
   actions = Array(actions).compact
   return true if actions.empty?
   actions.include? @action
 end
 
-def changed_condition_applies? db_columns
+def changed_condition_applies? _event, db_columns
   db_columns = Array(db_columns).compact
   return true if db_columns.empty?
   db_columns.any? { |col| single_changed_condition_applies? col }
 end
 
-def when_condition_applies? block
+def when_condition_applies? _event, block
   case block
   when Proc then block.call(self)
   when Symbol then send block
@@ -32,6 +32,11 @@ def when_condition_applies? block
   end
 end
 
+def optional_condition_applies? event, optional
+  return true unless optional
+  skip_event? event
+end
+
 def single_changed_condition_applies? db_column
   return true unless db_column
   db_column =
@@ -53,6 +58,11 @@ def wrong_stage opts
 end
 
 def wrong_action action
-  return false if on_condition_applies? action
+  return false if on_condition_applies?(nil, action)
   "on: #{action} method #{method} called on #{@action}"
 end
+
+def skip_event? event
+  @names_of_skipped_events ||= ::Set.new(Array.wrap(skip_event).map(&:to_sym))
+  !@names_of_skipped_events.include? event
+end

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

@@ -13,6 +13,16 @@ module ClassMethods
     end
   end
 
+  def safe_param param
+    if param.respond_to? :to_unsafe_h
+      # clone doesn't work for Parameters
+      param.to_unsafe_h
+    else
+      # clone so that original params remain unaltered.  need deeper clone?
+      (param || {}).clone
+    end
+  end
+
   private
 
   def standard_controller_fetch args, card_opts
@@ -23,23 +33,13 @@ module ClassMethods
   end
 
   def controller_fetch_opts args
-    opts = safe_card_opts args[:card]
+    opts = safe_param args[:card]
     opts[:type] ||= args[:type] if args[:type]
     # for /new/:type shortcut.  we should handle in routing and deprecate this
     opts[:name] ||= Card::Name.url_key_to_standard(args[:id])
     opts
   end
 
-  def safe_card_opts card_opts
-    if card_opts.respond_to? :to_unsafe_h
-      # clone doesn't work for Parameters
-      card_opts.to_unsafe_h
-    else
-      # clone so that original params remain unaltered.  need deeper clone?
-      (card_opts || {}).clone
-    end
-  end
-
   def validate_fetch_opts! opts
     return unless opts[:new] && opts[:skip_virtual]
     raise Card::Error, "fetch called with new args and skip_virtual"

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

@@ -1,12 +1,4 @@
 module ClassMethods
-  def delete_tmp_files id=nil
-    dir = Cardio.paths["files"].existent.first + "/tmp"
-    dir += "/#{id}" if id
-    FileUtils.rm_rf dir, secure: true
-  rescue
-    Rails.logger.info "failed to remove tmp files"
-  end
-
   def merge_list attribs, opts={}
     unmerged = []
     attribs.each do |row|
@@ -49,8 +41,4 @@ module ClassMethods
       card.update_attributes! attribs
     end
   end
-
-  def seed_test_db
-    system "env RAILS_ENV=test bundle exec rake db:fixtures:load"
-  end
 end

data/mod/core/spec/format/html_format_spec.rb

@@ -32,10 +32,10 @@ RSpec.describe Card::Format::HtmlFormat do
 
       it "renders top menu" do
         is_expected.to have_tag "header" do
-          with_tag 'a.nav-link.internal-link[href="/"]', text: "Home"
-          with_tag 'a.nav-link.internal-link[href="/:recent"]', text: "Recent"
+          with_tag 'a.nav-link.internal-link[href=""]', text: "Home"
+          with_tag 'a.nav-link.internal-link[href=":recent"]', text: "Recent"
           with_tag 'form.navbox-form[action="/*search"]' do
-            with_tag 'input[name="_keyword"]'
+            with_tag 'input[name="query[keyword]"]'
           end
         end
       end

data/mod/core/spec/set/all/event_conditions_spec.rb

@@ -50,5 +50,20 @@ describe Card::Set::All::EventConditions, "event" do
         expect(@log).to contain_exactly(*content_before_change)
       end
     end
+
+    specify "skip event condition" do
+      with_test_events do
+        test_event :validate, on: :update, optional: true, for: "A" do
+          add_to_log "not skipped"
+        end
+        Card["A"].update_attributes! content: "changed content", skip_event: :test_event_0
+
+        aggregate_failures do
+          expect(@log).to be_empty
+          Card["A"].update_attributes! content: "changed content"
+          expect(@log).to contain_exactly "not skipped"
+        end
+      end
+    end
   end
 end

data/mod/core/spec/set/all/name_spec.rb

@@ -57,6 +57,13 @@ describe Card::Set::All::Name do
     end
   end
 
+  describe "event: escape_name" do
+    it "escapes invalid characters" do
+      c = Card.create! name: "8 / 5 <script>"
+      expect(c.name).to eq("8 &#47; 5 &#60;script&#62;")
+    end
+  end
+
   describe "codename" do
     before do
       @card = Card["a"]