card 1.19.1 → 1.19.2

data/lib/card/act_manager/subdirector_array.rb

@@ -0,0 +1,43 @@
+class Card
+  class ActManager
+    class SubdirectorArray < Array
+      def self.initialize_with_subcards parent
+        dir_array = new(parent)
+        parent.card.subcards.each_card do |subcard|
+          dir_array.add subcard
+        end
+        dir_array
+      end
+
+      def initialize parent
+        @parent = parent
+        super()
+      end
+
+      def add card, opts={}
+        card = card.card if card.is_a? StageDirector
+        each { |dir| return dir if dir.card == card }
+        dir = ActManager.fetch card, parent: @parent
+        dir.main = false
+        dir.parent = @parent
+        dir.transact_in_stage = opts[:transact_in_stage]
+        self << dir
+        dir
+      end
+
+      alias_method :delete_director, :delete
+
+      def delete card
+        if card.is_a? StageDirector
+          delete_director card
+        else
+          delete_if { |dir| dir.card == card }
+        end
+      end
+
+      def add_director dir
+        add dir.card
+      end
+    end
+  end
+end

data/lib/card/set.rb

@@ -74,6 +74,7 @@ class Card
     include AdvancedApi
     include Helpers
 
+    extend I18nScope
     extend Loader
 
     mattr_accessor :modules, :traits

data/lib/card/set/i18n_scope.rb

@@ -0,0 +1,52 @@
+class Card
+  module Set
+    module I18nScope
+      # return scope for I18n
+      def scope backtrace
+        parts = tmp_set_path_parts backtrace
+        "mod.#{parts.first}.set.#{parts[1..-1].join '.'}"
+      end
+
+      # extract the mod name from the path of a set's tmp file
+      def mod_name backtrace
+        tmp_set_path_parts(backtrace).first
+      end
+
+      private
+
+      # extract mod and set from tmp path
+      # @example
+      #   a tmp paths looks like ~/mydeck/tmp/set/mod002-core/all/event.rb/
+      #   this method returns ["core", "all", "event"]
+      def tmp_set_path_parts backtrace
+        path_parts = find_tmp_set_path(backtrace).split(File::SEPARATOR)
+        res = path_parts[path_mod_index(path_parts)..-1]
+        res[0] = mod_name_from_tmp_dir res.first
+        res[-1] = res.last.split(".").first
+        res
+      end
+
+      def find_tmp_set_path backtrace
+        path = backtrace.find { |line| line.include? "tmp/set/" }
+        unless path
+          raise Error, "couldn't find set path in backtrace: #{backtrace}"
+        end
+        path
+      end
+
+      # index of the mod part in the tmp path
+      def path_mod_index parts
+        unless (set_index = parts.index("set")) &&
+               parts.size >= set_index + 2
+          raise Error, "not a valid set path: #{path}"
+        end
+        set_index + 1
+      end
+
+      def mod_name_from_tmp_dir dir
+        match = dir.match(/^mod\d+-(?<mod_name>.+)$/)
+        match[:mod_name]
+      end
+    end
+  end
+end

data/lib/card/subcards.rb

@@ -12,7 +12,6 @@
 class Card
   def subcards
     @subcards ||= Subcards.new(self)
-    # @subcards ||= (director && director.subcards)
   end
 
   def expire_subcards
@@ -82,7 +81,7 @@ class Card
     def clear
       @keys.each do |key|
         if (subcard = fetch_subcard key)
-          Card::DirectorRegister.delete subcard.director
+          ActManager.delete subcard.director
         end
         Card.cache.soft.delete key
       end
@@ -104,7 +103,7 @@ class Card
       @keys.delete key
       removed_card = fetch_subcard key
       removed_card.current_action.delete if removed_card.current_action
-      Card::DirectorRegister.deep_delete removed_card.director
+      ActManager.deep_delete removed_card.director
       Card.cache.soft.delete key
       removed_card
     end

data/lib/cardio.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 
 require "active_support/core_ext/numeric/time"
-require "delayed_job_active_record"
+djar = "delayed_job_active_record"
+require djar if Gem::Specification.find_all_by_name(djar).any?
 require "cardio/schema.rb"
 
 ActiveSupport.on_load :card do
@@ -16,11 +17,11 @@ module Cardio
   extend Schema
   CARD_GEM_ROOT = File.expand_path("../..", __FILE__)
 
-  mattr_reader :paths, :config, :cache
+  mattr_reader :paths, :config
 
   class << self
     def cache
-      @@cache ||= ::Rails.cache
+      @cache ||= ::Rails.cache
     end
 
     def default_configs
@@ -63,7 +64,6 @@ module Cardio
 
     def set_config config
       @@config = config
-      @@root = config.root
 
       config.autoload_paths += Dir["#{gem_root}/lib/**/"]
       config.autoload_paths += Dir["#{gem_root}/mod/*/lib/**/"]

data/mod/admin/set/self/admin.rb

@@ -5,7 +5,6 @@ basket :tasks
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task])
   raise Card::Error::PermissionDenied, self unless Auth.always_ok?
-
   case task.to_sym
   when :clear_cache          then Card::Cache.reset_all
   when :repair_references    then Card::Reference.repair_all
@@ -15,7 +14,7 @@ event :admin_tasks, :initialize, on: :update do
   when :clear_solid_cache    then Card.clear_solid_cache
   when :clear_machine_cache  then Card.reset_all_machines
   else
-    task_data = tasks.find { |h| h[:name].to_sym == task }
+    task_data = tasks.find { |h| h[:name].to_sym == task.to_sym }
     task_data[:execute_policy].call if task_data
   end
   abort :success

data/mod/admin/set/self/trash.rb

@@ -0,0 +1,29 @@
+format :html do
+  def trashed_cards
+    Card.where(trash: true)
+  end
+
+  view :core do |_args|
+    rows =
+      trashed_cards.map do |card|
+        [card.name, Card[card.updater_id].name, put_back_link(card)]
+      end
+    output [
+      (content_tag(:p, empty_trash_link) if rows.present?),
+      table(rows, header: ["card", "deleted by", ""])
+    ]
+  end
+
+  def empty_trash_link
+    card_link :admin, path_opts: { action: :update, task: :empty_trash,
+                                   success: { id: "~#{card.id}" } },
+                      text: "empty trash"
+  end
+
+  def put_back_link card
+    before_delete = card.actions[-2]
+    link_path = path action: :update, view: :open, action_ids: [before_delete],
+                     success: { id: card.name }
+    link_to "put back", link_path, method: :post, rel: "nofollow"
+  end
+end

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

@@ -1,24 +1,6 @@
 def self.included host_class
   host_class.mattr_accessor :file_content_mod_name
-  host_class.file_content_mod_name = mod_name(caller)
-end
-
-# try to extract the mod name from the path of the set's tmp file
-# the caller that included the set file is set.rb
-def self.mod_name backtrace
-  mod_dir = tmp_mod_dir backtrace
-  raise Error, "not a valid set path: #{path}" unless mod_dir
-  match = mod_dir.match(/^mod\d+-(?<mod_name>.+)$/)
-  match[:mod_name]
-end
-
-def self.tmp_mod_dir backtrace
-  path = backtrace.find { |line| line.include? "tmp/set/" }
-  raise Error, "couldn't find set path in backtrace: #{backtrace}" unless path
-  path_parts = path.split(File::SEPARATOR)
-  path_parts.fetch(path_parts.index("set") + 1) do
-    raise Error, "not a valid set path: #{path}"
-  end
+  host_class.file_content_mod_name = Card::Set.mod_name(caller)
 end
 
 # @return [Array<String>, String] the name of file(s) to be loaded
@@ -39,12 +21,10 @@ def source_dir
 end
 
 def find_file filename
-  Card.paths["mod"].to_a.each do |mod_path|
-    file_path =
-      File.join(mod_path, file_content_mod_name, "lib", source_dir, filename)
-    return file_path if File.exist? file_path
-  end
-  nil
+  mod_path = Card::Mod::Loader.mod_dirs.path file_content_mod_name
+  file_path = File.join(mod_path, "lib", source_dir, filename)
+  return unless File.exist? file_path
+  file_path
 end
 
 def existing_source_paths

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

@@ -19,6 +19,41 @@ def abort status, msg="action canceled"
   raise Card::Error::Abort.new(status, msg)
 end
 
+def act opts={}
+  if ActManager.act_card
+    add_to_act opts
+    main_act_block = false
+  else
+    start_new_act opts
+    main_act_block = true
+  end
+  yield
+ensure
+  ActManager.clear if main_act_block
+end
+
+def start_new_act opts
+  ActManager.clear
+  self.director = nil
+  ActManager.act_card = self
+  if opts && opts[:success]
+    Env[:success] = Env::Success.new(cardname, Env.params[:success])
+  end
+end
+
+def add_to_act opts
+  # if only_storage_phase is true the card is already part of the act
+  return if ActManager.act_card == self || only_storage_phase
+  director.reset_stage
+  if opts && opts[:trash]
+    @action = :delete
+  else
+    identify_action
+  end
+  director.update_card self
+  self.only_storage_phase = true
+end
+
 module ClassMethods
   def create! opts
     card = Card.new opts

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

@@ -8,21 +8,18 @@ module ClassMethods
   # * database
   # * virtual cards
   #
-  # @param mark [Integer, String, Card::Name, Symbol, Array]
-  #    one of three unique identifiers
-  #    1. a numeric id (Integer)
-  #    2. a name/key (String or Card::Name)
-  #    3. a codename (Symbol)
-  #    or any combination of those. If you pass more then one mark they get
-  #    joined with a '+'
-  # @param options [Hash]
-  #   Options:
-  #     :skip_virtual               Real cards only
-  #     :skip_modules               Don't load Set modules
-  #     :look_in_trash              Return trashed card objects
-  #     :local_only                 Use only local cache for lookup and storing
-  #     new: { opts for Card#new }  Return a new card when not found
-  #
+  # @param args [Integer, String, Card::Name, Symbol]
+  #    one or more of the three unique identifiers
+  #      1. a numeric id (Integer)
+  #      2. a name/key (String or Card::Name)
+  #      3. a codename (Symbol)
+  #    If you pass more then one mark they get joined with a '+'.
+  #    The final argument can be a hash to set the following options
+  #      :skip_virtual               Real cards only
+  #      :skip_modules               Don't load Set modules
+  #      :look_in_trash              Return trashed card objects
+  #      :local_only                 Use only local cache for lookup and storing
+  #      new: { opts for Card#new }  Return a new card when not found
   # @return [Card]
   def fetch *args
     mark, opts = normalize_fetch_args args

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

@@ -0,0 +1,9 @@
+def t key, args={}
+  I18n.t key, args.merge(scope: Card::Set.scope(caller))
+end
+
+format do
+  def t key, args={}
+    I18n.t key, args.merge(scope: Card::Set.scope(caller))
+  end
+end

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

@@ -12,5 +12,5 @@ delegate :storage_phase, to: :director
 delegate :integration_phase, to: :director
 
 def clean_up
-  Card::DirectorRegister.clear
+  Card::ActManager.clear
 end

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

@@ -1,8 +1,8 @@
 attr_writer :director
-delegate :stage, to: :director
+delegate :act_manager, to: :director
 
 def director
-  @director ||= Card::DirectorRegister.fetch self
+  @director ||= Card::ActManager.fetch self
 end
 
 def identify_action

data/mod/developer/set/all/event_viz.rb

@@ -15,7 +15,8 @@ require_dependency 'active_support/callbacks_ext'
 # prevent events from showing up in the tree.
 def events action
   @action = action
-  events = Card::Stage::STAGES.map { |stage| events_tree("#{stage}_stage") }
+  events =
+    ActManager::Stage::STAGES.map { |stage| events_tree("#{stage}_stage") }
   @action = nil
   puts_events events
 end

data/mod/email/set/all/notify.rb

@@ -68,7 +68,7 @@ def silent_change
 end
 
 def silent_change?
-  silent_change.nil? ? !Card::Env[:controller] : silent_change
+  silent_change || !Card::Env[:controller]
 end
 
 def notable_change?

data/mod/history/lib/card/act.rb

@@ -70,7 +70,7 @@ class Card
     # @return [Card]
     def card
       res = Card.fetch card_id, look_in_trash: true, skip_modules: true
-      return res unless res.type_id.in? [FileID, ImageID]
+      return res unless res && res.type_id.in?([FileID, ImageID])
       res.include_set_modules
     end
 

data/mod/history/lib/card/action.rb

@@ -62,7 +62,7 @@ class Card
     # @return [Card]
     def card
       res = Card.fetch card_id, look_in_trash: true, skip_modules: true
-      return res unless res.type_id.in? [FileID, ImageID]
+      return res unless res && res.type_id.in?([FileID, ImageID])
       res.include_set_modules
     end
 

data/mod/history/set/all/history.rb

@@ -62,7 +62,7 @@ event :finalize_act,
 end
 
 def act_card?
-  self == DirectorRegister.act_card
+  self == Card::ActManager.act_card
 end
 
 event :rollback_actions, :prepare_to_validate,

data/mod/machines/set/abstract/machine.rb

@@ -239,7 +239,7 @@ def unlock!
 end
 
 def update_input_card
-  if DirectorRegister.running_act?
+  if Card::ActManager.running_act?
     input_card = attach_subcard! machine_input_card
     input_card.content = ""
     engine_input.each { |input| input_card << input }

data/mod/machines/spec/set/type/coffeescript_spec.rb

@@ -6,7 +6,7 @@ describe Card::Set::Type::CoffeeScript do
   let(:changed_coffee)            { 'alert "Hello"  ' }
   let(:compressed_changed_coffee) { '(function(){alert("Hello")}).call(this);' }
 
-  it_should_behave_like "content machine", that_produces_js do
+  it_should_behave_like "content machine", that_produces: :js do
     let(:machine_card) do
       Card.gimme! "coffee machine", type: Card::CoffeeScriptID,
                                     content: coffee

data/mod/machines/spec/set/type/css_spec.rb

@@ -30,7 +30,7 @@ describe Card::Set::Type::Css do
     end
   end
 
-  it_behaves_like "content machine", that_produces_css do
+  it_behaves_like "content machine", that_produces: :css do
     let(:machine_card) { Card.gimme! "test css", type: :css, content: css }
     let(:card_content) do
       { in:         css,         out:         compressed_css,

data/mod/machines/spec/set/type/javascript_spec.rb

@@ -10,7 +10,7 @@ describe Card::Set::Type::JavaScript do
     "//#{source}\n#{content}"
   end
 
-  it_should_behave_like "content machine", that_produces_js do
+  it_should_behave_like "content machine", that_produces: :js do
     let(:machine_card) do
       Card.gimme! "test javascript", type: :java_script, content: js
     end