card 1.20.4 → 1.21.0

data/lib/generators/card/format/format_generator.rb

@@ -17,6 +17,8 @@ class Card
         template "format_spec_template.erb", format_path("spec")
       end
 
+      private
+
       def format_path modifier=nil
         suffix = modifier ? "_#{modifier}" : nil
         filename = "#{module_name}_format#{suffix}.rb"

data/lib/generators/card/set/set_generator.rb

@@ -18,6 +18,8 @@ class Card
         template "set_spec_template.erb", set_path("spec")
       end
 
+      private
+
       def set_path modifier=nil
         suffix = modifier ? "_#{modifier}" : nil
         filename = "#{anchors.last}#{suffix}.rb"

data/lib/generators/card/template/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Generates a haml template.
+
+Example:
+    wagn generate card:template standard type tshirt core
+
+    This will create:
+        mod/standard/template/type/tshirt/core.haml
+
+

data/lib/generators/card/template/template_generator.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+
+require "generators/card"
+
+class Card
+  module Generators
+    # A wagn generator that creates a haml template for a view.
+    # Run "wagn generate card:template" to get usage information.
+    class TemplateGenerator < NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :set_pattern, required: true
+      argument :anchors, required: true, type: :array
+      class_option "core", type: :boolean, aliases: "-c",
+                           default: false, group: :runtime,
+                           desc: "create haml template in Card gem"
+
+      def create_files
+        with_valid_arguments do
+          template "haml_template.erb", set_path
+        end
+      end
+
+      private
+
+      def with_valid_arguments
+        if !Dir.exist? mod_path
+          warn "invalid mod name: #{file_name}. Directory #{mod_path} doesn't exist."
+        # Card.set_patterns not loaded at this point
+        elsif !%w[self type type_plus_right ltype_rtype rstar star
+                  type all_plus all].include? set_pattern
+          warn "invalid set pattern: #{set_pattern}"
+        else
+          yield
+        end
+      end
+
+      def set_path
+        filename = "#{anchors.last}.haml"
+        dirs = anchors[0..-2]
+        path_parts = [mod_path, "template", set_pattern, dirs, filename]
+        File.join(*path_parts.compact)
+      end
+    end
+  end
+end

data/lib/generators/card/template/templates/haml_template.erb

@@ -0,0 +1 @@
+

data/mod/Modfile

@@ -5,7 +5,7 @@ mod 'basic_formats'
 mod 'pointer'
 mod 'ace_editor'
 mod 'prosemirror_editor'
-mod 'tiny_mce'
+mod 'tinymce_editor'
 mod 'solid_cache'
 mod 'basic_types'
 mod 'machines'

data/mod/account/set/all/account.rb

@@ -17,10 +17,11 @@ def parties
 end
 
 def among? ok_ids
-  ok_ids.each do |ok_id|
-    return true if parties.member? ok_id
+  ok_ids.any? do |ok_id|
+    ok_id == Card::AnyoneID ||
+      (ok_id == Card::AnyoneWithRoleID && all_roles.size > 1) ||
+      parties.member?(ok_id)
   end
-  ok_ids.member? Card::AnyoneID
 end
 
 def own_account?
@@ -48,10 +49,13 @@ def all_roles
 end
 
 def fetch_roles
+  [Card::AnyoneSignedInID] + role_ids_from_roles_trait
+end
+
+def role_ids_from_roles_trait
   Auth.as_bot do
     role_trait = fetch trait: :roles
-    next [Card::AnyoneSignedInID] unless role_trait
-    [Card::AnyoneSignedInID] + role_trait.item_ids
+    role_trait ? role_trait.item_ids : []
   end
 end
 

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

@@ -57,12 +57,27 @@ end
 
 format :html do
   view :raw do
+    # FIXME: use field_nest instead of parsing content
+    #        Problem: whey you do that then the fields are missing in the sign up form
+    # output(
+    #   [
+    #     field_nest(:email, view: :titled, title: "email"),
+    #     field_nest(:password, view: :titled, title: "password")
+    #   ]
+    # )
     %({{+#{Card[:email].name}|titled;title:email}}
-     {{+#{Card[:password].name}|titled;title:password}})
+      {{+#{Card[:password].name}|titled;title:password}})
   end
 
   view :edit do
     voo.structure = true
+    voo.edit_structure = [[:email, "email"], [:password, "password"]]
+    super()
+  end
+
+  view :edit_in_form do
+    voo.structure = true
+    voo.edit_structure = [[:email, "email"], [:password, "password"]]
     super()
   end
 end
@@ -120,10 +135,7 @@ def reset_password_try_again
              "Please check your email for a new password reset link." }
 end
 
-
-def edit_password_success_args
-
-end
+def edit_password_success_args; end
 
 def reset_password?
   @env_token = Env.params[:token]

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

@@ -1,7 +1,7 @@
 
 format :html do
   def item_links _args=nil
-    [:my_card, :invite, :sign_out, :sign_up, :sign_in].map do |link_view|
+    %i[my_card invite sign_out sign_up sign_in].map do |link_view|
       optional_render link_view
     end
   end
@@ -50,7 +50,6 @@ format :html do
 
   view(:navbar_right, cache: :never) { super() }
 
-
   view :core, cache: :never do
     status_class = Auth.signed_in? ? "logged-in" : "logged-out"
     wrap_with :span, id: "logging", class: status_class do

data/mod/account/set/type/signup.rb

@@ -1,10 +1,9 @@
 format :html do
   def invitation?
-    if @invitation.nil?
-      @invitation = Auth.signed_in? && args[:account].confirm_ok?
-    else
-      @invitation
-    end
+    return @invitation unless @invitation.nil?
+    @invitation = Auth.signed_in? &&
+                  (card.fetch trait: :account, new: {}).confirm_ok?
+    # consider making account a card_accessor?
   end
 
   view :new do

data/mod/account/set/type/user.rb

@@ -5,7 +5,7 @@ attr_accessor :email
 
 format :html do
   view :setup, tags: :unknown_ok,
-               perms: ->(_r) { Auth.needs_setup? } do |args|
+               perms: ->(_r) { Auth.needs_setup? } do |_args|
     voo.title = "Welcome, Wagneer!"
     voo.show! :help
     voo.hide! :menu

data/mod/account/spec/set/all/account_spec.rb

@@ -129,11 +129,11 @@ describe Card::Set::All::Account do
       expect(@read_rules.member?(Card.fetch("*all+*read").id)).to be_truthy
     end
 
-    it "13 more should apply to Joe Admin" do
+    it "14 more should apply to Joe Admin" do
       # includes lots of account rules...
       Card::Auth.as("joe_admin") do
         ids = Card::Auth.as_card.read_rules
-        expect(ids.length).to eq(@read_rules.size + 18)
+        expect(ids.length).to eq(@read_rules.size + 14)
       end
     end
   end

data/mod/account/spec/set/right/account_spec.rb

@@ -109,7 +109,7 @@ describe Card::Set::Right::Account do
   end
 
   describe "#update_attributes" do
-    before :each do
+    before do
       @account = Card::Auth.find_account_by_email("joe@user.com")
     end
 
@@ -127,7 +127,7 @@ describe Card::Set::Right::Account do
   end
 
   describe "#reset_password" do
-    before :each do
+    before do
       @email = "joe@user.com"
       @account = Card::Auth.find_account_by_email(@email)
       @account.send_reset_password_token

data/mod/account/spec/set/right/email_spec.rb

@@ -27,7 +27,7 @@ describe Card::Set::Right::Email do
 
   context "+*account+*email" do
     context "update" do
-      before :each do
+      before do
         @email_card = Card["u1"].account.email_card
       end
 

data/mod/account/spec/set/right/password_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Password do
-  before :each do
+  before do
     @account = Card::Auth.find_account_by_email("joe@user.com")
   end
 

data/mod/account/spec/set/self/signin_spec.rb

@@ -3,7 +3,7 @@
 # FIXME: need more specific assertions
 
 describe Card::Set::Self::Signin do
-  before :each do
+  before do
     @card = Card[:signin]
   end
 
@@ -51,7 +51,7 @@ describe Card::Set::Self::Signin do
   end
 
   context "#reset password" do
-    before :each do
+    before do
       Card::Env.params[:reset_password] = true
     end
 

data/mod/account/spec/set/type/signup_spec.rb

@@ -205,6 +205,10 @@ describe Card::Set::Type::Signup do
       expect(@account.token).to be_present
       expect(@account.password).not_to be_present
     end
+
+    it "considers signups created by signed-in users to be invitations" do
+      expect(@signup.format.invitation?).to be(true)
+    end
   end
 
   # describe '#signup_notifications' do

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

@@ -1,8 +1,11 @@
 format :html do
-  view :editor do |args|
-    args[:ace_mode] ||= "html"
+  def ace_editor_input
     text_area :content, rows: 5,
                         class: "card-content ace-editor-textarea",
-                        "data-ace-mode" => args[:ace_mode]
+                        "data-ace-mode" => ace_mode
+  end
+
+  def ace_mode
+    :html
   end
 end

data/mod/ace_editor/set/self/script_ace.rb

@@ -1,3 +1,4 @@
 include_set Abstract::CodeFile
 
 Self::ScriptMods.add_to_basket :item_codenames, :script_ace
+Self::InputOptions.add_to_basket :options, "ace editor"

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

@@ -27,7 +27,7 @@ format :html do
       stats += Array.wrap task[:stats]
     end
     table_content = stats.map { |args| stat_row(args) }
-    table table_content, header: %w(Stat Value Action)
+    table table_content, header: %w[Stat Value Action]
   end
 
   def card_stats

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require_dependency "card/version"
 
 view :raw do |_args|

data/mod/basic_formats/format/css_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class CssFormat < Format

data/mod/basic_formats/format/csv_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class CsvFormat < TextFormat

data/mod/basic_formats/format/file_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class FileFormat < Format

data/mod/basic_formats/format/js_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class JsFormat < Format

data/mod/basic_formats/format/json_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class JsonFormat < DataFormat

data/mod/basic_formats/format/rss_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class RssFormat < HtmlFormat

data/mod/basic_formats/format/xml_format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Card
   class Format
     class XmlFormat < DataFormat

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

@@ -27,7 +27,7 @@ format :csv  do
   end
 
   def name_with_fields_row
-    nested_fields.each_with_object([card.name]) do |(field_name, options), row|
+    nested_fields.each_with_object([card.name]) do |(field_name, _options), row|
       row << nest(field_name)
     end
   end

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

@@ -35,9 +35,17 @@ format do
 
   # DATE VIEWS
 
-  view(:created_at, closed: true) { time_ago_in_words card.created_at }
-  view(:updated_at, closed: true) { time_ago_in_words card.updated_at }
-  view(:acted_at,   closed: true) { time_ago_in_words card.acted_at   }
+  view(:created_at, closed: true) { date_view card.created_at }
+  view(:updated_at, closed: true) { date_view card.updated_at }
+  view(:acted_at,   closed: true) { date_view card.acted_at   }
+
+  def date_view date
+    if voo.variant
+      date.strftime voo.variant
+    else
+      time_ago_in_words date
+    end
+  end
 
   # CONTENT VIEWS
 

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

@@ -1,4 +1,6 @@
 format :json do
+  AUTOCOMPLETE_LIMIT = 8 # number of name suggestions for autocomplete text fields
+
   def default_nest_view
     :atom
   end
@@ -20,11 +22,27 @@ format :json do
   end
 
   view :name_complete, cache: :never do
+    name_search
+  end
+
+  view :junction_name_complete, cache: :never do
+    name_search query_attribute: :junction_complete
+  end
+
+  view :name_match, cache: :never do
+    starts_with = name_search query_attribute: :junction_complete
+    remaining_slots = AUTOCOMPLETE_LIMIT - starts_with.size
+    return starts_with if remaining_slots.zero?
+    starts_with + name_search(query_attribute: :name_match,
+                              limit: remaining_slots)
+  end
+
+  def name_search query_attribute: :complete, limit: AUTOCOMPLETE_LIMIT
     # context is "" so that term will not be interpreted in the context
     # of search card name.  However, this can break searches where the
     # search card name is required (eg found_by)
-    card.search complete: params["term"], limit: 8, sort: "name",
-                return: "name", context: ""
+    card.search limit: limit, sort: "name", return: "name", context: "",
+                query_attribute => params[:term]
   end
 
   view :status, tags: :unknown_ok, perms: :none, cache: :never do
@@ -37,17 +55,16 @@ format :json do
   end
 
   view :content, cache: :never do
-    req = controller.request
-    { url:       (req && req.original_url),
+    { url: request_url,
       timestamp: Time.now.to_s,
-      card:      _render_atom }
+      card: _render_atom }
   end
 
   view :atom, cache: :never do
     h = { name: card.name, type: card.type_name }
-    h[:content]  = card.content  unless card.structure
+    h[:content] = card.content unless card.structure
     h[:codename] = card.codename if card.codename
-    h[:value]    = _render_core  if @depth < max_depth
+    h[:value] = _render_core if @depth < max_depth
     h
   end
 
@@ -55,10 +72,35 @@ format :json do
   view :cast, cache: :never do
     card.cast
   end
+
+  view :marks do
+    {
+      id: card.id,
+      name: card.name,
+      url: path
+    }
+  end
+
+  view :essentials do
+    if voo.show? :marks
+      render_marks.merge(essentials)
+    else
+      essentials
+    end
+  end
+
+  def essentials
+    return {} if card.structure
+    { content: card.content }
+  end
+
+  def request_url
+    req = controller.request
+    req ? req.original_url : path
+  end
 end
 
 # TODO: perhaps this should be in a general "data" module.
 def cast
   real? ? { id: id } : { name: name, type_id: type_id, content: db_content }
 end
-