card 1.16.6 → 1.16.7

data/mod/02_basic_types/set/all/base.rb

@@ -6,33 +6,33 @@ format do
   end
 
   # NAME VIEWS
-                                                                              
-  view :name,     :closed=>true, :perms=>:none do |args| card.name                           end
-  view :key,      :closed=>true, :perms=>:none do |args| card.key                            end
-  view :title,    :closed=>true, :perms=>:none do |args| args[:title] || card.name           end
 
-  view :linkname, :closed=>true, :perms=>:none do |args| card.cardname.url_key               end
-  view :url,      :closed=>true, :perms=>:none do |args| card_url _render_linkname           end
-  view :url_link, :closed=>true, :perms=>:none do |args| web_link card_url(_render_linkname) end
+  view :name,     closed: true, perms: :none do |args| card.name                           end
+  view :key,      closed: true, perms: :none do |args| card.key                            end
+  view :title,    closed: true, perms: :none do |args| args[:title] || card.name           end
 
-  view :link, :closed=>true, :perms=>:none do |args|
+  view :linkname, closed: true, perms: :none do |args| card.cardname.url_key               end
+  view :url,      closed: true, perms: :none do |args| card_url _render_linkname           end
+  view :url_link, closed: true, perms: :none do |args| web_link card_url(_render_linkname) end
+
+  view :link, closed: true, perms: :none do |args|
     card_link( card.name,
-      :text=>showname( args[:title] ),
-      :known=>card.known?,
-      :path_opts=>{ :type=>args[:type] }
+      text: showname( args[:title] ),
+      known: card.known?,
+      path_opts: { type: args[:type] }
     )
   end
-        
-  view :codename, :closed=>true do |args| card.codename.to_s  end  
-  view :id,       :closed=>true do |args| card.id             end
-  view :type,     :closed=>true do |args| card.type_name      end
+
+  view :codename, closed: true do |args| card.codename.to_s  end
+  view :id,       closed: true do |args| card.id             end
+  view :type,     closed: true do |args| card.type_name      end
 
 
   # DATE VIEWS
 
-  view :created_at, :closed=>true do |args| time_ago_in_words card.created_at end
-  view :updated_at, :closed=>true do |args| time_ago_in_words card.updated_at end
-  view :acted_at,   :closed=>true do |args| time_ago_in_words card.acted_at   end
+  view :created_at, closed: true do |args| time_ago_in_words card.created_at end
+  view :updated_at, closed: true do |args| time_ago_in_words card.updated_at end
+  view :acted_at,   closed: true do |args| time_ago_in_words card.acted_at   end
 
 
   # CONTENT VIEWS
@@ -54,11 +54,11 @@ format do
     _render_core args
   end
 
-  view :closed_content, :closed=>true do |args|
+  view :closed_content, closed: true do |args|
     Card::Content.truncatewords_with_closing_tags _render_core(args) #{ yield }
   end
 
-  view :blank, :closed=>true, :perms=>:none do |args|
+  view :blank, closed: true, perms: :none do |args|
     ''
   end
 
@@ -84,7 +84,7 @@ format do
   # SPECIAL VIEWS
 
   view :array do |args|
-    card.item_cards(:limit=>0).map do |item_card|
+    card.item_cards(limit: 0).map do |item_card|
       subformat(item_card)._render_core(args)
     end.inspect
   end
@@ -94,13 +94,13 @@ format do
   #none of the below belongs here!!
 
 
-  view :template_rule, :tags=>:unknown_ok do |args|
+  view :template_rule, tags: :unknown_ok do |args|
     #FIXME - relativity should be handled in smartname
-  
+
     name = args[:inc_name] or return ''
     regexp = /\b_(left|right|whole|self|user|main|\d+|L*R?)\b/
     absolute = name !~ regexp && name !~ /^\+/
-    
+
     tname = name.gsub regexp, ''
     if tname !~ /^\+/ and !absolute
       "{{#{args[:inc_syntax]}}}"
@@ -115,7 +115,7 @@ format do
           "#{tname.gsub /^\+/,''}+#{Card[:right].name}"                                      # *right
         end
       end
-    
+
       subformat( Card.fetch(set_name) ).render_template_link args
     end
   end

data/mod/02_basic_types/set/all/json.rb

@@ -2,17 +2,17 @@
 format :json do
 
   def get_inclusion_defaults nested_card
-    { :view=>:atom }
+    { view: :atom }
   end
 
   def default_item_view
     params[:item] || :atom
   end
-  
+
   def max_depth
     params[:max_depth] || 1
   end
-  
+
   def show view, args
     view ||= :content
     raw = render view, args
@@ -24,38 +24,38 @@ format :json do
   end
 
   view :name_complete do |args|
-    card.item_cards :complete=>params['term'], :limit=>8, :sort=>'name', :return=>'name', :context=>''
+    card.item_cards complete: params['term'], limit: 8, sort: 'name', return: 'name', context: ''
   end
-  
-  view :status, :tags=>:unknown_ok, :perms=>:none do |args|
+
+  view :status, tags: :unknown_ok, perms: :none do |args|
     status = case
     when !card.known?       ;  :unknown
-# do we want the following to prevent fishing?  of course, they can always post...        
+# do we want the following to prevent fishing?  of course, they can always post...
     when !card.ok?(:read)   ;  :unknown
     when card.real?         ;  :real
     when card.virtual?      ;  :virtual
     else                    ;  :wtf
     end
-    
-    hash = { :key=>card.key, :url_key=>card.cardname.url_key, :status=>status }
+
+    hash = { key: card.key, url_key: card.cardname.url_key, status: status }
     hash[:id] = card.id if status == :real
-     
+
     hash
   end
 
   view :content do |args|
     req = controller.request
     {
-      :url       => (req && req.original_url),
-      :timestamp => Time.now.to_s,
-      :card      => _render_atom
+      url:       (req && req.original_url),
+      timestamp: Time.now.to_s,
+      card:      _render_atom
     }
   end
-  
+
   view :atom do |args|
     h = {
-      :name    => card.name,
-      :type    => card.type_name
+      name: card.name,
+      type: card.type_name
     }
     h[:content]  = card.content  unless card.structure
     h[:codename] = card.codename     if card.codename

data/mod/02_basic_types/set/all/rss.rb

@@ -17,8 +17,8 @@ format :rss do
   # FIXME: integrate this with common XML features when it is added
   view :feed do |args|
     begin
-      @xml.instruct! :xml, :version => "1.0"
-      @xml.rss :version => "2.0" do
+      @xml.instruct! :xml, version: "1.0"
+      @xml.rss version: "2.0" do
         @xml.channel do
           @xml.title       render_feed_title
           @xml.description render_feed_description
@@ -42,7 +42,7 @@ format :rss do
   view :feed_item_list do |args|
     raw_feed_items(args).each do |item|
       @xml.item do
-        subformat(item).render_feed_item :view_changes=>(card.id==RecentID)  #FIXME! yuck.
+        subformat(item).render_feed_item view_changes: (card.id==RecentID)  #FIXME! yuck.
       end
     end
   end
@@ -67,9 +67,9 @@ format :rss do
   view :menu             do |args| '' end
 
 
-  view :open,         { :view=>:titled, :mod=>All::Base::Format }
-  view :content,      { :view=>:core,   :mod=>All::Base::Format }
-  view :open_content, { :view=>:core,   :mod=>All::Base::Format }
-  view :closed,       { :view=>:link,   :mod=>All::Base::Format }
+  view :open,         { view: :titled, mod: All::Base::Format }
+  view :content,      { view: :core,   mod: All::Base::Format }
+  view :open_content, { view: :core,   mod: All::Base::Format }
+  view :closed,       { view: :link,   mod: All::Base::Format }
 
 end

data/mod/02_basic_types/set/type/html.rb

@@ -3,7 +3,7 @@ def clean_html?
 end
 
 def diff_args
- {:format=>:raw}
+ {format: :raw}
 end
 
 format do
@@ -19,7 +19,7 @@ end
 
 format :html do
   view :editor do |args|
-    text_area :content, :rows=>5, :class=>'card-content ace-editor-textarea', "data-card-type-code"=>card.type_code
+    text_area :content, rows: 5, class: 'card-content ace-editor-textarea', "data-card-type-code"=>card.type_code
   end
 end
 

data/mod/02_basic_types/set/type/plain_text.rb

@@ -1,7 +1,7 @@
 format :html do
 
   view :editor do |args|
-    text_area :content, :rows=>5, :class=>'card-content', "data-card-type-code"=>card.type_code
+    text_area :content, rows: 5, class: 'card-content', "data-card-type-code"=>card.type_code
   end
 
   view :core do |args|

data/mod/02_basic_types/set/type/pointer.rb

@@ -1,10 +1,10 @@
 
-event :add_and_drop_items, :before=>:approve, :on=>:save do
+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
 
-event :insert_item_event, :before=>:approve, :on=>:save, :when=> proc {|c| Env.params['insert_item']} do
+event :insert_item_event, before: :approve, on: :save, when: proc {|c| Env.params['insert_item']} do
   index = Env.params['item_index'] || 0
   self.insert_item index.to_i, Env.params['insert_item']
 end
@@ -21,10 +21,10 @@ format do
   end
 
   view :core do |args|
-    render_pointer_items args.merge(:joint=>', ')
+    render_pointer_items args.merge(joint: ', ')
   end
 
-  view :pointer_items, :tags=>:unknown_ok do |args|
+  view :pointer_items, tags: :unknown_ok do |args|
     i_args = item_args(args)
     joint = args[:joint] || ' '
     card.item_cards.map do |i_card|
@@ -46,20 +46,20 @@ format :html do
   end
 
 #  view :edit do |args|
-#    super(args.merge(:pointer_item_class=>'form-control'))
+#    super(args.merge(pointer_item_class: 'form-control'))
 #  end
 
   view :editor do |args|
     part_view = (c = card.rule(:input)) ? c.gsub(/[\[\]]/,'') : :list
-    hidden_field( :content, :class=>'card-content') +
+    hidden_field( :content, class: 'card-content') +
     raw(_render part_view, args)
 
-    #.merge(:pointer_item_class=>'form-control')))
+    #.merge(pointer_item_class: 'form-control')))
   end
 
   view :list do |args|
     args ||= {}
-    items = args[:item_list] || card.item_names(:context=>:raw)
+    items = args[:item_list] || card.item_names(context: :raw)
     items = [''] if items.empty?
     options_card_name = (oc = card.options_rule_card) ? oc.cardname.url_key : ':all'
 
@@ -69,7 +69,7 @@ format :html do
       <ul class="pointer-list-editor #{extra_css_class}" data-options-card="#{options_card_name}">
         #{
           items.map do |item|
-            _render_list_item args.merge( :pointer_item=>item )
+            _render_list_item args.merge( pointer_item: item )
           end * "\n"
         }
       </ul>
@@ -78,8 +78,8 @@ format :html do
   end
 
   def add_item_button
-    content_tag :span, :class=>'input-group' do
-      button_tag :class=>'pointer-item-add' do
+    content_tag :span, class: 'input-group' do
+      button_tag class: 'pointer-item-add' do
         glyphicon('plus') + ' add another'
       end
     end
@@ -93,7 +93,7 @@ format :html do
           #{ glyphicon 'option-vertical left' }
           #{ glyphicon 'option-vertical right'}
         </span>
-        #{ text_field_tag 'pointer_item', args[:pointer_item], :class=>'pointer-item-text form-control' }
+        #{ text_field_tag 'pointer_item', args[:pointer_item], class: 'pointer-item-text form-control' }
         <span class="input-group-btn">
           <button class="pointer-item-delete btn btn-default" type="button">
             #{ glyphicon 'remove'}
@@ -113,7 +113,7 @@ format :html do
       description = pointer_option_description option_name
       <<-HTML
         <div class="pointer-checkbox">
-          #{ check_box_tag "pointer_checkbox", option_name, checked, :id=>id, :class=>'pointer-checkbox-button' }
+          #{ check_box_tag "pointer_checkbox", option_name, checked, id: id, class: 'pointer-checkbox-button' }
           <label for="#{id}">#{label}</label>
           #{ %{<div class="checkbox-option-description">#{ description }</div>} if description }
         </div>
@@ -126,7 +126,7 @@ format :html do
   view :multiselect do |args|
     select_tag("pointer_multiselect",
       options_for_select(card.option_names, card.item_names),
-      :multiple=>true, :class=>'pointer-multiselect form-control'
+      multiple: true, class: 'pointer-multiselect form-control'
     )
   end
 
@@ -139,7 +139,7 @@ format :html do
       description = pointer_option_description option_name
       <<-HTML
         <li class="pointer-radio radio">
-          #{ radio_button_tag input_name, option_name, checked, :id=>id, :class=>'pointer-radio-button' }
+          #{ radio_button_tag input_name, option_name, checked, id: id, class: 'pointer-radio-button' }
           <label for="#{id}">#{ label }</label>
           #{ %{<div class="radio-option-description">#{ description }</div>} if description }
         </li>
@@ -153,7 +153,7 @@ format :html do
     options = [["-- Select --",""]] + card.option_names.map{ |x| [x,x]}
     select_tag("pointer_select",
       options_for_select(options, card.item_names.first),
-      :class=>'pointer-select form-control'
+      class: 'pointer-select form-control'
     )
   end
 
@@ -191,7 +191,7 @@ format :css do
 
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>item_view(args)
+      nest item, view: item_view(args)
     end.join "\n\n"
   end
 
@@ -204,7 +204,7 @@ format :js do
 
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>( args[:item] || :core)
+      nest item, view: ( args[:item] || :core)
     end.join "\n\n"
   end
 end
@@ -218,32 +218,40 @@ format :data do
   end
 end
 
+format :rss do
+  def raw_feed_items args
+    @raw_feed_items ||= begin
+      card.item_cards
+    end
+  end
+end
+
 # while a card's card type and content are updated in the same request,
 # the new module will override the old module's events and functions.
 # this event is only on pointer card. Other type cards do not have this event,
 # so it is not overridden and will be run while updating type and content in the same request.
-event :standardize_items, :before=>:approve, :on=>:save, :changed=>:content,
-    :when=>proc{  |c| c.type_id == Card::PointerID  } do
-    self.content = item_names(:context=>:raw).map { |name| "[[#{name}]]" }.join "\n"
+event :standardize_items, before: :approve, on: :save, changed: :content,
+    when: proc{  |c| c.type_id == Card::PointerID  } do
+    self.content = item_names(context: :raw).map { |name| "[[#{name}]]" }.join "\n"
 end
 
 
 
 def diff_args
-  {:format => :pointer}
+  {format: :pointer}
 end
 
 def item_cards args={}
   if args[:complete]
-    #warn "item_card[#{args.inspect}], :complete"
-    Card::Query.new({:referred_to_by=>name}.merge(args)).run
+    query = { referred_to_by: name }.merge args
+    Card::Query.run query
   else
 
     itype = args[:type] || item_type
     #warn "item_card[#{inspect}], :complete"
     item_names(args).map do |name|
-      new_args = itype ? { :type=>itype } : {}
-      Card.fetch name, :new=>new_args
+      new_args = itype ? { type: itype } : {}
+      Card.fetch name, new: new_args
     end.compact # compact?  can't be nil, right?
   end
 end
@@ -333,9 +341,9 @@ end
 
 def option_names
   result_cards = if oc = options_rule_card
-    oc.item_names :default_limit=>50, :context=>name
+    oc.item_names default_limit: 50, context: name
   else
-    Card.search :sort=>'name', :limit=>50, :return=>:name
+    Card.search sort: 'name', limit: 50, return: :name
   end
   if selected_options = item_names
     result_cards = result_cards | selected_options
@@ -345,13 +353,13 @@ end
 
 def option_cards
   result_cards = if oc = options_rule_card
-    oc.item_cards :default_limit=>50, :context=>name
+    oc.item_cards default_limit: 50, context: name
   else
-    Card.search :sort=>'alpha', :limit=>50
+    Card.search sort: 'alpha', limit: 50
   end
   if selected_options = item_names
     selected_options.each do |item|
-      result_cards.push Card.fetch(item,:new=>{})
+      result_cards.push Card.fetch(item,new: {})
     end
     result_cards.uniq!
   end

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

@@ -3,7 +3,7 @@
 describe Card::Set::All::AllCss do
   it "should render content view" do
     content = '#box { display: block }'
-    rendered = render_card :content, { :content=>content }, :format=>:css
+    rendered = render_card :content, { content: content }, format: :css
 #    rendered.should =~ /Style Card\:/
     expect(rendered).to match(/#{ Regexp.escape content }/)
   end