card 1.21.0 → 1.91

data/lib/card/set/event.rb

@@ -16,7 +16,7 @@ class Card
     # effect that params changes in the CardController get lost
     # (a crucial example are success params that are processed in
     # CardController#update_params_for_success)
-    return yield if Wagn.config.active_job.queue_adapter == :inline
+    return yield if Decko.config.active_job.queue_adapter == :inline
     Card::Auth.with auth do
       Card::Env.with env do
         yield

data/lib/card/set_pattern.rb

@@ -99,7 +99,6 @@ EOF
             @module_key
           else
             @module_key = begin
-              # binding.pry if to_s == "*input+*right+*options+*self"
               if self.class.anchorless?
                 self.class.pattern_code.camelize
               elsif anchor_codenames

data/lib/card/subcards.rb

@@ -233,11 +233,11 @@ class Card
     #   tracked_attributes.rb. Find a place for it where its accessible
     #   for both. There is one important difference. The keys are symbols
     # here instead of strings
-    def extract_subcard_args! args
+    def extract_subcard_args! name, args
       subcards = args.delete(:subcards) || {}
       if (subfields = args.delete(:subfields))
         subfields.each_pair do |key, value|
-          subcards[cardname.field(key)] = value
+          subcards[name.to_name.field(key)] = value
         end
       end
       args.keys.each do |key|
@@ -255,7 +255,7 @@ class Card
         new_by_card left_card, transact_in_stage: attributes[:transact_in_stage]
         left_card.subcards.new_by_attributes absolute_name, attributes
       else
-        subcard_args = extract_subcard_args! attributes
+        subcard_args = extract_subcard_args! name, attributes
         t_i_s = attributes.delete(:transact_in_stage)
         card = Card.assign_or_initialize_by absolute_name.s, attributes, local_only: true
         subcard = new_by_card card, transact_in_stage: t_i_s
@@ -265,6 +265,7 @@ class Card
     end
 
     def absolutize_subcard_name name
+      name = Card.compose_mark name if name.is_a? Array
       if @context_card.name =~ /^\+/ || name.blank?
         name.to_name
       else

data/lib/card/tasks/card.rake

@@ -1,13 +1,17 @@
 namespace :card do
+  def importer
+    @importer ||= Card::Migration::Import.new Card::Migration.data_path
+  end
+  
   desc "merge import card data that was updated since the last push into " \
        "the the database"
   task merge: :environment do
-    Card::Migration::Import.merge
+    importer.merge
   end
 
   desc "merge all import card data into the the database"
   task merge_all: :environment do
-    Card::Migration::Import.merge all: true
+    importer.merge all: true
   end
 
   desc "add card to import data"
@@ -27,14 +31,14 @@ namespace :card do
 
   desc "add items of the export card to import data"
   task pull_export: :environment do
-    Card::Migration::Import.pull "export", items_only: true,
+    importer.pull "export", items_only: true,
                                            remote: ENV["from"]
   end
 
   desc "add a new card to import data"
   task add: :environment do
     _task, name, type, codename = ARGV
-    Card::Migration::Import.add_card name: name, type: type || "Basic",
+    importer.add_card name: name, type: type || "Basic",
                                      codename: codename
     exit
   end
@@ -44,14 +48,14 @@ namespace :card do
     _task, name, url = ARGV
     raise "no name given" unless name.present?
     raise "no url given" unless url.present?
-    Card::Migration::Import.add_remote name, url
+    importer.add_remote name, url
     exit
   end
 
   def pull_card opts={}
     _task, card = ARGV
     raise "no card given" unless card.present?
-    Card::Migration::Import.pull card, opts.merge(remote: ENV["from"])
+    importer.pull card, opts.merge(remote: ENV["from"])
     exit # without exit the card argument is treated as second rake task
   end
 end

data/lib/card/tasks/card/create.rake

@@ -58,7 +58,7 @@ namespace :card do
 
     def create_migration_file name, category, type_codename
       puts "creating migration file...".yellow
-      migration_out = `bundle exec wagn generate card:migration #{name}`
+      migration_out = `bundle exec decko generate card:migration #{name}`
       migration_file = migration_out[/db.*/]
       content = migration_content name, category, type_codename
       write_at migration_file, 5, content # 5 is line no.

data/lib/cardio.rb

@@ -76,7 +76,7 @@ module Cardio
     end
 
     def read_only?
-      !ENV["WAGN_READ_ONLY"].nil?
+      !ENV["DECKO_READ_ONLY"].nil?
     end
 
     # In production mode set_config gets called twice.

data/mod/account/set/right/password.rb

@@ -10,7 +10,7 @@ view :editor do
                  else
                    "off"
                  end
-  password_field :content, class: "card-content", autocomplete: autocomplete
+  password_field :content, class: "d0-card-content", autocomplete: autocomplete
 end
 
 view :raw do

data/mod/account/set/self/account_links.rb

@@ -14,29 +14,29 @@ format :html do
 
   view :sign_up, link_options(&:show_signup_link?) do
     link_to_card :signup, account_link_text(:sign_up),
-                 class: classy("signup-link"),
+                 class: nav_link_class("signup-link"),
                  path: { action: :new, mark: :signup }
   end
 
   view :sign_in, link_options { !Auth.signed_in? } do
     link_to_card :signin, account_link_text(:sign_in),
-                 class: classy("signin-link")
+                 class: nav_link_class("signin-link")
   end
 
   view :sign_out, link_options { Auth.signed_in? } do
     link_to_card :signin, account_link_text(:sign_out),
-                 class: classy("signout-link"),
+                 class: nav_link_class("signout-link"),
                  path: { action: :delete }
   end
 
   view :invite, link_options(&:show_invite_link?) do
     link_to_card :signup, account_link_text(:invite),
-                 class: classy("invite-link"),
+                 class: nav_link_class("invite-link"),
                  path: { action: :new, mark: :signup }
   end
 
   view :my_card, link_options { Auth.signed_in? } do
-    link_to_card Auth.current.cardname, nil, id: "my-card-link"
+    link_to_card Auth.current.cardname, nil, id: "my-card-link", class: nav_link_class("my-card")
   end
 
   def account_link_text purpose
@@ -48,7 +48,9 @@ format :html do
     item_links.join " "
   end
 
-  view(:navbar_right, cache: :never) { super() }
+  def nav_link_class type
+    "nav-link #{classy(type)}"
+  end
 
   view :core, cache: :never do
     status_class = Auth.signed_in? ? "logged-in" : "logged-out"

data/mod/ace_editor/lib/javascript/script_ace_config.js.coffee

@@ -1,19 +1,19 @@
-wagn.addEditor(
+decko.addEditor(
   '.ace-editor-textarea',
   ->
-    wagn.initAce $(this),
+    decko.initAce $(this),
   ->
     aceEditorContent this[0]
 )
 
-$.extend wagn,
+$.extend decko,
   setAceConfig: (string) ->
     setter = ->
       try
         $.parseJSON string
       catch
         {}
-    wagn.aceConfig = setter()
+    decko.aceConfig = setter()
 
   configAceEditor: (editor, mode) ->
     conf = {
@@ -27,7 +27,7 @@ $.extend wagn,
     hard_conf = {
       mode: "ace/mode/" + mode
     }
-    user_conf = if wagn.aceConfig? then wagn.aceConfig else {}
+    user_conf = if decko.aceConfig? then decko.aceConfig else {}
     $.extend conf, user_conf['default'], user_conf[mode], hard_conf
     editor.setOptions conf
 
@@ -46,7 +46,7 @@ $.extend wagn,
     ace.config.set('basePath','/assets/ace')
     editor = ace.edit(editDiv[0])
     editor.getSession().setValue textarea.val()
-    wagn.configAceEditor(editor, mode)
+    decko.configAceEditor(editor, mode)
     return
 
 aceEditorContent = (element) ->
@@ -57,7 +57,7 @@ aceEditorContent = (element) ->
 
 
 
-$.extend wagn,
+$.extend decko,
 
 
   initProseMirror: (el_id) ->
@@ -66,6 +66,6 @@ $.extend wagn,
       tooltipMenu: false
     }
     hard_conf = { docFormat: "html" }
-    user_conf = if wagn.proseMirrorConfig? then wagn.proseMirrorConfig else {}
+    user_conf = if decko.proseMirrorConfig? then decko.proseMirrorConfig else {}
     $.extend conf, user_conf, hard_conf
     createProseMirror(el_id, conf)

data/mod/ace_editor/set/abstract/ace_editor.rb

@@ -1,7 +1,7 @@
 format :html do
   def ace_editor_input
     text_area :content, rows: 5,
-                        class: "card-content ace-editor-textarea",
+                        class: "d0-card-content ace-editor-textarea",
                         "data-ace-mode" => ace_mode
   end
 

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

@@ -23,10 +23,7 @@ format :html do
     # 'ADMINISTRATOR WARNING'
     admin_warn = I18n.t(:admin_warn,
                         scope: "mod.admin.set.self.admin_info")
-    "<h6>#{admin_warn}</h6>".html_safe + list_group(
-      warnings,
-      items: { class: "list-group-item-warning" }
-    )
+    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
   end
 
   def email_warning
@@ -57,14 +54,14 @@ format :html do
       <p>
         #{warning}
       </p>
-      <h4>#{instructions}</h4>
+      <h5>#{instructions}</h5>
       #{howto_add_new_recaptcha_keys}
       #{howto_turn_captcha_off}
     HTML
   end
 
   def instructions title, steps
-    steps = list_group steps
+    steps = list_tag steps, ordered: true
     "#{title}#{steps}"
   end
 

data/mod/basic_formats/set/all/base.rb

@@ -23,12 +23,22 @@ format do
   end
 
   view :link, closed: true, perms: :none do
+    link_view
+  end
+
+  view :nav_link, closed: true, perms: :none do
+    link_view class: "nav-link"
+  end
+
+  def link_view opts={}
     title = showname voo.title
-    opts = { known: card.known? }
+    opts[:known] = card.known?
     opts[:path] = { card: { type: voo.type } } if voo.type && !opts[:known]
     link_to_card card.name, title, opts
   end
 
+
+
   view(:codename, closed: true) { card.codename.to_s }
   view(:id,       closed: true) { card.id            }
   view(:type,     closed: true) { card.type_name     }