wagn 1.13.0.pre1 → 1.13.0.pre2

data/spec/mods/core/sets/all/phases_spec.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Phases do
-  # SPECSTUB
+  
+  # how to test abort directly?   set up a stub set module and include it by hand?
 end

data/spec/mods/standard/lib/machine_input_spec.rb

@@ -10,6 +10,10 @@ shared_examples_for 'machine input' do
     f.putty
     f
   end
+  let!(:more_input) do
+    moreinput = create_another_machine_input_card
+    moreinput
+  end
   
   context 'when removed' do
     it 'updates machine_input card of machine card' do
@@ -21,7 +25,7 @@ shared_examples_for 'machine input' do
       expect(f.machine_input_card.item_cards).to eq([])
     end
     
-    it 'updates file of machine card' do
+    it 'updates output of machine card' do
       machine
       Card::Auth.as_bot do
         input.delete!
@@ -37,11 +41,23 @@ shared_examples_for 'machine input' do
   end
   
   context 'when updated' do
-    it 'updates file of related factory card' do
-      input.putty :content => card_content[:new_in]
+    it 'updates output of related machine card' do
+      input.putty :content => card_content[:changed_in]
       updated_machine  = Card.gimme machine.cardname
       path = updated_machine.machine_output_path
-      expect(File.read path).to eq(card_content[:new_out])
+      expect(File.read path).to eq(card_content[:changed_out])
+    end
+  end
+  
+  context 'when added' do
+    it 'updates output of related machine card' do
+      if machine.kind_of? Card::Set::Type::Pointer
+        machine << more_input
+        machine.putty
+        updated_machine  = Card.gimme machine.cardname
+        path = updated_machine.machine_output_path
+        expect(File.read path).to eq( ([card_content[:out]]*2).join("\n"))
+      end
     end
   end
 end

data/spec/mods/standard/lib/machine_spec.rb

@@ -21,7 +21,7 @@ shared_examples_for 'machine' do |filetype|
     it 'has +machine_output card' do
       machine.machine_output_card.should_not be_nil
     end
-    it "generates #{filetype} file" do
+    it "generates #{filetype} file" do 
       expect(machine.machine_output_path).to match(/\.#{filetype}$/)
     end
   end
@@ -45,9 +45,9 @@ shared_examples_for 'content machine' do |filetype|
     end
     it "updates #{filetype} file when content is changed" do
       changed_factory = machine_card
-      changed_factory.putty :content =>card_content[:new_in]
+      changed_factory.putty :content =>card_content[:changed_in]
       changed_path = changed_factory.machine_output_path
-      expect(File.read(changed_path)).to eq(card_content[:new_out])
+      expect(File.read(changed_path)).to eq(card_content[:changed_out])
     end
   end
 end
@@ -55,25 +55,51 @@ end
 
 shared_examples_for 'pointer machine' do |filetype|
   subject do
+=begin
+We build the following structure:
+    
+ #{machine_card}
+   |- expected_input_items (passed by the calling test if it prepopulates the machine_card with some additional items)
+   |_ level 0 #{filetype}
+        |- level 1 basic 1
+        |- level 1 #{filetype} 
+        |    |- level 2 basic 1
+        |    |- level 2 #{filetype}
+        |    |    |_ ....
+        |    |_ level 2 basic 2 
+        |_ level 1 basic 2
+    
+=end
+    
     change_machine = machine_card
-    @depth = 4
-    @expected_items = []
+    @depth = 2
+    @leaf_items = []
+    @expected_items = expected_input_items || []
+    start = @expected_items.size
     Card::Auth.as_bot do
-      (2*@depth).times do |i|
-        @expected_items << Card.fetch( "basic level #{i}", :new =>  {:type => Card::BasicID } )
-        @expected_items.last.save
+      @depth.times do |i|
+        @leaf_items << Card.fetch( "level #{i} basic 1", :new =>  {:type => Card::BasicID } )
+        @leaf_items.last.save
+        @leaf_items << Card.fetch( "level #{i} basic 2", :new =>  {:type => Card::BasicID } )
+        @leaf_items.last.save
       end
+
+      # we build the tree from bottom up
       last_level = false
-      @depth.times do |i|
-        next_level = Card.fetch(  "#{filetype} level #{@depth-i}", :new => {:type => :pointer } )
+      (@depth-1).downto(0) do |i|
+        next_level = Card.fetch(  "level #{i} #{filetype} ", :new => {:type => :pointer } )
         next_level.content = ""
-        next_level << @expected_items[@depth-i-1]
+        next_level << @leaf_items[i*2]
         next_level << last_level if last_level
-        next_level << @expected_items[@depth+i]
+        next_level << @leaf_items[i*2+1]
         next_level.save!
+        @expected_items.insert(start, @leaf_items[i*2])
+        @expected_items.insert(start+1, last_level) if last_level
+        @expected_items << @leaf_items[i*2+1]
         last_level = next_level
       end
       change_machine << last_level
+      @expected_items.insert(start, last_level)
       change_machine << machine_input_card
       @expected_items << machine_input_card
       change_machine.save!
@@ -102,9 +128,33 @@ shared_examples_for 'pointer machine' do |filetype|
     end
     
     it 'updates #{filetype} file if item is changed' do
-      machine_input_card.putty :content => card_content[:new_in]
+      machine_input_card.putty :content => card_content[:changed_in]
       changed_path = subject.machine_output_path
-      expect(File.read(changed_path)).to eq(card_content[:new_out])
+      expect(File.read(changed_path)).to eq(card_content[:changed_out])
+    end
+    
+    it 'updates #{filetype} file if item is added' do
+      Card::Auth.as_bot do
+        ca = Card.gimme! "pointer item", :type=>Card::SkinID, :content=>''
+        subject.items = [ca]
+        ca << another_machine_input_card
+        ca.save!
+        changed_path = subject.machine_output_path
+        expect(File.read(changed_path)).to eq(card_content[:new_out])
+      end
+    end
+    
+    context 'a non-existent card was added as item and now created' do
+      it 'updates #{filetype} file' do
+        Card::Auth.as_bot do
+          subject.content = "[[non-existent input]]" 
+          subject.save!
+          ca = Card.gimme! "non-existent input", :type=>input_type, :content=>card_content[:changed_in]
+          ca.save!
+          changed_path = subject.machine_output_path
+          expect(File.read(changed_path)).to eq(card_content[:changed_out])
+        end
+      end
     end
   end
 end

data/spec/mods/standard/sets/right/machine_output_spec.rb

@@ -1,20 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-#load 'spec/mods/zfactory/lib/machine_spec.rb'
-
-describe Card::Set::Right::Script do
-  let(:js)                    { 'alert( "Hi" );'    }
-  let(:compressed_js)         { 'alert("Hi");'      }
-  let(:changed_js)            { 'alert( "Hello" );' }
-  let(:compressed_changed_js) { 'alert("Hello");'   }
-  
-  
-  it_should_behave_like 'pointer machine', that_produces_js do
-    let(:machine_card)  { Card.gimme! "test my style+*script", :type => :pointer, :content => ''}
-    let(:machine_input_card) { Card.gimme! "test js",  :type => Card::JavaScriptID, :content => js  }
-    let(:card_content) do
-       { in:       js,         out:     compressed_js, 
-         new_in:   changed_js, new_out: compressed_changed_js }
-    end
-  end
+describe Card::Set::Right::MachineOutput do
+  # tested in controller_spec.rb
 end

data/spec/mods/standard/sets/right/script_spec.rb

@@ -1,20 +1,24 @@
 # -*- encoding : utf-8 -*-
 
-#load 'spec/mods/zfactory/lib/machine_spec.rb'
-
 describe Card::Set::Right::Script do
   let(:js)                    { 'alert( "Hi" );'    }
   let(:compressed_js)         { 'alert("Hi");'      }
   let(:changed_js)            { 'alert( "Hello" );' }
   let(:compressed_changed_js) { 'alert("Hello");'   }
-  
+  let(:new_js)                { 'alert( "Hey" );'   }
+  let(:compressed_new_js)     { 'alert("Hey");'   }
   
   it_should_behave_like 'pointer machine', that_produces_js do
     let(:machine_card)  { Card.gimme! "test my style+*script", :type => :pointer, :content => ''}
     let(:machine_input_card) { Card.gimme! "test js",  :type => Card::JavaScriptID, :content => js  }
+    let(:another_machine_input_card) { Card.gimme! "more js",  :type => Card::JavaScriptID, :content => new_js  }
+    let(:expected_input_items) { nil }
+    let(:input_type) { :java_script }
     let(:card_content) do
-       { in:       js,         out:     compressed_js, 
-         new_in:   changed_js, new_out: compressed_changed_js }
+       { in:           js,         out:     compressed_js, 
+         changed_in:   changed_js, changed_out: compressed_changed_js,
+         new_in:       new_js,     new_out:     compressed_new_js
+       }
     end
   end
 end

data/spec/mods/standard/sets/right/style_spec.rb

@@ -5,19 +5,25 @@ require File.expand_path('../../../lib/machine_spec.rb', __FILE__)
 describe Card::Set::Right::Style do
 #  describe "#delet"
 #  it "should delete tempfile"
-  let(:skin_card)              { Card.gimme! "test skin", :type => :skin, :content => '[[test css]]'}
+  #let!(:skin_card)              { Card.gimme! "test skin", :type => :skin, :content => '[[test css]]'}
   let(:css)                    { "#box { display: block }"  }
   let(:compressed_css)         { "#box{display:block}\n"    }
   let(:changed_css)            { "#box { display: inline }" }
   let(:compressed_changed_css) { "#box{display:inline}\n"   }
-  
+  let(:new_css)                { "#box{ display: none}\n"   }
+  let(:compressed_new_css)     { "#box{display:none}\n"   }  
   
   it_should_behave_like 'pointer machine', that_produces_css do
-    let(:machine_card)  { Card.gimme! "test my style+*style", :type => :pointer, :content => '[[test skin]]'}
+    let(:machine_card)  { Card.gimme! "test my style+*style", :type => :pointer, :content => ''}
     let(:machine_input_card) { Card.gimme! "test css",  :type => :css, :content => css  }
+    let(:another_machine_input_card) { Card.gimme! "more css",  :type => :css, :content => new_css  }
+    let(:expected_input_items) { nil } #[Card.fetch("test skin"), machine_input_card] }
+    let(:input_type) { :css }
     let(:card_content) do
-       { in:       css,         out:     compressed_css, 
-         new_in:   changed_css, new_out: compressed_changed_css }
+       { in:           css,         out:     compressed_css, 
+         changed_in:   changed_css, changed_out: compressed_changed_css,
+         new_in:       new_css,     new_out:     compressed_new_css
+       }
     end
   end
 end

data/spec/mods/standard/sets/type/coffeescript_spec.rb

@@ -1,6 +1,3 @@
-# load 'spec/mods/zfactory/lib/machine_spec.rb'
-# load 'spec/mods/zfactory/lib/machine_input_spec.rb'
-
 describe Card::Set::Type::CoffeeScript do
   let(:coffee)                    { 'alert "Hi"  '    }
   let(:compressed_coffee)         { '(function(){alert("Hi")}).call(this);'    }
@@ -11,17 +8,18 @@ describe Card::Set::Type::CoffeeScript do
   it_should_behave_like 'content machine', that_produces_js do
     let(:machine_card)  { Card.gimme! "test coffeescript", :type => Card::CoffeeScriptID, :content => coffee}
     let(:card_content) do
-       { in:       coffee,         out:     compressed_coffee, 
-         new_in:   changed_coffee, new_out: compressed_changed_coffee }
+       { in:           coffee,         out:     compressed_coffee, 
+         changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
     end
   end
 
   it_behaves_like "machine input"  do
     let(:create_machine_input_card) { Card.gimme! "test coffeescript", :type => :coffee_script, :content => coffee }
+    let(:create_another_machine_input_card) { Card.gimme! "more coffee", :type => :coffee_script, :content => coffee }
     let(:create_machine_card)  { Card.gimme! "script with coffee+*script", :type => :pointer }
     let(:card_content) do
-       { in:       coffee,         out:     compressed_coffee, 
-         new_in:   changed_coffee, new_out: compressed_changed_coffee }
+       { in:           coffee,         out:     compressed_coffee, 
+         changed_in:   changed_coffee, changed_out: compressed_changed_coffee }
     end
   end
 

data/spec/mods/standard/sets/type/css_spec.rb

@@ -1,5 +1,3 @@
-# load 'spec/mods/zfactory/lib/machine_spec.rb'
-# load 'spec/mods/zfactory/lib/machine_input_spec.rb'
 
 describe Card::Set::Type::Css do
   let(:css) { '#box { display: block }' }
@@ -16,10 +14,11 @@ describe Card::Set::Type::Css do
 
   it_behaves_like "machine input"  do
     let(:create_machine_input_card) { Card.gimme! "test css", :type => :css, :content => css }
+    let(:create_another_machine_input_card) { Card.gimme! "more test css", :type => :css, :content => css }
     let(:create_machine_card)  { Card.gimme! "style with css+*style", :type => :pointer }
     let(:card_content) do
        { in:       css,         out:     compressed_css, 
-         new_in:   changed_css, new_out: compressed_changed_css }
+         changed_in:   changed_css, changed_out: compressed_changed_css }
     end
   end
 
@@ -27,7 +26,7 @@ describe Card::Set::Type::Css do
     let(:machine_card) {  Card.gimme! "test css", :type => :css, :content => css }
     let(:card_content) do
        { in:       css,         out:     compressed_css, 
-         new_in:   changed_css, new_out: compressed_changed_css }
+         changed_in:   changed_css, changed_out: compressed_changed_css }
     end
   end
 end

data/spec/mods/standard/sets/type/javascript_spec.rb

@@ -1,6 +1,3 @@
-# load 'spec/mods/zfactory/lib/machine_spec.rb'
-# load 'spec/mods/zfactory/lib/machine_input_spec.rb'
-
 describe Card::Set::Type::JavaScript do
   let(:js)                    { 'alert( "Hi" );'    }
   let(:compressed_js)         { 'alert("Hi");'      }
@@ -12,16 +9,17 @@ describe Card::Set::Type::JavaScript do
     let(:machine_card)  { Card.gimme! "test javascript", :type => :java_script, :content => js}
     let(:card_content) do
        { in:       js,         out:     compressed_js, 
-         new_in:   changed_js, new_out: compressed_changed_js }
+         changed_in:   changed_js, changed_out: compressed_changed_js }
     end
   end
 
   it_behaves_like "machine input"  do
     let(:create_machine_input_card) { Card.gimme! "test javascript", :type => :java_script, :content => js }
+    let(:create_another_machine_input_card) { Card.gimme! "more javascript", :type => :java_script, :content => js }
     let(:create_machine_card)  { Card.gimme! "script with js+*script", :type => :pointer }
     let(:card_content) do
        { in:       js,         out:     compressed_js, 
-         new_in:   changed_js, new_out: compressed_changed_js }
+         changed_in:   changed_js, changed_out: compressed_changed_js }
     end
   end
 

data/spec/mods/standard/sets/type/scss_spec.rb

@@ -1,9 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# load 'spec/mods/zfactory/lib/machine_spec.rb'
-# load 'spec/mods/zfactory/lib/machine_input_spec.rb'
-
-
 describe Card::Set::Type::Scss do
   let(:scss) { 
     %{
@@ -25,7 +21,7 @@ describe Card::Set::Type::Scss do
   
   
   it 'should highlight code in html' do
-    assert_view_select @scss_card.format.render_core, 'div[class=CodeRay]'
+    assert_view_select @scss_card.format(:format=>:html).render_core, 'div[class=CodeRay]'
   end
   
   it 'should not highlight code in css' do
@@ -34,10 +30,11 @@ describe Card::Set::Type::Scss do
   
   it_should_behave_like "machine input"  do
     let(:create_machine_input_card) { Card.gimme! "test scss", :type => :scss, :content => scss }
+    let(:create_another_machine_input_card) { Card.gimme! "more scss", :type => :scss, :content => scss }
     let(:create_machine_card)  { Card.gimme! "style with scss+*style", :type => :pointer }
     let(:card_content) do
        { in:       scss,         out:     compressed_css, 
-         new_in:   changed_scss, new_out: compressed_changed_css }
+         changed_in:   changed_scss, changed_out: compressed_changed_css }
     end
   end
 
@@ -45,7 +42,7 @@ describe Card::Set::Type::Scss do
     let(:machine_card) {  Card.gimme! "test scss", :type => :scss, :content => scss }
     let(:card_content) do
        { in:       scss,         out:     compressed_css, 
-         new_in:   changed_scss, new_out: compressed_changed_css }
+         changed_in:   changed_scss, changed_out: compressed_changed_css }
     end
   end
 end

data/spec/mods/standard/sets/type/skin_spec.rb

@@ -5,23 +5,44 @@ describe Card::Set::Type::Skin do
   let(:compressed_css)         { "#box{display:block}\n"    }
   let(:changed_css)            { "#box { display: inline }" }
   let(:compressed_changed_css) { "#box{display:inline}\n"   }
-  
+  let(:new_css)                { "#box{display: none }\n"   }
+  let(:compressed_new_css)     { "#box{display:none}\n"   }
   
   it_should_behave_like 'pointer machine', that_produces_css do
-    let(:machine_card)  { Card.gimme! "test skin factory", :type => :skin, :content => ''}
+    let(:machine_card)  { Card.gimme! "test skin machine", :type => :skin, :content => ''}
     let(:machine_input_card) { Card.gimme! "test skin supplier",  :type => :css, :content => css  }
+    let(:another_machine_input_card) { Card.gimme! "more css",  :type => :css, :content => new_css  }
+    let(:expected_input_items) { nil }
+    let(:input_type) { :css }
     let(:card_content) do
-       { in:       css,         out:     compressed_css, 
-         new_in:   changed_css, new_out: compressed_changed_css }
+       { in:           css,         out:         compressed_css, 
+         changed_in:   changed_css, changed_out: compressed_changed_css,
+         new_in:       new_css,     new_out:     compressed_new_css   }
     end
   end
   
   it_behaves_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test skin supplier", :type => :css, :content => css }
-    let(:create_machine_card)  { Card.gimme! "style with skin factory+*style", :type => :pointer }
+    let(:create_machine_input_card) { Card.gimme! "test skin input", :type => :css, :content => css }
+    let(:create_another_machine_input_card) { Card.gimme! "more skin input", :type => :css, :content => css }
+    let(:create_machine_card)  { Card.gimme! "style with skin machine+*style", :type => :pointer }
     let(:card_content) do
-       { in:       css,         out:     compressed_css, 
-         new_in:   changed_css, new_out: compressed_changed_css }
+       { in:           css,         out:     compressed_css, 
+         changed_in:   changed_css, changed_out: compressed_changed_css
+       }
+    end
+  end
+  
+  context 'when item added' do
+    it 'updates output of related machine card' do
+        #item = Card.gimme! "skin item", :type => :css, :content => css 
+        skin = Card.gimme! "test skin supplier", :type => :skin, :content => ''
+        machine = Card.gimme! "style with skin machine+*style", :type => :pointer, :content=>'[[test skin supplier]]'
+        item = Card.gimme! "skin item", :type => :css, :content => css 
+        skin << item
+        skin.putty
+        updated_machine  = Card.gimme machine.cardname
+        path = updated_machine.machine_output_path
+        expect(File.read path).to eq( compressed_css )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.13.0.pre1
+  version: 1.13.0.pre2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -340,6 +340,7 @@ files:
 - lib/wagn/config/initializers/inflections.rb
 - lib/wagn/config/initializers/mime_types.rb
 - lib/wagn/config/initializers/notification.rb
+- lib/wagn/config/initializers/paperclip.rb
 - lib/wagn/config/initializers/recaptcha.rb
 - lib/wagn/config/initializers/secret_token.rb
 - lib/wagn/config/initializers/session_store.rb
@@ -419,6 +420,8 @@ files:
 - mods/core/sets/all/trash.rb
 - mods/core/sets/all/type.rb
 - mods/core/sets/all/utils.rb
+- mods/core/sets/right/structure.rb
+- mods/core/sets/type/plain_text.rb
 - mods/standard/files/103/icon-6566.ico
 - mods/standard/files/103/large-6566.ico
 - mods/standard/files/103/medium-6566.ico
@@ -491,7 +494,6 @@ files:
 - mods/standard/sets/right/script.rb
 - mods/standard/sets/right/stats.rb
 - mods/standard/sets/right/status.rb
-- mods/standard/sets/right/structure.rb
 - mods/standard/sets/right/style.rb
 - mods/standard/sets/right/token.rb
 - mods/standard/sets/right/update.rb
@@ -531,7 +533,6 @@ files:
 - mods/standard/sets/type/layout_type.rb
 - mods/standard/sets/type/number.rb
 - mods/standard/sets/type/phrase.rb
-- mods/standard/sets/type/plain_text.rb
 - mods/standard/sets/type/pointer.rb
 - mods/standard/sets/type/scss.rb
 - mods/standard/sets/type/search_type.rb