card 1.16.6 → 1.16.7

data/mod/02_basic_types/spec/set/all/all_csv_spec.rb

@@ -3,7 +3,7 @@
 describe Card::Set::All::AllCsv, "CSV mod" do
   context "csv_row view" do
     it "should handle inclusions" do
-      expect(render_card( :csv_row, { :content=>'{{A+B}} {{T}}' }, :format => :csv )).to eq("AlphaBeta,Theta")
+      expect(render_card( :csv_row, { content: '{{A+B}} {{T}}' }, format: :csv )).to eq("AlphaBeta,Theta")
     end
   end
 end

data/mod/02_basic_types/spec/set/all/base_spec.rb

@@ -3,7 +3,7 @@
 describe Card::Set::All::Base do
 
   describe 'handles view' do
-  
+
     it("name"    ) { expect(render_card(:name)).to      eq('Tempo Rary') }
     it("key"     ) { expect(render_card(:key)).to       eq('tempo_rary') }
     it("linkname") { expect(render_card(:linkname)).to  eq('Tempo_Rary') }
@@ -15,43 +15,43 @@ describe Card::Set::All::Base do
     end
 
     it :raw do
-      @a = Card.new :content=>"{{A}}"
+      @a = Card.new content: "{{A}}"
       expect(@a.format._render(:raw)).to eq("{{A}}")
     end
 
     it "core" do
-      expect(render_card(:core, :name=>'A+B')).to eq("AlphaBeta")
+      expect(render_card(:core, name: 'A+B')).to eq("AlphaBeta")
     end
-    
+
     it 'core for new card' do
       expect(Card.new.format._render_core).to eq('')
     end
-  
+
     describe 'array' do
       it "of search items" do
-        Card.create! :name => "n+a", :type=>"Number", :content=>"10"
+        Card.create! name: "n+a", type: "Number", content: "10"
         sleep 1
-        Card.create! :name => "n+b", :type=>"Phrase", :content=>"say:\"what\""
+        Card.create! name: "n+b", type: "Phrase", content: "say:\"what\""
         sleep 1
-        Card.create! :name => "n+c", :type=>"Number", :content=>"30"
-        c = Card.new :name => 'nplusarray', :content => "{{n+*children+by create|array}}"
+        Card.create! name: "n+c", type: "Number", content: "30"
+        c = Card.new name: 'nplusarray', content: "{{n+*children+by create|array}}"
         expect(c.format._render( :core )).to eq(%{["10", "say:\\"what\\"", "30"]})
       end
 
       it "of pointer items" do
-        Card.create! :name => "n+a", :type=>"Number", :content=>"10"
-        Card.create! :name => "n+b", :type=>"Number", :content=>"20"
-        Card.create! :name => "n+c", :type=>"Number", :content=>"30"
-        Card.create! :name => "npoint", :type=>"Pointer", :content => "[[n+a]]\n[[n+b]]\n[[n+c]]"
-        c = Card.new :name => 'npointArray', :content => "{{npoint|array}}"
+        Card.create! name: "n+a", type: "Number", content: "10"
+        Card.create! name: "n+b", type: "Number", content: "20"
+        Card.create! name: "n+c", type: "Number", content: "30"
+        Card.create! name: "npoint", type: "Pointer", content: "[[n+a]]\n[[n+b]]\n[[n+c]]"
+        c = Card.new name: 'npointArray', content: "{{npoint|array}}"
         expect(c.format._render( :core )).to eq(%q{["10", "20", "30"]})
       end
-      
+
       it "of basic items" do
-        expect(render_card(:array, :content=>'yoing')).to eq(%{["yoing"]})
+        expect(render_card(:array, content: 'yoing')).to eq(%{["yoing"]})
       end
     end
- 
-  end 
+
+  end
 end
 

data/mod/02_basic_types/spec/set/all/json_spec.rb

@@ -9,13 +9,13 @@ describe Card::Set::All::Json, "JSON mod" do
       virtual_json = jf.new(Card.fetch('T+*self')).show :status, {}
       expect(JSON[virtual_json]).to eq({"key"=>"t+*self","status"=>"virtual",'url_key'=>'T+*self'})
     end
-    
+
     it "should treat both unknown and unreadable cards as unknown" do
       Card::Auth.as Card::AnonymousID do
         jf = Card::JsonFormat
-        
-        unknown = Card.new :name=>'sump'
-        unreadable = Card.new :name=>'kumq', :type=>'Fruit'
+
+        unknown = Card.new name: 'sump'
+        unreadable = Card.new name: 'kumq', type: 'Fruit'
         unknown_json = jf.new(unknown).show :status, {}
         expect(JSON[unknown_json]).to eq({"key"=>"sump","status"=>"unknown", 'url_key'=>'sump'})
         unreadable_json = jf.new(unreadable).show :status, {}

data/mod/02_basic_types/spec/set/all/rss_spec.rb

@@ -7,9 +7,15 @@ describe Card::Set::All::Rss do
   end
 
   it 'should handle faulty search queries' do
-    bad_search = Card.create! :name=>'Bad Search', :type=>'Search', :content=>'not no search'
+    bad_search = Card.create! name: 'Bad Search', type: 'Search', content: 'not no search'
     rendered = bad_search.format(:rss).render_feed_body
-    expect(rendered).to match(/item/)
+    expect(rendered).to have_tag("item",:text => /JSON::ParserError/)
+  end
+
+  it 'should handle bad queries' do
+    bad_search = Card.create! :name=>'Bad Search', :type=>'Search', :content=>'{"found_by":"home"}'
+    rendered = bad_search.format(:rss).render_feed_body
+    expect(rendered).to have_tag("item",:text => /Card::BadQuery/)
   end
 
 end

data/mod/02_basic_types/spec/set/type/plain_text_spec.rb

@@ -6,6 +6,6 @@ describe Card::Set::Type::PlainText do
   end
 
   it "should have special content that escapes HTML" do
-    render_card(:core, :type=>'Plain Text', :content=>"<b></b>").should == '&lt;b&gt;&lt;/b&gt;'
+    render_card(:core, type: 'Plain Text', content: "<b></b>").should == '&lt;b&gt;&lt;/b&gt;'
   end
 end

data/mod/02_basic_types/spec/set/type/pointer_spec.rb

@@ -1,65 +1,69 @@
 # -*- 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
-      Card.new(:type=>'Pointer', :content=>"[[Busy]]\n[[Body]]").item_names.should == ['Busy', 'Body']
+    it 'should return array of names of items referred to by a pointer' do
+      card = Card.new(type: 'Pointer', content:"[[Busy]]\n[[Body]]")
+      card.item_names.should == ['Busy', 'Body']
     end
   end
 
-  describe "add_item" do
-    it "add to empty ref list" do
-      pointer = Card.new :name=>"tp", :type=>"pointer", :content=>""
-      pointer.add_item "John"
-      pointer.content.should == "[[John]]"
+  describe 'add_item' do
+    it 'add to empty ref list' do
+      pointer = Card.new name: 'tp', type: 'pointer', content: ''
+      pointer.add_item 'John'
+      pointer.content.should == '[[John]]'
     end
 
-    it "add to existing ref list" do
-      pointer = Card.new :name=>"tp", :type=>"pointer", :content=>"[[Jane]]"
-      pointer.add_item "John"
+    it 'add to existing ref list' do
+      pointer = Card.new name: 'tp', type: 'pointer', content: '[[Jane]]'
+      pointer.add_item 'John'
       pointer.content.should == "[[Jane]]\n[[John]]"
     end
 
-    it "not add duplicate entries" do
-      pointer = Card.new :name=>"tp", :type=>"pointer", :content=>"[[Jane]]"
-      pointer.add_item "Jane"
-      pointer.content.should == "[[Jane]]"
+    it 'not add duplicate entries' do
+      pointer = Card.new name: 'tp', type: 'pointer', content: '[[Jane]]'
+      pointer.add_item 'Jane'
+      pointer.content.should == '[[Jane]]'
     end
   end
 
-  describe "drop_item" do
-    it "remove the link" do
-      pointer = Card.new :name=>"tp", :type=>"pointer", :content=>"[[Jane]]\n[[John]]"
-      pointer.drop_item "Jane"
-      pointer.content.should == "[[John]]"
+  describe 'drop_item' do
+    it 'remove the link' do
+      content = "[[Jane]]\n[[John]]"
+      pointer = Card.new name: 'tp', type: 'pointer', content: content
+      pointer.drop_item 'Jane'
+      pointer.content.should == '[[John]]'
     end
 
-    it "not fail on non-existent reference" do
-      pointer = Card.new :name=>"tp", :type=>"pointer", :content=>"[[Jane]]\n[[John]]"
-      pointer.drop_item "Bigfoot"
-      pointer.content.should == "[[Jane]]\n[[John]]"
+    it 'not fail on non-existent reference' do
+      content = "[[Jane]]\n[[John]]"
+      pointer = Card.new name: 'tp', type: 'pointer', content: content
+      pointer.drop_item 'Bigfoot'
+      pointer.content.should == content
     end
 
-    it "remove the last link" do
-      pointer = Card.new :name=>"tp", :type=>"pointer", :content=>"[[Jane]]"
-      pointer.drop_item "Jane"
-      pointer.content.should == ""
+    it 'remove the last link' do
+      pointer = Card.new name: 'tp', type: 'pointer', content: '[[Jane]]'
+      pointer.drop_item 'Jane'
+      pointer.content.should == ''
     end
   end
 
 
 
-  describe "html" do
+  describe 'html' do
     before do
       Card::Auth.as_bot do
-        @card_name = "nonexistingcardmustnotexistthisistherule"
-        @pointer = Card.create :name=>"tp", :type=>"pointer", :content=>"[[#{@card_name}]]"
+        @card_name = 'nonexistingcardmustnotexistthisistherule'
+        @pointer = Card.create name: 'tp', type: 'pointer', content: "[[#{@card_name}]]"
         # similar tests for an inherited type of Pointer
-        @my_list = Card.create! :name=>'MyList', :type_id=>Card::CardtypeID
-        Card.create :name=>'MyList+*type+*default', :type_id=>Card::PointerID
-        @inherit_pointer = Card.create :name=>'ip', :type_id=>@my_list.id, :content=>"[[#{@card_name}]]"
+        @my_list = Card.create! name: 'MyList', type_id: Card::CardtypeID
+        Card.create name: 'MyList+*type+*default', type_id: Card::PointerID
+        @inherit_pointer = Card.create name: 'ip', type_id: @my_list.id, content: "[[#{@card_name}]]"
       end
     end
-    it "should include nonexistingcardmustnotexistthisistherule in radio options" do
+
+    it 'should include nonexisting card in radio options' do
       common_html = 'input[class="pointer-radio-button"][checked="checked"][type="radio"][value="nonexistingcardmustnotexistthisistherule"][id="pointer-radio-nonexistingcardmustnotexistthisistherule"]'
       option_html = common_html + '[name="pointer_radio_button-tp"]'
       assert_view_select @pointer.format.render_radio, option_html
@@ -67,31 +71,35 @@ describe Card::Set::Type::Pointer do
       assert_view_select @inherit_pointer.format.render_radio, option_html
     end
 
-    it "should include nonexistingcardmustnotexistthisistherule in checkbox options" do
+    it 'should include nonexisting card in checkbox options' do
       option_html = 'input[class="pointer-checkbox-button"][checked="checked"][name="pointer_checkbox"][type="checkbox"][value="nonexistingcardmustnotexistthisistherule"][id="pointer-checkbox-nonexistingcardmustnotexistthisistherule"]'
       assert_view_select @pointer.format.render_checkbox, option_html
       assert_view_select @inherit_pointer.format.render_checkbox, option_html
     end
-    it "should include nonexistingcardmustnotexistthisistherule in select options" do
+
+    it 'should include nonexisting card in select options' do
       option_html = "option[value='#{@card_name}'][selected='selected']"
       assert_view_select @pointer.format.render_select, option_html, @card_name
       assert_view_select @inherit_pointer.format.render_select, option_html, @card_name
     end
-    it "should include nonexistingcardmustnotexistthisistherule in multiselect options" do
+
+    it 'should include nonexisting card in multiselect options' do
       option_html = "option[value='#{@card_name}'][selected='selected']"
       assert_view_select @pointer.format.render_multiselect, option_html, @card_name
       assert_view_select @inherit_pointer.format.render_multiselect, option_html, @card_name
     end
   end
-  describe "css" do
+
+  describe 'css' do
     before do
       @css = '#box { display: block }'
-      Card.create :name=>'my css', :content=> @css
+      Card.create name: 'my css', content: @css
     end
-    it "should render CSS of items" do
-      css_list = render_card :content,
-        { :type=>Card::PointerID, :name=>'my style list', :content=>'[[my css]]' },
-        :format=>:css
+    it 'should render CSS of items' do
+      css_list = render_card(:content,
+        { type: Card::PointerID, name: 'my style list', content: '[[my css]]' },
+        format: :css
+      )
 #      css_list.should =~ /STYLE GROUP\: \"my style list\"/
 #      css_list.should =~ /Style Card\: \"my css\"/
       css_list.should =~ /#{ Regexp.escape @css }/
@@ -100,7 +108,9 @@ describe Card::Set::Type::Pointer do
 
   describe '#standardize_item' do
     it "should handle unlinked items" do
-      pointer1 = Card.create! :name=>'pointer1', :type=>'Pointer', :content=>'bracketme'
+      pointer1 = Card.create!(
+        name: 'pointer1', type: 'Pointer', content: 'bracketme'
+      )
       pointer1.content.should == '[[bracketme]]'
     end
   end

data/mod/03_machines/lib/card/machine.rb

@@ -1,24 +1,34 @@
-# What is this?
-# The Machine module together with the MachineInput module implements a kind of observer pattern.
-# It handles a collection of input cards to generate a output card (default is a file card).
-# If one of the input cards is changed the output card will be updated.
-# The classic example:
-# A style card observes a collection of css and sccs card to generate a file card with a css file containg the assembled compressed css.
-
-# How to use it?
-# Include the Machine module in the card set that is supposed to produce the output card. If the output card should be autmatically updated when a input card is changed the input card has to be in a set that includes the MachineInput module.
+# WHAT IS THIS?
+# The Machine module together with the MachineInput module implements a kind of
+# observer pattern. It handles a collection of input cards to generate an
+# outputcard (default is a file card). If one of the input cards is changed the
+# output card will be updated.
+#
+# The classic example: A style card observes a collection of css and sccs card
+# to generate a file card with a css file containg the assembled compressed css.
+#
+# HOW TO USE IT?
+# Include the Machine module in the card set that is supposed to produce the
+# output card. If the output card should be autmatically updated when a input
+# card is changed the input card has to be in a set that includes the
+# MachineInput module.
+#
 # The default machine
-#  -  uses its item cards as input cards or the card itself if there are no item cards;
-#     can be changed by passing a block to collect_input_cards
+#  -  uses its item cards as input cards or the card itself if there are no item
+#     cards;
+#  -  can be changed by passing a block to collect_input_cards
 #  -  takes the raw view of the input cards to generate the output;
-#     can be changed by passing a block to machine_input (in the input card set)
+#  -  can be changed by passing a block to machine_input (in the input card set)
 #  -  stores the output as a .txt file in the "+machine output" card;
-#     can be cahnged by passing a filetype and/or a block to store_machine_output
-
-
-# How does it work?
-# Machine cards have a +machine input and a +machine output card. The +machine input card is a pointer to all input cards.
-# Including the MachineInput module creates an ":on => save" event that runs the machines of all cards that are linked to that card via the +machine input pointer.
+#  -  can be changed by passing a filetype and/or a block to
+#     store_machine_output
+#
+#
+# HOW DOES IT WORK?
+# Machine cards have a "+machine input" and a "+machine output" card. The
+# "+machine input" card is a pointer to all input cards. Including the
+# MachineInput module creates an "on: save" event that runs the machines of
+# all cards that are linked to that card via the +machine input pointer.
 
 
 
@@ -49,12 +59,12 @@ class Card
 
     def self.included(host_class)
       host_class.extend( ClassMethods )
-      host_class.output_config = { :filetype => "txt" }
+      host_class.output_config = { filetype: 'txt' }
 
 
       if Codename[:machine_output]  # for compatibility with old migrations
-        host_class.card_accessor :machine_output, :type=>:file
-        host_class.card_accessor :machine_input, :type => :pointer
+        host_class.card_accessor :machine_output, type: :file
+        host_class.card_accessor :machine_input, type: :pointer
 
         # define default machine behaviour
         host_class.collect_input_cards do
@@ -66,15 +76,15 @@ class Card
           loop_limit = 5
           while items.size > 0
             item = items.shift
-            if item.trash or ( already_extended[item.id] and already_extended[item.id] > loop_limit)
-              next
-            elsif item.item_cards == [item]  # no pointer card
+            next if item.trash
+            next if already_extended[item.id].to_i > loop_limit
+            if item.item_cards == [item]  # no pointer card
               new_input << item
             else
               items.insert(0, item.item_cards)
               items.flatten!
               new_input << item if item != self
-              already_extended[item] = already_extended[item] ? already_extended[item] + 1 : 1
+              already_extended[item] = already_extended[item].to_i + 1
             end
           end
           new_input
@@ -83,7 +93,8 @@ class Card
         host_class.prepare_machine_input {}
         host_class.machine_engine { |input| input }
         host_class.store_machine_output do |output|
-          file = Tempfile.new [ id.to_s, ".#{host_class.output_config[:filetype]}" ]
+          filetype = host_class.output_config[:filetype]
+          file = Tempfile.new [ id.to_s, ".#{filetype}" ]
           file.write output
           file.rewind
           Card::Auth.as_bot do
@@ -102,7 +113,11 @@ class Card
           end
         end
 
-        host_class.event "reset_machine_output_#{host_class.name.gsub(':','_')}".to_sym, :after => :store_subcards, :on => :save do
+        event_suffix = host_class.name.gsub ':', '_'
+        host_class.event(
+          "reset_machine_output_#{ event_suffix }".to_sym,
+          after: :store_subcards, on: :save
+        ) do
           reset_machine_output!
         end
       end
@@ -169,7 +184,8 @@ class Card
 
     def machine_output_url
       ensure_machine_output
-      machine_output_card.file.url #(:default, :timestamp => false)   # to get rid of additional number in url
+      machine_output_card.file.url #(:default, timestamp: false)
+      # to get rid of additional number in url
     end
 
     def machine_output_path
@@ -178,7 +194,8 @@ class Card
     end
 
     def ensure_machine_output
-      if !output = fetch(:trait => :machine_output) or !output.selected_content_action_id
+      output = fetch trait: :machine_output
+      if !output || !output.selected_content_action_id
         update_machine_output
       end
     end

data/mod/03_machines/lib/card/machine_input.rb

@@ -2,34 +2,58 @@ class Card
   module MachineInput
     module ClassMethods
       attr_accessor :machines_wql
-    
+
       def machine_input_for args
         @machines_wql = args
       end
-    
+
       def machine_input &block
         define_method :machine_input, block
       end
     end
-  
+
     def self.included host_class
       host_class.extend( ClassMethods )
       host_class.machines_wql = {}
       host_class.machine_input do
         format._render_raw
       end
-      host_class.event "after_machine_input_updated_#{host_class.name.gsub(':','_')}".to_sym, :after=>:extend, :on => :save do
-        machines = Card.search( {:right_plus => [{:codename => "machine_input"}, {:link_to => name}]}.merge(host_class.machines_wql) )  
+
+      event_suffix = host_class.name.gsub ':', '_'
+
+      host_class.event(
+        "after_machine_input_updated_#{ event_suffix }".to_sym,
+        after: :extend, on: :save
+      ) do
+
+        wql_statement = { right_plus: [
+          { codename: "machine_input" },
+          { link_to: name}
+        ]}.merge(host_class.machines_wql)
+        machines = Card.search(wql_statement)
         machines.each do |item|
           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) )  
+
+      host_class.event(
+        "before_machine_input_deleted_#{ event_suffix }".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
-    
-      host_class.event "after_machine_input_deleted_#{host_class.name.gsub(':','_')}".to_sym, :after=>:store_subcards, :on => :delete do
+
+      host_class.event(
+       "after_machine_input_deleted_#{ event_suffix }".to_sym,
+       after: :store_subcards, on: :delete
+      ) do
+
         @involved_machines.each do |item|
           item.reset_machine_output! if item.kind_of? Machine
         end