card 1.19.0 → 1.19.1

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

@@ -0,0 +1,76 @@
+module MachineInputClassMethods
+  attr_accessor :machines_wql
+
+  def machine_input_for args
+    @machines_wql = args
+  end
+
+  def machine_input &block
+    define_method :machine_input, block
+  end
+end
+
+def self.included host_class
+  host_class.extend(MachineInputClassMethods)
+  host_class.machines_wql = {}
+  host_class.machine_input do
+    format._render_raw
+  end
+  event_suffix = host_class.name.tr ":", "_"
+  define_update_event event_suffix, host_class
+  define_delete_events event_suffix, host_class
+end
+
+def self.define_delete_events event_suffix, host_class
+  event_name = "before_machine_input_deleted_#{event_suffix}".to_sym
+  host_class.event event_name, :store, on: :delete do
+    # exclude self because it's on the way to the trash
+    # otherwise it will be created again with the reset_machine_output
+    # call in the event below
+    @involved_machines =
+      MachineInput.search_involved_machines(name, host_class)
+                  .reject { |card| card == self }
+  end
+  event_name = "after_machine_input_deleted_#{event_suffix}".to_sym
+  host_class.event event_name, :finalize, on: :delete do
+    expire_machine_cache
+    @involved_machines.each do |item|
+      item.reset_machine_output if item.is_a? Machine
+    end
+  end
+end
+
+def self.define_update_event event_suffix, host_class
+  host_class.event(
+    "after_machine_input_updated_#{event_suffix}".to_sym, :integrate,
+    on: :save
+  ) do
+    expire_machine_cache
+    MachineInput.search_involved_machines(name, host_class)
+                .each do |item|
+      item.reset_machine_output if item.is_a? Machine
+    end
+  end
+end
+
+def self.search_involved_machines name, host_class
+  wql_statement =
+    { right_plus: [
+      { codename: "machine_input" },
+      { link_to: name }
+    ] }.merge(host_class.machines_wql)
+  Card.search(wql_statement)
+end
+
+def expire_machine_cache
+  Card.search(right_plus: [
+                { codename: "machine_input" },
+                { link_to: name }
+              ],
+              return: :name).each do |machine_name|
+    next unless (cache = Card.fetch(name, machine_name, :machine_cache))
+    Auth.as_bot do
+      cache.update_attributes! trash: true
+    end
+  end
+end

data/mod/machines/set/right/machine_output.rb

@@ -6,6 +6,14 @@ 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?
@@ -20,7 +28,7 @@ format do
 
   def update_machine_output_live?
     case
-    when !card.left.is_a?(Machine) then false # must be a machine
+    when !card.left.is_a?(Abstract::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/mod/machines/set/type/coffee_script.rb

@@ -2,12 +2,8 @@
 require "coffee-script"
 
 include_set Abstract::Script
-
-require_dependency "card/machine"
-require_dependency "card/machine_input"
-
-include Machine
-include MachineInput
+include_set Abstract::Machine
+include_set Abstract::MachineInput
 
 store_machine_output filetype: "js"
 

data/mod/machines/set/type/css.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require "sass"
-include Machine
-include MachineInput
+include_set Abstract::Machine
+include_set Abstract::MachineInput
 include_set Abstract::AceEditor
 
 store_machine_output filetype: "css"

data/mod/machines/set/type/java_script.rb

@@ -2,8 +2,8 @@
 
 include_set Abstract::Script
 
-include Machine
-include MachineInput
+include_set Abstract::Machine
+include_set Abstract::MachineInput
 
 store_machine_output filetype: "js"
 

data/mod/machines/set/type/skin.rb

@@ -1,5 +1,5 @@
-include Machine
-include MachineInput
+include_set Abstract::Machine
+include_set Abstract::MachineInput
 
 store_machine_output filetype: "css"
 

data/mod/machines/spec/set/abstract/machine_spec.rb

@@ -0,0 +1,10 @@
+describe Card::Set::Abstract::Machine do
+  describe "#make_machine_output_coded" do
+    it "creates coded file" do
+      Card[:all, :script].make_machine_output_coded
+      mod_path = Card::Mod::Loader.mod_dirs.path "machines"
+      path = File.join mod_path, "file", "all_script_machine_output", "file.js"
+      expect(File.exist?(path)).to be_truthy
+    end
+  end
+end

data/mod/{basic_types → pointer}/spec/set/type/pointer_spec.rb

@@ -54,17 +54,17 @@ describe Card::Set::Type::Pointer do
                 content: "[[item1]]\n[[item2]]"
   end
 
+  def pointer_update content
+    -> { pointer.update_attributes! content: content }
+  end
+
   describe "#added_item_names" do
     it "recognizes added items" do
       Card::Auth.as_bot do
         pointer
-        in_stage :validate,
+        in_stage(:validate,
                  on: :save,
-                 trigger: -> do
-                            pointer.update_attributes!(
-                              content: "[[item1]]\n[[item2]]\n[[item3]]"
-                            )
-                          end do
+                 trigger: pointer_update("[[item1]]\n[[item2]]\n[[item3]]")) do
           expect(added_item_names).to eq ["item3"]
         end
       end
@@ -75,11 +75,7 @@ describe Card::Set::Type::Pointer do
         pointer
         in_stage :validate,
                  on: :save,
-                 trigger: -> do
-                   pointer.update_attributes!(
-                     content: "[[item2]]\n[[item1]]"
-                   )
-                 end do
+                 trigger: pointer_update("[[item2]]\n[[item1]]") do
           expect(added_item_names).to eq []
         end
       end
@@ -92,11 +88,7 @@ describe Card::Set::Type::Pointer do
         pointer
         in_stage :validate,
                  on: :save,
-                 trigger: -> do
-                   pointer.update_attributes!(
-                     content: "[[item1]]"
-                   )
-                 end do
+                 trigger: pointer_update("[[item1]]") do
           expect(dropped_item_names).to eq ["item2"]
         end
       end
@@ -107,11 +99,7 @@ describe Card::Set::Type::Pointer do
         pointer
         in_stage :validate,
                  on: :save,
-                 trigger: -> do
-                   pointer.update_attributes!(
-                     content: "[[item2]]\n[[item1]]"
-                   )
-                 end do
+                 trigger: pointer_update("[[item2]]\n[[item1]]") do
           expect(dropped_item_names).to eq []
         end
       end
@@ -124,11 +112,7 @@ describe Card::Set::Type::Pointer do
         pointer
         in_stage :validate,
                  on: :save,
-                 trigger: -> do
-                   pointer.update_attributes!(
-                     content: "[[item1]]\n[[item3]]"
-                   )
-                 end do
+                 trigger: pointer_update("[[item1]]\n[[item3]]") do
           expect(changed_item_names.sort).to eq %w(item2 item3)
         end
       end

data/mod/settings/set/right/script.rb

@@ -1,4 +1,4 @@
-include Machine
+include_set Abstract::Machine
 
 store_machine_output filetype: "js"
 

data/mod/settings/set/right/style.rb

@@ -1,5 +1,5 @@
 require "sass"
-include Machine
+include_set Abstract::Machine
 
 store_machine_output filetype: "css"
 

data/mod/solid_cache/set/all/solid_cache.rb

@@ -1,5 +1,5 @@
 def solid_cache?
-  respond_to?(:solid_cache_card)
+  respond_to? :solid_cache_card
 end
 
 module ClassMethods

data/mod/standard/set/all/links.rb

@@ -40,7 +40,7 @@ format do
         "email-link"
       when /^([a-zA-Z][\-+\.a-zA-Z\d]*):/
         Regexp.last_match(1) + "-link"
-      when /^\//
+      when %r{^/}
         href = internal_url href[1..-1]
         "internal-link"
       else
@@ -153,6 +153,6 @@ end
 
 format :css do
   def link_to _text, href, _opts={}
-    interpret_href href
+    card_url interpret_href(href)
   end
 end

data/spec/spec_helper.rb

@@ -11,8 +11,10 @@ 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__)
+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__)
 
 Spork.prefork do
   if ENV["RAILS_ROOT"]
@@ -37,7 +39,7 @@ Spork.prefork do
                    file_path: %r{\bspec/controllers/}
     config.include RSpecHtmlMatchers
     # format_index = ARGV.find_index {|arg| arg =~ /--format|-f/ }
-    # formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation' #'textmate'
+    # formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation'
     # config.default_formatter=formatter
 
     config.infer_spec_type_from_file_location!
@@ -77,6 +79,16 @@ Card["*all+*style"].ensure_machine_output
 Card["*all+*script"].ensure_machine_output
 (ie9 = Card[:script_html5shiv_printshiv]) && ie9.ensure_machine_output
 
+def bucket_credentials key
+  @buckets ||= begin
+    yml_file =
+      ENV["BUCKET_CREDENTIALS_PATH"] ||
+      File.expand_path("../config/bucket_credentials.yml", __FILE__)
+    File.exist?(yml_file) ? YAML.load_file(yml_file).deep_symbolize_keys : {}
+  end
+  @buckets[key]
+end
+
 Spork.each_run do
   # This code will be run each time you run your specs.
 end

data/tmpsets/set/{mod014-admin → mod001-admin}/self/admin.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; class Self; module Admin; extend Card::Set
 # ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/admin/set/self/admin.rb ~~
+# collect arrays of the form
+# [task symbol, { execute_policy: block, stats_policy: block }]
+basket :tasks
+
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task])
-  raise Card::Error::PermissionDenied.new(self) unless Auth.always_ok?
+  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
-  when :empty_trash          then Card.empty_trash
   when :clear_view_cache     then Card::Cache::ViewCache.reset
   when :delete_old_revisions then Card::Action.delete_old
   when :repair_permissions   then Card.repair_all_permissions
   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[:execute_policy].call if task_data
   end
   abort :success
 end
@@ -23,63 +29,74 @@ format :html do
     stats = card_stats
     stats += cache_stats
     stats += memory_stats
-    table_content = stats.map { |args| stat_row(*args) }
+    card.tasks.each do |task|
+      stats += Array.wrap task[:stats]
+    end
+    table_content = stats.map { |args| stat_row(args) }
     table table_content, header: %w(Stat Value Action)
   end
 
   def card_stats
     [
-      ["cards",         { count: Card.where(trash: false) }],
-      ["trashed cards", { count: Card.where(trash: true),
-                          link_text: "delete all", task: "empty_trash" }],
-      ["actions",       { count: Card::Action,
-                          link_text: "delete old",
-                          task: "delete_old_revisions" }],
-      ["references",    { count: Card::Reference,
-                          link_text: "repair all", task: "repair_references" }]
+      { title: "cards",
+        count: Card.where(trash: false) },
+      { title: "actions",
+        count: Card::Action,
+        link_text: "delete old",
+        task: "delete_old_revisions" },
+      { title: "references",
+        count: Card::Reference,
+        link_text: "repair all",
+        task: "repair_references" }
     ]
   end
 
   def cache_stats
     stats = [
-      ["solid cache", { count: solid_cache_count, unit: " cards",
-                        link_text: "clear cache",
-                        task: "clear_solid_cache" }],
-      ["machine cache", { count: machine_cache_count, unit: " cards",
-                          link_text: "clear cache",
-                          task: "clear_machine_cache" }]
+      { title: "solid cache",
+        count: solid_cache_count, unit: " cards",
+        link_text: "clear cache",
+        task: "clear_solid_cache" },
+      { title: "machine cache",
+        count: machine_cache_count, unit: " cards",
+        link_text: "clear cache",
+        task: "clear_machine_cache" }
     ]
     return stats unless Card.config.view_cache
-    stats <<
-      ["view cache", { count: Card::Cache::ViewCache,
-                       link_text: "clear view cache",
-                       task: "clear_view_cache" }]
-    stats
+    stats << { title: "view cache",
+               count: Card::Cache::ViewCache,
+               link_text: "clear view cache",
+               task: "clear_view_cache" }
   end
 
   def memory_stats
     oldmem = session[:memory]
     session[:memory] = newmem = card.profile_memory
     stats = [
-      ["memory now", { count: newmem, unit: "M",
-                       link_text: "clear cache", task: "clear_cache" }]
+      { title: "memory now",
+        count: newmem, unit: "M",
+        link_text: "clear cache", task: "clear_cache" }
     ]
     return stats unless oldmem
-    stats << ["memory prev", { count: oldmem, unit: "M" }]
-    stats << ["memory diff", { count: newmem - oldmem, unit: "M" }]
+    stats << { title: "memory prev", count: oldmem, unit: "M" }
+    stats << { title: "memory diff", count: newmem - oldmem, unit: "M" }
     stats
   end
 
-  def stat_row name, args={}
-    res = [name]
-    args[:count] = args[:count].count if args[:count].respond_to?(:count)
-    res << "#{args[:count]}#{args[:unit]}"
+  def stat_row args={}
+    res = [(args[:title] || "")]
+    res << "#{count(args[:count])}#{args[:unit]}"
     return res unless args[:task]
     path = card_path("update/:admin?task=#{args[:task]}")
     res << link_to(args[:link_text] || args[:task], path)
     res
   end
 
+  def count counter
+    counter = counter.call if counter.is_a?(Proc)
+    counter.respond_to?(:count) ? counter.count : counter
+  end
+
   def solid_cache_count
     Card.search right: { codename: "solid_cache" }, return: "count"
   end