card 1.16.1 → 1.16.2

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

@@ -103,30 +103,13 @@ 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.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(true).empty?
-      card.current_act.delete
-      card.current_act = nil
-    end
-
     wrap args.merge( :slot_class=>'error-view' ) do  #ENGLISH below
       alert 'warning' do
         %{<strong>Conflict!</strong><span class="new-current-revision-id">#{card.last_action_id}</span>
           <div>#{ card_link card.last_action.act.actor.cardname } has also been making changes.</div>
           <div>Please examine below, resolve above, and re-submit.</div>
           #{ wrap do |args|
-              if card.current_act
-                _render_act_expanded :act=>card.current_act, :current_rev_nr => 0
-              else
-                "No difference between your changes and #{card.last_action.act.actor.name}'s version."
-              end
+              _render_act_expanded :act=>card.last_action.act, :current_rev_nr => 0
             end
            }
         }

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

@@ -1,21 +1,23 @@
-#~~~~~~~~~~~~~~~~
-# EXPERIMENTAL
-# the following methods are for visualing card events
-#  not ready for prime time!
-#  not working with Rails 4
-
+# the events method is a developer's tool for visualizing the event order for a given card.
+# For example, from a console you might run
+#
+#   puts mycard.events :update
+#
+# to see the order of events that will be executed on mycard.
+# The indention and arrows (^v) indicate event dependencies.
+#
+# Note: as of yet, the functionality is a bit rough.  It does not display events
+# that are called directly from within other events (like :stored), and certain event
+# requirements (like the presence of a "current_act") may prevent events from showing
+# up in the tree.
 def events action
   @action = action
-
-  # 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)]
+  events = [ events_tree(:validation), events_tree(:save) ]
   @action = nil
   puts_events events
 end
 
-private
+#private
 
 def puts_events events, prefix='', depth=0
   r = ''
@@ -54,13 +56,14 @@ def events_tree filt
       hash[callback.kind] << events_tree( callback.filter )
     end
   end
+
   hash
 end
-#FIXME - this doesn't belong here!!
+
 
 class ::ActiveSupport::Callbacks::Callback
   def applies? object
-    object.send :eval, "value=nil;halted=false;!!(#{@compiled_options})"
+    conditions_lambdas.all? { |c| c.call(object, nil) }
   end
 end
 

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

@@ -154,11 +154,10 @@ format :html do
 
   view :edit_rules, :tags=>:unknown_ok do |args|
     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
+    slot_args = {
+        :rule_view=>view, :optional_set_navbar=>:show, :optional_set_label=>:hide, :optional_rule_navbar=>:hide
+      }
+    _render_related args.merge(:related=>{:card=>current_set_card, :view=>:open, :slot=>slot_args})
   end
 
   def default_edit_rules_args args
@@ -167,13 +166,14 @@ format :html do
 
   view :options, {:view=>:edit_rules, :mod=>All::RichHtml::Editing::HtmlFormat} # for backwards compatibility
 
-
   view :edit_structure do |args|
-    slot_args = {:cancel_slot_selector=>'.card-slot.related-view', :cancel_path=>card.format.path(:view=>:edit), :optional_edit_toolbar=>:hide, :hidden=>{:success=>"REDIRECT: #{card.structure.key}"}}
+    slot_args = {
+        :cancel_slot_selector=>'.card-slot.related-view',
+        :cancel_path=>card.format.path(:view=>:edit),
+        :optional_edit_toolbar=>:hide,
+        :hidden=>{:success=>{:view=>:open, 'slot[subframe]'=>true}}
+      }
     render_related args.merge(:related=>{:card=>card.structure, :view=>:edit, :slot=>slot_args})
-    # frame args do
-    #   nest card.structure, slot_args.merge(:view=>:edit)
-    # end
   end
 
   def default_edit_structure_args args

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

@@ -12,7 +12,7 @@ format :html do
         (wrap_with(:form, :class=>'navbar-form navbar-left') do
           [
             (account_split_button(args) if card.accountable?),
-            engage_split_button(args),
+            activity_split_button(args),
             rules_split_button(args),
             edit_split_button(args),
           ]
@@ -32,11 +32,11 @@ format :html do
 
   def active_toolbar_button active_view, args
     case active_view
-    when :follow, :editors
-      'engage'
+    when :follow, :editors, :history
+      'activity'
     when :edit_rules, :edit_nest_rules
       'rules'
-    when :edit, :edit_name, :edit_type, :edit_structure, :edit_nests, :history
+    when :edit, :edit_name, :edit_type, :edit_structure, :edit_nests
       'edit'
     when :related
       if args[:related_card] && (tag=args[:related_card].tag)
@@ -45,6 +45,8 @@ format :html do
           'engage'
         when 'account', 'roles', 'edited', 'created', 'follow'
           'account'
+        when 'structure'
+          'edit'
         else
           'rules'
         end
@@ -61,11 +63,12 @@ format :html do
     end
   end
 
-  def engage_split_button args
-    discuss = smart_link 'discuss', { :related=>Card[:discussion].key }
-    editors = smart_link 'editors', { :related=>Card[:editors].key }
-    toolbar_split_button 'engage',  { :related=>Card[:discussion].key }, args do
+  def activity_split_button args
+    discuss = smart_link 'discuss',  { :related=>Card[:discussion].key }
+    editors = smart_link 'editors',  { :related=>Card[:editors].key }
+    toolbar_split_button 'activity', { :view=>:history }, args do
       {
+        :history    => (_render_history_link if card.history?),
         :discuss => discuss,
         :follow  =>_render_follow_link(args),
         :editors => editors
@@ -80,9 +83,9 @@ format :html do
     nests  = smart_link 'nests',    {:view => :edit_nest_rules, :slot=>{:rule_view=>:field_related_rules}}
     toolbar_split_button 'rules',   {:view => :edit_rules }, args do
       {
-        :common_rules  => common,
-        :grouped_rules => group,
-        :all_rules     => all,
+        :common_rules    => common,
+        :grouped_rules   => group,
+        :all_rules       => all,
         :separator       => (separator if args[:nested_fields].present?),
         :recent_rules    => (recent if recently_edited_settings?),
         :edit_nest_rules => (nests if args[:nested_fields].present?)
@@ -92,13 +95,11 @@ format :html do
   def edit_split_button args
     toolbar_split_button 'edit', {:view=>:edit}, args do
       {
-        :edit           => _render_edit_content_link(args),
-        :edit_nests     => (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
-        :edit_structure => (smart_link 'structure', {:view => :edit_structure} if structure_editable?),
-        :edit_name      => _render_edit_name_link,
-        :edit_type      => _render_edit_type_link,
-        :separator      => separator,
-        :history        => (_render_history_link if card.history?)
+        :edit       => _render_edit_content_link(args),
+        :edit_nests => (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
+        :structure  => (smart_link 'structure', {:view => :edit_structure} if structure_editable?),
+        :edit_name  => _render_edit_name_link,
+        :edit_type  => _render_edit_type_link,
       }
     end
   end
@@ -139,37 +140,38 @@ format :html do
       link_opts[:path_opts] = {:slot=>{:subframe=>true}}
     end
 
-    link = view_link glyphicon('remove'), :home, link_opts
+    link = view_link glyphicon('remove'), :home, link_opts.merge(:class=>'btn-toolbar-control btn btn-primary')
     css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
-    list_tag link, :class=>css_class
+    wrap_with :div, :class=>css_class do
+      [
+        toolbar_pin_button,
+        link
+      ]
+    end
+    #list_tag link, :class=>css_class
+  end
+  def toolbar_pin_button
+    button_tag glyphicon('pushpin'), :situation=>:primary, :remote=>true, :title=>"#{'un' if toolbar_pinned?}pin", :class=>"btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
   end
 
   view :toolbar_buttons do |args|
     wrap_with(:div, :class=>'btn-group') do
       [
-        _optional_render(:related_button, args, :show),
-        toolbar_pin_button,
         _optional_render(:delete_button,  args, (card.ok?(:delete) ? :show : :hide)),
-        _optional_render(:refresh_button, args, :hide),
+        _optional_render(:refresh_button, args, :show),
+        _optional_render(:related_button, args, :show),
         _optional_render(:history_button, args, :hide),
       ]
     end
   end
 
 
+
+
   view :related_button do |args|
     path_opts = {:slot=>{:show=>:toolbar}}
-    page_link =
-      if main?
-        menu_item ' refresh', 'refresh', path_opts.merge(:card=>card), args[:html_args]
-      else
-        menu_item ' page', 'new-window', path_opts.merge(:card=>card), args[:html_args]
-      end
-
-    dropdown_button '', :class=>'related', :icon=>'eye-open' do
+    dropdown_button '', :icon=>'education', :class=>'related' do #, :icon=>'eye-open' do
       [
-        page_link,
-        separator,
         menu_item(' children',       'baby-formula', path_opts.merge(:related=>'*children')),
         menu_item(' mates',          'bed',          path_opts.merge(:related=>'*mates')),
         menu_item(' references out', 'log-out',      path_opts.merge(:related=>'*refers_to')),
@@ -177,6 +179,13 @@ format :html do
       ]
     end
   end
+  view :refresh_button do |args|
+    path_opts = {:slot=>{:show=>:toolbar},:page=>card}
+    icon = main? ? 'refresh' : 'new-window'
+    toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', :path_opts=>path_opts)
+  end
+
+
   view :delete_button do |args|
     toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
                     :action=>:delete,
@@ -187,9 +196,7 @@ format :html do
                   )
   end
 
-  def toolbar_pin_button
-    button_tag glyphicon('pushpin'), :situation=>:primary, :remote=>true, :title=>"#{'un' if toolbar_pinned?}pin", :class=>"toolbar-pin #{'in' unless toolbar_pinned?}active"
-  end
+
 
   def toolbar_button text, symbol, hide=nil, tag_args={}
     hide ||= 'hidden-xs hidden-sm hidden-md hidden-lg'
@@ -210,7 +217,7 @@ format :html do
   end
 
   def autosaved_draft_link
-    view_link('autosaved draft', :edit, :path_opts=>{:edit_draft=>true, :slot=>{:show=>:edit_toolbar}}, :class=>'navbar-link slotter pull-right')
+    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

@@ -74,7 +74,7 @@ end
 event :set_default_salt, :on=>:create, :before=>:process_subcards do
   salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
-  subcards["+#{Card[:salt].name}"] ||= {:content => salt }
+  subcards["+#{Card[:salt].name}"] ||= { :content => salt }
 end
 
 event :set_default_status, :on=>:create, :before=>:process_subcards do

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

@@ -11,17 +11,16 @@ view :raw do |args|
   '<em>encrypted</em>'
 end
 
-event :encrypt_password, :on=>:save, :after=>:process_subcards do
+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)
-  unless salt.present? or salt = Card::Env[:salt] # hack - fix with better ORM handling
-    #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
-  if db_content_changed?
-    unless Card::Env[:no_password_encryptions] # hack for import - fix with api for ignoring events
-      self.content = Auth.encrypt content, salt
-    end
-  end
+  salt = Card::Env[:salt] unless salt.present? # hack - fix with better ORM handling
+  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??
 end
 
 event :validate_password, :on=>:save, :before=>:approve do

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

@@ -17,7 +17,7 @@ format :html do
         day = Date.today
         card.content = "(error getting date)"
       end
-      cards_by_day[day] << card
+      cards_by_day[day] << card if card.followable?
     end
 
     paging = _optional_render :paging, args

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

@@ -1,12 +1,11 @@
-  
-def item_names(args={})  # needed for flexmail attachments.  hacky.
-  [self.cardname]
-end
+include Abstract::Attachment
 
+set_specific_attributes :file, :remote_file_url
+mount_uploader :file, FileUploader
 
 format do
   view :source do |args|
-    card.attach.url
+    card.attachment.url
   end
 
   view :core do |args|
@@ -24,24 +23,24 @@ format do
 end
 
 
+
 format :file do
-      
+
   view :core do |args|                                    # returns send_file args.  not in love with this...
     if format = card.attachment_format( params[:format] ) # this means we only support known formats.  dislike.
       if params[:explicit_file] and r = controller.response
         r.headers["Expires"] = 1.year.from_now.httpdate
         #r.headers["Cache-Control"] = "public"            # currently using default "private", because proxy servers could block needed permission checks
       end
-      
-   
-  #      elsif ![format, 'file'].member? params[:format]  # formerly supported redirecting to correct file format 
-  #        return redirect_to( request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format ) ) #card.attach.url(style) )
 
-      style = _render_style :style=>params[:size]         # fixme, shouldn't be in type file
-      [ card.attach.path( *[style].compact ),             # nil or empty arg breaks 1.8.7
+  #      elsif ![format, 'file'].member? params[:format]  # formerly supported redirecting to correct file format
+  #        return redirect_to( request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format ) ) #card.attachment.url(style) )
+
+      file = selected_file_version
+      [ file.path,
         {
-          :type => card.attach_content_type,
-          :filename =>  "#{card.cardname.url_key}#{style.blank? ? '' : '-'}#{style}.#{format}",
+          :type => file.content_type,
+          :filename =>  "#{card.cardname.safe_key}#{file.extension}",
           :x_sendfile => true,
           :disposition => (params[:format]=='file' ? 'attachment' : 'inline' )
         }
@@ -49,13 +48,17 @@ format :file do
     else
       _render_not_found
     end
-  end  
+  end
+
+  def selected_file_version
+    card.attachment
+  end
 
 end
 
 
 format :html do
-  
+
   view :core do |args|
     handle_source args do |source|
       "<a href=\"#{source}\">Download #{ showname args[:title] }</a>"
@@ -64,22 +67,31 @@ format :html do
 
   view :editor do |args|
     #Rails.logger.debug "editor for file #{card.inspect}"
-    out = '<div class="choose-file">'
-    if !card.new_card?
-      out << %{<div class="attachment-preview" :id="#{card.attach_file_name}-preview"> #{_render_core(args)} </div> }
-    end
-    out << %{
-      <div>#{file_field :attach, :class=>'file-upload slotter'}</div>
-    </div>
-    <div class="chosen-file" style="display:none">
-      <div><label>File chosen:</label> <span class="chosen-filename"></span></div>
-      <div><a class="cancel-upload">Unchoose</a></div>
-    </div>
-      }
-    out
+    file_chooser args
   end
-  
-end
 
+  def file_chooser args, db_column=:file
+    preview =
+      if !card.new_card?
+        content_tag :div, _render_core(args).html_safe,
+          :class=>'attachment-preview', :id=>"#{card.attachment.filename}-preview"
+      end
+
+    <<-HTML
+      <div class="choose-file">
+        #{preview}
+        <div>#{file_field db_column, :class=>'file-upload slotter'}</div>
+      </div>
+      <div class="chosen-file" style="display:none">
+        <div>
+          <label>File chosen:</label>
+          <span class="chosen-filename"></span>
+        </div>
+        <div><a class="cancel-upload">Unchoose</a></div>
+      </div>
+    HTML
+  end
+
+end