card 1.93.3 → 1.93.4

data/lib/card/tasks/card/file_card_creator/abstract_file_card/migration_file.rb

@@ -0,0 +1,49 @@
+class Card
+  class FileCardCreator
+    class AbstractFileCard
+      # Module that provides #create_migration_file method for classes that
+      # inherit from AbstractFileCard.
+      # It uses the decko generator to create the migration.
+      module MigrationFile
+        def create_migration_file
+          puts "creating migration file...".yellow
+          migration_out = `#{migrate_command}`
+          return if migration_out.include?("conflict")
+          migration_file_name = migration_out[/db.*/]
+          write_at migration_file_name, 5, indented_migration_content # 5 is line no.
+        end
+
+        private
+
+        def migrate_command
+          cmd = "bundle exec decko generate card:migration add_#{@codename}"
+          cmd += " --force" if @force
+          cmd
+        end
+
+        def indented_migration_content
+          migration_file_content.lines.map do |line|
+            " " * 4 + line
+          end.join
+        end
+
+        def migration_file_content
+          indent = " " * category.to_s.size
+          <<-RUBY.strip_heredoc
+            add_#{category} "#{remove_prefix @name}",
+                #{indent} type_id: #{type_id},
+                #{indent} to: "#{rule_card_name}"
+          RUBY
+        end
+
+        def remove_prefix name
+          name.sub(/^(?:#{category}):?_?\s*/, "")
+        end
+
+        def type_id
+          "Card::#{type_codename.to_s.camelcase}ID"
+        end
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/abstract_file_card/ruby_file.rb

@@ -0,0 +1,30 @@
+class Card
+  class FileCardCreator
+    class AbstractFileCard
+      # Module that provides #create_ruby_file method for a classes that
+      # inherit from AbstractFileCard.
+      # The default location for the ruby file is set/self.
+      module RubyFile
+        def create_ruby_file
+          write_to_mod(ruby_file_dir, ruby_file_name) do |f|
+            f.puts ruby_file_content
+          end
+        end
+
+        private
+
+        def ruby_file_dir
+          File.join "set", "self"
+        end
+
+        def ruby_file_name
+          @codename + ".rb"
+        end
+
+        def ruby_file_content
+          "include_set Abstract::CodeFile"
+        end
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/abstract_file_card/source_file.rb

@@ -0,0 +1,36 @@
+class Card
+  class FileCardCreator
+    class AbstractFileCard
+      # Module that provides #create_source_file method for a classes that
+      # inherit from AbstractFileCard
+      module SourceFile
+        def create_source_file
+          write_to_mod source_file_dir, source_file_name do |f|
+            f.puts source_file_content
+          end
+        end
+
+        private
+
+        def source_file_content
+          card = Card.fetch(@name)
+          if card
+            card.content
+          else
+            color_puts "warning:", :yellow,
+                       "Card '#{@name}' doesn't exist. Creating empty source file ..."
+            ""
+          end
+        end
+
+        def source_file_name
+          "#{@codename}.#{source_file_ext}"
+        end
+
+        def source_file_ext
+          @type
+        end
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/haml_card.rb

@@ -0,0 +1,42 @@
+require "html2haml"
+
+class Card
+  class FileCardCreator
+    # Convert a card with html db content to a card with hard-coded haml.
+    # It generates three files:
+    #   1. a migration file that creates a card with codename
+    #   2. a haml file with the converted html
+    #   3. a ruby file (=code rule)that ties the haml file to the card
+    class HamlCard < AbstractFileCard
+      @supported_types = %i[haml]
+      @category = :haml
+
+      private
+
+      def type_codename
+        @type_codename ||= :html
+      end
+
+      def source_file_dir
+        File.join "template", "self"
+      end
+
+      def source_file_content
+        html = super()
+        Html2haml::HTML.new(html).render
+      end
+
+      def migration_file_content
+        <<-RUBY.strip_heredoc
+          ensure_card "#{@name}",
+                      type_id: #{type_id},
+                      codename: "#{@codename}"
+        RUBY
+      end
+
+      def ruby_file_content
+        "include_set Abstract::HamlFile"
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/output_helper.rb

@@ -0,0 +1,50 @@
+class Card
+  class FileCardCreator
+    # Helper methods to write to files and the console.
+    module OutputHelper
+      def write_to_mod rel_dir, filename
+        dir = File.join "mod", @mod, rel_dir
+        FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+
+        path = File.join dir, filename
+        log_file_action path do
+          File.open(path, "w") do |opened_file|
+            yield(opened_file)
+          end
+        end
+      end
+
+      def log_file_action path
+        status, color =
+          if File.exist?(path) && !@force
+            ["file exists (use 'force=true' to override)", :yellow]
+          else
+            status = File.exist?(path) ? "overridden" : "created"
+            yield
+            [status, :green]
+          end
+
+        color_puts status, color, path
+      end
+
+      # insert content into a file at a given line number
+      def write_at fname, at_line, sdat
+        open(fname, "r+") do |f|
+          (at_line - 1).times do # read up to the line you want to write after
+            f.readline
+          end
+          pos = f.pos # save your position in the file
+          rest = f.read # save the rest of the file
+          f.seek pos # go back to the old position
+          f.puts sdat # write new data & rest of file
+          f.puts rest
+          color_puts "created", :green, fname
+        end
+      end
+
+      def color_puts colored_text, color, text=""
+        puts "#{colored_text.send(color.to_s)} #{text}"
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/script_card.rb

@@ -0,0 +1,33 @@
+class Card
+  class FileCardCreator
+    # Move javascript or coffeescript from the card database to a file.
+    # It generates three files:
+    #  1. a migration file that ensures the card has a codename and adds it to the
+    #     script rule card.
+    #  2. a script file with the source code
+    #  3. a ruby file (=code rule) that ties the script file to the card
+    class ScriptCard < AbstractFileCard
+      @supported_types = %i[js coffee]
+      @category = :script
+      @default_rule_name = "*all+*script"
+
+      private
+
+      def source_file_ext
+        @type == :coffee ? "js.coffee" : @type
+      end
+
+      def type_codename
+        @type_codename ||=
+          case @type
+          when :js then :java_script
+          when :coffee then :coffee_script
+          end
+      end
+
+      def source_file_dir
+        File.join "lib", "javascript"
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/style_card.rb

@@ -0,0 +1,25 @@
+class Card
+  class FileCardCreator
+    # Move css or scss from the card database to a file.
+    # It generates three files:
+    #  1. a migration file that ensures the card has a codename and adds it to the
+    #     style rule card.
+    #  2. a style file with the source code
+    #  3. a ruby file (=code rule) that ties the style file to the card
+    class StyleCard < AbstractFileCard
+      @supported_types = %i[css scss]
+      @category = :style
+      @default_rule_name = "*all+*style"
+
+      private
+
+      def type_codename
+        @type_codename ||= @type.to_sym
+      end
+
+      def source_file_dir
+        File.join "lib", "stylesheets"
+      end
+    end
+  end
+end

data/lib/generators/card/template/template_generator.rb

@@ -27,7 +27,7 @@ class Card
         if !Dir.exist? mod_path
           warn "invalid mod name: #{file_name}. Directory #{mod_path} doesn't exist."
         # Card.set_patterns not loaded at this point
-        elsif !%w[self type type_plus_right ltype_rtype rstar star
+        elsif !%w[self type right type_plus_right ltype_rtype rstar star
                   type all_plus all].include? set_pattern
           warn "invalid set pattern: #{set_pattern}"
         else

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

@@ -3,7 +3,7 @@ format :html do
   def item_links _args=nil
     %i[my_card invite sign_out sign_up sign_in].map do |link_view|
       render link_view
-    end
+    end.compact
   end
 
   def self.link_options opts={}

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

@@ -9,6 +9,14 @@ format :csv  do
     depth.zero? ? :csv_row : :name
   end
 
+  view :core do
+    if (item_view_options[:view] == :name_with_fields) && focal?
+      title_row("item name") + name_with_field_rows
+    else
+      super()
+    end
+  end
+
   view :csv_row do
     array = _render_raw.scan(/\{\{[^\}]*\}\}/).map do |inc|
       process_content(inc).strip
@@ -31,4 +39,59 @@ format :csv  do
       row << nest(field_name)
     end
   end
+
+  def name_with_field_rows
+    return [] unless row_card_names.present?
+
+    row_card_names.map do |item_name|
+      CSV.generate_line row_from_field_names(item_name, columns)
+    end.join
+  end
+
+  def row_card_names
+    @row_cards ||= card.item_names
+  end
+
+  def columns
+    columns = []
+    csv_structure_card.format.each_nested_field do |chunk|
+      columns << chunk.referee_name.tag
+    end
+    columns
+  end
+
+  def csv_structure_card
+    card.rule_card(:csv_structure) || Card.fetch(row_card_names.first)
+  end
+
+  def row_from_field_names parent_name, field_names, view=:core
+    field_names.each_with_object([parent_name]) do |field, row|
+      row << nest([parent_name, field], view: view)
+    end
+  end
+
+  def title_row extra_titles=nil
+    titles = column_titles extra_titles
+    return "" unless titles.present?
+    CSV.generate_line titles.map(&:upcase)
+  end
+
+  def column_titles extra_titles=nil
+    res = Array extra_titles
+    card1 = Card.fetch card.item_names(limit: 1).first
+    card1.each_nested_chunk do |chunk|
+      res << column_title(chunk.options)
+    end
+    res.compact
+  end
+
+  def column_title opts
+    if opts[:title]
+      opts[:title]
+    elsif %w[name link].member? opts[:view]
+      opts[:view]
+    else
+      opts[:nest_name].to_name.tag
+    end
+  end
 end

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

@@ -39,7 +39,10 @@ format :json do
   end
 
   def name_search query_attribute: :complete, limit: AUTOCOMPLETE_LIMIT
-    card.search limit: limit, sort: "name", return: "name", query_attribute => params[:term]
+    card.search limit: limit,
+                sort: "name",
+                return: "name",
+                query_attribute => params[:term]
   end
 
   view :status, tags: :unknown_ok, perms: :none, cache: :never do

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

@@ -36,8 +36,11 @@ class UpdateBootswatchThemesTo4Beta < Card::Migration::Core
   end
 
   def update_bootstrap_default
-    ensure_scss "default bootstrap skin+bootswatch theme",
-                content: "{{bootstrap: functions}}{{bootstrap: variables}}{{bootstrap: core}}"
+    ensure_card "bootstrap default skin+bootswatch theme",
+                type_id: Card::ScssID,
+                content: "{{bootstrap: functions}}" \
+                         "{{bootstrap: variables}}" \
+                         "{{bootstrap: core}}"
   end
 
   def add_icon_cards

data/mod/carrierwave/set/abstract/attachment.rb

@@ -54,8 +54,7 @@ def original_filename
 end
 
 def unfilled?
-  !attachment.present? && !save_preliminary_upload? && !subcards.present? &&
-    !content.present?
+  !attachment.present? && !save_preliminary_upload? && !subcards? && blank_content?
 end
 
 def attachment_changed?

data/mod/core/set/abstract/haml_file.rb

@@ -0,0 +1,20 @@
+
+def self.included host_class
+  host_class.mattr_accessor :template_path
+  host_class.extend Card::Set::Format::HamlViews
+  host_class.template_path = host_class.haml_template_path
+end
+
+def content
+  File.read template_path
+end
+
+format :html do
+  def haml_locals
+    {}
+  end
+
+  view :core do
+    haml card.content, haml_locals
+  end
+end

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

@@ -0,0 +1,125 @@
+
+def chunks content, type
+  content ||= self.content
+  type ||= Card::Content::Chunk
+  Card::Content.new(content, self).find_chunks type
+end
+
+def each_chunk content, type
+  chunks(content, type).each do |chunk|
+    next unless chunk.referee_name # filter commented nests
+    yield chunk
+  end
+end
+
+def each_reference_chunk content=nil
+  each_chunk content, Card::Content::Chunk::Reference do |chunk|
+    yield chunk
+  end
+end
+
+def each_nested_chunk content=nil
+  each_chunk content, Card::Content::Chunk::Nest do |chunk|
+    yield chunk
+  end
+end
+
+def each_item_name_with_options content=nil
+  each_reference_chunk content do |chunk|
+    options = chunk.respond_to?(:options) ? chunk.options : {}
+    yield chunk.referee_name, options
+  end
+end
+
+format do
+  def nested_fields content=nil
+    result = []
+    each_nested_card(content) do |chunk|
+      result << [chunk.referee_name, chunk.options]
+    end
+    result
+  end
+
+  def nested_cards_for_edit fields_only=false
+    return normalized_edit_fields if edit_fields.present?
+    result = []
+    each_nested_card nil, fields_only do |chunk|
+      result << [chunk.options[:nest_name], chunk.options]
+    end
+    result
+  end
+
+  def edit_fields
+    voo.edit_structure || []
+  end
+
+  def normalized_edit_fields
+    edit_fields.map do |cardish, options|
+      field_mark = normalized_edit_field_mark cardish, options
+      options = normalized_edit_field_options options, Card::Name[field_mark]
+      [field_mark, options]
+    end
+  end
+
+  def normalized_edit_field_options options, cardname
+    options ||= cardname
+    options.is_a?(String) ? { title: options } : options
+  end
+
+  def normalized_edit_field_mark cardish, options
+    return cardish if cardish.is_a?(Card) ||
+                      (options.is_a?(Hash) && options.delete(:absolute))
+    card.name.field cardish
+  end
+
+  def process_field chunk, processed, &_block
+    return unless process_unique_field? chunk, processed
+    yield chunk
+  end
+
+  def each_nested_field content=nil, &block
+    each_nested_card content, true, &block
+  end
+
+  def each_nested_card content=nil, fields_only=true, &block
+    processed = process_tally
+    each_nested_chunk content do |chunk|
+      next if fields_only && !field_chunk?(chunk)
+      process_nested_chunk chunk, processed, &block
+    end
+  end
+
+  def each_nested_chunk content, &block
+    content ||= _render_raw
+    card.each_nested_chunk content, &block
+  end
+
+  def process_tally
+    ::Set.new [card.key]
+  end
+
+  def field_chunk? chunk
+    chunk.referee_name.to_name.field_of? card.name
+  end
+
+  def process_nested_chunk chunk, processed, &block
+    virtual = chunk.referee_card && chunk.referee_card.virtual?
+    # TODO: handle structures that are non-virtual
+    method = virtual ? :process_virtual_field : :process_field
+    send method, chunk, processed, &block
+  end
+
+  def process_virtual_field chunk, processed, &block
+    return unless process_unique_field? chunk, processed
+    subformat(chunk.referee_card).each_nested_field do |sub_chunk|
+      process_field sub_chunk, processed, &block
+    end
+  end
+
+  def process_unique_field? chunk, processed
+    key = chunk.referee_name.key
+    return false if processed.include? key
+    processed << key
+    true
+  end
+end