card 1.17.4 → 1.18.0

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

@@ -1,11 +1,11 @@
 format :html do
   view :core do |args|
-    with_inclusion_mode :template do
+    with_nest_mode :template do
       super args
     end
   end
-  
-  view :closed_content do |args|
+
+  view :closed_content do |_args|
     "#{_render_type} : #{_render_raw}"
   end
 end

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

@@ -1,10 +1,9 @@
 include Machine
 
-store_machine_output filetype: "js"
+store_machine_output filetype: 'js'
 
-
-view :javascript_include_tag do |args|
-  %{
+view :javascript_include_tag do |_args|
+  %(
     <script src="#{card.machine_output_url}" type="text/javascript"></script>
-  }
+  )
 end

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

@@ -9,8 +9,7 @@ format :html do
   include AddHelp::HtmlFormat
 end
 
-event :update_structurees_references,
-      before: :subsequent,
+event :update_structurees_references, :integrate,
       when: proc { |c| c.db_content_changed? || c.action == :delete } do
   return unless (statement = structuree_statement)
   Auth.as_bot do
@@ -18,8 +17,8 @@ event :update_structurees_references,
   end
 end
 
-event :update_structurees_type, after: :store, changed: :type_id,
-                                when: proc { |c| c.assigns_type? } do
+event :update_structurees_type, :finalize,
+      changed: :type_id, when: proc { |c| c.assigns_type? } do
   update_structurees type_id: type_id
 end
 

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

@@ -1,10 +1,10 @@
 require 'sass'
 include Machine
 
-store_machine_output filetype: "css"
+store_machine_output filetype: 'css'
 
 format do
-  def chunk_list  #turn off autodetection of uri's
-    :inclusion_only
+  def chunk_list  # turn off autodetection of uri's
+    :nest_only
   end
 end

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts  group: :editing_cue, position: 2, rule_type_editable: true
+setting_opts group: :editing_cue, position: 2, rule_type_editable: true

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :pointer, position: 3, restricted_to_type: [:pointer,:session], rule_type_editable: false
+setting_opts group: :pointer, position: 3, restricted_to_type: [:pointer, :session], rule_type_editable: false

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :event, position: 1 , rule_type_editable: false
+setting_opts group: :event, position: 1, rule_type_editable: false

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :pointer, position: 1, restricted_to_type: [:pointer,:session], rule_type_editable: true
+setting_opts group: :pointer, position: 1, restricted_to_type: [:pointer, :session], rule_type_editable: true

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

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts group: :pointer, position: 2, restricted_to_type: [:pointer,:session], rule_type_editable: false
+setting_opts group: :pointer, position: 2, restricted_to_type: [:pointer, :session], rule_type_editable: false

data/mod/04_settings/set/type/setting.rb

@@ -13,81 +13,66 @@ def self.member_names
 end
 
 view :core do |args|
-
   klasses = Card.set_patterns.reverse.map do |set_class|
     wql = { left:  { type: Card::SetID },
             right: card.id,
-            #sort:  'content',
+            # sort:  'content',
 
-            sort:  ['content', 'name'],
+            sort:  %w(content name),
             limit: 0
           }
-    wql[:left][ (set_class.anchorless? ? :id : :right_id )] = set_class.pattern_id
+    wql[:left][(set_class.anchorless? ? :id : :right_id)] = set_class.pattern_id
 
     rules = Card.search wql
-    [ set_class, rules ] unless rules.empty?
+    [set_class, rules] unless rules.empty?
   end.compact
 
-
-
-  %{
-    #{ _render_rule_help args }
+  %(
+    #{_render_rule_help args}
     <table class="setting-rules">
       <tr><th>Set</th><th>Rule</th></tr>
-      #{
-        klasses.map do |klass, rules|
-          %{
-            <tr class="klass-row anchorless-#{ klass.anchorless? }">
-              <td class="setting-klass">#{ klass.anchorless? ? card_link( klass.pattern ) : klass.pattern }</td>
+      #{klasses.map do |klass, rules|
+          %(
+            <tr class="klass-row anchorless-#{klass.anchorless?}">
+              <td class="setting-klass">#{klass.anchorless? ? card_link(klass.pattern) : klass.pattern}</td>
               <td class="rule-content-container">
-                <span class="closed-content content">#{ subformat(rules[0])._render_closed_content if klass.anchorless? }</span>
+                <span class="closed-content content">#{subformat(rules[0])._render_closed_content if klass.anchorless?}</span>
               </td>
             </tr>
-            #{
-              unless klass.anchorless?
+            #{unless klass.anchorless?
                 previous_content = nil
                 rules.map do |rule|
                   current_content = rule.db_content.strip
                   duplicate = previous_content == current_content
                   changeover = previous_content && !duplicate
                   previous_content = current_content
-                  %{
-                    <tr class="#{ 'rule-changeover' if changeover }">
-                    <td class="rule-anchor">#{ card_link rule.cardname.trunk_name, text: rule.cardname.trunk_name.trunk_name }</td>
+                  %(
+                    <tr class="#{'rule-changeover' if changeover}">
+                    <td class="rule-anchor">#{card_link rule.cardname.trunk_name, text: rule.cardname.trunk_name.trunk_name}</td>
 
-                      #{
-                        if duplicate
-                          %{ <td></td> }
+                      #{if duplicate
+                          %( <td></td> )
                         else
-                          %{
+                          %(
                             <td class="rule-content-container">
-                              <span class="closed-content content">#{ subformat(rule)._render_closed_content }</span>
+                              <span class="closed-content content">#{subformat(rule)._render_closed_content}</span>
                             </td>
-                          }
-                        end
-                      }
+                          )
+                        end}
                     </tr>
-                  }
-
+                  )
                 end * "\n"
-              end
-
-            }
-          }
-        end * "\n"
-
-      }
+              end}
+          )
+        end * "\n"}
     </table>
-  }
-
+  )
 end
 
-view :rule_help do |args|
-  %{<div class="alert alert-info">#{process_content_object "{{+*right+*help|content}}"}</div>}
+view :rule_help do |_args|
+  %(<div class="alert alert-info">#{process_content_object '{{+*right+*help|content}}'}</div>)
 end
 
-
-view :closed_content do |args|
+view :closed_content do |_args|
   render_rule_help
 end
-

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

@@ -1,14 +1,13 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Comment do
-
-  context "record appender" do
+  context 'record appender' do
     before do
-#      @r = Card.where(type_id: Card::RoleID).first
-      @rule = Card.new name: 'A+*self+*comment', type_id: Card::PointerID, content: "[[Anyone Signed In]]"
+      #      @r = Card.where(type_id: Card::RoleID).first
+      @rule = Card.new name: 'A+*self+*comment', type_id: Card::PointerID, content: '[[Anyone Signed In]]'
     end
 
-    it "should have appender immediately" do
+    it 'should have appender immediately' do
       expect(Card['a'].ok?(:comment)).not_to be_truthy
       Card::Auth.as_bot do
         @rule.save!
@@ -16,7 +15,7 @@ describe Card::Set::Right::Comment do
       expect(Card['a'].ok?(:comment)).to be_truthy
     end
 
-    it "should have appender immediately" do
+    it 'should have appender immediately' do
       Card::Auth.as_bot do
         expect(Card['a'].ok?(:comment)).not_to be_truthy
         @rule.save!
@@ -25,17 +24,15 @@ describe Card::Set::Right::Comment do
     end
   end
 
-
-  context "comment addition" do
-    it "should combine content after save" do
+  context 'comment addition' do
+    it 'should combine content after save' do
       Card::Auth.as_bot do
         Card.create name: 'basicname+*self+*comment', content: '[[Anyone Signed In]]'
-        @c = Card.fetch "basicname"
+        @c = Card.fetch 'basicname'
         @c.comment = " and more\n  \nsome lines\n\n"
         @c.save!
       end
-      expect(Card["basicname"].content).to match(/\<p\>some lines\<\/p\>/)
+      expect(Card['basicname'].content).to match(/\<p\>some lines\<\/p\>/)
     end
   end
-
 end

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

@@ -9,16 +9,16 @@ describe Card::Set::Right::Script do
   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(: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,
-         changed_in:   changed_js, changed_out: compressed_changed_js,
-         new_in:       new_js,     new_out:     compressed_new_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/mod/04_settings/spec/set/right/structure_spec.rb

@@ -1,24 +1,25 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Structure do
-  it "closed_content is rendered as type + raw" do
-    template = Card.new(name: 'A+*right+*structure', content: '[[link]] {{inclusion}}')
+  it 'closed_content is rendered as type + raw' do
+    template = Card.new name: 'A+*right+*structure',
+                        content: '[[link]] {{nest}}'
     expect(template.format._render(:closed_content)).to eq(
-      '<a class="cardtype known-card" href="/Basic">Basic</a> : [[link]] {{inclusion}}'
+      '<a class="cardtype known-card" href="/Basic">Basic</a>' \
+      ' : [[link]] {{nest}}'
     )
   end
 
-  it "closed_content is rendered as type + raw" do
-    template = Card.new(name: 'A+*right+*structure', type: 'Html', content: '[[link]] {{inclusion}}')
+  it 'closed_content is rendered as type + raw' do
+    template = Card.new name: 'A+*right+*structure', type: 'Html',
+                        content: '[[link]] {{nest}}'
     expect(template.format._render(:closed_content)).to eq(
-      '<a class="cardtype known-card" href="/HTML">HTML</a> : [[link]] {{inclusion}}'
+      '<a class="cardtype known-card" href="/HTML">HTML</a> : [[link]] {{nest}}'
     )
   end
 
-=begin
-  it 'renders core as raw' do
-    trs = Card.fetch('*type+*right+*structure').format.render_core
-    expect(trs).to eq '{"type":"_left"}'
-  end
-=end
+  # it 'renders core as raw' do
+  #     trs = Card.fetch('*type+*right+*structure').format.render_core
+  #     expect(trs).to eq '{"type":"_left"}'
+  # end
 end

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

@@ -3,27 +3,27 @@
 require File.expand_path('../../../../../03_machines/spec/lib/shared_machine_examples.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(:css)                    { "#box { display: block }"  }
+  #  describe "#delet"
+  #  it "should delete tempfile"
+  # 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(: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: ''}
-    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(: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,
-         changed_in:   changed_css, changed_out: compressed_changed_css,
-         new_in:       new_css,     new_out:     compressed_new_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/mod/04_settings/spec/set/type/setting_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Setting do
-  context "core view" do
+  context 'core view' do
     it 'should have a table' do
       core = render_card :core, name: :help
       assert_view_select core, 'table'

data/mod/05_email/format/email_html_format.rb

@@ -2,7 +2,7 @@
 
 class Card::EmailHtmlFormat < Card::HtmlFormat
   @@aliases['email'] = 'email_html'
-  
+
   def internal_url relative_path
     card_url relative_path
   end

data/mod/05_email/format/email_text_format.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-class Card::EmailTextFormat < Card::TextFormat  
+class Card::EmailTextFormat < Card::TextFormat
   def internal_url relative_path
     card_url relative_path
   end
-  
+
   def chunk_list
     :references
   end

data/mod/05_email/lib/card/follow_option.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 
-
 class Card
   module FollowOption
     mattr_reader :test, :follower_candidate_ids
-    @@test, @@follower_candidate_ids = {}, {}
+    @@test = {}
+    @@follower_candidate_ids = {}
 
     @@options = { all: [], main: [], restrictive: [] }
 
-    def self.included(host_class)
-       host_class.extend ClassMethods
+    def self.included host_class
+      host_class.extend ClassMethods
     end
 
     def self.codenames type=:all
@@ -17,15 +17,15 @@ class Card
     end
 
     def self.cards
-       codenames.map { |codename| Card[codename] }
+      codenames.map { |codename| Card[codename] }
     end
 
     def self.restrictive_options
-      self.codenames :restrictive
+      codenames :restrictive
     end
 
     def self.main_options
-      self.codenames :main
+      codenames :main
     end
 
     def restrictive_option?
@@ -37,7 +37,6 @@ class Card
     end
 
     module ClassMethods
-
       # args:
       # position: <Fixnum> (starting at 1, default: add to end)
       def restrictive_follow_opts args
@@ -51,11 +50,11 @@ class Card
       end
 
       def follow_test opts={}, &block
-        Card::FollowOption.test[ get_codename(opts) ] = block
+        Card::FollowOption.test[get_codename(opts)] = block
       end
 
       def follower_candidate_ids opts={}, &block
-        Card::FollowOption.follower_candidate_ids[ get_codename(opts) ] = block
+        Card::FollowOption.follower_candidate_ids[get_codename(opts)] = block
       end
 
       private
@@ -70,10 +69,10 @@ class Card
         end
       end
 
-      def add_option opts, type, &block
+      def add_option opts, type, &_block
         codename = get_codename opts
         if opts[:position]
-          insert_option opts[:position]-1, codename, type
+          insert_option opts[:position] - 1, codename, type
         else
           Card::FollowOption.codenames(type) << codename
         end
@@ -81,10 +80,8 @@ class Card
       end
 
       def get_codename opts
-        opts[:codename] || self.name.match(/::(\w+)$/)[1].underscore.to_sym
+        opts[:codename] || name.match(/::(\w+)$/)[1].underscore.to_sym
       end
-
-
     end
   end
 end