card 1.16.13 → 1.16.14

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

@@ -9,11 +9,11 @@ def account
 end
 
 def accountable?
-  Card.toggle( rule :accountable )
+  Card.toggle(rule :accountable)
 end
 
 def parties
-  @parties ||= (all_roles << self.id).flatten.reject(&:blank?)
+  @parties ||= (all_roles << id).flatten.reject(&:blank?)
 end
 
 def among? ok_ids
@@ -23,18 +23,18 @@ def among? ok_ids
   ok_ids.member? Card::AnyoneID
 end
 
-def is_own_account?
+def own_account?
   # card is +*account card of signed_in user.
-  cardname.part_names[0].key == Auth.as_card.key and
-  cardname.part_names[1].key == Card[:account].key
+  cardname.part_names[0].key == Auth.as_card.key &&
+    cardname.part_names[1].key == Card[:account].key
 end
 
 def read_rules
   @read_rules ||= begin
     rule_ids = []
-    unless id==Card::WagnBotID # always_ok, so not needed
-      ( [ Card::AnyoneID ] + parties ).each do |party_id|
-        if rule_ids_for_party = self.class.read_rule_cache[ party_id ]
+    unless id == Card::WagnBotID # always_ok, so not needed
+      ([Card::AnyoneID] + parties).each do |party_id|
+        if rule_ids_for_party = self.class.read_rule_cache[party_id]
           rule_ids += rule_ids_for_party
         end
       end
@@ -44,24 +44,22 @@ def read_rules
 end
 
 def all_roles
-  @all_roles ||=
-    if id == Card::AnonymousID
-      []
-    else
-      Auth.as_bot do
-        role_trait = fetch trait: :roles
-        [ Card::AnyoneSignedInID ] + ( role_trait ? role_trait.item_ids : [] )
-      end
-    end
+  @all_roles ||= (id == Card::AnonymousID ? [] : fetch_roles)
 end
 
+def fetch_roles
+  Auth.as_bot do
+    role_trait = fetch trait: :roles
+    next [Card::AnyoneSignedInID] unless role_trait
+    [Card::AnyoneSignedInID] + (role_trait.item_ids)
+  end
+end
 
 event :generate_token do
-  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--"
+  Digest::SHA1.hexdigest "--#{Time.zone.now.to_f}--#{rand 10}--"
 end
 
 event :set_stamper, before: :approve do
   self.updater_id = Auth.current_id
-  self.creator_id = self.updater_id if new_card?
+  self.creator_id = updater_id if new_card?
 end
-

data/mod/05_standard/set/all/rich_html/toolbar.rb

@@ -213,9 +213,9 @@ format :html do
       path_opts = tag_args.delete(:path_opts) || {}
       path_opts.merge! action: tag_args.delete(:action) if tag_args[:action]
       link_to link_text, path_opts, tag_args
+
     end
   end
-
   def autosaved_draft_link
     view_link('autosaved draft', :edit, path_opts: {edit_draft: true, slot: {show: :toolbar}}, class: 'navbar-link slotter pull-right')
   end

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

@@ -71,7 +71,7 @@ event :require_email, on: :create, after: :approve do
 end
 
 event :set_default_salt, on: :create, before: :process_subcards do
-  salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
+  salt = Digest::SHA1.hexdigest "--#{Time.zone.now}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
   add_subfield :salt, content: salt
 end
@@ -146,7 +146,7 @@ event :send_reset_password_token do
 end
 
 def ok_to_read
-  is_own_account? ? true : super
+  own_account? ? true : super
 end
 
 def changes_visible? act

data/mod/05_standard/set/right/email.rb

@@ -1,10 +1,11 @@
-#event :
 include All::Permissions::Accounts
 
-view :raw do |args|
+view :raw do
   case
-  when card.real?          ; card.content
-  when card.left.account   ; card.left.account.email #this supports legacy behavior (should be moved to User+*email+*type plus right)
+  when card.real? then card.content
+  # following supports legacy behavior
+  # (should be moved to User+*email+*type plus right)
+  when card.left.account then card.left.account.email
   else ''
   end
 end
@@ -22,7 +23,7 @@ event :validate_unique_email, after: :validate_email, on: :save do
     Auth.as_bot do
       wql = { right_id: Card::EmailID, eq: content }
       wql[:not] = { id: id } if id
-      if Card.search( wql ).first
+      if Card.search(wql).first
         errors.add :content, 'must be unique'
       end
     end
@@ -30,9 +31,8 @@ event :validate_unique_email, after: :validate_email, on: :save do
 end
 
 event :downcase_email, before: :approve, on: :save do
-  if content and content != content.downcase
-    self.content = content.downcase
-  end
+  return if !content || content == content.downcase
+  self.content = content.downcase
 end
 
 def email_required?
@@ -40,13 +40,14 @@ def email_required?
 end
 
 def ok_to_read
-  if is_own_account? or Auth.always_ok?
+  if own_email? || Auth.always_ok?
     true
   else
-    deny_because "viewing email is restricted to administrators and account holders"
+    deny_because 'viewing email is restricted to administrators and ' \
+                 'account holders'
   end
 end
 
-def is_own_account?
-  cardname.parts[0].to_name.key == Auth.as_card.cardname.key
-end
+def own_email?
+  cardname.part_names[0].key == Auth.as_card.key
+end

data/mod/05_standard/set/right/password.rb

@@ -1,26 +1,34 @@
 
 include All::Permissions::Accounts
 
-view :editor do |args|
+view :editor do
   card.content = ''
-  autocomplete = (@parent && @parent.card.name=='*signin+*account') ? 'on' : 'off' #hack
+
+  # HACK
+  autocomplete = if @parent && @parent.card.name == '*signin+*account'
+                   'on'
+                 else
+                   'off'
+                 end
   password_field :content, class: 'card-content', autocomplete: autocomplete
 end
 
-view :raw do |args|
+view :raw do
   '<em>encrypted</em>'
 end
 
-event :encrypt_password, on: :save, after: :process_subcards, changed: :content,
-    when: proc{ |c| !Card::Env[:no_password_encryptions] } do
-      # no_password_encryptions = hack for import - fix with api for ignoring events
-
-  salt = (left && left.salt)
-  salt = Card::Env[:salt] unless salt.present? # hack - fix with better ORM handling
+event :encrypt_password, on: :save, after: :process_subcards,
+                         changed: :content,
+                         when: proc { !Card::Env[:no_password_encryptions] } do
+  # no_password_encryptions = hack for import - fix with api for ignoring events
+  salt = left && left.salt
+  # HACK: fix with better ORM handling
+  salt = Card::Env[:salt] unless salt.present?
   self.content = Auth.encrypt content, salt
 
-  #  errors.add :password, 'need a valid salt'
-  #  turns out we have a lot of existing account without a salt.  not sure when that broke??
+  # errors.add :password, 'need a valid salt'
+  # turns out we have a lot of existing account without a salt.
+  # not sure when that broke??
 end
 
 event :validate_password, on: :save, before: :approve do
@@ -34,5 +42,5 @@ event :validate_password_present, on: :update, before: :approve do
 end
 
 def ok_to_read
-  is_own_account? ? true : super
+  own_account? ? true : super
 end

data/mod/05_standard/set/right/status.rb

@@ -1,9 +1,9 @@
 include All::Permissions::Accounts
 
 def ok_to_update
-  if is_own_account? && !Auth.always_ok?
+  if own_account? && !Auth.always_ok?
     deny_because you_cant('change the status of your own account')
   else
     super
-  end 
+  end
 end

data/mod/05_standard/set/self/head.rb

@@ -1,6 +1,5 @@
 format :html do
-
-  view :raw do |args|
+  view :raw do
     %(
       <meta charset="UTF-8">
       <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
@@ -13,79 +12,93 @@ format :html do
 
   view :core do |args|
     case
-    when focal?    ; CGI.escapeHTML _render_raw(args)
-    when @mainline ; "(*head)"
-    else           ; _render_raw(args)
+    when focal?    then CGI.escapeHTML _render_raw(args)
+    when @mainline then "(*head)"
+    else _render_raw(args)
     end
   end
 
   def head_title
     title = root.card && root.card.name
     title = nil if title.blank?
-    title = params[:action] if title=='*placeholder'
+    title = params[:action] if title == '*placeholder'
     %(<title>#{title ? "#{title} - " : ''}#{ Card.setting :title }</title>)
   end
 
   def head_buttons
-    bits = []
-    [:favicon, :logo].each do |name|
-      if c = Card[name] and c.type_id == ImageID and !c.db_content.blank?
-        bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source size: :small }" />}
-        break
-      end
-    end
-
-    #Universal Edit Button
+    bits = [favicon]
     if root.card
-      if !root.card.new_record? && root.card.ok?(:update)
-        bits << %{<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="#{ root.path view: :edit }"/>}
-      end
-
+      bits << universal_edit_button
       # RSS # move to mods!
       if root.card.type_id == SearchTypeID
-        opts = { format: :rss }
-        root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
-        bits << %{<link rel="alternate" type="application/rss+xml" title="RSS" href=#{page_path root.card.cardname, opts} />}
+        bits << rss_link
       end
     end
-    bits.join "\n      "
+    bits.compact.join "\n      "
+  end
+
+  def favicon
+    [:favicon, :logo].each do |name|
+      if (c = Card[name]) && c.type_id == ImageID && !c.db_content.blank?
+        href = subformat(c)._render_source size: :small
+        return %{<link rel="shortcut icon" href="#{ href }" />}
+      end
+    end
+  end
+
+  def universal_edit_button
+    return if root.card.new_record? || !root.card.ok?(:update)
+    href = root.path view: :edit
+    %{<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="#{ href }"/>}
+  end
+
+  def rss_link
+    opts = { format: :rss }
+    root.search_params[:vars].each { |key, val| opts["_#{key}"] = val }
+    href = page_path root.card.cardname, opts
+    %{<link rel="alternate" type="application/rss+xml" title="RSS" href="#{href}" />}
   end
 
   def head_stylesheets
     manual_style = params[:style]
-    style_card   = Card[manual_style] if manual_style
+    style_card = Card[manual_style] if manual_style
     style_card ||= root.card.rule_card :style
-    @css_path = if params[:debug] == 'style'
-      page_path( style_card.cardname, item: :import, format: :css)
-    elsif style_card
-      card_path style_card.machine_output_url
-    end
-
-    if @css_path
-      %{<link href="#{@css_path}" media="all" rel="stylesheet" type="text/css" />}
-    end
+    @css_path =
+      if params[:debug] == 'style'
+      page_path(style_card.cardname, item: :import, format: :css)
+      elsif style_card
+        card_path style_card.machine_output_url
+      end
+    return unless @css_path
+    %{<link href="#{@css_path}" media="all" rel="stylesheet" type="text/css" />}
   end
 
   def head_javascript
     varvals = [
       "window.wagn={rootPath:'#{ Card.config.relative_url_root }'}",
-      "window.tinyMCEPreInit={base:\"#{card_path 'assets/tinymce'}\",query:'3.5.9',suffix:''}" # tinyMCE doesn't load on non-root wagns w/o preinit line
+      # tinyMCE doesn't load on non-root wagns w/o preinit line
+      "window.tinyMCEPreInit={base:\"#{card_path 'assets/tinymce'}\",query:'3.5.9',suffix:''}"
     ]
-    card.have_recaptcha_keys?                        and varvals << "wagn.recaptchaKey='#{Card.config.recaptcha_public_key}'"
-    c=Card[:double_click] and !Card.toggle c.content and varvals << 'wagn.noDoubleClick=true'
-    @css_path                                        and varvals << "wagn.cssPath='#{@css_path}'"
+    card.have_recaptcha_keys? &&
+      varvals << "wagn.recaptchaKey='#{Card.config.recaptcha_public_key}'"
+    (c = Card[:double_click]) && !Card.toggle(c.content) &&
+      varvals << 'wagn.noDoubleClick=true'
+    @css_path &&
+      varvals << "wagn.cssPath='#{@css_path}'"
 
     manual_script = params[:script]
     script_card   = Card[manual_script] if manual_script
     script_card ||= root.card.rule_card :script
 
-    @js_tag = if params[:debug] == 'script'
-      script_card.format(:js).render_core item: :include_tag
-    elsif script_card
-      javascript_include_tag script_card.machine_output_url
-    end
-    ie9_card    = Card[:script_html5shiv_printshiv]
-    %(#{ javascript_tag do varvals * ';' end  }
+    @js_tag =
+      if params[:debug] == 'script'
+        script_card.format(:js).render_core item: :include_tag
+      elsif script_card
+        javascript_include_tag script_card.machine_output_url
+      end
+    ie9_card = Card[:script_html5shiv_printshiv]
+    <<-HTML
+      #{ javascript_tag do varvals * ';' end  }
       #{ @js_tag if @js_tag }
       <!--[if lt IE 9]>#{ javascript_include_tag ie9_card.machine_output_url if ie9_card }<![endif]-->
       #{ javascript_tag { "wagn.setTinyMCEConfig('#{ escape_javascript Card.setting(:tiny_mce).to_s }')" } }
@@ -94,26 +107,26 @@ format :html do
         $('document').ready(function() {
           $('.card-slot').trigger('slotReady');
         })
-      </script>)
+      </script>
+    HTML
   end
 
-
   def google_analytics_head_javascript
-    if ga_key = Card.setting("*google analytics key") #fixme.  escape this?
-      %{
+    if (ga_key = Card.setting("*google analytics key")) # FIXME: escape this?
+      <<-HTML
         <script type="text/javascript">
           var _gaq = _gaq || [];
           _gaq.push(['_setAccount', '#{ga_key}']);
           _gaq.push(['_trackPageview']);
           (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+            var ga = document.createElement('script');
+            ga.type = 'text/javascript'; ga.async = true;
             ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(ga, s);
           })();
         </script>
-      }
+      HTML
     end
   end
 end
-
-

data/mod/05_standard/set/type/search_type.rb

@@ -4,11 +4,12 @@ def item_cards params={}
   raise('OH NO.. no limit') unless s[:limit]
   # forces explicit limiting
   # can be 0 or less to force no limit
-  Card.search(s)
+  Query.run(s, name)
 end
 
 def item_names params={}
-  Card.search(query(params.merge(return: :name)))
+  statement = query params.merge(return: :name)
+  Query.run(statement, name)
 end
 
 def item_type

data/mod/05_standard/set/type/set.rb

@@ -227,13 +227,13 @@ def junction_only?()
 end
 
 def reset_set_patterns
-  Card.members( key ).each do |mem|
+  Card.cached_set_members(key).each do |mem|
     Card.expire mem
   end
 end
 
 def label
-  if klass = subclass_for_set
+  if (klass = subclass_for_set)
     klass.label cardname.left
   else
     ''
@@ -241,7 +241,7 @@ def label
 end
 
 def follow_label
-  if klass = subclass_for_set
+  if (klass = subclass_for_set)
     klass.follow_label cardname.left
   else
     ''

data/mod/06_bootstrap/lib/stylesheets/bootstrap_cards.scss

@@ -82,6 +82,56 @@ body.mceContentBody {
 }
 
 
+/*----------- Sidebar -------------*/
+
+.row.row-offcanvas {
+  > aside, article {
+    margin: 0;
+  }
+}
+
+/* collapsed sidebar styles */
+@media screen and (max-width: 767px) {
+  .row-offcanvas {
+    position: relative;
+    -webkit-transition: all 0.25s ease-out;
+    -moz-transition: all 0.25s ease-out;
+    transition: all 0.25s ease-out;
+  }
+
+  .sidebar-offcanvas-right {
+    right: -41.6%;
+  }
+
+  .sidebar-offcanvas-left {
+    left: -41.6%;
+  }
+  .row-offcanvas.right-active {
+    right: 41.6%;
+  }
+  .row-offcanvas.left-active {
+    left: 41.6%;
+  }
+  .sidebar-offcanvas {
+    position: absolute !important;
+    top: 0 !important;
+    width: 41.6% !important;
+  }
+}
+
+.offcanvas-toggle {
+  font-size: 10px !important;
+  padding: 5px !important;
+  margin-bottom: 15px !important;
+}
+.offcanvas-toggle-right {
+  float: right;
+}
+.offcanvas-toggle-left {
+  float: left;
+}
+
+
 /*---------- Card menu ------------*/
 
 @media (min-width: $screen-xs-max) {