card 1.19.1 → 1.19.2

data/spec/lib/card/i18n_spec.rb

@@ -6,14 +6,13 @@ if use_i18_tasks
   require "i18n/tasks"
 end
 
-# Note: I18n::Tasks only knows how to function when run from root of Card GEM,
-# since it locates its configuration file and source to parse relative to this
-
-def card_gem_root
-  Pathname(__FILE__).parent.parent.parent.parent.to_s
-end
-
 RSpec.describe "I18n" do
+  # Note: I18n::Tasks only knows how to function when run from root of Card GEM,
+  # since it locates its configuration file and source to parse relative to this
+  def card_gem_root
+    Pathname(__FILE__).parent.parent.parent.parent.to_s
+  end
+
   if use_i18_tasks
     let(:i18n) { Dir.chdir(card_gem_root) { I18n::Tasks::BaseTask.new } }
     let(:missing_keys) { Dir.chdir(card_gem_root) { i18n.missing_keys } }

data/spec/lib/card/query_spec.rb

@@ -1,10 +1,11 @@
 # -*- encoding : utf-8 -*-
 
-A_JOINEES = %w(B C D E F).freeze
-CARDS_MATCHING_TWO = ["Joe User", "One+Two", "One+Two+Three",
-                      "script: slot+*all+*script+*machine cache", "Two"].freeze
-
 describe Card::Query do
+  A_JOINEES = %w(B C D E F).freeze
+  CARDS_MATCHING_TWO = ["Joe User", "One+Two", "One+Two+Three",
+                        "script: slot+*all+*script+*machine cache",
+                        "Two"].freeze
+
   subject do
     Card::Query.run @query.reverse_merge return: :name, sort: :name
   end

data/spec/lib/card/stage_director_spec.rb

@@ -1,4 +1,4 @@
-describe Card::StageDirector do
+describe Card::ActManager::StageDirector do
   describe "abortion" do
     let(:create_card) { Card.create name: "a card" }
     let(:create_card_with_subcard) do

data/spec/spec_helper.rb

@@ -11,10 +11,9 @@ require File.expand_path("../../db/seed/test/seed.rb", __FILE__)
 require File.expand_path("../../config/simplecov_helper.rb", __FILE__)
 require "simplecov"
 
-require File.expand_path("../../mod/machines/spec/lib/"\
-                         "shared_machine_examples.rb", __FILE__)
-require File.expand_path("../../mod/machines/spec/lib/"\
-                         "shared_machine_input_examples.rb", __FILE__)
+shared_example_dir =
+  File.expand_path("../../mod/machines/spec/shared_examples", __FILE__)
+Dir["#{shared_example_dir}**/*.rb"].sort.each { |f| require f }
 
 Spork.prefork do
   if ENV["RAILS_ROOT"]

data/tmpsets/set/{mod002-core → mod001-core}/all/fetch.rb

@@ -11,20 +11,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

data/tmpsets/set/{mod002-core → mod001-core}/all/trash.rb

@@ -1,56 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; class All; module Trash; extend Card::Set
 # ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/trash.rb ~~
-Self::Admin.add_to_basket(
-  :tasks,
-  name: :empty_trash,
-  execute_policy: -> { Card.empty_trash },
-  stats: {
-    title: "trashed cards",
-    count: -> { Card.where(trash: true) },
-    link_text: "delete all",
-    task: "empty_trash"
-  }
-)
-
-module ClassMethods
-  def empty_trash
-    Card.delete_trashed_files
-    Card.where(trash: true).delete_all
-    Card::Action.delete_cardless
-    Card::Reference.unmap_if_referee_missing
-    Card::Reference.delete_if_referer_missing
-  end
-
-  # deletes any file not associated with a real card.
-  def delete_trashed_files
-    dir = Cardio.paths["files"].existent.first
-    # TODO: handle cloud files
-    return unless dir
-
-    trashed_card_ids = all_trashed_card_ids
-    file_ids = all_file_ids
-    file_ids.each do |file_id|
-      next unless trashed_card_ids.member?(file_id)
-      if Card.exists?(file_id) # double check!
-        raise Card::Error, "Narrowly averted deleting current file"
-      end
-      FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
-    end
-  end
-
-  def all_file_ids
-    dir = Card.paths["files"].existent.first
-    Dir.entries(dir)[2..-1].map(&:to_i)
-  end
-
-  def all_trashed_card_ids
-    trashed_card_sql = %( select id from cards where trash is true )
-    sql_results = Card.connection.select_all(trashed_card_sql)
-    sql_results.map(&:values).flatten.map(&:to_i)
-  end
-end
-
 def delete
   update_attributes trash: true unless new_card?
 end

data/tmpsets/set/{mod002-core → mod001-core}/all/utils.rb

@@ -2,6 +2,28 @@
 class Card; module Set; class All; module Utils; extend Card::Set
 # ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/utils.rb ~~
 module ClassMethods
+  def empty_trash
+    Card.delete_trashed_files
+    Card.where(trash: true).delete_all
+    Card::Action.delete_cardless
+    Card::Reference.unmap_if_referee_missing
+    Card::Reference.delete_if_referer_missing
+  end
+
+  # deletes any file not associated with a real card.
+  def delete_trashed_files
+    trashed_card_ids = all_trashed_card_ids
+    file_ids = all_file_ids
+    dir = Cardio.paths["files"].existent.first
+    file_ids.each do |file_id|
+      next unless trashed_card_ids.member?(file_id)
+      if Card.exists?(file_id) # double check!
+        raise Card::Error, "Narrowly averted deleting current file"
+      end
+      FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+    end
+  end
+
   def delete_tmp_files id=nil
     dir = Cardio.paths["files"].existent.first + "/tmp"
     dir += "/#{id}" if id
@@ -10,6 +32,17 @@ module ClassMethods
     Rails.logger.info "failed to remove tmp files"
   end
 
+  def all_file_ids
+    dir = Card.paths["files"].existent.first
+    Dir.entries(dir)[2..-1].map(&:to_i)
+  end
+
+  def all_trashed_card_ids
+    trashed_card_sql = %( select id from cards where trash is true )
+    sql_results = Card.connection.select_all(trashed_card_sql)
+    sql_results.map(&:values).flatten.map(&:to_i)
+  end
+
   def merge_list attribs, opts={}
     unmerged = []
     attribs.each do |row|

data/tmpsets/set/{mod004-basic_formats → mod003-basic_formats}/self/head.rb

@@ -54,7 +54,7 @@ format :html do
       if params[:debug] == "style"
         page_path(style_card.cardname, item: :import, format: :css)
       elsif style_card
-        style_card.machine_output_url
+        card_path style_card.machine_output_url
       end
     return unless @css_path
     %(<link href="#{@css_path}" media="all" rel="stylesheet" type="text/css" />)

data/tmpsets/set/{mod009-solid_cache → mod008-solid_cache}/abstract/solid_cache.rb

@@ -31,7 +31,7 @@ module ClassMethods
   # cards whose solid caches are expired because of the update.
   # @param set_of_changed_card [set constant] a set of cards that triggers
   #   a cache update
-  # @params args [Hash]
+  # @param args [Hash]
   # @option args [Symbol, Array of symbols] :on the action(s)
   #   (:create, :update, or :delete) on which the cache update
   #   should be triggered. Default is all actions.

data/tmpsets/set/{mod011-machines → mod010-machines}/right/machine_output.rb

@@ -9,14 +9,6 @@ def history?
   false
 end
 
-event :remove_codename, :prepare_to_validate,
-      on: :delete,
-      when: proc { |c| c.codename.present? } do
-  # load file before deleting codename otherwise it will fail later
-  attachment
-  self.codename = nil
-end
-
 format do
   view :not_found do |args|
     if update_machine_output_live?
@@ -31,7 +23,7 @@ format do
 
   def update_machine_output_live?
     case
-    when !card.left.is_a?(Abstract::Machine) then false # must be a machine
+    when !card.left.is_a?(Machine) then false # must be a machine
     when card.left.locked?         then false # machine must not be running
     when card.new_card?            then true  # always update if new
     else

data/tmpsets/set/{mod011-machines → mod010-machines}/type/coffee_script.rb

@@ -5,8 +5,12 @@ class Card; module Set; class Type; module CoffeeScript; extend Card::Set
 require "coffee-script"
 
 include_set Abstract::Script
-include_set Abstract::Machine
-include_set Abstract::MachineInput
+
+require_dependency "card/machine"
+require_dependency "card/machine_input"
+
+include Machine
+include MachineInput
 
 store_machine_output filetype: "js"
 

data/tmpsets/set/{mod011-machines → mod010-machines}/type/css.rb

@@ -3,8 +3,8 @@ class Card; module Set; class Type; module Css; extend Card::Set
 # ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/machines/set/type/css.rb ~~
 # -*- encoding : utf-8 -*-
 require "sass"
-include_set Abstract::Machine
-include_set Abstract::MachineInput
+include Machine
+include MachineInput
 include_set Abstract::AceEditor
 
 store_machine_output filetype: "css"

data/tmpsets/set/{mod011-machines → mod010-machines}/type/java_script.rb

@@ -5,8 +5,8 @@ class Card; module Set; class Type; module JavaScript; extend Card::Set
 
 include_set Abstract::Script
 
-include_set Abstract::Machine
-include_set Abstract::MachineInput
+include Machine
+include MachineInput
 
 store_machine_output filetype: "js"
 

data/tmpsets/set/{mod011-machines → mod010-machines}/type/skin.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; class Type; module Skin; extend Card::Set
 # ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/machines/set/type/skin.rb ~~
-include_set Abstract::Machine
-include_set Abstract::MachineInput
+include Machine
+include MachineInput
 
 store_machine_output filetype: "css"