wagn 1.13.0 → 1.14.0.pre1

data/mod/{standard → 03_machines}/set/right/machine_output.rb

@@ -1,6 +1,7 @@
 format do
   view :not_found do |args|
     if update_machine_output_live?
+      Wagn::Cache.reset_global
       root.error_status = 302      
       card.left.update_machine_output
       wagn_path card.left.machine_output_url
@@ -10,10 +11,10 @@ format do
   end
   
   def update_machine_output_live?
-    srid = card.selected_revision_id
+    said = card.selected_action_id
     card.left.kind_of? Machine and                                  # must be a machine
     !card.left.locked?         and                                  # machine must not already be running    
-    ( card.new_card? or !srid or srid == card.current_revision_id ) # must want current output (won't re-output old stuff)
+    ( card.new_card? or !said or said == card.last_action_id )      # must want current output (won't re-output old stuff)
   end
   
 end

data/mod/{standard → 03_machines}/set/self/script_card_menu.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/wagn_menu.js"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/wagn_menu.js"
 end
 
 view :editor do |args|

data/mod/{standard → 03_machines}/set/self/script_html5shiv_printshiv.rb

@@ -1,5 +1,5 @@
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/html5shiv-printshiv.js"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/html5shiv-printshiv.js"
 end
 
 view :editor do |args|

data/mod/{standard → 03_machines}/set/self/script_jquery.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/jquery.js"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/jquery.js"
 end
 
 view :editor do |args|

data/mod/{standard → 03_machines}/set/self/script_jquery_helper.rb

@@ -4,7 +4,7 @@ view :raw do |args|
   # jquery.ui.autocomplete must be after jquery.ui stuff 
   js_files = %w( jquerymobile.js jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
   js_files.map do |filename|
-    File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/#{filename}"
+    File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/#{filename}"
   end.join("\n")
 end
 

data/mod/{standard → 03_machines}/set/self/script_slot.rb

@@ -1,6 +1,6 @@
 view :raw do |args|
   [ "wagn_mod.js.coffee", "wagn.js.coffee" ].map do |name|
-    File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/#{name}"
+    File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/#{name}"
   end.join("\n")
 end
 

data/mod/{standard → 03_machines}/set/self/script_tinymce.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/tinymce.js"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/tinymce.js"
 end
 
 view :editor do |args|

data/mod/{standard → 03_machines}/set/self/style_functional.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/stylesheets/functional.scss"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/stylesheets/functional.scss"
 end
 
 view :editor do |args|

data/mod/{standard → 03_machines}/set/self/style_jquery_ui_smoothness.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/stylesheets/jquery-ui-smoothness.css"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/stylesheets/jquery-ui-smoothness.css"
 end
 
 view :editor do |args|

data/mod/{standard → 03_machines}/set/self/style_standard.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mod/standard/lib/stylesheets/standard.scss"
+  File.read "#{Wagn.gem_root}/mod/03_machines/lib/stylesheets/standard.scss"
 end
 
 view :editor do |args|

data/{spec/mod/standard → mod/03_machines/spec}/lib/machine_spec.rb

@@ -20,10 +20,10 @@ shared_examples_for 'machine' do |filetype|
     end
     
     it 'has +machine_input card' do
-      machine.machine_input_card.real?.should be_true 
+      expect(machine.machine_input_card.real?).to be_truthy 
     end
     it 'has +machine_output card' do
-      machine.machine_output_card.real?.should be_true
+      expect(machine.machine_output_card.real?).to be_truthy
     end
     it "generates #{filetype} file" do 
       expect(machine.machine_output_path).to match(/\.#{filetype}$/)
@@ -127,11 +127,11 @@ We build the following structure:
     end
     
     it "contains items of all levels" do
-      subject.machine_input_card.item_cards.map(&:id).sort.should == @expected_items.map(&:id).sort
+      expect(subject.machine_input_card.item_cards.map(&:id).sort).to eq(@expected_items.map(&:id).sort)
     end
     
     it "preserves order of items" do
-      subject.machine_input_card.item_cards.map(&:id).should == @expected_items.map(&:id)
+      expect(subject.machine_input_card.item_cards.map(&:id)).to eq(@expected_items.map(&:id))
     end
   end
   

data/{spec/mod/standard → mod/03_machines/spec}/set/type/scss_spec.rb

@@ -25,7 +25,7 @@ describe Card::Set::Type::Scss do
   end
   
   it 'should not highlight code in css' do
-    @scss_card.format(:format=>:css).render_core.should_not =~ /CodeRay/
+    expect(@scss_card.format(:format=>:css).render_core).not_to match(/CodeRay/)
   end
   
   it_should_behave_like "machine input"  do

data/{spec/mod/standard → mod/03_machines/spec}/set/type/skin_spec.rb

@@ -45,4 +45,26 @@ describe Card::Set::Type::Skin do
         expect(File.read path).to eq( compressed_css )
     end
   end
+  
+  context 'when item changed' do
+    it 'updates output of related machine card' do
+      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
+      Card::Auth.as_bot do
+        item.update_attributes :content=>changed_css
+        { :get => machine.machine_output_url }
+        item.update_attributes :content=>new_css
+      end
+      updated_machine  = Card.gimme machine.cardname
+      path = updated_machine.machine_output_path
+      expect(File.read path).to eq( compressed_new_css )
+      expect(updated_machine.machine_input_card.content).to include("[[skin item]]")
+      expect(Card.search(:link_to => "skin item")).to include(updated_machine.machine_input_card)
+    end
+  end
+  
+  
 end

data/mod/04_settings/lib/card/setting.rb

@@ -0,0 +1,57 @@
+# -*- encoding : utf-8 -*-
+
+# Used to extend setting modules like Card::Set::Self::Create in the settings mod
+
+class Card
+  module Setting
+    # Let M = Card::Setting           (module)
+    #     E = Card::Set::Self::Create (module extended with M)
+    #     O = Card["*create"]         (object)
+    attr_accessor :codename                                                # accessible in E
+    mattr_accessor :groups, :group_names                                   # accessible in E and M 
+    def self.extended(host_class)     
+       host_class.mattr_accessor :restricted_to_type, :rule_type_editable  # accessible in E and O
+    end
+    
+    @@groups = { :permission =>[], :look_and_feel=>[], :communication => [], :pointer=>[], :other =>[] }
+    @@group_names = {
+      :permission    => "Permission",
+      :look_and_feel => "Look and Feel",
+      :communication => "Communication",
+      :pointer       => "Pointer",
+      :other         => "Other"  
+    }
+
+    def to_type_id type
+      type.is_a?(Fixnum) ? type : Card::Codename[type]
+    end
+    
+    # usage:
+    # setting_opts :group              => :permission | :look_and_feel | ...
+    #              :position           => <Fixnum> (starting at 1, default: add to end)
+    #              :rule_type_editable => true | false (default: false)
+    #              :restricted_to_type => <cardtype> | [ <cardtype>, ...] 
+    def setting_opts opts
+      group = opts[:group] || :other
+      @@groups[group] ||= []
+      if opts[:position]
+        if @@groups[group][opts[:position]-1]
+          @@groups[group].insert(opts[:position]-1, self)
+        else
+          @@groups[group][opts[:position]-1] = self
+        end
+      else
+        @@group_namesoups[group] << self
+      end
+  
+      @codename = opts[:codename] || self.name.match(/::(\w+)$/)[1].underscore.to_sym
+      self.rule_type_editable = opts[:rule_type_editable]
+      self.restricted_to_type = opts[:restricted_to_type] ? ::Set.new([opts[:restricted_to_type]].flatten.map{ |cardtype| to_type_id(cardtype) }) : false
+    end
+    
+    def applies_to_cardtype type_id
+      !self.restricted_to_type or self.restricted_to_type.include? type_id
+    end
+  end
+end
+

data/mod/{core/set/right/structure.rb → 04_settings/set/right/add_help.rb}

@@ -1,4 +1,3 @@
-
 format :html do
   view :core do |args|
     with_inclusion_mode :template do
@@ -9,5 +8,4 @@ format :html do
   view :closed_content do |args|
     "#{_render_type} : #{_render_raw}"
   end
-  
 end

data/mod/{standard → 04_settings}/set/right/comment.rb

@@ -1,4 +1,3 @@
-
 format :html do
   view :editor do |args|
     set_name = card.cardname.trunk_name

data/mod/{standard → 04_settings}/set/right/create.rb

@@ -1,3 +1,2 @@
-
 include Comment
 format :html do include Comment::HtmlFormat end

data/mod/04_settings/set/right/default.rb

@@ -0,0 +1,3 @@
+format :html do
+  include AddHelp::HtmlFormat
+end

data/mod/{standard → 04_settings}/set/right/delete.rb

@@ -1,2 +1,4 @@
 include Create
 format :html do include Create::HtmlFormat end
+
+

data/mod/04_settings/set/right/help.rb

@@ -0,0 +1,3 @@
+format :html do
+  include AddHelp::HtmlFormat
+end

data/mod/04_settings/set/right/structure.rb

@@ -0,0 +1,4 @@
+
+format :html do
+  include AddHelp::HtmlFormat
+end

data/mod/04_settings/set/self/accountable.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:other, :position=>2

data/mod/04_settings/set/self/add_help.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts  :group=>:communication, :position=>2, :rule_type_editable => true

data/mod/04_settings/set/self/autoname.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:other, :position=>1

data/mod/04_settings/set/self/captcha.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:other, :position=>3

data/mod/04_settings/set/self/comment.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :permission, :position=>5, :rule_type_editable=>false

data/mod/04_settings/set/self/create.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :permission, :position=>1, :rule_type_editable=>false

data/mod/04_settings/set/self/default.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :look_and_feel, :position=>1, :rule_type_editable => true

data/mod/04_settings/set/self/delete.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :permission, :position=>4, :rule_type_editable=>false

data/mod/04_settings/set/self/help.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:communication, :position=>1, :rule_type_editable => true

data/mod/04_settings/set/self/input.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:pointer, :position=>3, :restricted_to_type => :pointer, :rule_type_editable => false

data/mod/04_settings/set/self/layout.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:look_and_feel, :position=>3, :rule_type_editable => false

data/mod/04_settings/set/self/on_create.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:communication, :position=>4 , :rule_type_editable => false

data/mod/04_settings/set/self/on_delete.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:communication, :position=>5, :rule_type_editable => false

data/mod/04_settings/set/self/on_update.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:communication, :position=>4, :rule_type_editable => false

data/mod/04_settings/set/self/options.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:pointer, :position=>1, :restricted_to_type => :pointer, :rule_type_editable=>true

data/mod/04_settings/set/self/options_label.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:pointer, :position=>2, :restricted_to_type => :pointer, :rule_type_editable => false

data/mod/04_settings/set/self/read.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :permission, :position=>2, :rule_type_editable=>false

data/mod/04_settings/set/self/script.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :look_and_feel, :position=>5

data/mod/04_settings/set/self/structure.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :look_and_feel, :position=>2, :rule_type_editable => true

data/mod/04_settings/set/self/style.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:look_and_feel, :position=>4

data/mod/04_settings/set/self/table_of_contents.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :look_and_feel, :position=>6, :rule_type_editable=>false

data/mod/04_settings/set/self/thanks.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=>:communication, :position=>3, :rule_type_editable => false

data/mod/04_settings/set/self/update.rb

@@ -0,0 +1,2 @@
+extend Card::Setting
+setting_opts :group=> :permission, :position=>3, :rule_type_editable=>false

data/mod/{standard → 04_settings}/set/type/setting.rb

@@ -1,16 +1,5 @@
 require_dependency 'json'
 
-POINTER_KEY = "Pointer"
-
-SETTING_GROUPS = {
-  "Permission"    => [ :create, :read, :update, :delete, :comment ],
-  "Look and Feel" => [ :default, :structure, :layout, :style, :script, :table_of_contents ],
-  "Communication" => [ :help, :add_help, :send, :thanks ],
-  POINTER_KEY     => [ :options, :options_label, :input ],
-  "Other"         => [ :autoname, :accountable, :captcha ]
-}
-
-
 view :core do |args|
 
   klasses = Card.set_patterns.reverse.map do |set_class|
@@ -30,7 +19,7 @@ view :core do |args|
 
   
   %{ 
-    #{ _render_closed_content args }
+    #{ _render_rule_help args }
     <table class="setting-rules">
       <tr><th>Set</th><th>Rule</th></tr>
       #{
@@ -46,7 +35,7 @@ view :core do |args|
               unless klass.anchorless?
                 previous_content = nil
                 rules.map do |rule|
-                  current_content = rule.content.strip
+                  current_content = rule.db_content.strip
                   duplicate = previous_content == current_content
                   changeover = previous_content && !duplicate
                   previous_content = current_content
@@ -81,7 +70,12 @@ view :core do |args|
 
 end
 
-view :closed_content do |args|
+view :rule_help do |args|
   %{<div class="instruction">#{process_content_object "{{+*right+*help}}"}</div>}
 end
 
+
+view :closed_content do |args|
+  render_rule_help
+end
+