card 1.19.0 → 1.19.1

data/db/seeds.rb

@@ -0,0 +1,8 @@
+WAGN_SEED_TABLES = %w( cards card_actions card_acts card_changes
+                       card_references ).freeze
+WAGN_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

data/lib/card.rb

@@ -1,5 +1,15 @@
 # -*- encoding : utf-8 -*-
+cw_path = File.expand_path "../../vendor/carrierwave/lib", __FILE__
+$LOAD_PATH.unshift(cw_path) unless $LOAD_PATH.include?(cw_path)
 require "carrierwave"
+
+# if Cardio.file_buckets.present?
+#   require "carrierwave/storage/fog"
+#   Cardio.file_buckets.each do |bucket, config|
+#     require config["provider"]
+#   end
+# end
+
 Object.send :remove_const, :Card if Object.send(:const_defined?, :Card)
 
 # Cards are wiki-inspired building blocks.

data/lib/card/auth/setup.rb

@@ -21,12 +21,12 @@ class Card
         @simulating_setup_need = mode
       end
 
-      # def instant_account_activation
-      #   simulate_setup_need!
-      #   yield
-      # ensure
-      #   simulate_setup_need! false
-      # end
+      def instant_account_activation
+        simulate_setup_need!
+        yield
+      ensure
+        simulate_setup_need! false
+      end
 
       private
 

data/lib/card/mod/dirs.rb

@@ -17,12 +17,22 @@ class Card
         end
       end
 
-      def mod mod_name
+      # add a new mod to mod load paths
+      def add_path mod_name
+        if @mods.include? mod_name
+          raise Error,
+                "name conflict: mod with name \"#{mod_name}\" already loaded"
+        end
         @mods << mod_name
-        # TODO: do something if two mods have the same name?
         @paths[mod_name] = File.join @current_path, mod_name
       end
 
+      alias_method :mod, :add_path
+
+      def path mod_name
+        @paths[mod_name]
+      end
+
       def each type=nil
         super() do |path|
           dirname = type ? File.join(path, type.to_s) : path
@@ -58,7 +68,7 @@ class Card
       def load_from_dir
         Dir.entries(@current_path).sort.each do |filename|
           next if filename =~ /^\./
-          mod filename
+          add_path filename
         end.compact
       end
 

data/lib/card/set/advanced_api.rb

@@ -20,10 +20,11 @@ class Card
       end
 
       def attachment name, args
-        include Abstract::Attachment
-        add_attributes name, "remote_#{name}_url".to_sym, :load_from_mod,
-                       :action_id_of_cached_upload, :empty_ok
-        uploader_class = args[:uploader] || CarrierWave::FileUploader
+        include_set Abstract::Attachment
+        add_attributes name, "remote_#{name}_url".to_sym,
+                       :action_id_of_cached_upload, :empty_ok,
+                       :storage_type, :bucket, :mod
+        uploader_class = args[:uploader] || ::CarrierWave::FileCardUploader
         mount_uploader name, uploader_class
       end
 

data/lib/cardio.rb

@@ -53,7 +53,11 @@ module Cardio
         encoding:               "utf-8",
         request_logger:         false,
         performance_logger:     false,
-        sql_comments:           true
+        sql_comments:           true,
+
+        file_storage:           :local,
+        file_buckets:           {},
+        file_default_bucket:    nil
       }
     end
 
@@ -61,8 +65,8 @@ module Cardio
       @@config = config
       @@root = config.root
 
-      config.autoload_paths += Dir["#{gem_root}/mod/*/lib/**/"]
       config.autoload_paths += Dir["#{gem_root}/lib/**/"]
+      config.autoload_paths += Dir["#{gem_root}/mod/*/lib/**/"]
       config.autoload_paths += Dir["#{root}/mod/*/lib/**/"]
 
       default_configs.each_pair do |setting, value|
@@ -92,7 +96,7 @@ module Cardio
       add_path "db/migrate"
       add_path "db/migrate_core_cards"
       add_path "db/migrate_deck_cards", root: root, with: "db/migrate_cards"
-      add_path "db/seeds", with: "db/seeds.rb"
+      add_path "db/seeds.rb", with: "db/seeds.rb"
 
       add_path "config/initializers", glob: "**/*.rb"
       add_initializers root

data/mod/Modfile

@@ -1,3 +1,4 @@
+mod 'admin'
 mod 'core'
 mod 'history'
 mod 'basic_formats'
@@ -10,9 +11,8 @@ mod 'basic_types'
 mod 'machines'
 mod 'settings'
 mod 'email'
-mod 'carrierwave'
-mod 'admin'
 mod 'developer'
+mod 'carrierwave'
 mod 'standard'
 mod 'account'
 mod 'bootstrap'

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

@@ -1,16 +1,22 @@
+# 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
@@ -20,63 +26,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

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

@@ -22,7 +22,7 @@ format :html do
   def render_warning_list warnings
     # 'ADMINISTRATOR WARNING'
     admin_warn = I18n.t(:admin_warn,
-                        scope: "mod.standard.set.self.admin_info")
+                        scope: "mod.admin.set.self.admin_info")
     "<h6>#{admin_warn}</h6>".html_safe + list_group(
       warnings,
       items: { class: "list-group-item-warning" }
@@ -33,7 +33,7 @@ format :html do
     # "Email delivery is turned off."
     # "Change settings in config/application.rb to send sign up notifications."
     I18n.t(:email_off,
-           scope: "mod.standard.set.self.admin_info",
+           scope: "mod.admin.set.self.admin_info",
            path: "config/application.rb")
   end
 
@@ -43,16 +43,16 @@ format :html do
         # %(Your captcha is currently working with temporary settings.
         #   This is fine for a local installation, but you will need new
         #   recaptcha keys if you want to make this site public.)
-        I18n.t(:captcha_temp, scope: "mod.standard.set.self.admin_info")
+        I18n.t(:captcha_temp, scope: "mod.admin.set.self.admin_info")
       else
         # %(You are configured to use [[*captcha]], but for that to work
         #   you need new recaptcha keys.)
         process_content(I18n.t(:captcha_keys,
-                               scope: "mod.standard.set.self.admin_info"))
+                               scope: "mod.admin.set.self.admin_info"))
       end
     # 'Instructions'
     instructions = I18n.t(:instructions,
-                          scope: "mod.standard.set.self.admin_info")
+                          scope: "mod.admin.set.self.admin_info")
     <<-HTML
       <p>
         #{warning}
@@ -71,15 +71,15 @@ format :html do
   def howto_add_new_recaptcha_keys
     instructions(
       # 'How to add new recaptcha keys:'
-      I18n.t(:howto_add_keys, scope: "mod.standard.set.self.admin_info"),
+      I18n.t(:howto_add_keys, scope: "mod.admin.set.self.admin_info"),
       [
         # "1. Register your domain at #{web_link 'http://google.com/recaptcha'}"
         I18n.t(:howto_register,
-               scope: "mod.standard.set.self.admin_info",
+               scope: "mod.admin.set.self.admin_info",
                recaptcha_link: web_link("http://google.com/recaptcha")),
         # "2. Add your keys to #{card_link :recaptcha_settings}"
         I18n.t(:howto_add,
-               scope: "mod.standard.set.self.admin_info",
+               scope: "mod.admin.set.self.admin_info",
                recaptcha_settings: card_link(:recaptcha_settings))
       ]
     )
@@ -88,15 +88,15 @@ format :html do
   def howto_turn_captcha_off
     instructions(
       # 'How to turn captcha off:'
-      I18n.t(:howto_turn_off, scope: "mod.standard.set.self.admin_info"),
+      I18n.t(:howto_turn_off, scope: "mod.admin.set.self.admin_info"),
       [
         # "1. Go to #{card_link :captcha}"
         I18n.t(:howto_go,
-               scope: "mod.standard.set.self.admin_info",
+               scope: "mod.admin.set.self.admin_info",
                captcha_card: card_link(:captcha)),
         # '2. Update all *captcha rules to "no".'
         I18n.t(:howto_update,
-               scope: "mod.standard.set.self.admin_info")
+               scope: "mod.admin.set.self.admin_info")
       ]
     )
   end

data/mod/basic_formats/set/self/head.rb

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

data/mod/bootstrap/lib/stylesheets/bootstrap/_variables.scss

@@ -80,7 +80,7 @@ $headings-color:          inherit !default;
 
 // [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
 // [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
-$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "[[/assets/fonts/bootstrap/]]") !default;
 
 //** File name for all font files.
 $icon-font-name:          "glyphicons-halflings-regular" !default;

data/mod/bootstrap/set/all/bootstrap/table.rb

@@ -40,7 +40,7 @@ format :html do
     if cell.is_a? Hash
       content_tag :td, cell.delete(:content).to_s.html_safe, cell
     else
-      content_tag :td, cell.html_safe
+      content_tag :td, String(cell).html_safe
     end
   end
 

data/mod/bootstrap/set/self/bootswatch_shared.rb

@@ -9,7 +9,7 @@ view :raw do |_args|
   content = File.read("#{bootstrap_path}/_variables.scss")
   content += %(
       $bootstrap-sass-asset-helper: false;
-      $icon-font-path: "#{card_path 'assets/fonts/'}";
+      $icon-font-path: "#{card_url 'assets/fonts/'}";
     )
   # mixins
   content += Dir.glob("#{bootstrap_path}/mixins/*.scss").map do |name|

data/mod/carrierwave/Gemfile

@@ -0,0 +1,4 @@
+# the current release 0.11.2 uses an old version of the fog gem which isn't
+# compatible with rails 4.2
+gem "carrierwave", git: "https://github.com/carrierwaveuploader/carrierwave",
+                   branch: "master"

data/mod/carrierwave/lib/carrier_wave/cardmount.rb

@@ -1,3 +1,5 @@
+cw_path = File.expand_path "../../../../../vendor/carrierwave/lib", __FILE__
+$LOAD_PATH.unshift(cw_path) unless $LOAD_PATH.include?(cw_path)
 require "carrierwave"
 
 module CarrierWave
@@ -30,15 +32,12 @@ module CarrierWave
               on: :update do
           mark_remove_#{column}_false
         end
-        event :store_previous_model_for_#{column}_event, :store,
+        event :store_previous_changes_for_#{column}_event, :store,
               on: :update, when: proc { |c| !c.history? } do
-          store_previous_model_for_#{column}
+          store_previous_changes_for_#{column}
         end
-        event :remove_previously_stored_#{column}_event, :store,
+        event :remove_previously_stored_#{column}_event, :finalize,
               on: :update, when: proc { |c| !c.history?} do
-          if @previous_model_for_#{column}
-            @previous_model_for_#{column}.include_set_modules
-          end
           remove_previously_stored_#{column}
         end
 
@@ -64,23 +63,35 @@ module CarrierWave
 
         def #{column}=(new_file)
           return if new_file.blank?
-          send(:"#{column}_will_change!")
-          db_column = _mounter(:#{column}).serialization_column
-          send(:"\#{db_column}_will_change!")
-          super
+          assign_file(new_file) { super }
         end
 
         def remote_#{column}_url=(url)
-          send(:"#{column}_will_change!")
+          assign_file(url) { super }
+        end
+
+        def assign_file file
           db_column = _mounter(:#{column}).serialization_column
           send(:"\#{db_column}_will_change!")
+          if web?
+            self.content = file
+          else
+            send(:"#{column}_will_change!")
+            yield
+          end
+        end
+
+        def remove_#{column}=(value)
+          column = _mounter(:#{column}).serialization_column
+          send(:"\#{column}_will_change!")
           super
         end
 
         def remove_#{column}!
+          self.remove_#{column} = true
+          write_#{column}_identifier
+          self.remove_#{column} = false
           super
-          _mounter(:#{column}).remove = true
-          _mounter(:#{column}).write_identifier
         end
 
         def #{column}_will_change!