card 1.103.3 → 1.104.2

data/lib/cardio/mod/load_strategy/tmp_files.rb

@@ -20,7 +20,7 @@ module Cardio
 
           p = Card.paths[path]
           FileUtils.rm_rf p.first, secure: true if p.existent.first
-          Dir.mkdir p.first
+          FileUtils.mkdir_p p.first
         end
 
         def rewrite_tmp_files?

data/lib/cardio/mod/modfile_api.rb

@@ -12,6 +12,11 @@ module Cardio
         deps.each { |spec| @dirs.add_gem_mod spec.name, spec.full_gem_path }
       end
 
+      # load all gem mods
+      def gem_mods
+        @dirs.load_from_gemfile
+      end
+
       private
 
       def unknown_gem_mod! name

data/lib/cardio/mod/poop.rb

@@ -0,0 +1,135 @@
+module Cardio
+  class Mod
+    # POOP (or Plain Old OutPut) is our nickname for our standard card YAML,
+    # used to define cards associated with mods.
+    #
+    # Monkeys throw it around, and Sharks can eat it (if you believe this guy:
+    # https://www.youtube.com/watch?v=VvEa4NSqw7I).
+    #
+    # https://docs.google.com/document/d/13K_ynFwfpHwc3t5gnLeAkZJZHco1wK063nJNYwU8qfc/edit#
+    class Poop
+      def initialize **args
+        @mod = args[:mod]
+        @name = args[:name]
+        @cql = args[:cql]
+        @env = args[:env] || Rails.env
+        @items = args[:items]
+        @field_tags = args[:field_tags]
+      end
+
+      # @return [Array <Hash>]
+      def new_data
+        @new_data ||= cards.map { |c| c.export_hash field_tags: field_tag_marks }
+      end
+
+      def field_tag_marks
+        @field_tag_marks ||= @field_tags.to_s.split(",").map do |mark|
+          mark.strip.cardname.codename_or_string
+        end
+      end
+
+      # @return [String] -- MOD_DIR/data/ENVIRONMENT.yml
+      def filename
+        @filename ||= File.join mod_path, "#{@env}.yml"
+      end
+
+      # if output mod given,
+      def out
+        Card::Cache.reset_all
+        @mod ? dump : puts(new_data.to_yaml.yellow)
+        :success
+      rescue Card::Error::NotFound => e
+        e.message
+      rescue JSON::ParserError => e
+        e.message
+      end
+
+      # write yaml to file
+      def dump
+        hash = output_hash
+        File.write filename, hash.to_yaml
+        puts "#{filename} now contains #{hash.size} items".green
+      end
+
+      private
+
+      def cards
+        if @name
+          cards_from_name
+        elsif @cql
+          Card.search JSON.parse(@cql).reverse_merge(limit: 0)
+        else
+          raise Card::Error::NotFound, "must specify either name (-n) or CQL (-c)"
+        end
+      end
+
+      def cards_from_name
+        case @items
+        when :only
+          item_cards
+        when true
+          main_cards + item_cards
+        else
+          main_cards
+        end
+      end
+
+      def item_cards
+        main_cards.map { |mc| mc.item_cards }.flatten
+      end
+
+      def main_cards
+        @main_cards ||= @name.split(",").map { |n| require_card n }
+      end
+
+      def require_card name
+        Card.fetch(name) || raise(Card::Error::NotFound, "card not found: #{name}")
+      end
+
+      def output_hash
+        if target.present?
+          merge_data
+          target
+        else
+          new_data
+        end
+      end
+
+      def merge_data
+        new_data.each do |item|
+          if (index = target_index item)
+            target[index] = item
+          else
+            target << item
+          end
+        end
+      end
+
+      def target_index new_item
+        new_code = new_item[:codename]
+        new_name = new_item[:name].to_name
+        target.find_index do |t|
+          t.is_a?(Hash) &&
+            ((new_code.present? && (new_code == t[:codename])) ||
+              (t[:name].to_name == new_name))
+        end
+      end
+
+      def target
+        @target ||= old_data
+      end
+
+      def old_data
+        return nil unless File.exist? filename
+
+        YAML.safe_load File.read(filename), [Symbol]
+      end
+
+      # @return Path
+      def mod_path
+        Mod.dirs.subpaths("data")[@mod] ||
+          raise(Card::Error::NotFound, "no data directory found for mod: #{@mod}")
+      end
+    end
+  end
+end

data/lib/cardio/mod.rb

@@ -1,3 +1,5 @@
+require "cardio/mod/class_methods"
+
 module Cardio
   # A Card Mod (short for "module" or "modification") is a discrete piece of Decko
   # functionality. Mods are how the Decko community develops and shares code.
@@ -60,11 +62,13 @@ module Cardio
   #     or types of sets.
   #   - **file** for fixed initial card content
   class Mod
+    extend ClassMethods
+
     attr_reader :name, :path, :index
 
     def initialize name, path, index
       @name = Mod.normalize_name name
-      @path = path
+      @path = required_path path
       @index = index
     end
 
@@ -76,30 +80,34 @@ module Cardio
       "mod_#{name}"
     end
 
+    def subpath *parts
+      path = File.join [@path] + parts
+      path if File.exist? path
+    end
+
     def tmp_dir type
       File.join Cardio.paths["tmp/#{type}"].first,
                 "mod#{'%03d' % (@index + 1)}-#{@name}"
     end
 
-    def public_path
-      File.join @path, "public"
-    end
-
-    def assets_path
-      File.join @path, "assets"
-    end
-
-    def ensure_mod_installed
+    def ensure
       Card::Auth.as_bot do
-        card = ensure_mod_card
+        card = ensure_card
         card.ensure_mod_script_card
         card.ensure_mod_style_card
+        Card::Cache.reset_all
       end
     end
 
     private
 
-    def ensure_mod_card
+    def required_path path
+      return path if File.exist? path
+
+      raise Card::Error::NotFound, "mod not found: #{@name}"
+    end
+
+    def ensure_card
       if Card::Codename.exists? codename
         card = Card.fetch codename.to_sym
         card.update type: :mod unless card.type_code == :mod
@@ -108,73 +116,5 @@ module Cardio
         Card.create name: mod_card_name, type: :mod, codename: codename
       end
     end
-
-    class << self
-      def load
-        return if ENV["CARD_MODS"] == "none"
-
-        if Card.take
-          Loader.load_mods
-        else
-          Rails.logger.warn "empty database"
-        end
-      end
-
-      # @return an array of Rails::Path objects
-      def dirs
-        @dirs ||= Mod::Dirs.new(Cardio.paths["mod"].existent)
-      end
-
-      def dependencies name, nickname=true
-        return unless (spec = gem_spec name, nickname)
-
-        deps = spec&.dependencies || []
-        dep_names = deps.map { |dep| dependencies dep.name, false }
-        (dep_names << spec).flatten.compact.uniq
-      end
-
-      def each_path &block
-        each_simple_path(&block)
-        each_gem_path(&block)
-      end
-
-      # @return [Hash] in the form{ modname(String) => Gem::Specification }
-      def gem_specs
-        Bundler.definition.specs.each_with_object({}) do |gem_spec, h|
-          h[gem_spec.name] = gem_spec if gem_spec? gem_spec
-        end
-      end
-
-      def normalize_name name
-        name.to_s.sub(/^card-mod-/, "")
-      end
-
-      private
-
-      def gem_spec name, nickname=true
-        name = "card-mod-#{name}" if nickname && !name.match?(/^card-mod/)
-        spec = Gem::Specification.stubs_for(name)&.first
-        gem_spec?(spec) ? spec : nil
-      end
-
-      def each_simple_path &block
-        Cardio.paths["mod"].each do |mods_path|
-          Dir.glob("#{mods_path}/*").each(&block)
-        end
-      end
-
-      def each_gem_path
-        gem_specs.each_value do |spec|
-          yield spec.full_gem_path
-        end
-      end
-
-      # @return [True/False]
-      def gem_spec? spec
-        return unless spec
-
-        spec.name.match?(/^card-mod-/) || spec.metadata["card-mod"].present?
-      end
-    end
   end
 end

data/lib/cardio/railtie.rb

@@ -3,7 +3,6 @@ module Cardio
   class Railtie < Rails::Railtie
     # if you disable inline styles tinymce's formatting options stop working
     config.allow_inline_styles = true
-    config.delaying = nil
     config.token_expiry = 2.days
 
     config.recaptcha_public_key = nil  # deprecated; use recaptcha_site_key instead
@@ -15,9 +14,8 @@ module Cardio
     config.recaptcha_minimum_score = 0.5
 
     config.google_analytics_key = nil
-
-    config.override_host = nil
-    config.override_protocol = nil
+    config.google_analytics_tracker_key = nil
+    config.google_analytics_four_key = nil
 
     config.no_authentication = false
     config.files_web_path = "files"
@@ -31,6 +29,9 @@ module Cardio
     config.closed_search_limit = 10
     config.paging_limit = 20
 
+    config.delaying = false
+    config.active_job.queue_adapter = :delayed_job
+
     config.non_createable_types = %w[
       signup
       setting
@@ -38,6 +39,14 @@ module Cardio
       session
       bootswatch_skin
       customized_bootswatch_skin
+      local_folder_group
+      local_manifest_group
+      local_script_folder_group
+      local_script_manifest_group
+      local_style_folder_group
+      local_style_manifest_group
+      remote_manifest_group
+      mod
     ]
 
     config.view_cache = false
@@ -47,19 +56,20 @@ module Cardio
     config.encoding = "utf-8"
     config.request_logger = false
     config.performance_logger = false
-    config.sql_comments = true
+    config.sql_comments = false
 
     config.file_storage = :local
     config.file_buckets = {}
     config.file_default_bucket = nil
-    config.protocol_and_host = nil
+
+    config.deck_origin = nil
 
     config.rich_text_editor = :tinymce
 
     config.persistent_cache = true
     config.prepopulate_cache = false
-    config.machine_refresh = :cautious
-    config.compress_javascript = true
+    config.asset_refresh = :cautious
+    config.compress_assets = true
 
     config.allow_irreversible_admin_tasks = false
     config.raise_all_rendering_errors = false
@@ -93,6 +103,7 @@ module Cardio
           p.add "files"
 
           p.add "lib/graph_q_l/types/query.rb"
+          p.add "mod-data"
 
           p.add "db", with: "#{card_root}/db"
           p.add "db/seeds.rb", with: "#{card_root}/db/seeds.rb"
@@ -112,6 +123,7 @@ module Cardio
             p["late/initializers"] << "#{mod_path}/init/late"
             p["config/locales"] << "#{mod_path}/locales"
             p["lib/tasks"] << "#{mod_path}/lib/tasks"
+            p["mod-data"] << "#{mod_path}/data"
           end
 
           p["app/models"] = []

data/lib/cardio/schema.rb

@@ -1,9 +1,10 @@
 module Cardio
   module Schema
     class << self
-      def assume_migrated_upto_version type
-        mode type do |paths|
-          ActiveRecord::Schema.assume_migrated_upto_version version(type), paths
+      def assume_migrated_upto_version type, version=nil
+        mode type do |_paths|
+          version ||= version type
+          ActiveRecord::Schema.assume_migrated_upto_version version
         end
       end
 
@@ -53,6 +54,13 @@ module Cardio
         list.flatten
       end
 
+      def migration_context type
+        with_suffix type do
+          yield ActiveRecord::MigrationContext.new(migration_paths(type),
+                                                   ActiveRecord::SchemaMigration)
+        end
+      end
+
       private
 
       def deck_migration? type
@@ -82,13 +90,6 @@ module Cardio
         ActiveRecord::SchemaMigration.table_name = old_table_name
         ActiveRecord::SchemaMigration.reset_column_information
       end
-
-      def migration_context type
-        with_suffix type do
-          yield ActiveRecord::MigrationContext.new(migration_paths(type),
-                                                   ActiveRecord::SchemaMigration)
-        end
-      end
     end
   end
 end

data/lib/cardio/version.rb

@@ -0,0 +1,35 @@
+# -*- encoding : utf-8 -*-
+
+module Cardio
+  module Version
+    class << self
+      CARD_MINOR = { 0 => 90, 1 => 1000 }.freeze # can remove and hardcode after 1.0
+
+      def release
+        @version ||= File.read(File.expand_path("../../VERSION", __dir__)).strip
+      end
+
+      def card_release
+        @card_release ||= [1, minor, point].compact.map(&:to_s).join "."
+      end
+
+      private
+
+      def bits
+        release.split(".").map(&:to_i)
+      end
+
+      def major
+        bits[0]
+      end
+
+      def minor
+        CARD_MINOR[major] + bits[1]
+      end
+
+      def point
+        bits[2]
+      end
+    end
+  end
+end

data/lib/cardio.rb

@@ -41,5 +41,17 @@ module Cardio
     def database
       @database ||= config.database_configuration.dig Rails.env, "database"
     end
+
+    def mods
+      Mod.dirs.mods
+    end
+
+    def with_config tmp
+      keep = tmp.keys.each_with_object({}) { |k, h| h[k] = config.send k }
+      tmp.each { |k, v| config.send "#{k}=", v }
+      yield
+    ensure
+      keep.each { |k, v| config.send "#{k}=", v }
+    end
   end
 end

data/lib/generators/deck/deck_generator.rb

@@ -118,10 +118,11 @@ module Cardio
           if options["interactive"]
             Interactive.new(destination_root, (monkey? || platypus?)).run
           else
+            prefix = "bundle exec " if options["platypus"]
             puts "Now:
       1. Run `cd #{File.basename(destination_root)}` to enter your new deck directory
-      2. Run `decko seed` to seed your database (see config/database.yml).
-      3. Run `decko server` to start your server"
+      2. Run `#{prefix}decko seed` to seed your database (see config/database.yml).
+      3. Run `#{prefix}decko server` to start your server"
           end
         end
 

data/lib/generators/deck/templates/Gemfile.erb

@@ -50,7 +50,3 @@ gem "card-mod-defaults"<%= repo_path_constraint :mod %>
 # This mod is strongly recommended for platypuses – coders working on the decko core
 gem "card-mod-platypus"<%= repo_path_constraint :mod %>
 <% end %>
-
-# The following allows simple (non-gem) mods to specify gems via a Gemfile.
-# You may need to alter this code if you move such mods to an unconventional location.
-Dir.glob("mod/**/Gemfile").each { |gemfile| instance_eval File.read(gemfile) }

data/lib/generators/deck/templates/config/application.rb.erb

@@ -4,55 +4,75 @@ require "decko/application"
 
 module <%= app_const_base %>
   class Application < Decko::Application
-    config.performance_logger = nil
-
     # Decko inherits most Ruby-on-Rails configuration options.
     # See http://guides.rubyonrails.org/configuring.html
 
     # EMAIL
-    # Email is not turned on by default.  To turn it on, you need to change the
-    # following to `true` and then add configuration specific to your site.
-    # Learn more:
+    # Outgoing email, which is used by a lot of account processes (signup,
+    # forgot password, notifications, etc) is not turned on by default.
+    # To turn it on, you need to change the following to `true` and add
+    # configuration specific to your site.
+    #
+    # Learn more about Rails email configuration:
     #  https://guides.rubyonrails.org/configuring.html#configuring-action-mailer
-
+    #
     config.action_mailer.perform_deliveries = false
     # config.action_mailer.delivery_method  = ...
     # config.action_mailer.smtp_settings    = ...
-
-    # Example configuration for mailcatcher, a simple smtp server.
-    # See http://mailcatcher.me for more information
+    #
+    # Example configuration for mailcatcher, a simple development-friendly
+    # smtp server (but not an option for production sites):
+    #
     # config.action_mailer.delivery_method = :smtp
     # config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
-
-
-    # BACKGROUND
-    # Decko lets you run some card events (like follower notifications) in the
-    # background. This is off by default but can be turned on by changing the
-    # `delaying` setting to `true`
-    config.active_job.queue_adapter = :delayed_job
-    config.delaying = false
-
+    #
+    # Learn more about mailcatcher:
+    #   http://mailcatcher.me for more information
 
     # CACHING
+    # Cards make heavy use of caching to improve performance. Caching storage
+    # options include: file_store (default), memory_store, mem_cache_store...
+    #
     # config.cache_store = :file_store, "tmp/cache"
-    # determines caching mechanism.  options include: file_store, memory_store,
-    # mem_cache_store...
     #
     # for production, we highly recommend memcache
-    # here's a sample configuration for use with the dalli gem
+    # here's a sample configuration for use with the "dalli" gem
+    # (which you can install by adding `gem "dalli"` to your Gemfile and then
+    # running `bundle install`.
+    #
     # config.cache_store = :mem_cache_store, []
-
+    #
+    # Learn more about Rails caching configuration:
+    #   https://guides.rubyonrails.org/caching_with_rails.html#cache-stores
 
     # FILES
-    # config.paths["files"] = "files"
-    # directory in which uploaded files are actually stored. (eg Image and File cards)
-
+    # Some card content (eg for Image and File cards) is stored in files
+    # rather than in the database.
+    #
+    # Most will want to set file_storage to use either :local or :cloud.
+    #
+    # By default storage is set to :local, and files are stored in the "files"
+    # directory in the deck root.
+    #
     # config.file_storage = :local
-    # File storage options (see http://decko.org/file_storage_options)
-    # options include: local, cloud, web, coded
-    # defaults to local
-    # For cloud storage use the following config options and add the corresponding fog gem
-    # for your cloud service. For example for AWS add "fog-aws" to your Gemfile.
+    # config.paths["files"] = "files"
+    #
+    <% if platypus? %>
+    config.file_buckets = {
+      test_bucket: {
+        provider: "AWS",
+        aws_access_key_id: ENV["TEST_BUCKET_AWS_ACCESS_KEY_ID"],
+        aws_secret_access_key: ENV["TEST_BUCKET_AWS_SECRET_ACCESS_KEY"],
+        region: "us-east-1"
+      }
+    }
+    <% else %>
+    # For cloud storage use the following config options and add the
+    # corresponding fog gem for your cloud service. For example for AWS add
+    # `gem "fog-aws"` to your Gemfile. IMPORTANT: also see protocol and host
+    # below.
+    #
+    # config.file_storage = :cloud
     # config.file_default_bucket = :my_bucket
     # config.file_buckets = {
     #   my_bucket: {
@@ -63,7 +83,7 @@ module <%= app_const_base %>
     #        aws_access_key_id: "key",                # required
     #        aws_secret_access_key: "secret-key",     # required
     #        use_iam_profile: true,             # optional, defaults to false
-    #        region: "eu-central-1",                   # optional, defaults to "us-east-1"
+    #        region: "eu-central-1",                  # optional, defaults to "us-east-1"
     #        host: "s3.example.com",                  # optional, defaults to nil
     #        endpoint: "https://s3.example.com:8080"  # optional, defaults to nil
     #     },
@@ -76,32 +96,31 @@ module <%= app_const_base %>
     #                                        # option is needed
     #   }
     # }
+    #
+    # Learn more about file storage options:
+    #   http://decko.org/file_storage_options)
+    <% end %>
+
+    # ORIGIN AND RELATIVE_ROOT
+    # The following option is used when generating absolute links and
+    # are necessary when using cloud file storage, especially when using
+    # commands (like `decko update`) in a non-web context.
+    #
+    # Without it your generated CSS (which is stored on the cloud) will not
+    # be able to find permanent resources (which are stored with the deck).
+    # This usually shows up as broken icons.
+    #
+    # config.deck_origin = "https://mysite.com"
+    #
+    # If your deck is not at the url's root but in a subdirectory, such as
+    # mysite.com/mydeck, then you must configure the relative_url_root:
+    #
+    # config.relative_url_root = "/mydeck"
 
     # MISCELLANEOUS
+    # You can use the following to disallow creating, updating, and deleting
+    # cards:
+    #
     # config.read_only = true
-    # defaults to false
-    # disallows creating, updating, and deleting cards.
-
-    # config.paths["mod"] << "my-mod-dir"
-    # add a new directory for code customizations, or "mods"
-
-    # config.allow_inline_styles = false
-    # don't strip style attributes (not recommended)
-
-    # config.override_host = "example.com"
-    # overrides host auto-detected from web requests
-
-    # config.override_protocol = "https"
-    # overrides protocol auto-detected from web requests
-    <% if platypus? %>
-    config.file_buckets = {
-      test_bucket: {
-        provider: "AWS",
-        aws_access_key_id: ENV["TEST_BUCKET_AWS_ACCESS_KEY_ID"],
-        aws_secret_access_key: ENV["TEST_BUCKET_AWS_SECRET_ACCESS_KEY"],
-        region: "us-east-1"
-      }
-    }
-    <% end %>
   end
 end

data/lib/generators/deck/templates/rspec.erb

@@ -1,6 +1,6 @@
 --color
 --profile
 --backtrace
---format documentation
+// --format documentation
 --default-path '<%= File.expand_path spec_path %>'
 --require '<%= File.expand_path spec_helper_path %>'

data/lib/generators/deck/templates/spec/javascripts/support/decko_jasmine.yml.erb

@@ -37,7 +37,6 @@ src_files:
  - jquery.iframe-transport.js
  - jquery_ujs.js
  - script_ace.js
- - script_prosemirror.js
  #- "**/*.{js.coffee,js,coffee}"
 
 # list of file expressions to include as css files