wagn 1.13.0 → 1.14.0.pre1

data/mod/{core → 01_core}/set/all/permissions.rb

@@ -43,7 +43,7 @@ def permission_rule_card action
   end
 
   rcard = Auth.as_bot do
-    if ['_left','[[_left]]'].member?(opcard.content) && self.junction?  # compound cards can inherit permissions from left parent
+    if ['_left','[[_left]]'].member?(opcard.db_content) && self.junction?  # compound cards can inherit permissions from left parent
       lcard = left_or_new( :skip_virtual=>true, :skip_modules=>true )
       if action==:create && lcard.real? && !lcard.action==:create
         action = :update

data/mod/{core → 01_core}/set/all/phases.rb

@@ -10,6 +10,9 @@
 def abort status, msg='action canceled'
   if status == :failure && errors.empty?
     errors.add :abort, msg
+  elsif Hash === status and status[:success]
+    Env.params[:success] = status[:success]
+    status = :success
   end
   raise Card::Abort.new( status, msg)
 end
@@ -20,8 +23,11 @@ def abortable
 rescue Card::Abort => e
   if e.status == :triumph
     @supercard ? raise( e ) : true
-  else
-    e.status == :success
+  elsif e.status == :success
+    if @supercard
+      @supercard.subcards.delete_if { |k,v| v==self }
+    end
+    true
   end
 end
 
@@ -45,11 +51,9 @@ end
 
 def approve
   @action = identify_action
-
   # the following should really happen when type, name etc are changed
   reset_patterns
   include_set_modules
-  
   run_callbacks :approve
   expire_pieces if errors.any?
   errors.empty?
@@ -65,9 +69,23 @@ def identify_action
   end
 end
 
+def store_changes
+  @changed_fields = Card::TRACKED_FIELDS.select{ |f| changed_attributes.member? f }
+  return unless @current_action
+  if @changed_fields.present?
+    #@changed_fields.each{ |f| @current_action.changes.build :field => f, :value => self[f] }
+    @changed_fields.each{ |f| Card::Change.create :field => f, :value => self[f], :card_action_id=>@current_action.id }
+  elsif @current_action and @current_action.changes.empty?
+    @current_action.delete
+  end
+end
+
+
+
 def store
   run_callbacks :store do
-    yield
+    yield #unless @draft
+    store_changes
     @virtual = false
   end
 rescue =>e
@@ -78,7 +96,6 @@ end
 
 
 def extend
-#    puts "extend called"
   run_callbacks :extend
 rescue =>e
   rescue_event e
@@ -118,7 +135,6 @@ end
 
 
 event :process_subcards, :after=>:approve, :on=>:save do
-  
   subcards.keys.each do |sub_name|
     opts = @subcards[sub_name] || {}
     opts = { 'content' => opts } if String===opts
@@ -158,7 +174,7 @@ end
 
 event :store_subcards, :after=>:store do
   subcards.each do |key, sub|
-    sub.save! :validate=>false
+    sub.save! :validate=>false #unless @draft
   end
 end
 

data/mod/{core → 01_core}/set/all/references.rb

@@ -10,7 +10,7 @@ def extended_referencers
 end
 
 def replace_references old_name, new_name
-  obj_content = Card::Content.new content, card=self
+  obj_content = Card::Content.new raw_content, card=self
   
   obj_content.find_chunks( Card::Chunk::Reference ).select do |chunk|
     if old_ref_name = chunk.referee_name and new_ref_name = old_ref_name.replace_part(old_name, new_name)
@@ -36,7 +36,7 @@ def update_references rendered_content = nil, refresh = false
 #  references_expired = nil
   expire if refresh
 
-  rendered_content ||= Card::Content.new(content, card=self)
+  rendered_content ||= Card::Content.new(raw_content, card=self)
   
   rendered_content.find_chunks(Card::Chunk::Reference).each do |chunk|
     if referee_name = chunk.referee_name # name is referenced (not true of commented inclusions)

data/mod/{core → 01_core}/set/all/rules.rb

@@ -23,7 +23,7 @@ end
 def rule setting_code, options={}
   options[:skip_modules] = true
   card = rule_card setting_code, options
-  card && card.content
+  card && card.db_content
 end
 
 def rule_card setting_code, options={}
@@ -58,7 +58,7 @@ module ClassMethods
   
   def setting name
     Auth.as_bot do
-      card=Card[name] and !card.content.strip.empty? and card.content
+      card=Card[name] and !card.db_content.strip.empty? and card.db_content
     end
   end
   

data/mod/{core → 01_core}/set/all/states.rb

@@ -12,5 +12,5 @@ end
 
 def pristine?
   # has not been edited directly by human users.  bleep blorp.
-  new_card? or !revisions.map(&:creator_id).find { |id| id != Card::WagnBotID }
+  new_card? or actions.joins(:act).where('card_acts.actor_id != ?', Card::WagnBotID).exists?
 end

data/mod/{core → 01_core}/set/all/templating.rb

@@ -19,13 +19,13 @@ def template
       dup_card.type_id = default_card ? default_card.type_id : Card.default_type_id
 
 
-      if content_card = dup_card.content_rule_card
+      if content_card = dup_card.structure_rule_card
         @virtual = true if junction?
         content_card
       else
         default_card
       end
-    elsif tmpl = content_rule_card
+    elsif tmpl = structure_rule_card
       # this is a mechanism for repairing bad data.  like #repair_key, it should be obviated and removed.
       if type_id != tmpl.type_id and tmpl.assigns_type?
         repair_type tmpl.type_id
@@ -49,9 +49,9 @@ def virtual?
   @virtual
 end
 
-def content_rule_card
+def structure_rule_card
   card = rule_card :structure, :skip_modules=>true
-  card && card.content.strip == '_self' ? nil : card
+  card && card.db_content.strip == '_self' ? nil : card
 end
 
 def structuree_names

data/mod/{core → 01_core}/set/all/tracked_attributes.rb

@@ -1,15 +1,3 @@
-
-event :set_tracked_attributes, :before=>:store, :on=>:save do
-  updates.each_pair do |attrib, value|
-    if send("set_#{attrib}", value )
-      updates.clear attrib
-    end
-    @changed ||={}; @changed[attrib.to_sym]=true
-  end
-  #Rails.logger.debug "Card(#{name})#set_tracked_attributes end"
-end
-
-
 #fixme -this is called by both initialize and update_attributes.  really should be optimized for new!
 def assign_attributes args={}, options={}
   if args
@@ -23,7 +11,6 @@ def assign_attributes args={}, options={}
   super args, options
 end
 
-
 def extract_subcard_args! args={}
   extracted_subcards = args.delete('subcards') || {}
   args.keys.each do |key|
@@ -37,43 +24,14 @@ def extract_subcard_args! args={}
 end
 
 
-
 protected
 
-
-
-
-def set_content new_content
-  if self.id #have to have this to create revision
-    new_content ||= ''
-    new_content = Card::Content.clean! new_content if clean_html?
-    clear_drafts if current_revision_id
-    new_rev = Card::Revision.create :card_id=>self.id, :content=>new_content, :creator_id =>Auth.current_id
-    self.current_revision_id = new_rev.id
-    self.selected_revision_id = nil
-    reset_patterns_if_rule saving=true
-    @name_or_content_changed = true
-  else
-    false
-  end
-end
-
-
-
-event :set_initial_content, :after=>:store, :on=>:create do
-  #Rails.logger.info "Card(#{inspect})#set_initial_content start #{content_without_tracking}"
-  # set_content bails out if we call it on a new record because it needs the
-  # card id to create the revision.  call it again now that we have the id.
-
-  #Rails.logger.warn "si cont #{content} #{updates.for?(:content).inspect}, #{updates[:content]}"
-  unless @from_trash
-    set_content updates[:content] # if updates.for?(:content)
-  
-    updates.clear :content
-
-    Card.where(:id=>id).update_all(:current_revision_id => current_revision_id)
-  end
-  #Rails.logger.info "set_initial_content #{content}, #{@current_revision_id}, s.#{self.current_revision_id} #{inspect}"
+event :set_content, :before=>:store, :on=>:save do
+  self.db_content = content || '' #necessary?
+  self.db_content = Card::Content.clean! self.db_content if clean_html?
+  self.selected_action_id = nil
+  clear_drafts
+  reset_patterns_if_rule saving=true
 end
 
 
@@ -85,17 +43,8 @@ event :update_ruled_cards, :after=>:store do
     self.class.clear_rule_cache
     left.reset_set_patterns
 
-    if right_id==Card::ReadID && (@name_or_content_changed || ([:create, :delete].member? @action) )
-      # These instance vars are messy.  should use tracked attributes' @changed variable
-      # and get rid of @name_changed, @name_or_content_changed, and @child.
-      # Above should look like [:name, :content, :trash].member?( @changed.keys ).
-      # To implement that, we need to make sure @changed actually tracks trash
-      # (though maybe not as a tracked_attribute for performance reasons?)
-      # AND need to make sure @changed gets wiped after save (probably last in the sequence)
-
+    if right_id==Card::ReadID and (name_changed? or trash_changed?)
       self.class.clear_read_rule_cache
-
-#        Auth.cache.reset
       Card.cache.reset # maybe be more surgical, just Auth.user related
       expire #probably shouldn't be necessary,
       # but was sometimes getting cached version when card should be in the trash.
@@ -113,13 +62,15 @@ event :update_ruled_cards, :after=>:store do
                 # Why isn't this just 'trunk', do we need the fetch?
                 Card.fetch(cardname.trunk_name).item_cards(:limit=>0).each do |item_card|
                   in_set[item_card.key] = true
-                  next if cur_index > rule_class_index
-                  item_card.update_read_rule
+                  next if cur_index < rule_class_index
+                  if cur_index >= rule_class_index
+                    item_card.update_read_rule
+                  end
                 end
-             elsif rule_class_index = rule_class_ids.index( 0 )
-               in_set[trunk.key] = true
-               #warn "self rule update: #{trunk.inspect}, #{rule_class_index}, #{cur_index}"
-               trunk.update_read_rule if cur_index > rule_class_index
+             # elsif rule_class_index = rule_class_ids.index( 0 )
+ #               in_set[trunk.key] = true
+ #               #warn "self rule update: #{trunk.inspect}, #{rule_class_index}, #{cur_index}"
+ #   trunk.update_read_rule if cur_index > rule_class_index
              else warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
              end
           end

data/mod/{core → 01_core}/set/all/trash.rb

@@ -1,9 +1,9 @@
 def delete
-  update_attributes :trash => true
+  update_attributes :trash => true unless new_card?
 end
 
 def delete!
-  update_attributes! :trash => true
+  update_attributes! :trash => true unless new_card?
 end
 
 
@@ -31,13 +31,14 @@ event :validate_delete, :before=>:approve, :on=>:delete do
     errors.add :delete, "#{name} is an indestructible rule"
   end
   
-  if account && Card::Revision.find_by_creator_id( self.id )
-    errors.add :delete, "Edits have been made with #{name}'s user account.\n  Deleting this card would mess up our revision records."
-  end
+  # if account && Card::Revision.find_by_creator_id( self.id )  #ask ethan
+  #   errors.add :delete, "Edits have been made with #{name}'s user account.\n  Deleting this card would mess up our revision records."
+  # end
 end
 
 event :validate_delete_children, :after=>:approve, :on=>:delete do
   children.each do |child|
+    child.supercard = self
     subcards[child.name]=child
     child.trash = true
     unless child.valid?

data/mod/{core → 01_core}/set/all/utils.rb

@@ -3,7 +3,7 @@ module ClassMethods
   
   def empty_trash
     Card.where(:trash=>true).delete_all
-    Card::Revision.delete_cardless
+    Card::Action.delete_cardless
     Card::Reference.repair_missing_referees
     Card.delete_trashed_files
   end

data/mod/01_core/spec/chunk/literal_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Chunk::EscapedLiteral, "literal chunk tests" do
+
+  it "should handle escaped link" do
+    expect(render_content('write this: \[[text]]')).to eq('write this: <span>[</span>[text]]')
+  end
+
+  it "should handle escaped inclusion" do
+    expect(render_content('write this: \{{cardname}}')).to eq('write this: <span>{</span>{cardname}}')
+  end
+
+end
+

data/{spec/mod/core → mod/01_core/spec}/chunk/uri_spec.rb

@@ -267,19 +267,19 @@ describe Card::Chunk::URI, "URI chunk tests" do
   # Asserts a number of tests for the given type and text.
   def no_match(type, test_text)
     test_cont = Card::Content.new(test_text, DUMMY_CARD)
-    ( ((test_cont.respond_to? :each) ? test_cont : [test_cont]).find{|ck| type===ck } ).should be_nil
+    expect( ((test_cont.respond_to? :each) ? test_cont : [test_cont]).find{|ck| type===ck } ).to be_nil
   end
 
   def aa_match(type, test_text)
     test_cont = Card::Content.new(test_text, DUMMY_CARD)
-    ( ((test_cont.respond_to? :each) ? test_cont : [test_cont]).find{|ck| type===ck } ).should_not be_nil
+    expect( ((test_cont.respond_to? :each) ? test_cont : [test_cont]).find{|ck| type===ck } ).not_to be_nil
   end
 
   def match_chunk(type, test_text, expected)
     test_cont = Card::Content.new(test_text, DUMMY_CARD)
     chunk = ((test_cont.respond_to? :each) ? test_cont : [test_cont]).find{ |ck| type===ck }
     #warn "chunk? #{chunk.inspect}"
-    chunk.should_not be_nil
+    expect(chunk).not_to be_nil
 
     expected.each_pair do |method_sym, value|
       #assert_respond_to(chunk, method_sym)

data/{spec/mod/core → mod/01_core/spec}/format/html_format_spec.rb

@@ -115,7 +115,7 @@ describe Card::HtmlFormat do
         @layout_card.content = "Hi {{A}}"
         Card::Auth.as_bot { @layout_card.save }
 
-        @main_card.format.render(:layout).should match('Hi Alpha')
+        expect(@main_card.format.render(:layout)).to match('Hi Alpha')
       end
 
       it "should default to open view for main card" do
@@ -123,9 +123,9 @@ describe Card::HtmlFormat do
         Card::Auth.as_bot { @layout_card.save }
 
         result = @main_card.format.render_layout
-        result.should match(/Open up/)
-        result.should match(/card-header/)
-        result.should match(/Joe User/)
+        expect(result).to match(/Open up/)
+        expect(result).to match(/card-header/)
+        expect(result).to match(/Joe User/)
       end
 
       it "should render custom view of main" do
@@ -133,16 +133,17 @@ describe Card::HtmlFormat do
         Card::Auth.as_bot { @layout_card.save }
 
         result = @main_card.format.render_layout
-        result.should match(/Hey.*div.*Joe User/)
-        result.should_not match(/card-header/)
+        expect(result).to match(/Hey.*div.*Joe User/)
+        expect(result).not_to match(/card-header/)
       end
 
       it "shouldn't recurse" do
         @layout_card.content="Mainly {{_main|core}}"
         Card::Auth.as_bot { @layout_card.save }
 
-        rendered = @layout_card.format.render(:layout).should == 
+        rendered = expect(@layout_card.format.render(:layout)).to eq( 
           %{Mainly <div id="main"><div class="CodeRay">\n  <div class="code"><pre>Mainly {{_main|core}}</pre></div>\n</div>\n</div>}
+        )
           #probably better to check that it matches "Mainly" exactly twice.
       end
       
@@ -154,7 +155,7 @@ describe Card::HtmlFormat do
           Card.create :name=>"outer space", :content=>"{{_main|name}}"
         end
         
-        @layout_card.format.render(:layout).should == 'Joe User'
+        expect(@layout_card.format.render(:layout)).to eq('Joe User')
       end
     end
 

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

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+
+# describe Card::Set::All::AttributeTracking do
+#   context "new card" do
+#     before(:each) do
+#       Card::Auth.as_bot do
+#         @c = Card.new :name=>"New Card", :content=>"Great Content"
+#       end
+#     end
+#
+#     it "should have updates" do
+#       described_class::Updates.should === @c.updates
+#     end
+#
+#     it "should track changes" do
+#       @c.name.should == 'New Card'
+#       @c.name = 'Old Card'
+#       @c.name.should == 'Old Card'
+#     end
+#   end
+# end