card 1.15.7 → 1.16.0

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:communication, :position=>7, :rule_type_editable => false, :user_specific=>true
+setting_opts :group=>:other, :position=>7, :rule_type_editable => false, :user_specific=>true

data/mod/05_email/spec/set/all/follow_spec.rb

@@ -4,9 +4,6 @@ describe "Card::Set::All::Follow" do
   def follow_view card_name
     render_card :follow_link, :name=>card_name
   end
-  def follow_modal_view card_name
-    render_card :follow_modal_link, :name=>card_name
-  end
 
   describe "follower_ids" do
 
@@ -19,7 +16,6 @@ describe "Card::Set::All::Follow" do
       end
     end
 
-
     subject { Card[cardname].follower_names.sort }
     context 'followers of No One Sees Me' do
       let(:cardname) {'No One Sees Me'}
@@ -61,7 +57,7 @@ describe "Card::Set::All::Follow" do
     end
 
     def assert_following_view name, args
-      assert_follow_view name, args.reverse_merge(:following => true, :text=>"unfollow #{name}")
+      assert_follow_view name, args.reverse_merge(:following => true, :text=>"unfollow" )
     end
 
 #  href="/card/update/Home+*self+philipp+*follow?card%5Bcontent%5D=%5B%5Bnever%5D%5D&success%5Bid%5D=Home&success%5Bview%5D=follow"
@@ -78,14 +74,11 @@ describe "Card::Set::All::Follow" do
       #          CGI.escape("[[*always]]")
       #        end
 
-      link_class = args[:following] ? "follow-toggle-off" : "follow-toggle-on"
-      assert_view_select follow_view(name), "a[class~=#{link_class}][href*='']", args[:text] || "follow #{name}"
+      link_class = 'follow-link'
+      assert_view_select follow_view(name), "a[class~=#{link_class}][href*='']", args[:text] || "follow"
     end
 
-    def assert_follow_modal_view card_name
-      href_part = args[:following] ? "never" : "always"
-      assert_view_select follow_view(name), "a[class~=follow-link][href*=#{href_part}]", args[:text] || "follow #{name}"
-    end
+
 
 
     context "when not following" do
@@ -108,13 +101,13 @@ describe "Card::Set::All::Follow" do
 
     context "when following cardtype card" do
       it 'renders following all link' do
-        assert_following_view 'Optic', :add_set=>'Optic+*type', :text=>'unfollow all "Optics"'
+        assert_following_view 'Optic', :add_set=>'Optic+*type', :text=>'unfollow'
       end
     end
 
     context "when not following cardtype card" do
       it "renders 'follow all' link" do
-        assert_follow_view 'Basic', :add_set=>'Basic+*type', :text=>'follow all "Basics"'
+        assert_follow_view 'Basic', :add_set=>'Basic+*type', :text=>'follow'
       end
     end
 

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

@@ -3,7 +3,7 @@ require 'rmagick'
 require 'paperclip'
 
 def attach_array
-  
+
   c= self.content
   !c || c =~ /^\s*<img / ?  ['','',''] : c.split(/\n/)
 end
@@ -38,17 +38,17 @@ STYLES = %w{ icon small medium large original }
 
 
 def attachment_format(ext)
-  if ext.present? and attach and original_ext=attach_extension 
+  if ext.present? and attach and original_ext=attach_extension
     if['file', original_ext].member? ext
       original_ext
-    elsif exts = MIME::Types[attach.content_type] 
+    elsif exts = MIME::Types[attach.content_type]
       if exts.find {|mt| mt.extensions.member? ext }
         ext
       else
         exts[0].extensions[0]
       end
     end
-  end   
+  end
 rescue => e
   Rails.logger.info "attachment_format issue: #{e.message}"
   nil
@@ -65,7 +65,7 @@ def attachment_symlink_to(prior_action_id) # create filesystem links to files fr
   if styles and prior_action_id != last_action_id
     save_action_id = selected_action_id
     links = {}
-    
+
     self.selected_action_id = prior_action_id
     styles.each { |style|  links[style] = ::File.basename(attach.path(style))          }
 
@@ -94,12 +94,14 @@ def self.included(base)
     # this isn't quite right, but without it, we see logging to STDOUT
     Paperclip.options[:log] = false
 
+
     has_attached_file :attach, :preserve_files=>true,
       :default_url => "missing",
       :url => ":web_dir/:basename-:size:action_id.:extension",
       :path => ":system_path.:extension",
       :styles => { :icon   => '16x16#', :small  => '75x75',
                  :medium => '200x200>', :large  => '500x500>' }
+      # :validate_media_type => false
 
     before_post_process :before_post_attach
 
@@ -111,13 +113,25 @@ def self.included(base)
         end
       end
     end
+
+    do_not_validate_attachment_file_type :attach
   end
 end
 
 
+# allow empty files
+# without this monkey patch empty files get detected as application/octet-stream
+# and throw a type mismatch exception
+# alternative solution: turn spoof detection always off with option :validate_media_type=>false
+class Paperclip::MediaTypeSpoofDetector
+  alias_method 'content_spoofed?', 'spoofed?'
+  def spoofed?
+    @file.size == 0 ? false : content_spoofed?
+  end
+end
 
 module Paperclip::Interpolations
-  
+
   extend Card::Format::Location
 
   def system_path at, style
@@ -130,7 +144,7 @@ module Paperclip::Interpolations
       "#{ Card.paths['files'].existent.first }/#{card.id}/#{size at, style}#{action_id at, style}"
     end
   end
-      
+
   def web_dir at, style_name
     card_path Card.config.files_web_path
   end
@@ -143,8 +157,8 @@ module Paperclip::Interpolations
     at.instance.type_id==Card::FileID || style_name.blank? ? '' : "#{style_name}-"
   end
 
-  def action_id(at, style_name) 
-    at.instance.selected_content_action_id 
+  def action_id(at, style_name)
+    at.instance.selected_content_action_id
   end
 end
 

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

@@ -104,17 +104,14 @@ format :html do
 
   view :conflict, :error_code=>409 do |args|
     # FIXME: hack to get the conflicted update as a proper act for the diff view
-    card.current_act.save
-    action = card.actions.last  # the unsaved action with the new changes
-    action.card_act_id = card.current_act.id
-    action.draft = true
-    action.save
+    card.current_act.update_attributes! :card_id => card.id
+    card.current_action.update_attributes! :card_id => card.id, :draft=>true  # the unsaved action with the new changes
     card.store_changes  # deletes action if there are no changes
 
     # as a consequence card.current_act.actions can be empty when both users made exactly the same changes
     # but an act is always supposed to have at least one action, so we have to delete the act to avoid bad things
-    card.current_act.reload
-    if card.current_act.actions.empty?
+    #card.current_act.reload
+    if card.current_act.actions(true).empty?
       card.current_act.delete
       card.current_act = nil
     end
@@ -138,6 +135,7 @@ format :html do
   end
 
   view :errors, :perms=>:none do |args|
+
     if card.errors.any?
       title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
       frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do

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

@@ -2,10 +2,14 @@
 # EXPERIMENTAL
 # the following methods are for visualing card events
 #  not ready for prime time!
+#  not working with Rails 4
 
 def events action
   @action = action
-  root = _validate_callbacks + _save_callbacks
+
+  # don't know what this line is for but it breaks with Rails 4
+  # root = _validate_callbacks + _save_callbacks
+
   events = [ events_tree(:validation), events_tree(:save)]
   @action = nil
   puts_events events
@@ -21,19 +25,19 @@ def puts_events events, prefix='', depth=0
 
     #FIXME - this is not right.  before and around callbacks are processed in declaration order regardless of kind.
     # not all befores then all arounds
-    
+
     if e[:before]
       r += puts_events( e[:before], space+'v  ', depth)
     end
     if e[:around]
       r += puts_events( e[:around], space+'vv ', depth )
     end
-    
-    
+
+
     output = "#{prefix}#{e[:name]}"
     #warn output
     r+= "#{output}\n"
-    
+
     if e[:after]
       r += puts_events( e[:after ].reverse, space+'^  ', depth )
     end
@@ -46,7 +50,7 @@ def events_tree filt
   if respond_to? "_#{filt}_callbacks"
     send( "_#{filt}_callbacks" ).each do |callback|
       next unless callback.applies? self
-      hash[callback.kind] ||= []    
+      hash[callback.kind] ||= []
       hash[callback.kind] << events_tree( callback.filter )
     end
   end

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

@@ -14,6 +14,25 @@ format do
     end
   end
 
+  # link to url, view, card or related card
+  #
+  def smart_link link_text, target, html_args={}
+    if (view = target.delete(:view))
+      view_link link_text, view, html_args.merge(:path_opts=>target)
+    elsif (page = target.delete(:card))
+      card_link page, html_args.merge(:path_opts=>target, :text=>link_text)
+    elsif target[:related]
+      if target[:related].kind_of? String
+        target[:related] = {:name=>"+#{target[:related]}"}
+      end
+      view_link link_text, :related, html_args.merge(:path_opts=>target)
+    elsif target[:web]
+    else
+      link_to link_text, target, html_args
+    end
+  end
+
+
   # link to a specific url or path
   def web_link href, opts={}
     text = opts.delete(:text) || href
@@ -72,24 +91,29 @@ format do
 
 
   def path opts={}
-    name = opts.delete(:name) || card.name
-    base = opts[:action] ? "card/#{ opts.delete :action }/" : ''
+    if opts[:action] == :new && opts[:type] && !(opts[:name] || opts[:card] || opts[:id])
+      opts.delete(:action)
+      base = "new/#{opts.delete(:type)}"
+    else
+      name = opts.delete(:name) || card.name
+      base = opts[:action] ? "card/#{ opts.delete :action }/" : ''
 
-    opts[:no_id] = true if [:new, :create].member? opts[:action]
-    #generalize. dislike hardcoding views/actions here
+      opts[:no_id] = true if [:new, :create].member? opts[:action]
+      #generalize. dislike hardcoding views/actions here
 
-    linkname = name.to_name.url_key
-    unless name.empty? || opts.delete(:no_id)
-      base += ( opts[:id] ? "~#{ opts.delete :id }" : linkname )
-    end
+      linkname = name.to_name.url_key
+      unless name.empty? || opts.delete(:no_id)
+        base += ( opts[:id] ? "~#{ opts.delete :id }" : linkname )
+      end
 
-    opts[:card] ||= {}
-    opts[:card][:name] = name if opts.delete(:known)==false && name.present? && name.to_s != linkname
+      opts[:card] ||= {}
+      opts[:card][:name] = name if opts.delete(:known)==false && name.present? && name.to_s != linkname
 
-    if type = opts.delete(:type) and Card.known?( type )
-      opts[:card][:type] = type
+      if type = opts.delete(:type) and Card.known?( type )
+        opts[:card][:type] = type
+      end
+      opts.delete(:card) if opts[:card].empty?
     end
-    opts.delete(:card) if opts[:card].empty?
 
     query = opts.empty? ? '' : "?#{opts.to_param}"
     internal_url( base + query )

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

@@ -5,21 +5,29 @@ end
 format :html do
 
   def show view, args
-    if Env.ajax?
-      view ||= args[:home_view] || :open
-      @inclusion_opts = args.delete(:items)
-      render view, args
-    else
+    if show_layout?
       args.merge! :view=>view if view
       @main_opts = args
       self.render :layout
+    else
+      view ||= args[:home_view] || :open
+      @inclusion_opts = args.delete(:items)
+      render view, args
     end
   end
 
+  def show_layout?
+    !Env.ajax? || params[:layout]
+  end
+
   view :layout, :perms=>:none do |args|
-    process_content get_layout_content, :content_opts=>{ :chunk_list=>:references }
+    output [
+      process_content(get_layout_content, :content_opts=>{ :chunk_list=>:references }),
+      _render_modal_slot(args)
+    ]
   end
 
+
   view :content do |args|
     wrap args.reverse_merge(:slot_class=>'card-content') do
       [
@@ -65,10 +73,9 @@ format :html do
 
   view :title do |args|
     title = fancy_title args[:title], args[:title_class]
-    title =  _optional_render( :title_toolbar, args, (show_view?(:toolbar,args.merge(:default_visibility=>:hide)) || toolbar_pinned? ? :show : :hide)) ||
-             _optional_render( :title_link, args.merge( :title_ready=>title ), :hide )       ||
+    title =  _optional_render( :title_editable, args, :hide) ||
+             _optional_render( :title_link, args.merge( :title_ready=>title ), :hide ) ||
              title
-    #title += " (#{card.type_name})" if Card[:show_cardtype].content == 'true'
     add_name_context
     title
   end
@@ -77,7 +84,15 @@ format :html do
     card_link card.cardname, :text=>( args[:title_ready] || showname(args[:title]) )
   end
 
-  view :title_toolbar do |args|
+  view :type_info do |args|
+    %{
+      <span class="type-info pull-right">
+        #{card_link(card.type_name, :text=>"#{card.type_name}", :class=>'navbar-link')}
+      </span>
+    }.html_safe
+  end
+
+  view :title_editable do |args|
     links = card.cardname.parts.map do |name|
       card_link name
     end
@@ -88,7 +103,7 @@ format :html do
     end
     res += ' '
     res.concat view_link(glyphicon('edit','header-icon'),:edit_name, :class=>'slotter', 'data-toggle'=>'tooltip', :title=>'edit name')
-    res
+    res.concat _optional_render(:type_link,args,:show)
   end
 
   view :open, :tags=>:comment do |args|
@@ -116,7 +131,7 @@ format :html do
   end
 
   view :closed do |args|
-    frame args.reverse_merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show, :optional_edit_toolbar=>:hide ) do
+    frame args.reverse_merge(:content=>true, :body_class=>'closed-content', :toggle_mode=>:close, :optional_toggle=>:show, :optional_toolbar=>:hide ) do
       _optional_render :closed_content, args
     end
   end
@@ -142,25 +157,38 @@ format :html do
 
 
   view :related do |args|
+    if args[:related_card]
+      frame args.merge(:optional_toolbar=>:show) do
+        nest( args[:related_card], args[:related_args])
+      end
+    end
+  end
+
+  def default_related_args args
     if rparams = args[:related] || params[:related]
       rcard = rparams[:card] || begin
                 rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
                 Card.fetch rcardname, :new=>{}
               end
 
+      #subheader =  with_name_context(card.name) { showname rcard.name }
+      subheader =  with_name_context(card.name) { subformat(rcard)._render_title(args) }
+      add_name_context card.name
       nest_args = ( rparams[:slot] || {} ).deep_symbolize_keys.reverse_merge(
         :view            => ( rparams[:view] || :open ),
+        :optional_header => :hide,
+        :optional_menu   => :show,
+        :subheader       => subheader,
         :optional_toggle => :hide,
         :optional_help   => :show,
-        :optional_menu   => :show,
-        :optional_close_related_link => :show,
-        :parent          => card
+        :parent          => card,
+        :subframe        => true,
+        :subslot         => true
       )
       nest_args[:optional_comment_box] = :show if rcard.show_comment_box_in_related?
 
-      frame args do
-        nest rcard, nest_args
-      end
+      args[:related_args] = nest_args
+      args[:related_card] = rcard
     end
   end
 

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

@@ -64,7 +64,7 @@ format :html do
 
 
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
-    frame_and_form :update, args do
+    frame_and_form :update, args.merge(:optional_toolbar=>:show) do
       [
         _optional_render( :content_formgroup, args ),
         _optional_render( :button_formgroup,   args )
@@ -75,8 +75,7 @@ format :html do
 
   def default_edit_args args
     args[:optional_help] ||= :show
-    args[:optional_edit_toolbar] ||= :show
-    args[:active_toolbar_view] ||= :edit
+    args[:optional_toolbar] ||= :show
 
     args[:buttons] ||= %{
       #{ button_tag 'Submit', :class=>'submit-button', :disable_with=>'Submitting', :situation=>'primary' }
@@ -123,8 +122,7 @@ format :html do
       :referers => referers.size,
       :card     => { :update_referencers => false }
     )
-    args[:optional_edit_toolbar] ||= :show
-    args[:active_toolbar_view] ||= :edit_name
+    args[:optional_toolbar] ||= :show
     args[:buttons] = %{
       #{ button_tag 'Rename and Update', :disable_with=>'Renaming', :class=>'renamer-updater', :situation=>'primary' }
       #{ button_tag 'Rename',            :disable_with=>'Renaming', :class=>'renamer'         }
@@ -146,8 +144,7 @@ format :html do
 
   def default_edit_type_args args
     args[:variety] = :edit #YUCK!
-    args[:optional_edit_toolbar] ||= :show
-    args[:active_toolbar_view] ||= :edit_type
+    args[:optional_toolbar] ||= :show
     args[:hidden] ||= { :success=>{:view=>:edit} }
     args[:buttons] = %{
       #{ button_tag 'Submit', :disable_with=>'Submitting', :situation=>'primary' }
@@ -156,14 +153,16 @@ format :html do
   end
 
   view :edit_rules, :tags=>:unknown_ok do |args|
-    frame args do
-      subformat( current_set_card ).render_content args
-    end
+    view = args[:rule_view] || :common_rules
+    _render_related args.merge(:related=>{:card=>current_set_card, :view=>:open, :slot=>{ :rule_view=>view, :optional_set_navbar=>:show, :optional_set_label=>:hide, :optional_rule_navbar=>:hide}})
+
+    # frame args do
+    #   subformat( current_set_card ).render(view, args)
+    # end
   end
 
   def default_edit_rules_args args
-    args[:optional_edit_toolbar] ||= :show
-    args[:active_toolbar_view] ||= :edit_rules
+    args[:optional_toolbar] ||= :show
   end
 
   view :options, {:view=>:edit_rules, :mod=>All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
@@ -178,27 +177,32 @@ format :html do
   end
 
   def default_edit_structure_args args
-    args[:optional_edit_toolbar] ||= :show
-    args[:active_toolbar_view] ||= :edit_structure
+    args[:optional_toolbar] ||= :show
   end
 
   view :edit_nests do |args|
-    #nests = card.fetch(:trait=>:includes)
-    includes = Card::Content.new(card.content, card).find_chunks( Card::Chunk::Include )
-
     frame args do
-      includes.map do |chunk|
-        if chunk.referee_card
-          nest chunk.referee_card, :view=>:edit_rules, :hide=>'set_label'
-        end
+      with_inclusion_mode :edit do
+        process_relative_tags :optional_toolbar=>:hide
       end
-      #nest nests, :view=>:content, :items=>{:view=>:edit_rules, :hide=>'set_label'}
     end
   end
-
   def default_edit_nests_args args
-    args[:optional_edit_toolbar] ||= :show
-    args[:active_toolbar_view] ||= :edit_nests
+    args[:optional_toolbar] ||= :show
+  end
+
+  view :edit_nest_rules do |args|
+    view = args[:rule_view] || :field_related_rules
+    frame args do
+#      with_inclusion_mode :edit do
+       nested_fields(args).map do |chunk|
+         nest Card.fetch("#{chunk.referee_name}+*self"), :view=>:titled, :rule_view=>view, :optional_set_label=>:hide, :optional_rule_navbar=>:show
+       end
+    end
+  end
+
+  def default_edit_nest_rules_args args
+    args[:optional_toolbar] ||= :show
   end
 end