card 1.21.0 → 1.91

data/db/migrate_core_cards/data/cards.yml

@@ -0,0 +1,11 @@
+---
+:cards:
+- :name: "*header"
+  :type: HTML
+  :key: "*header"
+  :merged: 2017-07-26 10:46:33 UTC
+- :name: "*main menu"
+  :type: HTML
+  :key: "*main_menu"
+  :merged: 2017-07-26 10:46:33 UTC
+:remotes: {}

data/db/migrate_core_cards/data/cards/*header

@@ -0,0 +1,16 @@
+<div class="navbar navbar-inverse bg-primary navbar-toggleable-md navbar-static-top mb-3">
+    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar-collapse-1" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="navbar-brand">
+      {{*logo|size:small}}
+      {{*title|core}}
+    </div>
+    <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      <div class="navbar-nav mr-auto">
+        {{*main menu|navbar_links}}
+      </div>
+      {{*navbox|navbar}}
+      {{*account links|navbar_links}}
+    </div>
+</div>

data/db/migrate_core_cards/data/cards/*main_menu

@@ -0,0 +1,2 @@
+<a class="nav-link internal-link" href="/">Home</a>
+<a class="nav-link internal-link" href="/:recent">Recent</a>

data/db/seeds.rb

@@ -1,8 +1,8 @@
-WAGN_SEED_TABLES = %w( cards card_actions card_acts card_changes
+DECKO_SEED_TABLES = %w( cards card_actions card_acts card_changes
                        card_references ).freeze
-WAGN_SEED_PATH = File.join(
+DECKO_SEED_PATH = File.join(
   ENV["DECKO_SEED_REPO_PATH"] || [Cardio.gem_root, "db", "seed"], "new"
 )
 
 require "active_record/fixtures"
-ActiveRecord::FixtureSet.create_fixtures WAGN_SEED_PATH, WAGN_SEED_TABLES
+ActiveRecord::FixtureSet.create_fixtures DECKO_SEED_PATH, DECKO_SEED_TABLES

data/lib/card.rb

@@ -79,7 +79,9 @@ class Card < ActiveRecord::Base
 
     # INTEGRATION PHASE
     :integrate_stage, :integrate_with_delay_stage,
-    :integrate_final_stage, :integrate_with_delay_final_stage
+    :integrate_final_stage,
+    :after_integrate_stage,
+    :after_integrate_final_stage, :integrate_with_delay_final_stage
   )
 
   # Validation and integration phase are only called for the act card

data/lib/card/act_manager/stage.rb

@@ -2,7 +2,7 @@ class Card
   class ActManager
     module Stage
       STAGES = [:initialize, :prepare_to_validate, :validate, :prepare_to_store,
-                :store, :finalize, :integrate, :integrate_with_delay].freeze
+                :store, :finalize, :integrate, :after_integrate, :integrate_with_delay].freeze
       stage_index = {}
       STAGES.each_with_index do |stage, i|
         stage_index[stage] = i

data/lib/card/act_manager/stage_director.rb

@@ -114,9 +114,12 @@ class Card
         return if @abort
         @card.restore_changes_information
         run_single_stage :integrate
+        run_single_stage :after_integrate
         run_single_stage :integrate_with_delay
       rescue => e  # don't rollback
         Card::Error.current = e
+        warn "exception in integrate stage: #{e.message}"
+        # binding.pry
         @card.notable_exception_raised
         return false
       ensure

data/lib/card/auth/current.rb

@@ -64,14 +64,20 @@ class Card
           auth_data = { current_id: Card.fetch_id(auth_data) }
         end
 
-        tmp_current = current_id
+        tmp_current_id = current_id
         tmp_as_id = as_id
-        @current_id = auth_data[:current_id]
+        tmp_current = @current
+        tmp_as_card = @as_card
+
+        # resets @as and @as_card
+        self.current_id = auth_data[:current_id]
         @as_id = auth_data[:as_id] if auth_data[:as_id]
         yield
       ensure
-        @current_id = tmp_current
+        @current_id = tmp_current_id
         @as_id = tmp_as_id
+        @current = tmp_current
+        @as_card = tmp_as_card
       end
 
       # get session object from Env

data/lib/card/codename.rb

@@ -52,8 +52,7 @@ class Card
       # @todo remove duplicate checks here; should be caught upon creation
       def check_duplicates codehash, codename, card_id
         return unless codehash.key?(codename) || codehash.key?(card_id)
-        warn "dup code ID:#{card_id} (#{codehash[codename]}), " \
-             "CD:#{codename} (#{codehash[card_id]})"
+        warn "dup codename: #{codename}, ID:#{card_id} (#{codehash[codename]})"
       end
 
       # generate Hash for @codehash and put it in the cache

data/lib/card/error.rb

@@ -61,7 +61,7 @@ class Card
         when Card::Error::NotFound, ActiveRecord::RecordNotFound,
              ActionController::MissingFile
           :not_found
-        when Wagn::BadAddress
+        when Decko::BadAddress
           :bad_address
         else
           problematic_exception_view card, exception

data/lib/card/migration.rb

@@ -98,7 +98,7 @@ class Card::Migration < ActiveRecord::Migration
     names_or_keys = Array(names_or_keys)
     Card::Mailer.perform_deliveries = false
 
-    Card::Migration::Import.merge only: names_or_keys
+    Card::Migration::Import.new(data_path).merge only: names_or_keys
   end
 
   def read_json filename

data/lib/card/migration/import.rb

@@ -1,5 +1,5 @@
-require "import_data"
-require "merger"
+require_relative "import/import_data"
+require_relative "import/merger"
 
 class Card
   class Migration
@@ -15,90 +15,103 @@ class Card
     # To update other attributes change them in the yml file and either remove
     # the 'merged' value or touch the corresponding content file
     class Import
-      class << self
-        # Merge the import data into the cards table.
-        # Bu default it merges only the data that was changed or added
-        # since the last merge.
-        # @param [Hash] opts choose which cards to merge
-        # @option opts [Boolean] :all merge all available import data
-        # @option opts [Array] :only a key/name or list of keys/names to
-        #   be merged
-        def merge opts={}
-          Merger.new(opts).merge
-        end
+      def initialize data_path
+        @data_path = data_path
+      end
 
-        # Get import data from a deck
-        # @param [String] name The name of the card to be imported
-        # @param [Hash] opts pull options
-        # @option opts [String] remote Use a remote url. The remote url must
-        #   have been registered via 'add_remote'
-        # @option opts [Boolean] deep if true fetch all nested cards, too
-        # @option opts [Boolean] items_only if true fetch all nested cards but
-        #   not the card itself
-        def pull name, opts={}
-          ImportData.update do |import_data|
-            url = opts[:remote] ? import_data.url(opts.delete(:remote)) : nil
-            fetch_card_data(name, url, opts).each do |card_data|
-              import_data.add_card card_data
-            end
+      # Merge the import data into the cards table.
+      # Bu default it merges only the data that was changed or added
+      # since the last merge.
+      # @param [Hash] opts choose which cards to merge
+      # @option opts [Boolean] :all merge all available import data
+      # @option opts [Array] :only a key/name or list of keys/names to
+      #   be merged
+      def merge opts={}
+        Merger.new(@data_path, opts).merge
+      end
+
+      # Get import data from a deck
+      # @param [String] name The name of the card to be imported
+      # @param [Hash] opts pull options
+      # @option opts [String] remote Use a remote url. The remote url must
+      #   have been registered via 'add_remote'
+      # @option opts [Boolean] deep if true fetch all nested cards, too
+      # @option opts [Boolean] items_only if true fetch all nested cards but
+      #   not the card itself
+      def pull name, opts={}
+        update do |import_data|
+          url = opts[:remote] ? import_data.url(opts.delete(:remote)) : nil
+          fetch_card_data(name, url, opts).each do |card_data|
+            import_data.add_card card_data
           end
         end
+      end
 
-        # Add a card with the given attributes to the import data
-        def add_card attr
-          ImportData.update do |data|
-            data.add_card attr
-          end
+      # Add a card with the given attributes to the import data
+      def add_card attr
+        update do |data|
+          data.add_card attr
         end
+      end
 
-        # Save an url as remote deck to make it available for the pull method
-        def add_remote name, url
-          ImportData.update do |data|
-            data.add_remote name, url
-          end
+      # Save an url as remote deck to make it available for the pull method
+      def add_remote name, url
+        update do |data|
+          data.add_remote name, url
         end
+      end
 
-        private
+      private
 
-        # Returns an array of hashes with card attributes
-        def fetch_card_data name, url, opts
-          view, result_key =
-            if opts[:items_only]
-              ["export_items", nil]
-            elsif opts[:deep]
-              ["export", nil]
-            else
-              [nil, :card]
-            end
-          card_data =
-            if url
-              fetch_remote_data name, view, url
-            else
-              fetch_local_data name, view
-            end
-          result_key ? [card_data[result_key]] : card_data
-        end
+      def update &block
+        ImportData.update(@data_path, &block)
+      end
 
-        def fetch_remote_data name, view, url
-          json_url = "#{url}/#{name}.json"
-          json_url += "?view=#{view}" if view
-          json = open(json_url).read
-          parse_and_symbolize json
-        end
+      def importer
+        @importer ||= ImportData.new(@data_path)
+      end
 
-        def fetch_local_data name, view
-          Card::Auth.as_bot do
-            Card[name].format(format: :json).render(view || :content)
+      # Returns an array of hashes with card attributes
+      def fetch_card_data name, url, opts
+        view, result_key =
+          if opts[:items_only]
+            ["export_items", nil]
+          elsif opts[:deep]
+            ["export", nil]
+          else
+            [nil, :card]
           end
+        card_data =
+          if url
+            fetch_remote_data name, view, url
+          else
+            fetch_local_data name, view
+          end
+        result_key ? [card_data[result_key]] : card_data
+      end
+
+      def fetch_remote_data name, view, url
+        json_url = "#{url}/#{name}.json"
+        json_url += "?view=#{view}" if view
+        json = open(json_url).read
+        parse_and_symbolize json
+      end
+
+      def fetch_local_data name, view
+        Card::Auth.as_bot do
+          Card[name].format(format: :json).render(view || :content)
         end
+      end
 
-        def parse_and_symbolize json
-          parsed = JSON.parse(json)
-          case parsed
-          when Hash then parsed.deep_symbolize_keys
-          when Array then parsed.map(&:deep_symbolize_keys)
-          else parsed
-          end
+      def parse_and_symbolize json
+        parsed = JSON.parse(json)
+        case parsed
+        when Hash then
+          parsed.deep_symbolize_keys
+        when Array then
+          parsed.map(&:deep_symbolize_keys)
+        else
+          parsed
         end
       end
     end

data/lib/card/migration/import/import_data.rb

@@ -3,36 +3,32 @@ class Card
     class Import
       # Handles the card attributes and remotes for the import
       class ImportData
-        DEFAULT_PATH = Card::Migration.data_path("cards.yml").freeze
-
         include CardContent
         include CardAttributes
 
-        class << self
-          # Takes a block to update import data
-          # use #add_card and #add_remote in the block to make
-          # changes
-          def update
-            data = ImportData.new
-            yield(data)
-            data.write_attributes
-          end
-
-          def all_cards
-            ImportData.new.all_cards
-          end
-
-          def changed_cards
-            ImportData.new.changed_cards
-          end
-
-          def select_cards names_or_keys
-            ImportData.new.select_cards Array(names_or_keys)
+        # Takes a block to update import data
+        # use #add_card and #add_remote in the block to make
+        # changes
+        def self.update data_path
+          data = ImportData.new(data_path)
+          yield(data)
+          data.write_attributes
+        end
+
+        def self.load data_path, opts={}
+          data = ImportData.new(data_path)
+          if opts[:all]
+            data.all_cards
+          elsif opts[:only]
+            data.select_cards opts[:only]
+          else
+            data.changed_cards
           end
         end
 
-        def initialize path=nil
-          @path = path || DEFAULT_PATH
+        def initialize data_path
+          @path = File.join data_path, "cards.yml"
+          @card_content_dir = File.join data_path, "cards"
           @data = read_attributes
         end
 

data/lib/card/migration/import/import_data/card_content.rb

@@ -4,8 +4,6 @@ class Card
       class ImportData
         # handles card content for import
         module CardContent
-          CARD_CONTENT_DIR = Card::Migration.data_path("cards").freeze
-
           def card_content data
             File.read(content_path(data))
           end
@@ -17,13 +15,13 @@ class Card
           private
 
           def write_card_content data, content
-            FileUtils.mkpath CARD_CONTENT_DIR unless Dir.exist? CARD_CONTENT_DIR
+            FileUtils.mkpath @card_content_dir unless Dir.exist? @card_content_dir
             File.write content_path(data), content.to_s
           end
 
           def content_path data
             filename = data[:key] || data[:name].to_name.key
-            File.join CARD_CONTENT_DIR, filename
+            File.join @card_content_dir, filename
           end
         end
       end

data/lib/card/migration/import/merger.rb

@@ -3,10 +3,10 @@ class Card
     class Import
       # executes the card import
       class Merger
-        OUTPUT_FILE = Card::Migration.data_path "unmerged"
-
-        def initialize opts={}
-          load_data opts
+        def initialize data_path, opts={}
+          @data_path = data_path
+          @output_path = File.join data_path, "unmerged"
+          @data = ImportData.load @data_path, opts
         end
 
         def merge
@@ -14,7 +14,7 @@ class Card
 
           Card::Mailer.perform_deliveries = false
           Card::Auth.as_bot do
-            Card.merge_list @data, output_file: OUTPUT_FILE
+            Card.merge_list @data, output_file: @output_path
           end
 
           update_import_data
@@ -22,20 +22,9 @@ class Card
 
         private
 
-        def load_data opts
-          @data =
-            if opts[:all]
-              ImportData.all_cards
-            elsif opts[:only]
-              ImportData.select_cards opts[:only]
-            else
-              ImportData.changed_cards
-            end
-        end
-
         def update_import_data
           update_time = Time.zone.now.to_s
-          ImportData.update do |import_data|
+          ImportData.update(@data_path) do |import_data|
             @data.each do |card_data|
               import_data.merged card_data, update_time
             end