card 1.105.6 → 1.107.0

data/lib/cardio/mod/dirs.rb

@@ -63,7 +63,7 @@ module Cardio
       end
 
       # Add a mod to mod load paths
-      def add_mod mod_name, path: nil, group: nil
+      def add_mod mod_name, path: nil, group: nil, spec: nil
         if @mods_by_name.key? Mod.normalize_name(mod_name)
           raise StandardError,
                 "name conflict: mod with name \"#{mod_name}\" already loaded"
@@ -72,7 +72,7 @@ module Cardio
         path ||= File.join @current_path, mod_name
         group ||= @current_group
 
-        mod = Mod.new mod_name, path, group, @mods.size
+        mod = Mod.new mod_name, path, group: group, index: @mods.size, spec: spec
         @mods << mod
         @mods_by_name[mod.name] = mod
       end
@@ -139,15 +139,16 @@ module Cardio
 
       def add_gem_mods
         Cardio::Mod.gem_specs.each do |mod_name, spec|
-          add_gem_mod mod_name, spec.full_gem_path, spec.metadata["card-mod-group"]
+          add_gem_mod mod_name, spec
         end
       end
 
-      def add_gem_mod mod_name, mod_path, group
+      def add_gem_mod mod_name, spec
         return if @loaded_gem_mods.include?(mod_name)
 
         @loaded_gem_mods << mod_name
-        add_mod mod_name, path: mod_path, group: (group || "gem")
+        group = spec.metadata["card-mod-group"] || "gem"
+        add_mod mod_name, path: spec.full_gem_path, group: group, spec: spec
       end
 
       def add_core_mods

data/lib/cardio/mod/eat/edibles.rb

@@ -14,7 +14,7 @@ module Cardio
         def explicit_edibles
           return yield unless @name
 
-          yield.reject do |edible|
+          yield.select do |edible|
             if @name.match?(/^\:/)
               explicit_codename_match? edible[:codename]
             else
@@ -71,14 +71,20 @@ module Cardio
         end
 
         # for processing that needs to happen on all cards, including fields
-        def each_card_hash items
+        def each_card_hash items, &block
           items.each do |item|
+            raise Card::Error, "inedible pod data: #{item}" unless item.is_a? Hash
+
             yield item
-            item[:fields]&.values&.each { |val| yield val if val.is_a? Hash }
+            process_fields item, &block
           end
           items
         end
 
+        def process_fields item
+          item[:fields]&.values&.each { |val| yield val if val.is_a? Hash }
+        end
+
         def handle_attachments mod, hash
           each_attachment hash do |key, filename|
             hash[key] = mod_file mod, filename

data/lib/cardio/mod/eat.rb

@@ -25,7 +25,6 @@ module Cardio
             track edible do
               current_user edible.delete(:user)
               time_machine edible.delete(:time) do
-                # binding.pry if edible[:type] == :link_list
                 Card.ensure edible
               end
             end
@@ -47,6 +46,8 @@ module Cardio
 
       def track edible
         rescuing edible do
+          # n = edible[:name]
+          # binding.pry if (n.is_a? Array) && n.first.to_s == "main_menu"
           # puts "eating: #{edible}" if @verbose
           card = yield
           puts "eaten: #{card.name}".cyan if @verbose

data/lib/cardio/mod/sow/card_source.rb

@@ -0,0 +1,48 @@
+module Cardio
+  class Mod
+    class Sow
+      # Fetch sow data form cards
+      module CardSource
+        def new_data_from_cards
+          cards.map { |c| c.pod_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
+
+        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 then item_cards
+          when true  then main_cards + item_cards
+          else            main_cards
+          end
+        end
+
+        def item_cards
+          main_cards.map(&: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
+      end
+    end
+  end
+end

data/lib/cardio/mod/sow/yaml_dump.rb

@@ -0,0 +1,25 @@
+module Cardio
+  class Mod
+    class Sow
+      # Writing the card representations to yaml files in mod directories
+      module YamlDump
+        # write yaml to file
+        def dump hash
+          File.write filename, hash.to_yaml
+          puts "#{filename} now contains #{hash.size} items".green
+        end
+
+        # @return [String] -- MOD_DIR/data/ENVIRONMENT.yml
+        def filename
+          @filename ||= File.join mod_path, "#{@podtype}.yml"
+        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
+end

data/lib/cardio/mod/sow.rb

@@ -5,10 +5,14 @@ module Cardio
     #
     # https://docs.google.com/document/d/13K_ynFwfpHwc3t5gnLeAkZJZHco1wK063nJNYwU8qfc/edit#
     class Sow
+      include YamlDump
+      include CardSource
+
       def initialize **args
         @mod = args[:mod]
         @name = args[:name]
         @cql = args[:cql]
+        @url = args[:url]
         @podtype = args[:podtype] || (Rails.env.test? ? :test : :real)
         @items = args[:items]
         @field_tags = args[:field_tags]
@@ -17,7 +21,7 @@ module Cardio
       # if output mod given,
       def out
         Card::Cache.reset_all
-        @mod ? dump : puts(new_data.to_yaml.yellow)
+        @mod ? dump(output_hash) : puts(new_data.to_yaml.yellow)
         :success
       rescue Card::Error::NotFound => e
         e.message
@@ -27,59 +31,6 @@ module Cardio
 
       private
 
-      # @return [Array <Hash>]
-      def new_data
-        @new_data ||= cards.map { |c| c.pod_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, "#{@podtype}.yml"
-      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
-
-      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 then item_cards
-        when true  then main_cards + item_cards
-        else            main_cards
-        end
-      end
-
-      def item_cards
-        main_cards.map(&: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
@@ -89,6 +40,12 @@ module Cardio
         end
       end
 
+      # @return [Array <Hash>]
+      def new_data
+        @new_data ||=
+          @url ? pod_hash_from_url : new_data_from_cards
+      end
+
       def merge_data
         new_data.each do |item|
           if (index = target_index item)
@@ -99,6 +56,10 @@ module Cardio
         end
       end
 
+      def target
+        @target ||= (old_data || nil)
+      end
+
       def target_index new_item
         new_code = new_item[:codename]
         new_name = new_item[:name].to_name
@@ -109,18 +70,17 @@ module Cardio
         end
       end
 
-      def target
-        @target ||= (old_data || nil)
+      def old_data
+        return unless File.exist? filename
+        parse_pod_yaml File.read(filename)
       end
 
-      def old_data
-        YAML.safe_load File.read(filename), [Symbol] if File.exist? filename
+      def pod_hash_from_url
+        parse_pod_yaml URI.open(@url).read
       end
 
-      # @return Path
-      def mod_path
-        Mod.dirs.subpaths("data")[@mod] ||
-          raise(Card::Error::NotFound, "no data directory found for mod: #{@mod}")
+      def parse_pod_yaml pod_yaml
+        YAML.safe_load pod_yaml, permitted_classes: [Symbol]
       end
     end
   end

data/lib/cardio/mod.rb

@@ -42,13 +42,14 @@ module Cardio
   class Mod
     extend ClassMethods
 
-    attr_reader :name, :path, :group, :index
+    attr_reader :name, :path, :group, :index, :spec
 
-    def initialize name, path, group, index
+    def initialize name, path, group:, index:, spec: nil
       @name = Mod.normalize_name name
       @path = required_path path
       @group = group || :custom
       @index = index
+      @spec = spec
     end
 
     def mod_card_name
@@ -59,9 +60,12 @@ module Cardio
       "mod_#{name}"
     end
 
-    def subpath *parts
+    def subpath *parts, force: false
       path = File.join [@path] + parts
-      path if File.exist? path
+      return path if File.exist? path
+      return unless force
+
+      FileUtils.mkdir_p path
     end
 
     def tmp_dir type

data/lib/cardio/railtie.rb

@@ -36,7 +36,6 @@ module Cardio
 
     config.allow_irreversible_admin_tasks = false
     config.raise_all_rendering_errors = false
-    config.rescue_all_in_controller = true
 
     config.cache_set_module_list = false
 
@@ -65,14 +64,11 @@ module Cardio
 
           p.add "lib/graph_q_l/types/query.rb"
           p.add "mod-data"
+          p.add "data/schema"
+          p.add "data/transform"
 
           p.add "db", with: "#{card_root}/db"
           p.add "db/seeds.rb", with: "#{card_root}/db/seeds.rb"
-          p.add "db/migrate", with: "#{card_root}/db/migrate"
-          p.add "db/migrate_core_cards", with: "#{card_root}/db/migrate_core_cards"
-
-          p.add "db/migrate_deck", with: "db/migrate"
-          p.add "db/migrate_deck_cards", with: "db/migrate_cards"
 
           Cardio::Mod.dirs.each do |mod_path|
             c.autoload_paths += Dir["#{mod_path}/lib"]
@@ -83,7 +79,11 @@ module Cardio
             p["config/initializers"] << "#{mod_path}/config/early"
             p["late/initializers"] << "#{mod_path}/config/late"
             p["lib/tasks"] << "#{mod_path}/lib/tasks"
+
             p["mod-data"] << "#{mod_path}/data"
+            p["data/schema"] << "#{mod_path}/data/schema"
+            p["data/transform"] << "#{mod_path}/data/transform"
+
             p["config/locales"] << "#{mod_path}/config/locales"
           end
 

data/lib/cardio/seed.rb

@@ -2,8 +2,7 @@ module Cardio
   # methods in support of seeding
   module Seed
     TABLES = %w[cards card_actions card_acts card_changes card_references
-                schema_migrations schema_migrations_core_cards
-                schema_migrations_deck schema_migrations_deck_cards].freeze
+                schema_migrations transform_migrations].freeze
 
     class << self
       def default_path
@@ -23,10 +22,8 @@ module Cardio
 
         return unless update_seed?
 
-        Cardio::Migration.assume_current
-        Cardio::Migration::Core.assume_current
-        Cardio::Migration::DeckStructure.assume_current
-        # Cardio::Migration::Core.assume_current
+        Cardio::Migration::Schema.new.assume_current
+        Cardio::Migration::Transform.new.assume_current
       end
 
       def dump

data/lib/generators/deck/templates/cypress.json.erb

@@ -4,5 +4,5 @@
   "watchForFileChanges": false,
   "projectId": "n4h7vq",
   "integrationFolder": "<%= expanded_repo_path %>/decko/spec/cypress/integration",
-  "supportFile": "<%= expanded_repo_path %>/decko/spec/cypress/support/index.js"
+  "supportFile": "<%= expanded_repo_path %>/decko/spec/cypress/support/e2e.js"
 }

data/lib/generators/migration/USAGE

@@ -1,24 +1,23 @@
 
 Description:
-    Generates a migration of database content.
-
-    To import database content from a json file move your json file to db/migrate_cards/data
-    and choose as migration name import_<filename>.
+    Generates a migration of database schema or content.
 
 Example:
-    <%= banner_command %> generate card:migration better_commented_search_cards
+    <%= banner_command %> generate migration better_comments -m mymod
 
     This will create:
 
-        db/migrate_cards/(migration_number)_better_commented_search_cards.rb
-
-    ...which is set up to use methods in lib/card/migration.rb
+        mod/mymod/data/transform/(migration_number)_better_comments.rb
 
 
-    <%= banner_command %> generate card:migration import_better_search_cards
+    <%= banner_command %> generate migration better_comments -m mymod --schema
 
     This will create:
 
-        db/migrate_cards/(migration_number)_import_better_search_cards.rb
+        mod/mymod/data/schema/(migration_number)_better_comments.rb
+
+
+
+
+
 
-    ...which is set up to import data from db/migrate_cards/data/better_search_cards.json

data/lib/generators/migration/migration_generator.rb

@@ -3,42 +3,44 @@
 module Cardio
   module Generators
     # generate structure and card migrations
-    class MigrationGenerator < Base
+    class MigrationGenerator < ActiveRecord::Generators::Base
+      extend ClassMethods
       source_root File.expand_path("templates", __dir__)
 
-      # class_option "mod", aliases: "-m", group: :runtime, desc: "mod"
+      argument :name, required: true
 
-      class_option "core", type: :boolean, aliases: "-c",
-                           default: false, group: :runtime,
-                           desc: "Create card migration for card core"
+      class_option "mod", aliases: "-m", group: :runtime, desc: "mod", required: true
 
-      def create_migration_file
-        migration_type = options["core"] ? :core_cards : :deck_cards
-        mig_paths = Schema.migration_paths migration_type
-        raise "No migration directory for #{migration_type}" if mig_paths.blank?
+      class_option "schema",
+                   type: :boolean, lazy_default: true, group: :runtime,
+                   desc: "Create schema migration"
 
+      def create_migration_file
         set_local_assigns!
-        migration_template @migration_template,
-                           File.join(mig_paths.first, "#{file_name}.rb")
+        migration_template "card_migration.erb",
+                           File.join(migration_path, "#{file_name}.rb")
       end
 
       protected
 
-      # sets the default migration template that is being used for the
-      # generation of the migration
-      # depending on the arguments which would be sent out in the command line,
-      # the migration template
-      # and the table name instance variables are setup.
+      def mod_object
+        @mod_object ||= Cardio::Mod.fetch(options[:mod]) || raise("unknown mod: #{mod}")
+      end
+
+      def migration_path
+        mod_object.subpath "data", migration_type.to_s, force: true
+      end
+
+      def migration_type
+        options["schema"] ? :schema : :transform
+      end
+
+      def migration_object
+        Migration.new_for migration_type
+      end
 
       def set_local_assigns!
-        @migration_template = "card_migration.erb"
-        @migration_parent_class =
-          options["core"] ? "Cardio::Migration::Core" : "Cardio::Migration"
-        case file_name
-        when /^(import)_(.*)(?:\.json)?/
-          @migration_action = Regexp.last_match(1)
-          @json_filename    = "#{Regexp.last_match(2)}.json"
-        end
+        @migration_parent_class = Cardio::Migration.migration_class migration_type
       end
     end
   end

data/lib/generators/migration/templates/card_migration.erb

@@ -2,8 +2,6 @@
 
 class <%= migration_class_name %> < <%= @migration_parent_class %>
   def up
-<% if @migration_action == 'import' -%>
-    import_cards '<%= @json_filename %>'
-<% end -%>
+
   end
 end

data/mod/core/config/admin.yml

@@ -0,0 +1,10 @@
+cardtypes:
+  admin:
+    - mod
+    - user
+    - setting
+    - cardtype
+tasks:
+  - empty_trash
+  - clear_cash
+  - regenerate_assets