card 1.19.6 → 1.20.0

data/lib/generators/card.rb

@@ -10,19 +10,33 @@ class Card
         if path
           @_card_source_root = path
         else
-          @_card_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), "card", generator_name, "templates"))
+          @_card_source_root ||= File.expand_path(
+            File.join(File.dirname(__FILE__),
+                      "card", generator_name, "templates")
+          )
         end
       end
 
       # Override Rails default banner (wagn is the command name).
       def banner
-        "wagn generate #{namespace} #{arguments.map(&:usage) * ' '} [options]".gsub(/\s+/, " ")
+        usage_arguments = arguments.map(&:usage) * " "
+        text = "wagn generate #{namespace} #{usage_arguments} [options]"
+        text.gsub(/\s+/, " ")
       end
     end
 
     class NamedBase < ::Rails::Generators::NamedBase
       extend ClassMethods
+
+      def mod_path
+        @mod_path ||= begin
+          path_parts = ["mod", file_name]
+          path_parts.unshift Cardio.gem_root if options.core?
+          File.join(*path_parts)
+        end
+      end
     end
+
     class MigrationBase < ::ActiveRecord::Generators::Base
       extend ClassMethods
     end

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

@@ -8,19 +8,20 @@ class Card
       source_root File.expand_path("../templates", __FILE__)
 
       argument :module_name, required: true
-      class_option "core", type: :boolean, aliases: "-c", default: false, group: :runtime,
+      class_option "core", type: :boolean, aliases: "-c",
+                           default: false, group: :runtime,
                            desc: "create format files in Card gem"
 
       def create_files
-        mod_path = if options.core?
-                     File.join Cardio.gem_root, "mod", file_name
-                   else
-                     File.join "mod", file_name
-          end
-        format_path = File.join(mod_path, "format", "#{module_name}_format.rb")
-        spec_path = File.join(mod_path, "spec", "format", "#{module_name}_format_spec.rb")
         template "format_template.erb", format_path
-        template "format_spec_template.erb", spec_path
+        template "format_spec_template.erb", format_path("spec")
+      end
+
+      def format_path modifier=nil
+        suffix = modifier ? "_#{modifier}" : nil
+        filename = "#{module_name}_format#{suffix}.rb"
+        path_parts = [mod_path, modifier, "format", filename].compact
+        File.join(*path_parts)
       end
     end
   end

data/lib/generators/card/migration/migration_generator.rb

@@ -7,7 +7,8 @@ class Card
     class MigrationGenerator < MigrationBase
       source_root File.expand_path("../templates", __FILE__)
 
-      class_option "core", type: :boolean, aliases: "-c", default: false, group: :runtime,
+      class_option "core", type: :boolean, aliases: "-c",
+                           default: false, group: :runtime,
                            desc: "Create card migration for card core"
 
       def create_migration_file
@@ -15,18 +16,22 @@ class Card
         mig_paths = Cardio.migration_paths(migration_type)
         raise "No migration directory for #{migration_type}" if mig_paths.blank?
         set_local_assigns!
-        migration_template @migration_template, File.join(mig_paths.first, "#{file_name}.rb")
+        migration_template @migration_template,
+                           File.join(mig_paths.first, "#{file_name}.rb")
       end
 
       protected
 
-      # sets the default migration template that is being used for the generation of the migration
-      # depending on the arguments which would be sent out in the command line, the migration template
+      # sets the default migration template that is being used for the
+      # generation of the migration
+      # depending on the arguments which would be sent out in the command line,
+      # the migration template
       # and the table name instance variables are setup.
 
       def set_local_assigns!
         @migration_template = "card_migration.erb"
-        @migration_parent_class = options["core"] ? "Card::Migration::Core" : "Card::Migration"
+        @migration_parent_class =
+          options["core"] ? "Card::Migration::Core" : "Card::Migration"
         case file_name
         when /^(import)_(.*)(?:\.json)?/
           @migration_action = Regexp.last_match(1)

data/lib/generators/card/set/USAGE

@@ -6,7 +6,7 @@ Example:
 
     This will create:
         mod/standard/set/type/tshirt.rb
-        spec/mod/standard/set/type/tshirt_spec.rb
+        mod/standard/spec/set/type/tshirt_spec.rb
 
     wagn generate card:set standard type_plus_right basic about tshirt
 

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

@@ -9,19 +9,21 @@ class Card
 
       argument :set_pattern, required: true
       argument :anchors, required: true, type: :array
-      class_option "core", type: :boolean, aliases: "-c", default: false, group: :runtime,
+      class_option "core", type: :boolean, aliases: "-c",
+                           default: false, group: :runtime,
                            desc: "create set files in Card gem"
 
       def create_files
-        mod_path = if options.core?
-                     File.join Cardio.gem_root, "mod", file_name
-                   else
-                     File.join "mod", file_name
-          end
-        set_path  = File.join(mod_path, "set", set_pattern, anchors[0..-2], "#{anchors.last}.rb")
-        spec_path = File.join(mod_path, "spec", "set", set_pattern, anchors[0..-2], "#{anchors.last}_spec.rb")
         template "set_template.erb", set_path
-        template "set_spec_template.erb", spec_path
+        template "set_spec_template.erb", set_path("spec")
+      end
+
+      def set_path modifier=nil
+        suffix = modifier ? "_#{modifier}" : nil
+        filename = "#{anchors.last}#{suffix}.rb"
+        dirs = anchors[0..-2]
+        path_parts = [mod_path, modifier, "set", set_pattern, dirs, filename]
+        File.join(*path_parts.compact)
       end
     end
   end

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

@@ -1,4 +1,3 @@
-
 include All::Permissions::Accounts
 
 card_accessor :email
@@ -30,12 +29,13 @@ def validate_token! test_token
   errors.empty?
 end
 
+def refreshed_token # TODO: explain why needed
+  token_card.refresh(true).content
+end
+
 format do
   view :verify_url do
-    signup_name = card.cardname.left_name
-    card_url "update/#{signup_name.url_key}" \
-             "?token=#{card.token}" \
-             "&live_token=true"
+    card_url path({ mark: card.cardname.left }.merge(token_path_opts))
   end
 
   view :verify_days do
@@ -43,9 +43,11 @@ format do
   end
 
   view :reset_password_url do
-    card_url "update/#{card.cardname.url_key}" \
-             "?token=#{card.token_card.refresh(true).content}" \
-             "&live_token=true&event=reset_password"
+    card_url path({ mark: card, event: :reset_password }.merge(token_path_opts))
+  end
+
+  def token_path_opts
+    { action: :update, live_token: true, token: card.refreshed_token }
   end
 
   view :reset_password_days do
@@ -54,20 +56,14 @@ format do
 end
 
 format :html do
-  view :raw do |args|
-    content = []
-    unless args[:no_email]
-      content << "{{+#{Card[:email].name}|titled;title:email}}"
-    end
-    unless args[:no_password]
-      content << "{{+#{Card[:password].name}|titled;title:password}}"
-    end
-    content * " "
+  view :raw do
+    %({{+#{Card[:email].name}|titled;title:email}}
+     {{+#{Card[:password].name}|titled;title:password}})
   end
 
-  view :edit do |args|
-    args[:structure] = true
-    super args
+  view :edit do
+    voo.structure = true
+    super()
   end
 end
 
@@ -97,34 +93,36 @@ def confirm_ok?
   Card.new(type_id: Card.default_accounted_type_id).ok? :create
 end
 
-event :generate_confirmation_token, :prepare_to_store,
-      on: :create,
-      when: proc { |c| c.confirm_ok? } do
+event :generate_confirmation_token,
+      :prepare_to_store, on: :create, when: :confirm_ok? do
   add_subfield :token, content: generate_token
 end
 
 event :reset_password,
-      :prepare_to_validate, on: :update, when: proc { |c| c.reset_password? } do
-  if validate_token! @env_token
-    token_card.used!
-    Auth.signin left_id
-    success << edit_password_success_args
-  else
-    error_msg = errors.first.last
-    send_reset_password_token
-    msg = "Sorry, #{error_msg}. " \
-          "Please check your email for a new password reset link."
-    success << { id: "_self", view: "message", message: msg }
-  end
+      :prepare_to_validate, on: :update, when: :reset_password? do
+  valid = validate_token! @env_token
+  success << (valid ? reset_password_success : reset_password_try_again)
   abort :success
 end
 
+def reset_password_success
+  token_card.used!
+  Auth.signin left_id
+  { id: left.name, view: :related, related: { name: "+#{Card[:account].name}",
+                                              view: "edit" } }
+end
+
+def reset_password_try_again
+  send_reset_password_token
+  { id: "_self",
+    view: "message",
+    message: "Sorry, #{errors.first.last}. " \
+             "Please check your email for a new password reset link." }
+end
+
+
 def edit_password_success_args
-  {
-    id: left.name,
-    view: :related,
-    related: { name: "+#{Card[:account].name}", view: "edit" }
-  }
+
 end
 
 def reset_password?

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

@@ -27,7 +27,8 @@ def permanent?
 end
 
 def used!
-  Auth.as_bot { delete! } unless permanent?
+  # immediate deletion was causing problems.  commenting for now
+  # Auth.as_bot { delete! } unless permanent?
 end
 
 def term

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

@@ -1,80 +1,60 @@
 
 format :html do
-  def item_links args
-    [
-      optional_render(:my_card, args),
-      optional_render(:invite, args),
-      optional_render(:sign_out, args),
-      optional_render(:sign_up, args),
-      optional_render(:sign_in, args)
-    ]
-  end
-
-  view :sign_up, perms: ->(r) { r.show_signup_link? },
-                 denial: :blank do |args|
-    link_to_card :signup, args[:link_text], args[:link_opts]
-  end
-
-  view :sign_in, perms: ->(_r) { !Auth.signed_in? },
-                 denial: :blank do |args|
-    link_to_card :signin, args[:link_text], args[:link_opts]
-  end
-
-  view :sign_out, perms: ->(_r) { Auth.signed_in? },
-                  denial: :blank do |args|
-    link_to_card :signin, args[:link_text], args[:link_opts]
+  def item_links _args=nil
+    [:my_card, :invite, :sign_out, :sign_up, :sign_in].map do |link_view|
+      optional_render link_view
+    end
   end
 
-  view :invite, perms: ->(r) { r.show_invite_link? },
-                denial: :blank do |args|
-    link_to args[:link_text], args[:link_opts]
+  def self.link_options opts={}
+    options = { denial: :blank, cache: :never }.merge opts
+    options[:perms] = ->(r) { yield r } if block_given?
+    options.clone
   end
 
-  view :my_card, perms: ->(_r) { Auth.signed_in? },
-                 denial: :blank do |_args|
-    link_to_card Auth.current.cardname, nil, id: "my-card-link"
+  view :sign_up, link_options(&:show_signup_link?) do
+    link_to_card :signup, account_link_text(:sign_up),
+                 class: classy("signup-link"),
+                 path: { action: :new, mark: :signup }
   end
 
-  def default_sign_up_args args
-    account_link_text :sign_up, args
-    account_link_opts "signup-link", args, action: :new, mark: :signup
+  view :sign_in, link_options { !Auth.signed_in? } do
+    link_to_card :signin, account_link_text(:sign_in),
+                 class: classy("signin-link")
   end
 
-  def default_sign_in_args args
-    account_link_text :sign_in, args
-    account_link_opts "signin-link", args
+  view :sign_out, link_options { Auth.signed_in? } do
+    link_to_card :signin, account_link_text(:sign_out),
+                 class: classy("signout-link"),
+                 path: { action: :delete }
   end
 
-  def default_invite_args args
-    account_link_text :invite, args
-    account_link_opts "invite-a-friend-link", args, action: :new, mark: :signup
+  view :invite, link_options(&:show_invite_link?) do
+    link_to_card :signup, account_link_text(:invite),
+                 class: classy("invite-link"),
+                 path: { action: :new, mark: :signup }
   end
 
-  def default_sign_out_args args
-    account_link_text :sign_out, args
-    account_link_opts "signout-link", args, action: :delete
+  view :my_card, link_options { Auth.signed_in? } do
+    link_to_card Auth.current.cardname, nil, id: "my-card-link"
   end
 
-  def account_link_text purpose, args
-    args[:link_text] =
-      args.delete(:title) ||
+  def account_link_text purpose
+    voo.title ||
       I18n.t(purpose, scope: "mod.standard.set.self.account_links")
   end
 
-  def account_link_opts id, args, path=nil
-    args[:link_opts] ||= {}
-    args[:link_opts][:id] ||= id
-    args[:link_opts][:path] ||= path if path
+  view :raw do
+    item_links.join " "
   end
 
-  view :raw do |args|
-    item_links(args).join " "
-  end
+  view(:navbar_right, cache: :never) { super() }
+
 
-  view :core do |args|
+  view :core, cache: :never do
     status_class = Auth.signed_in? ? "logged-in" : "logged-out"
-    content_tag :span, id: "logging", class: status_class do
-      render_raw args
+    wrap_with :span, id: "logging", class: status_class do
+      render_raw
     end
   end
 

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

@@ -1,89 +1,105 @@
+def consider_recaptcha?
+  false
+end
 
 format :html do
-  view :open do |args|
-    args[:optional_help] = :show
-    super args
+  view :open do
+    voo.show :help
+    super()
   end
 
-  def default_title_args args
-    args[:title] ||= I18n.t(:sign_in_title, # 'Sign In'
-                            scope: "mod.standard.set.self.signin")
+  # FIXME: need a generic solution for this
+  view :title do
+    voo.title ||= I18n.t(:sign_in_title, scope: "mod.standard.set.self.signin")
+    super()
   end
 
-  view :open_content do |args|
+  view :open_content do
     # annoying step designed to avoid table of contents.  sigh
-    _render_core(args)
+    _render_core
   end
 
-  view :closed_content do |_args|
+  view :closed_content do
     ""
   end
 
-  def default_core_args args={}
-    # 'Sign in' '...or sign up!' 'RESET PASSWORD'
-    sign_in, or_sign_up, reset_password =
-      I18n.t([:sign_in, :or_sign_up, :reset_password],
-             scope: "mod.standard.set.self.signin")
-    # since i18n-tasks doesn't understand bulk lookups, tell it keys are used
-    # i18n-tasks-use t(:sign_in, scope: 'mod.standard.set.self.signin')
-    # i18n-tasks-use t(:or_sign_up, scope: 'mod.standard.set.self.signin')
-    # i18n-tasks-use t(:reset_password,
-    #                  scope: 'mod.standard.set.self.signin')
-    args[:buttons] = button_tag sign_in, situation: "primary"
-    subformat(Card[:account_links]).render :sign_up, title: or_sign_up
-    reset_link = link_to_view :edit, reset_password,
-                              path: { slot: { hide: :toolbar } }
-    args[:buttons] += raw("<div style='float:right'>#{reset_link}</div>")
-    # FIXME: hardcoded styling
-    args
-  end
-
-  view :core do |args|
-    form_args = {
-      hidden: { success: "REDIRECT: #{Env.interrupted_action || '*previous'}" },
-      recaptcha: :off
-    }
+  view :core, cache: :never do
+    voo.structure = true
     with_nest_mode :edit do
-      card_form :update, form_args do
+      card_form :update, recaptcha: :off do
         [
-          _optional_render(:content_formgroup, args.merge(structure: true)),
-          _optional_render(:button_formgroup, args)
-        ].join
+          hidden_signin_fields,
+          _optional_render_content_formgroup,
+          _optional_render_signin_buttons
+        ]
       end
     end
   end
 
+  def hidden_signin_fields
+    hidden_field_tag :success,
+                     "REDIRECT: #{Env.interrupted_action || '*previous'}"
+  end
+
+  view :signin_buttons do
+    button_formgroup do
+      [signin_button, signup_link, reset_password_link]
+    end
+  end
+
+  def signin_button
+    text = I18n.t :sign_in, scope: "mod.standard.set.self.signin"
+    button_tag text, situation: "primary"
+  end
+
+  def signup_link
+    text = I18n.t :or_sign_up, scope: "mod.standard.set.self.signin"
+    subformat(Card[:account_links]).render :sign_up, title: text
+  end
+
+  def reset_password_link
+    text = I18n.t :reset_password, scope: "mod.standard.set.self.signin"
+    reset_link = link_to_view :edit, text, path: { slot: { hide: :toolbar } }
+    # FIXME: inline styling
+    raw("<div style='float:right'>#{reset_link}</div>")
+  end
+
   # FORGOT PASSWORD
-  view :edit do |args|
+  view :edit do
     @forgot_password = true
-    args.merge!(
-      title: I18n.t(:forgot_password, # 'Forgot Password'
-                    scope: "mod.standard.set.self.signin"),
-      optional_help: :hide,
-      buttons: button_tag(I18n.t(:reset_my_password, # 'Reset my password'
-                                 scope: "mod.standard.set.self.signin"),
-                          situation: "primary"),
-      structure: true,
-      hidden: {
-        reset_password: true,
-        success: { view: :reset_password_success }
-      }
+    voo.title ||= card.i18n_signin(:forgot_password)
+    voo.structure ||= true
+    voo.hide :help
+    Auth.as_bot { super() }
+  end
+
+  def edit_view_hidden
+    hidden_tags(
+      reset_password: true,
+      success: { view: :reset_password_success }
     )
-    Auth.as_bot { super args }
   end
 
-  view :raw do |_args|
-    if @forgot_password
-      "{{+#{Card[:email].name}|title:email;type:Phrase}}"
-    else
-      %(
-        {{+#{Card[:email].name}|titled;title:email}}
-        {{+#{Card[:password].name}|titled;title:password}}
-      )
-    end
+  view :edit_buttons do
+    text = I18n.t :reset_my_password, scope: "mod.standard.set.self.signin"
+    button_tag text, situation: "primary"
+  end
+
+  view :content_formgroup do
+    fields = [signin_field(:email)]
+    fields << signin_field(:password) unless @forgot_password
+    voo.edit_structure = fields
+
+    super()
+  end
+
+  def signin_field name
+    nest_name = "".to_name.trait(name)
+    [nest_name, { title: name.to_s, view: "titled",
+                  nest_name: nest_name, skip_perms: true }]
   end
 
-  view :reset_password_success do |_args|
+  view :reset_password_success do
     # 'Check your email for a link to reset your password'
     frame { I18n.t(:check_email, scope: "mod.standard.set.self.signin") }
   end
@@ -95,57 +111,55 @@ event :signin, :validate, on: :update do
   pword = subfield :password
   pword &&= pword.content
 
-  unless email && pword
-    abort :failure, I18n.t(:abort_bad_signin_args, # 'bad signin args'
-                           scope: "mod.standard.set.self.signin")
-  end
+  authenticate_or_abort email, pword
+end
 
+def authenticate_or_abort email, pword
+  abort :failure, i18n_signin(:abort_bad_signin_args) unless email && pword
   if (account = Auth.authenticate(email, pword))
     Auth.signin account.left_id
   else
     account = Auth.find_account_by_email email
-    error_msg =
-      case
-      when account.nil?     then
-        # 'Unrecognized email.'
-        I18n.t(:error_unknown_email, scope: "mod.standard.set.self.signin")
-      when !account.active? then
-        # 'Sorry, that account is not active.'
-        I18n.t(:error_not_active, scope: "mod.standard.set.self.signin")
-      else
-        # 'Wrong password'
-        I18n.t(:error_wrong_password, scope: "mod.standard.set.self.signin")
-      end
-    errors.add :signin, error_msg
+    errors.add :signin, signin_error_message(account)
     abort :failure
   end
 end
 
+def signin_error_message account
+  case
+  when account.nil?     then i18n_signin(:error_unknown_email)
+  when !account.active? then i18n_signin(:error_not_active)
+  else                       i18n_signin(:error_wrong_password)
+  end
+end
+
+def i18n_signin key
+  I18n.t key, scope: "mod.standard.set.self.signin"
+end
+
 event :signin_success, after: :signin do
   abort :success
 end
 
-event :send_reset_password_token,
-      before: :signin, on: :update,
-      when: proc { Env.params[:reset_password] } do
+event :send_reset_password_token, before: :signin, on: :update,
+                                  when: proc { Env.params[:reset_password] } do
   email = subfield :email
   email &&= email.content
 
   account = Auth.find_account_by_email email
-  if account
-    if account.active?
-      account.send_reset_password_token
-      abort :success
-    else
-      errors.add :account, I18n.t(:error_not_active, # 'not active'
-                                  scope: "mod.standard.set.self.signin")
-      abort :failure
-    end
+  send_reset_password_email_or_fail account
+end
+
+def send_reset_password_email_or_fail account
+  if account && account.active?
+    account.send_reset_password_token
+    abort :success
+  elsif account
+    errors.add :account, i18n_signin(:error_not_active)
   else
-    errors.add :email, I18n.t(:error_not_recognized, # 'not recognized'
-                              scope: "mod.standard.set.self.signin")
-    abort :failure
+    errors.add :email, i18n_signin(:error_not_recognized)
   end
+  abort :failure
 end
 
 event :signout, :validate, on: :delete do