card 1.16.4 → 1.16.5

data/mod/01_core/spec/set/all/permissions_spec.rb

@@ -347,7 +347,7 @@ describe Card::Set::All::Permissions do
       assert_hidden_from( @u1, @c2 )
       assert_hidden_from( @u3, @c2 )
     end
-    
+
     context "create permissions" do
       before do
         Card::Auth.as_bot do
@@ -355,17 +355,17 @@ describe Card::Set::All::Permissions do
           Card.create! :name=>'*self+*right+*create',      :type=>'Pointer', :content=>'[[Anyone Signed In]]'
         end
       end
-      
+
       it "should inherit" do
         Card::Auth.as(:anyone_signed_in) do
           expect(Card.fetch( 'A+*self' ).ok?(:create)).to be_truthy #explicitly granted above
-          expect(Card.fetch( 'A+*right').ok?(:create)).to be_falsey #by default restricted   
-          
+          expect(Card.fetch( 'A+*right').ok?(:create)).to be_falsey #by default restricted
+
           expect(Card.fetch( 'A+*self+*structure',  :new=>{} ).ok?(:create)).to be_truthy # +*structure granted;
           expect(Card.fetch( 'A+*right+*structure', :new=>{} ).ok?(:create)).to be_falsey # can't create A+B, therefore can't create A+B+C
         end
       end
-      
+
     end
 
 
@@ -493,9 +493,9 @@ describe Card::Set::All::Permissions do
       end
     end
   end
-  
-  
-  
+
+
+
 end
 
 

data/mod/01_core/spec/set/all/type_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Type do
-  
+
   describe 'get_type_id (#new)' do
     it "should accept cardtype name and casespace variant as type" do
       expect(Card.new( :type=>'Phrase'   ).type_id).to eq(Card::PhraseID)
@@ -9,17 +9,17 @@ describe Card::Set::All::Type do
       expect(Card.new( :type=>'phrase'   ).type_id).to eq(Card::PhraseID)
       expect(Card.new( :type=>'phrase??' ).type_id).to eq(Card::PhraseID)
     end
-      
+
     it 'should accept type_code' do
       expect(Card.new( :type_code=>'phrase'   ).type_id).to eq(Card::PhraseID)
       expect(Card.new( :type_code=>:phrase    ).type_id).to eq(Card::PhraseID)
     end
-    
+
     it 'should accept type_id' do
       expect(Card.new( :type_id=>Card::PhraseID   ).type_code).to eq(:phrase)
     end
   end
-  
+
   describe 'card with wagneered type' do
     before do
       Card::Auth.as_bot do
@@ -27,26 +27,26 @@ describe Card::Set::All::Type do
       end
       @hat =  Card.new :type=>'Hat'
     end
-    
+
     it 'should have a type_name' do
       expect(@hat.type_name).to eq('Hat')
     end
-    
+
     it 'should not have a type_code' do
       expect(@hat.type_code).to eq(nil)
     end
-    
+
     it 'should have a type_id' do
       expect(@hat.type_id).to eq(@type.id)
     end
-    
+
     it 'should have a type_card' do
       expect(@hat.type_card).to eq(@type)
     end
 
   end
-  
-  
+
+
   describe 'card with structured type' do
     before do
       Card::Auth.as_bot do
@@ -55,11 +55,11 @@ describe Card::Set::All::Type do
         Card.create! :name=>'Topic+results+*type plus right+*structure', :type=>'Search', :content=>'{}'
       end
     end
-    
-    it "should clear cache of structured included card after saving" do
+
+    it "should clear cache of structured nested card after saving" do
       Card::Auth.as_bot do
         expect(Card.fetch('t1+results', :new=>{}).type_name).to eq('Basic')
-        
+
         topic1 = Card.new :type=>'Topic', :name=>'t1'
         topic1.format._render_new
         topic1.save!
@@ -67,5 +67,5 @@ describe Card::Set::All::Type do
       end
     end
   end
-  
+
 end

data/mod/01_history/set/all/content_history.rb

@@ -70,9 +70,13 @@ def with_selected_action_id action_id
 end
 
 def selected_content_action_id
-  @selected_action_id ||
- (@current_action && (new_card? || @current_action.new_content? || db_content_changed?) && @current_action.id) ||
-  last_content_action_id
+  @selected_action_id || new_content_action_id || last_content_action_id
+end
+
+def new_content_action_id
+  if @current_action && (new_card? || @current_action.new_content? || db_content_changed?)
+    @current_action.id
+  end
 end
 
 def last_action_id

data/mod/01_history/set/all/history.rb

@@ -5,7 +5,7 @@ def history?
 end
 
 # must be called on all actions and before :set_name, :process_subcards and :validate_delete_children
-event :assign_act,  :before=>:prepare, :when=>proc {|c| c.history?}  do
+event :assign_act,  :before=>:prepare, :when=>proc {|c| c.history? || c.respond_to?(:attachment) }  do
   @current_act = (@supercard && @supercard.current_act) || Card::Act.create(:ip_address=>Env.ip)
 end
 
@@ -19,7 +19,7 @@ end
 
 # stores changes in the changes table and assigns them to the current action
 # removes the action if there are no changes
-event :finalize_action, :after =>:stored, :when=>proc {|c| c.history? && c.current_action} do
+event :finalize_action, :after =>:stored, :when=>proc {|c| (c.history? || c.respond_to?(:attachment)) && c.current_action} do
   @changed_fields = Card::TRACKED_FIELDS.select{ |f| changed_attributes.member? f }
   if @changed_fields.present?
     @changed_fields.each{ |f| Card::Change.create :field => f, :value => self[f], :card_action_id=>@current_action.id }
@@ -30,7 +30,7 @@ event :finalize_action, :after =>:stored, :when=>proc {|c| c.history? && c.curre
   end
 end
 
-event :finalize_act, :after=>:finalize_action, :when=>proc {|c| c.history? && !c.supercard } do
+event :finalize_act, :after=>:finalize_action, :when=>proc {|c| !c.supercard } do
   if @current_act.actions(true).empty?
     @current_act.delete
     @current_act = nil

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

@@ -179,13 +179,19 @@ end
 
 
 format :css do
+
+  #generalize to all collections?
+  def default_item_view
+    params[:item] || :content
+  end
+
   view :titled do |args|
     %(#{major_comment "STYLE GROUP: \"#{card.name}\"", '='}#{ _render_core })
   end
 
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(args[:item] || :content)
+      nest item, :view=>item_view(args)
     end.join "\n\n"
   end
 
@@ -195,6 +201,7 @@ end
 
 
 format :js do
+
   view :core do |args|
     card.item_cards.map do |item|
       nest item, :view=>( args[:item] || :core)

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

@@ -333,6 +333,44 @@ $(window).ready ->
     if val != ''
       window.location = wagn.rootPath + escape( val )
 
+  # performance log mod
+  $('body').on 'click', '.open-slow-items', ->
+
+    panel = $(this).closest('.panel-group')
+    panel.find('.open-slow-items').removeClass('open-slow-items').addClass('close-slow-items')
+    panel.find('.toggle-fast-items').text("show < 100ms")
+    panel.find('.duration-ok').hide()
+    panel.find('.panel-danger > .panel-collapse').collapse('show').find('a > span').addClass('show-fast-items')
+
+  $('body').on 'click', '.close-slow-items', ->
+    panel = $(this).closest('.panel-group')
+    panel.find('.close-slow-items').removeClass('close-slow-items').addClass('open-slow-items')
+    panel.find('.toggle-fast-items').text("hide < 100ms")
+    panel.find('.panel-danger > .panel-collapse').collapse('hide').removeClass('show-fast-items')
+    panel.find('.duration-ok').show()
+
+  $('body').on 'click', '.toggle-fast-items', ->
+    panel = $(this).closest('.panel-group')
+    if $(this).text() == 'hide < 100ms'
+      panel.find('.duration-ok').hide()
+      $(this).text("show < 100ms")
+    else
+      panel.find('.duration-ok').show()
+      $(this).text("hide < 100ms")
+
+  $('body').on 'click', '.show-fast-items', (event) ->
+    $(this).removeClass('show-fast-items')
+    panel = $(this).closest('.panel-group')
+    panel.find('.duration-ok').show()
+    panel.find('.show-fast-items').removeClass('show-fast-items')
+    panel.find('.panel-collapse').collapse('show')
+    event.stopPropagation()
+
+
+
+
+
+
 
 toggleShade = (shadeSlot) ->
   shadeSlot.find('.shade-content').slideToggle 1000
@@ -408,3 +446,4 @@ navbox_select = (event, ui) ->
 
 
 
+

data/mod/03_machines/lib/stylesheets/style_cards.scss

@@ -924,7 +924,17 @@ html>body .open-view {
   font-size: .85em;
 }
 
-.SELF-Xperformance_log.open-view .panel-group {
-  margin-bottom: 0;
+.RIGHT-Xperformance_log.open-view {
+  font-size: 12px;
+  .panel-group {
+    margin-bottom: 0;
+  }
+  .panel-body {
+    padding: 0px 0px 0px 15px;
+  }
+  .panel-title {
+    font-size: 14px;
+  }
 }
 
+

data/mod/03_machines/set/right/machine_output.rb

@@ -2,6 +2,10 @@ def followable?
   false
 end
 
+def history?
+  false
+end
+
 format do
   view :not_found do |args|
     if update_machine_output_live?

data/mod/03_machines/set/type/css.rb

@@ -38,7 +38,7 @@ format :html do
   view :core do |args|
     # FIXME: scan must happen before process for inclusion interactions to work, but this will likely cause
     # problems with including other css?
-    process_content ::CodeRay.scan( _render_raw, :css ).div, :size=>:icon
+    process_content ::CodeRay.scan( _render_raw, :css ).div, :content_opts=>{:size=>:icon}
   end
 
   view :content_changes, :mod=>CoffeeScript::HtmlFormat

data/mod/04_settings/spec/set/right/structure_spec.rb

@@ -17,6 +17,6 @@ describe Card::Set::Right::Structure do
 
   it 'renders core as raw' do
     trs = Card.fetch('*type+*right+*structure').format.render_core
-    expect(trs).to eq '{"type":"_self"}'
+    expect(trs).to eq '{"type":"_left"}'
   end
 end

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

@@ -1,12 +1,12 @@
-def send_action_mails args  
-  setting = "on_#{args[:on]}".to_sym    
+def send_action_mails args
+  setting = "on_#{args[:on]}".to_sym
   email_templates_for( setting ) do |mailcard|
     mailcard.deliver( context: self )
   end
 end
 
 def email_templates_for setting
-  
+
   if email_templates = @email_template_cache ||
       ( event_card = self.rule_card(setting) and event_card.extended_item_cards )
     email_templates.each do |mailcard|
@@ -16,12 +16,12 @@ def email_templates_for setting
 end
 
 [:create, :update, :delete].each do |action|
-  event "observer_#{action}".to_sym, :after=>:extend, :on=>action do 
+  event "observer_#{action}".to_sym, :after=>:extend, :on=>action do
     self.send_action_mails :on=>action
   end
 end
 
-event :cache_delete_email_templates, :after=>:approve, :on=>:delete do 
+event :cache_delete_email_templates, :after=>:approve, :on=>:delete do
   event_card = self.rule_card(:on_delete)
   @email_template_cache = event_card && event_card.extended_item_cards
 end

data/mod/05_email/set/type_plus_right/user/follow.rb

@@ -160,7 +160,7 @@ format :html do
    view :errors, :perms=>:none do |args|
      if card.errors.any?
        if card.errors.find { |attrib,msg| attrib == :permission_denied }
-         save_interrupted_action(request.env['REQUEST_URI'])
+         Env.save_interrupted_action(request.env['REQUEST_URI'])
          title = "Problems with #{card.name}"
          frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
            "Please #{ link_to 'sign in', card_url(':signin') }" #" #{to_task}"

data/mod/05_standard/lib/carrier_wave/cardmount.rb

@@ -22,15 +22,19 @@ module CarrierWave
           store_#{column}!
         end
 
-        event :remove_#{column}_event, :on =>:delete, :after=>:stored do
+        # remove files only if card has no history
+        event :remove_#{column}_event, :on =>:delete, :after=>:stored, :when => proc { |c| !c.history? } do
           remove_#{column}!
         end
         event :mark_remove_#{column}_false_event, :on => :update, :after=>:stored do
           mark_remove_#{column}_false
         end
-        event :store_previous_model_for_#{column}_event, :on=>:update, :before =>:store do
+        event :store_previous_model_for_#{column}_event, :on=>:update, :before =>:store, :when => proc { |c| !c.history? } do
           store_previous_model_for_#{column}
         end
+        event :remove_previously_stored_#{column}_event, :on=>:update, :after => :store, :when => proc { |c| !c.history?} do
+          remove_previously_stored_#{column}
+        end
 
         def attachment
           #{column}
@@ -47,9 +51,11 @@ module CarrierWave
         def read_uploader *args
           read_attribute *args
         end
+
         def write_uploader *args
           write_attribute *args
         end
+
         def #{column}=(new_file)
           send(:"#{column}_will_change!")
           db_column = _mounter(:#{column}).serialization_column

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

@@ -1,22 +1,20 @@
 =begin
 
-DATABASE_CONTENT
+*DATABASE_CONTENT*
 if in mod:
   :codename/modname.ext
 else
   ~card_id/action_id.ext
 
-
-FILE SYSTEM
+*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
-
+variant = icon|small|medium|large|original  (only for images)
 
-URLS
+*URLS*
 mark.ext
 mark/revision.ext
 mark/revision-variant.ext
@@ -44,7 +42,7 @@ end
 
 class FileUploader < CarrierWave::Uploader::Base
   attr_accessor :mod
-  include Card::Format::Location
+  include Card::Location
 
   storage :file
 
@@ -57,33 +55,36 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def extension
-    if file && file.extension.present?
-      ".#{file.extension}"
-    elsif original_filename
-      File.extname(original_filename)
-    else model.content
-      File.extname(model.content)
+    case
+    when file && file.extension.present? ; ".#{file.extension}"
+    when card_content = model.content    ; File.extname(card_content)
+    when orig = original_filename        ; File.extname(orig)
+    else                                   ''
     end.downcase
   end
 
   # generate identifier that gets stored in the card's db_content field
   def db_content opts={}
-    @mod = opts[:mod] || model.load_from_mod  # don't use mod_file? here
-    # mod_file? looks at the identifier in the db
-    # to figure out whether it's a mod file
-    # so it wouldn't be possible to turn a mod file card into a regular file card
+    if opts[:mod] && !model.load_from_mod
+      model.load_from_mod = opts[:mod]
+    end
+    "%s/%s" % [file_dir, url_filename(opts)]
+  end
 
-    basename =
-      if @mod
-        "#{@mod}#{extension}"
-      else
-        "#{action_id}#{extension}"
-      end
-    "%s/%s" % [file_dir, basename]
+  def url_filename opts={}
+    if opts[:mod] && !model.load_from_mod
+      model.load_from_mod = opts[:mod]
+    end
+
+    basename = if (mod = mod_file?)
+      "#{mod}#{extension}"
+    else
+      "#{action_id}#{extension}"
+    end
   end
 
-  def url(options = {})
-    "%s/%s/%s" % [card_path(Card.config.files_web_path), file_dir, full_filename(filename)]
+  def url opts = {}
+    "%s/%s/%s" % [card_path(Card.config.files_web_path), file_dir, full_filename(url_filename(opts))]
   end
 
   def file_dir
@@ -100,20 +101,27 @@ class FileUploader < CarrierWave::Uploader::Base
     Cardio.paths['files'].existent.first + '/cache'
   end
 
-  # Carrierwave usually stores the filename as identifier in the database
-  # and retrieve_from_store! calls store_path with the identifier from the db
+  # 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.
-  # We can just call store_path always with the filename
-  def store_path(for_file=filename) #
-    super(filename)
+  def store_path(for_file=nil) #
+    if for_file
+      retrieve_path
+    else
+      File.join([store_dir, full_filename(filename)].compact)
+    end
+  end
+
+  def retrieve_path
+    File.join([retrieve_dir, full_filename(filename)].compact)
   end
 
   def tmp_path
-    if !Dir.exists? model.tmp_store_dir
-      Dir.mkdir model.tmp_store_dir
+    if !Dir.exists? model.tmp_upload_dir
+      Dir.mkdir model.tmp_upload_dir
     end
-    File.join model.tmp_store_dir, filename
+    File.join model.tmp_upload_dir, filename
   end
 
   def create_versions? new_file
@@ -126,13 +134,17 @@ class FileUploader < CarrierWave::Uploader::Base
   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
     model.store_dir
   end
 
+  def retrieve_dir
+    model.retrieve_dir
+  end
+
   def mod_file?
     @mod ||= model.mod_file?
   end