wagn 1.13.0 → 1.14.0.pre1

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

@@ -7,8 +7,8 @@ describe Card::Set::All::Trash do
       name = '*all+*default'
       card = Card[name]
       card.delete
-      card.errors[:delete].first.should == "#{name} is an indestructible rule"
-      Card[name].should be
+      expect(card.errors[:delete].first).to eq("#{name} is an indestructible rule")
+      expect(Card[name]).to be
     end
   end
 

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

@@ -4,19 +4,19 @@ describe Card::Set::All::Type do
   
   describe 'get_type_id (#new)' do
     it "should accept cardtype name and casespace variant as type" do
-      Card.new( :type=>'Phrase'   ).type_id.should == Card::PhraseID
-      Card.new( :type=>'PHRASE'   ).type_id.should == Card::PhraseID
-      Card.new( :type=>'phrase'   ).type_id.should == Card::PhraseID
-      Card.new( :type=>'phrase??' ).type_id.should == Card::PhraseID
+      expect(Card.new( :type=>'Phrase'   ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( :type=>'PHRASE'   ).type_id).to eq(Card::PhraseID)
+      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
-      Card.new( :type_code=>'phrase'   ).type_id.should == Card::PhraseID
-      Card.new( :type_code=>:phrase    ).type_id.should == Card::PhraseID
+      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
-      Card.new( :type_id=>Card::PhraseID   ).type_code.should == :phrase
+      expect(Card.new( :type_id=>Card::PhraseID   ).type_code).to eq(:phrase)
     end
   end
   
@@ -29,19 +29,19 @@ describe Card::Set::All::Type do
     end
     
     it 'should have a type_name' do
-      @hat.type_name.should == 'Hat'
+      expect(@hat.type_name).to eq('Hat')
     end
     
     it 'should not have a type_code' do
-      @hat.type_code.should == nil
+      expect(@hat.type_code).to eq(nil)
     end
     
     it 'should have a type_id' do
-      @hat.type_id.should == @type.id
+      expect(@hat.type_id).to eq(@type.id)
     end
     
     it 'should have a type_card' do
-      @hat.type_card.should == @type
+      expect(@hat.type_card).to eq(@type)
     end
 
   end
@@ -58,12 +58,12 @@ describe Card::Set::All::Type do
     
     it "should clear cache of structured included card after saving" do
       Card::Auth.as_bot do
-        Card.fetch('t1+results', :new=>{}).type_name.should == 'Basic'
+        expect(Card.fetch('t1+results', :new=>{}).type_name).to eq('Basic')
         
         topic1 = Card.new :type=>'Topic', :name=>'t1'
         topic1.format._render_new
         topic1.save!
-        Card.fetch('t1+results', :new=>{}).type_name.should == 'Search'
+        expect(Card.fetch('t1+results', :new=>{}).type_name).to eq('Search')
       end
     end
   end

data/mod/{standard → 02_basic_types}/set/type/pointer.rb

@@ -1,5 +1,11 @@
 
+event :add_and_drop_items, :before=>:approve, :on=>:save do
+  self.add_item Env.params['add_item']   if Env.params['add_item']
+  self.drop_item Env.params['drop_item'] if Env.params['drop_item']
+end
+
 format do
+
   def wrap_item item, args={}
     item #no wrap in base    
   end
@@ -60,6 +66,7 @@ format :html do
   end
 
   view :checkbox do |args|
+    
     options = card.options.map do |option|
       checked = card.item_names.include?(option.name)
       id = "pointer-checkbox-#{option.cardname.key}"
@@ -77,7 +84,8 @@ format :html do
   end
 
   view :multiselect do |args|
-    options = options_from_collection_for_select(card.options,:name,:name,card.item_names)
+    selected_options = card.item_names.map{|i_n| (c=Card.fetch(i_n) and c.name) or i_n}
+    options = options_from_collection_for_select(card.options,:name,:name,selected_options)
     select_tag("pointer_multiselect", options, :multiple=>true, :class=>'pointer-multiselect')
   end
 
@@ -130,7 +138,7 @@ format :css do
   
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(params[:item] || :content)
+      nest item, :view=>(params[:item] || args[:item] || :content)
     end.join "\n\n"
   end
   
@@ -142,7 +150,7 @@ end
 format :js do
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(params[:item] || :core)
+      nest item, :view=>(params[:item] || args[:item] || :core)
     end.join "\n\n"
   end
 end
@@ -158,7 +166,7 @@ end
 
 
 event :standardize_items, :before=>:approve, :on=>:save do
-  if updates.for? :content
+  if db_content_changed?
     self.content = item_names(:context=>:raw).map { |name| "[[#{name}]]" }.join "\n"
   end
 end
@@ -240,12 +248,17 @@ def options_card
   self.rule_card :options
 end
 
-def options
-  if oc = options_card
+def options 
+  result_cards = if oc = options_card
     oc.item_cards :default_limit=>50, :context=>name
   else
     Card.search :sort=>'alpha', :limit=>50
   end
+  if selected_options = item_names
+    selected_options.each do |item|
+      result_cards.push Card.fetch(item,:new=>{})
+    end
+    result_cards.uniq!
+  end
+  result_cards
 end
-
-

data/{spec/mod/standard/set/type → mod/02_basic_types/spec/set}/pointer_spec.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-
 describe Card::Set::Type::Pointer do
   describe "item_names" do
     it "should return array of names of items referred to by a pointer" do
@@ -46,16 +45,30 @@ describe Card::Set::Type::Pointer do
       pointer.content.should == ""
     end
   end
-
-  describe "watching" do
-    it "not break on permissions" do
-      watchers = Card.fetch "Home+*watchers", :new=>{}
-      watchers.type_code.should == :pointer
-      watchers << Card::Auth.current_id
-      assert_equal '[[Joe User]]', watchers.content
+   
+  describe "html" do
+    before do
+      Card::Auth.as_bot
+      @card_name = "nonexistingcardmustnotexistthisistherule"
+      @pointer = Card.create :name=>"tp", :type=>"pointer", :content=>"[[#{@card_name}]]"
+    end
+    it "should include nonexistingcardmustnotexistthisistherule in radio options" do
+      option_html ="<input checked=\"checked\" class=\"pointer-radio-button\" id=\"pointer-radio-nonexistingcardmustnotexistthisistherule\" name=\"pointer_radio_button-tp\" type=\"radio\" value=\"nonexistingcardmustnotexistthisistherule\" />"
+      @pointer.format.render_radio.should include(option_html)
+    end
+    it "should include nonexistingcardmustnotexistthisistherule in checkbox options" do
+      option_html = "<input checked=\"checked\" class=\"pointer-checkbox-button\" id=\"pointer-checkbox-nonexistingcardmustnotexistthisistherule\" name=\"pointer_checkbox\" type=\"checkbox\" value=\"nonexistingcardmustnotexistthisistherule\" />"
+      @pointer.format.render_checkbox.should include(option_html)
+    end
+    it "should include nonexistingcardmustnotexistthisistherule in select options" do
+      option_html = %{<option value="#{@card_name}" selected="selected">#{@card_name}</option>}
+      @pointer.format.render_select.should include(option_html)
+    end
+    it "should include nonexistingcardmustnotexistthisistherule in multiselect options" do
+      option_html = %{<option value="#{@card_name}" selected="selected">#{@card_name}</option>}
+      @pointer.format.render_multiselect.should include(option_html)
     end
   end
-  
   describe "css" do
     before do
       @css = '#box { display: block }'

data/mod/{standard → 03_machines}/lib/card/machine.rb

@@ -123,7 +123,8 @@ class Card
     def reset_machine_output!
       Auth.as_bot do
         moc = machine_output_card and moc.real? and moc.delete!
-        mic = machine_input_card  and mic.real? and mic.delete!
+        #mic = machine_input_card  and mic.real? and mic.delete!
+        update_input_card
       end
     end
     
@@ -175,7 +176,7 @@ class Card
     end 
 
     def ensure_machine_output
-      unless fetch :trait => :machine_output
+      if !output = fetch(:trait => :machine_output) or !output.selected_content_action_id
         update_machine_output 
       end
     end

data/mod/{standard → 03_machines}/lib/card/machine_input.rb

@@ -24,7 +24,7 @@ class Card
           item.reset_machine_output! if item.kind_of? Machine
         end
       end
-    
+      
       host_class.event "before_machine_input_deleted_#{host_class.name.gsub(':','_')}".to_sym, :after=>:approve, :on => :delete do
         @involved_machines = Card.search( {:right_plus => [{:codename => "machine_input"}, {:link_to => name}]}.merge(host_class.machines_wql) )  
       end

data/mod/{standard → 03_machines}/lib/javascript/wagn.js.coffee

@@ -26,14 +26,18 @@ $.extend wagn,
         
   slotReady: (func)->
     $('document').ready ->
-      $('body').on 'slotReady', '.card-slot', ->
+      $('body').on 'slotReady', '.card-slot', (e) ->
+        e.stopPropagation()
         func.call this, $(this)
-
   pingName: (name, success)->
     $.getJSON wagn.rootPath + '/', { format: 'json', view: 'status', 'card[name]': name }, success  
 
 jQuery.fn.extend {
-  slot: -> @closest '.card-slot'
+  slot: -> 
+    if @attr('slotSelector')
+      @closest @attr('slotSelector')
+    else
+      @closest '.card-slot'
 
   setSlotContent: (val) ->
     s = @slot()
@@ -105,13 +109,17 @@ jQuery.fn.extend {
       id = slot.data 'cardId'
       reportee = ''
 
-    #might be better to put this href base in the html
-
-    $.ajax wagn.rootPath + '/card/save_draft/~' + id, {
-      data : { 'card[content]' : @val() },
-      type : 'POST',
-      success: () -> slot.report 'draft saved' + reportee
+    # #might be better to put this href base in the html
+    submit_url  = wagn.rootPath + '/update/~' + id
+    form_data = $('#edit_card_'+id).serializeArray().reduce( ((obj, item) ->
+      obj[item.name] = item.value
+      return obj
+    ), { 'draft' : 'true', 'success[view]' : 'blank'});
+    $.ajax submit_url, {
+      data : form_data,
+      type : 'POST'
     }
+    ##{ 'card[content]' : @val() },
 
   setContentFieldsFromMap: (map) ->
     map = wagn.editorContentFunctionMap unless map?

data/mod/{standard → 03_machines}/lib/javascript/wagn_mod.js.coffee

@@ -266,7 +266,7 @@ $(window).ready ->
       true
     else
       f.find('.set-editor').addClass('attention')
-      $(this).notify 'To what Set of cards does this Rule apply?'
+      $(this).notify 'To what Set does this Rule apply?'
       false
 
 #  $('body').on 'click', '.rule-cancel-button', ->

data/mod/{standard → 03_machines}/lib/stylesheets/functional.scss

@@ -91,7 +91,7 @@ in your skin.  Choosing (b) will mean your CSS will not be affected by automated
   display: inline;
   white-space: nowrap !important;
   
-  table, thead, tbody, tr, th, td, p, h1, h2, h3, h4, h5, h6, ul, li, pre, ol, div, span, a, blockquote, img, label {
+  table, thead, tbody, tr, th, td, p, h1, h2, h3, h4, h5, h6, ul, li, pre, ol, div, span, a, blockquote, img, label, i {
     display: inline !important;
     white-space: nowrap !important;
     float: none !important;

data/mod/{standard → 03_machines}/lib/stylesheets/standard.scss

@@ -295,33 +295,138 @@ ul.pointer {
 
 
 
-.revision-header {
-  padding: 4px;
-  text-align: center;
+$diff-green: #41ad41;
+$diff-red: #ff5050;
+$action-white: #fdfdfd;
+$act-gray:  #b7b7b7;
+$act-background: #f3f3f3;
+
+.history-slot {
+  overflow: hidden;
+  clear: both;
 }
-.revision-title {
-  font-weight: bold;
+
+.history-header {
+    padding: 10px 10px 10px 10px;
 }
-.history-view > .card-content {
-  margin: 0px 1px;
-  padding: 10px 5px;
+.history-legend {
+    text-align: right;
+    float: right;
 }
-.autosave-alert {
-  font-weight: bold;
+.history-header nav.pagination {
+    display: inline;
+    text-align: left;
 }
-.revision-navigation {
-  border-bottom: 1px solid silver;
-  span {
-    margin: 0px 10px
-  }
+
+.act {
+    padding: 10px 10px 10px 10px;
+    background-color: $act-background;
+    margin-bottom: 5px;
+    
+    .head {
+        float: left;
+        margin-right:10px;
+        min-width: 175px;
+    }
+    .nr {
+        float: left;   
+    }
+    .title {
+        float: left;
+        margin-left: 10px;
+    }
+    .actor {
+        float: left;
+    }
+    .time {
+        font-size: 8pt;
+        float:left;
+        clear:left;
+    }
+    
+    .action-container {
+        overflow: hidden;
+    }
+    .action {
+        background-color: $action-white;
+        margin: 5px 5px 2px 2px;
+        padding: 6px 5px 6px 5px;
+        overflow: hidden;
+    }
+    .ampel {
+        margin: 2px 0 0 4px;
+    }
+    .arrow {
+        margin: 0px 10px 0px 10px;
+        color: green;
+    }
+    .toggle {
+        float: right;
+        margin: 12px 10px 0px 10px;
+        width: 20px;
+    }
+
+    .name-diff {
+        border-style: solid;
+        border-width: 1px;
+        border-color: #E4E4E4;
+        padding: 3px 8px 3px 8px;
+        background-color: #EEEEEE;
+        margin-left: 3px;
+    }
+    .type-diff {
+        padding: 1px 0px 1px 3px;
+    }
+    .content-diff {
+        overflow: hidden;
+    }
+
+    .action {
+      .expanded {
+          clear:left;
+          padding: 14px 10px 14px 24px;
+      }
+      .summary {
+          padding: 6px 0px;
+      }
+    }
+    
+    .arrow-down {
+    	width: 0; 
+    	height: 0; 
+    	border-left: 7px solid transparent;
+    	border-right: 7px solid transparent;
+    	border-top: 11px solid $act-gray;
+        display: block;
+    }
+    .arrow-right {
+    	width: 0; 
+    	height: 0; 
+    	border-top: 7px solid transparent;
+    	border-bottom: 7px solid transparent;
+    	border-left: 11px solid $act-gray;
+        display: block;
+    }
+    
+    .info {
+      font-style: italic;
+      color: #888;
+    }
 }
-ins.diffmod,
-.diffins {
-  background: #aea;  /* NOTGREY - green for additions */
+
+.diff-red {
+  text-decoration: line-through;
+  color: $diff-red;
+}
+.diff-green {
+    color: $diff-green;
 }
-del.diffmod,
-.diffdel {
-  background: #eaa;  /* NOTGREY - red for deletions */
+.diff-invisible {
+  color: $action-white;
+}
+
+.diff-green,.diff-invisible{
+  text-decoration: none;
 }