card 1.16.13 → 1.16.14

data/mod/01_core/set/all/templating.rb

@@ -29,7 +29,7 @@ def template
       end
 
     # EXISTING CARDS
-    elsif structure = structure_rule_card
+    elsif (structure = structure_rule_card)
       repair_type structure.type_id if assign_type_to?(structure)
       structure
     end
@@ -60,7 +60,7 @@ def structure_rule_card
 end
 
 def structuree_names
-  if wql = structuree_spec
+  if (wql = structuree_spec)
     Auth.as_bot do
       Card::Query.run(wql.merge return: :name)
     end
@@ -82,7 +82,7 @@ def update_structurees args
   # note that this is not smart about overriding templating rules
   # for example, if someone were to change the type of a +*right+*structure rule that was overridden
   # by a +*type plus right+*structure rule, the override would not be respected.
-  if query = structuree_spec
+  if (query = structuree_spec)
     Auth.as_bot do
       query[:return] = :id
       Card::Query.run(query).each_slice(100) do |id_batch|
@@ -115,8 +115,9 @@ def repair_type template_type_id
 end
 
 def structuree_spec
-  if is_structure? and c=trunk and c.type_id = Card::SetID  #could use is_rule?...
-    c.get_query
+  # could use is_rule?...
+  if is_structure? && (ca = trunk) && (ca.type_id = Card::SetID)
+    ca.get_query
   end
 end
 

data/mod/01_core/set/all/type.rb

@@ -1,7 +1,7 @@
 
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch( trait: :default ).type_id
+    @@default_type_id ||= Card[:all].fetch(trait: :default).type_id
   end
 end
 
@@ -11,7 +11,7 @@ def type_card
 end
 
 def type_code
-  Card::Codename[ type_id.to_i ]
+  Card::Codename[type_id.to_i]
 end
 
 def type_name
@@ -27,38 +27,40 @@ def type= type_name
 end
 
 def get_type_id_from_structure
-  if name && (t = template)
-    reset_patterns # still necessary even with new template handling?
-    t.type_id
-  end
+  return unless name && (t = template)
+  reset_patterns # still necessary even with new template handling?
+  t.type_id
 end
 
 event :validate_type_change, before: :approve, on: :update, changed: :type_id do
-  if c = dup and c.action == :create and !c.valid?
-    errors.add :type, "of #{ name } can't be changed; errors creating new #{ type_id }: #{ c.errors.full_messages * ', ' }"
+  if (c = dup) && c.action == :create && !c.valid?
+    errors.add :type, "of #{ name } can't be changed; errors creating new " \
+                      "#{ type_id }: #{ c.errors.full_messages * ', ' }"
   end
 end
 
 event :validate_type, before: :approve, changed: :type_id do
   if !type_name
-    errors.add :type, "No such type"
+    errors.add :type, 'No such type'
   end
 
-  if rt = structure and rt.assigns_type? and type_id!=rt.type_id
-    errors.add :type, "can't be changed because #{name} is hard templated to #{rt.type_name}"
+  if (rt = structure) && rt.assigns_type? && type_id != rt.type_id
+    errors.add :type, "can't be changed because #{name} is hard templated " \
+                      "to #{rt.type_name}"
   end
 end
 
 event :reset_type_specific_fields, after: :store do
   Auth.as_bot do
-    Card.search left: { left_id: type_id }, right: {codename: 'type_plus_right'} do |set_card|
+    Card.search left: { left_id: type_id },
+                right: { codename: 'type_plus_right' } do |set_card|
       set_card.reset_set_patterns
     end
   end
 end
 
-#    Card.search left_plus: [ type_name, right_plus: {codename: 'type_plus_right'}] do |right_anchor|
+#    Card.search left_plus: [ type_name, right_plus: {codename:
+#      'type_plus_right'}] do |right_anchor|
 #      Card["#{lef}"]
 #      set_card.reset_set_patterns
 #    end
-

data/mod/02_basic_types/set/all/base.rb

@@ -92,9 +92,9 @@ format do
     # FIXME: - relativity should be handled in smartname
     return '' unless args[:inc_name]
     name = args[:inc_name].to_name
-    stripped_name = name.stripped.to_name
+    stripped = name.stripped
 
-    if name.relative? && !stripped_name.starts_with_joint?
+    if name.relative? && !stripped.to_name.starts_with_joint?
       # not a simple relative name; just return the original syntax
       "{{#{args[:inc_syntax]}}}"
     else
@@ -105,7 +105,7 @@ format do
         when type = on_type_set
           "#{type}#{name}+#{Card[:type_plus_right].name}" # *type plus right
         else
-          "#{stripped_name.gsub(/^\+/, '')}+#{Card[:right].name}" # *right
+          "#{stripped.gsub(/^\+/, '')}+#{Card[:right].name}" # *right
         end
       subformat(Card.fetch set_name).render_template_link args
     end

data/mod/02_basic_types/set/type/pointer.rb

@@ -343,24 +343,24 @@ def options_rule_card
 end
 
 def option_names
-  result_cards = if oc = options_rule_card
+  result_cards = if (oc = options_rule_card)
     oc.item_names default_limit: 50, context: name
   else
     Card.search sort: 'name', limit: 50, return: :name
   end
-  if selected_options = item_names
+  if (selected_options = item_names)
     result_cards = result_cards | selected_options
   end
   result_cards
 end
 
 def option_cards
-  result_cards = if oc = options_rule_card
+  result_cards = if (oc = options_rule_card)
     oc.item_cards default_limit: 50, context: name
   else
     Card.search sort: 'alpha', limit: 50
   end
-  if selected_options = item_names
+  if (selected_options = item_names)
     selected_options.each do |item|
       result_cards.push Card.fetch(item,new: {})
     end

data/mod/02_basic_types/spec/set/all/base_spec.rb

@@ -51,7 +51,22 @@ describe Card::Set::All::Base do
         expect(render_card(:array, content: 'yoing')).to eq(%{["yoing"]})
       end
     end
-
+    it 'renders template rule of embed cards based on set' do
+      Card::Auth.as_bot
+      content = '{{_left+test_another_card|content|content;'\
+                'structure:test_another_card_structure}}'
+      card = Card.create! name: 'test_card+*right+*structure',
+                          type_id: Card::HTMLID, content: content
+      Card.create! name: 'test_another_card+*right+*structure',
+                   type_id: Card::SearchTypeID,
+                   content: ' {"type":"basic","left":"_1"}'
+      html = card.format.render_open
+      href = '/test_another_card+*right?view=template_editor'
+      text = '_left+test_another_card|content|content;'\
+             'structure:test_another_card_structure'
+      expect(html).to have_tag('a', with: { class: 'slotter', href: href },
+                                    text: text)
+    end
   end
 end
 

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -174,9 +174,68 @@ $.extend wagn,
     /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(userAgent) or /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4))
 
 
+# sidebars
+
+wrapDeckoLayout = () ->
+  $('body > article, body > aside, body > footer').wrapAll('<div class="container"/>')
+  $('div.container > article, div.container > aside').wrapAll('<div class="row row-offcanvas">')
+
+wrapSidebarToggle = (toggle) ->
+  "<div class='container'><div class='row'>#{toggle}</div></div>"
+
+sidebarToggle = (side) ->
+  "<button class='offcanvas-toggle offcanvas-toggle-#{side} btn btn-secondary visible-xs' data-toggle='offcanvas-#{side}'><span class='glyphicon glyphicon-chevron-#{if side == 'left' then 'right' else 'left'}'/></button>"
+
+singleSidebar = (side) ->
+  $article = $('body > article').first()
+  $aside   = $('body > aside').first()
+  $article.addClass("col-xs-12 col-sm-9")
+  $aside.addClass("col-xs-6 col-sm-3 sidebar-offcanvas sidebar-offcanvas-#{side}")
+  if side == 'left'
+    $('body').append($aside).append($article)
+  else
+    $('body').append($article).append($aside)
+
+  wrapDeckoLayout()
+  $article.prepend(wrapSidebarToggle(sidebarToggle(side)))
+
+
+doubleSidebar = ->
+  $article    = $('body > article').first()
+  $asideLeft  = $('body > aside').first()
+  $asideRight = $($('body > aside')[1])
+  $article.addClass("col-xs-12 col-sm-6")
+  $asideLeft.addClass("col-xs-6 col-sm-3 sidebar-offcanvas sidebar-offcanvas-left")
+  $asideRight.addClass("col-xs-6 col-sm-3 sidebar-offcanvas sidebar-offcanvas-right")
+  $('body').append($asideLeft).append($article).append($asideRight)
+
+  wrapDeckoLayout()
+  $article.prepend(wrapSidebarToggle("#{sidebarToggle('right')}#{sidebarToggle('left')}"))
 
 $(window).ready ->
 
+  #sidebar
+
+  switch
+    when $('body').hasClass('right-sidebar')
+      singleSidebar('right')
+
+    when $('body').hasClass('left-sidebar')
+      singleSidebar('left')
+
+    when $('body').hasClass('two-sidebar')
+      doubleSidebar()
+
+  $('[data-toggle="offcanvas-left"]').click ->
+    $('.row-offcanvas').removeClass('right-active').toggleClass('left-active')
+    $(this).find('span.glyphicon').toggleClass('glyphicon-chevron-left glyphicon-chevron-right')
+  $('[data-toggle="offcanvas-right"]').click ->
+    $('.row-offcanvas').removeClass('left-active').toggleClass('right-active')
+    $(this).find('span.glyphicon').toggleClass('glyphicon-chevron-left glyphicon-chevron-right')
+
+
+
+
   $('body').on 'click', '.cancel-upload', ->
     editor = $(this).closest '.card-editor'
     editor.find('.choose-file').show()
@@ -196,6 +255,8 @@ $(window).ready ->
     # sadly, it also causes odd navbox behavior, resetting the search term
   }
 
+
+
   #pointer mod
   $('body').on 'click', '.pointer-item-add', (event)->
     last_item = $(this).closest('.content-editor').find '.pointer-li:last'
@@ -485,3 +546,7 @@ navbox_select = (event, ui) ->
 
 
 
+
+
+
+

data/mod/05_email/set/all/follow.rb

@@ -186,22 +186,22 @@ def follower_ids
   end
 end
 
-
 def direct_followers
   direct_follower_ids.map do |id|
     Card.fetch(id)
   end
 end
 
-# all ids of users that follow this card because of a follow rule that applies to this card
-# doesn't include users that follow this card because they are following parent cards or other cards that include this card
+# all ids of users that follow this card because of a follow rule that applies
+# to this card doesn't include users that follow this card because they are
+# following parent cards or other cards that include this card
 def direct_follower_ids args={}
   result = ::Set.new
   with_follower_candidate_ids do
     set_names.each do |set_name|
       set_card = Card.fetch(set_name)
       set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
-        if (!result.include? user_id) and self.follow_rule_applies?(user_id)
+        if (!result.include? user_id) && self.follow_rule_applies?(user_id)
           result << user_id
         end
       end
@@ -216,7 +216,8 @@ def all_direct_follower_ids_with_reason
     set_names.each do |set_name|
       set_card = Card.fetch(set_name)
       set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
-        if (!visited.include?(user_id)) && (follow_option = self.follow_rule_applies?(user_id))
+        if (!visited.include?(user_id)) &&
+           (follow_option = self.follow_rule_applies?(user_id))
           visited << user_id
           yield(user_id, set_card: set_card, option: follow_option)
         end
@@ -225,8 +226,6 @@ def all_direct_follower_ids_with_reason
   end
 end
 
-
-
 #~~~~~ cache methods
 
 def write_follower_ids_cache user_ids
@@ -240,7 +239,6 @@ def read_follower_ids_cache
 end
 
 module ClassMethods
-
   def follow_caches_expired
     Card.clear_follower_ids_cache
     Card.clear_user_rule_cache
@@ -257,6 +255,4 @@ module ClassMethods
   def clear_follower_ids_cache
     Card.cache.write FOLLOWER_IDS_CACHE_KEY, nil
   end
-
 end
-

data/mod/05_email/set/type/email_template.rb

@@ -101,7 +101,7 @@ format do
 
       if attachment_list
         attachment_list.each_with_index do |cardname, i|
-          if c = Card[ cardname ] and c.respond_to?(:attachment)
+          if (c = Card[ cardname ]) && c.respond_to?(:attachment)
             add_file filename: "attachment-#{i + 1}.#{c.attachment.extension}", content: File.read( c.attachment.path )
           end
         end

data/mod/05_standard/lib/file_uploader.rb

@@ -1,38 +1,33 @@
-=begin
-
-*DATABASE_CONTENT*
-if in mod:
-  :codename/modname.ext
-else
-  ~card_id/action_id.ext
-
-*FILE SYSTEM*
-if in mod
-  (mod_dir)/files/codename/type_code-variant.ext  (no colon on codename!)
-else
-  (files_dir)/id/action_id-variant.ext            (no tilde on id!)
-
-variant = icon|small|medium|large|original  (only for images)
-
-*URLS*
-mark.ext
-mark/revision.ext
-mark/revision-variant.ext
-
-revision = modname or action_id
-
-Examples:
-~22/33-medium.png
-:yeti_skin/05_standard-large.png
-
-=end
-
+# *DATABASE_CONTENT*
+# if in mod:
+#   :codename/modname.ext
+# else
+#   ~card_id/action_id.ext
+#
+# *FILE SYSTEM*
+# if in mod
+#   (mod_dir)/files/codename/type_code-variant.ext  (no colon on codename!)
+# else
+#   (files_dir)/id/action_id-variant.ext            (no tilde on id!)
+#
+# variant = icon|small|medium|large|original  (only for images)
+#
+# *URLS*
+# mark.ext
+# mark/revision.ext
+# mark/revision-variant.ext
+#
+# revision = modname or action_id
+#
+# Examples:
+# ~22/33-medium.png
+# :yeti_skin/05_standard-large.png
 
 module CarrierWave::Uploader::Versions
   private
 
   # put version at the end of the filename
-  def full_filename(for_file)
+  def full_filename for_file
     name = super(for_file)
     parts = name.split '.'
     basename = [parts.shift, version_name].compact.join('-')
@@ -56,9 +51,9 @@ class FileUploader < CarrierWave::Uploader::Base
 
   def extension
     case
-    when file && file.extension.present? ; ".#{file.extension}"
-    when card_content = model.content    ; File.extname(card_content)
-    when orig = original_filename        ; File.extname(orig)
+    when file && file.extension.present? then ".#{file.extension}"
+    when card_content = model.content    then File.extname(card_content)
+    when orig = original_filename        then File.extname(orig)
     else                                   ''
     end.downcase
   end
@@ -68,7 +63,7 @@ class FileUploader < CarrierWave::Uploader::Base
     if opts[:mod] && !model.load_from_mod
       model.load_from_mod = opts[:mod]
     end
-    "%s/%s" % [file_dir, url_filename(opts)]
+    '%s/%s' % [file_dir, url_filename(opts)]
   end
 
   def url_filename opts={}
@@ -84,7 +79,8 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def url opts = {}
-    "%s/%s/%s" % [card_path(Card.config.files_web_path), file_dir, full_filename(url_filename(opts))]
+    '%s/%s/%s' % [card_path(Card.config.files_web_path), file_dir,
+                  full_filename(url_filename(opts))]
   end
 
   def file_dir
@@ -104,8 +100,9 @@ class FileUploader < CarrierWave::Uploader::Base
   # Carrierwave calls store_path without argument when it stores the file
   # and with the identifier from the db when it retrieves the file
   # In our case the first part of our identifier is not part of the path
-  # but we can construct the filename from db data. So we don't need the identifier.
-  def store_path(for_file=nil) #
+  # but we can construct the filename from db data. So we don't need the
+  # identifier.
+  def store_path for_file=nil
     if for_file
       retrieve_path
     else
@@ -124,17 +121,18 @@ class FileUploader < CarrierWave::Uploader::Base
     File.join model.tmp_upload_dir, filename
   end
 
-  def create_versions? new_file
+  def create_versions? _new_file
     model.create_versions?
   end
 
   # paperclip compatibility used in type/file.rb#core (base format)
-  def path(version=nil)
+  def path version=nil
     version ? versions[version].path : super()
   end
 
   def original_filename
-    @original_filename ||= (model.selected_action && model.selected_action.comment)
+    @original_filename ||= model.selected_action &&
+                           model.selected_action.comment
   end
 
   def store_dir
@@ -152,4 +150,4 @@ class FileUploader < CarrierWave::Uploader::Base
   def action_id
     model.selected_content_action_id
   end
-end
+end