card 1.16.6 → 1.16.7

data/mod/01_history/lib/card/act.rb

@@ -3,7 +3,7 @@ class Card
   class Act < ActiveRecord::Base
     before_save :set_actor
     has_many :actions, -> { order :id },
-      { :foreign_key=>:card_act_id, :inverse_of=> :act, :class_name=> "Card::Action" }
+      { foreign_key: :card_act_id, inverse_of: :act, class_name: "Card::Action" }
 
     belongs_to :actor, class_name: "Card"
     belongs_to :card
@@ -21,7 +21,7 @@ class Card
     def self.find_all_with_actions_on card_ids, args={}
       sql = 'card_actions.card_id IN (:card_ids) AND ( (draft is not true) '
       sql << ( args[:with_drafts] ? 'OR actor_id = :current_user_id)' : ')' )
-      vars = {:card_ids => card_ids, :current_user_id=>Card::Auth.current_id }
+      vars = {card_ids: card_ids, current_user_id: Card::Auth.current_id }
       Card::Act.joins(:actions).where( sql, vars ).uniq.order(:id).reverse_order
     end
 

data/mod/01_history/lib/card/action.rb

@@ -4,12 +4,12 @@ class Card
 
   class Action < ActiveRecord::Base
     belongs_to :card
-    belongs_to :act,  :foreign_key=>:card_act_id, :inverse_of=>:actions
-    has_many   :card_changes, :foreign_key=>:card_action_id, :inverse_of=>:action,
-      :dependent=>:delete_all, :class_name=> "Card::Change"
+    belongs_to :act,  foreign_key: :card_act_id, inverse_of: :actions
+    has_many   :card_changes, foreign_key: :card_action_id, inverse_of: :action,
+      dependent: :delete_all, class_name: "Card::Change"
 
-    belongs_to :super_action, :class_name=> "Action", :inverse_of=>:sub_actions
-    has_many   :sub_actions,  :class_name=> "Action", :inverse_of=>:super_action
+    belongs_to :super_action, class_name: "Action", inverse_of: :sub_actions
+    has_many   :sub_actions,  class_name: "Action", inverse_of: :super_action
 
     scope :created_by, lambda { |actor_id| joins(:act).where('card_acts.actor_id = ?', actor_id) }
 
@@ -61,42 +61,42 @@ class Card
     # another way.
     #
     def changed_fields obj, changed_fields
-      #changed_fields.each{ |f| changes.build :field => f, :value => self[f] }
-      changed_fields.each{ |f| Card::Change.create :field => f, :value => obj[f], :card_action_id=>id }
+      #changed_fields.each{ |f| changes.build field: f, value: self[f] }
+      changed_fields.each{ |f| Card::Change.create field: f, value: obj[f], card_action_id: id }
     end
 
     def edit_info
       @edit_info ||= {
-        :action_type  => "#{action_type}d",
-        :new_content  => new_values[:content],
-        :new_name     => new_values[:name],
-        :new_cardtype => new_values[:cardtype],
-        :old_content  => old_values[:content],
-        :old_name     => old_values[:name],
-        :old_cardtype => old_values[:cardtype]
+        action_type:  "#{action_type}d",
+        new_content:  new_values[:content],
+        new_name:     new_values[:name],
+        new_cardtype: new_values[:cardtype],
+        old_content:  old_values[:content],
+        old_name:     old_values[:name],
+        old_cardtype: old_values[:cardtype]
       }
     end
 
     def new_values
       @new_values ||=
       {
-        :content  => new_value_for(:db_content),
-        :name     => new_value_for(:name),
-        :cardtype => ( typecard = Card[new_value_for(:type_id).to_i] and typecard.name.capitalize )
+        content:  new_value_for(:db_content),
+        name:     new_value_for(:name),
+        cardtype: ( typecard = Card[new_value_for(:type_id).to_i] and typecard.name.capitalize )
       }
     end
 
     def old_values
       @old_values ||= {
-        :content  => last_value_for(:db_content),
-        :name     => last_value_for(:name),
-        :cardtype => ( value = last_value_for(:type_id) and
+        content:  last_value_for(:db_content),
+        name:     last_value_for(:name),
+        cardtype: ( value = last_value_for(:type_id) and
                        typecard = Card.find(value) and  typecard.name.capitalize )
       }
     end
 
     def last_value_for field
-      ch = self.card.last_change_on(field, :before=>self) and ch.value
+      ch = self.card.last_change_on(field, before: self) and ch.value
     end
 
     def field_index field
@@ -152,7 +152,7 @@ class Card
     end
 
     # def diff
-    #   @diff ||= { :cardtype=>type_diff, :content=>content_diff, :name=>name_diff}
+    #   @diff ||= { cardtype: type_diff, content: content_diff, name: name_diff}
     # end
 
     def name_diff opts={}

data/mod/01_history/lib/card/change.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card
   class Change < ActiveRecord::Base
-    belongs_to :action, :foreign_key=>:card_action_id, :inverse_of=>:card_changes
+    belongs_to :action, foreign_key: :card_action_id, inverse_of: :card_changes
 
     def field=(value)
       write_attribute(:field, Card::TRACKED_FIELDS.index(value.to_s))

data/mod/01_history/set/all/actions.rb

@@ -33,7 +33,7 @@ def revision action
     action = Card::Action.fetch(action)
   end
   action and Card::TRACKED_FIELDS.inject({}) do |attr_changes, field|
-    last_change = action.card_changes.find_by_field_name(field) || last_change_on(field, :not_after=>action)
+    last_change = action.card_changes.find_by_field_name(field) || last_change_on(field, not_after: action)
     attr_changes[field.to_sym] = (last_change ? last_change.value : self[field])
     attr_changes
   end
@@ -44,7 +44,7 @@ def delete_old_actions
     # assign previous changes on each tracked field to the last action
     if (la = last_action) && !la.change_for(field).present? and (last_change = last_change_on(field))
       last_change = Card::Change.find(last_change.id)   # last_change comes as readonly record
-      last_change.update_attributes!(:card_action_id=>last_action_id)
+      last_change.update_attributes!(card_action_id: last_action_id)
     end
   end
   actions.where('id != ?', last_action_id ).delete_all

data/mod/01_history/set/all/content_history.rb

@@ -4,7 +4,7 @@
 def content
   if @selected_action_id
     @selected_content ||= begin
-      (change = last_change_on( :db_content, :not_after=> @selected_action_id, :including_drafts=>true ) and change.value) || db_content
+      (change = last_change_on( :db_content, not_after: @selected_action_id, including_drafts: true ) and change.value) || db_content
     end
   else
     super
@@ -19,7 +19,7 @@ end
 def save_content_draft content
   super
   acts.create do |act|
-    act.actions.build(:draft => true, :card_id=>id).card_changes.build(:field=>:db_content, :value=>content)
+    act.actions.build(draft: true, card_id: id).card_changes.build(field: :db_content, value: content)
   end
 end
 
@@ -40,7 +40,7 @@ def last_change_on(field, opts={})
   action_id = action_arg.kind_of?(Card::Action) ? action_arg.id : action_arg
   field_index = Card::TRACKED_FIELDS.index(field.to_s)
   Change.joins(:action).where( where_sql,
-    {:card_id=>id, :field=>field_index, :action_id=>action_id}
+    {card_id: id, field: field_index, action_id: action_id}
   ).order(:id).last
 end
 
@@ -144,7 +144,7 @@ def draft_acts
   drafts.created_by(Card::Auth.current_id).map(&:act)
 end
 
-event :detect_conflict, :before=>:approve, :on=>:update, :when=>proc {|c| c.history? } do
+event :detect_conflict, before: :approve, on: :update, when: proc {|c| c.history? } do
   if last_action_id_before_edit and last_action_id_before_edit.to_i != last_action_id and last_action.act.actor_id != Auth.current_id
     errors.add :conflict, "changes not based on latest revision"
   end

data/mod/01_history/set/all/history.rb

@@ -5,12 +5,12 @@ def history?
 end
 
 # must be called on all actions and before :set_name, :process_subcards and :validate_delete_children
-event :assign_act,  :before=>:prepare, :when=>proc {|c| c.history? || c.respond_to?(:attachment) }  do
-  @current_act = (@supercard && @supercard.current_act) || Card::Act.create(:ip_address=>Env.ip)
+event :assign_act,  before: :prepare, when: proc {|c| c.history? || c.respond_to?(:attachment) }  do
+  @current_act = (@supercard && @supercard.current_act) || Card::Act.create(ip_address: Env.ip)
 end
 
-event :assign_action, :after=>:assign_act do
-  @current_action = Card::Action.create(:card_act_id=>@current_act.id, :action_type=>@action, :draft=>(Env.params['draft'] == 'true') )
+event :assign_action, after: :assign_act do
+  @current_action = Card::Action.create(card_act_id: @current_act.id, action_type: @action, draft: (Env.params['draft'] == 'true') )
   if (@supercard and @supercard !=self)
     @current_action.super_action = @supercard.current_action
   end
@@ -19,29 +19,29 @@ end
 
 # stores changes in the changes table and assigns them to the current action
 # removes the action if there are no changes
-event :finalize_action, :after =>:stored, :when=>proc {|c| (c.history? || c.respond_to?(:attachment)) && c.current_action} do
+event :finalize_action, after: :stored, when: proc {|c| (c.history? || c.respond_to?(:attachment)) && c.current_action} do
   @changed_fields = Card::TRACKED_FIELDS.select{ |f| changed_attributes.member? f }
   if @changed_fields.present?
-    @changed_fields.each{ |f| Card::Change.create :field => f, :value => self[f], :card_action_id=>@current_action.id }
-    @current_action.update_attributes! :card_id => id
+    @changed_fields.each{ |f| Card::Change.create field: f, value: self[f], card_action_id: @current_action.id }
+    @current_action.update_attributes! card_id: id
   elsif @current_action.card_changes(true).empty?
     @current_action.delete
     @current_action = nil
   end
 end
 
-event :finalize_act, :after=>:finalize_action, :when=>proc {|c| !c.supercard } do
+event :finalize_act, after: :finalize_action, when: proc {|c| !c.supercard } do
   if @current_act.actions(true).empty?
     @current_act.delete
     @current_act = nil
   else
-    @current_act.update_attributes! :card_id=>id
+    @current_act.update_attributes! card_id: id
   end
 end
 
 
-event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| c.rollback_request? } do
-  revision = { :subcards => {}}
+event :rollback_actions, before: :approve, on: :update, when: proc{ |c| c.rollback_request? } do
+  revision = { subcards: {}}
   rollback_actions = Env.params['action_ids'].map do |a_id|
     Action.fetch(a_id) || nil
   end
@@ -69,11 +69,11 @@ end
 # stopped working with Rails 4
 # def build_act_and_action
 #   @current_act = if @supercard
-#     @supercard.current_act || @supercard.acts.build(:ip_address=>Env.ip)
+#     @supercard.current_act || @supercard.acts.build(ip_address: Env.ip)
 #   else
-#     acts.build(:ip_address=>Env.ip)
+#     acts.build(ip_address: Env.ip)
 #   end
-#   @current_action = actions(true).build(:action_type=>@action, :draft=>(Env.params['draft'] == 'true') )
+#   @current_action = actions(true).build(action_type: @action, draft: (Env.params['draft'] == 'true') )
 #   @current_action.act = @current_act
 #
 #   if (@supercard and @supercard !=self)
@@ -88,7 +88,7 @@ def intrusive_family_acts args={}   # all acts with actions on self and on cards
   end
 end
 
-def intrusive_acts  args={:with_drafts=>true} # all acts with actions on self and on cards included in self
+def intrusive_acts  args={with_drafts: true} # all acts with actions on self and on cards included in self
   @intrusive_acts ||= begin
     Act.find_all_with_actions_on( (included_card_ids << id), args)
   end
@@ -101,7 +101,7 @@ def current_rev_nr
 end
 
 def included_card_ids
-  Card::Reference.select(:referee_id).where( :ref_type => 'I', :referer_id=>id ).pluck('referee_id').compact.uniq
+  Card::Reference.select(:referee_id).where( ref_type: 'I', referer_id: id ).pluck('referee_id').compact.uniq
 end
 
 def descendant_card_ids parent_ids=[id]
@@ -119,7 +119,7 @@ end
 
 format :html do
   view :history do |args|
-    frame args.merge(:body_class=>"history-slot list-group", :content=>true) do
+    frame args.merge(body_class: "history-slot list-group", content: true) do
       [
         history_legend,
         _render_revisions
@@ -135,17 +135,17 @@ format :html do
     count = card.intrusive_acts.size+1-(page.to_i-1)*REVISIONS_PER_PAGE
     card.intrusive_acts.page(page).per(REVISIONS_PER_PAGE).map do |act|
       count -= 1
-      render_act_summary args.merge(:act=>act,:rev_nr=>count)
+      render_act_summary args.merge(act: act,rev_nr: count)
     end.join
   end
 
   def history_legend
     intr = card.intrusive_acts.page(params['page']).per(REVISIONS_PER_PAGE)
-    render_haml :intr=>intr do
+    render_haml intr: intr do
       <<-HAML
 .history-header
   %span.slotter
-    = paginate intr, :remote=>true, :theme=>'twitter-bootstrap-3'
+    = paginate intr, remote: true, theme: 'twitter-bootstrap-3'
   %div.history-legend
     %span.glyphicon.glyphicon-plus-sign.diff-green
     %span
@@ -171,12 +171,12 @@ format :html do
     rev_nr = params['rev_nr'] || args[:rev_nr]
     current_rev_nr = params['current_rev_nr'] || args[:current_rev_nr] || card.current_rev_nr
     hide_diff = (params["hide_diff"]=="true") || args[:hide_diff]
-    wrap( args.merge(:slot_class=>"revision-#{act.id} history-slot list-group-item") ) do
-      render_haml :card=>card, :act=>act, :act_view=>act_view,
-                  :current_rev_nr=>current_rev_nr, :rev_nr=>rev_nr,
-                  :hide_diff=> hide_diff do
+    wrap( args.merge(slot_class: "revision-#{act.id} history-slot list-group-item") ) do
+      render_haml card: card, act: act, act_view: act_view,
+                  current_rev_nr: current_rev_nr, rev_nr: rev_nr,
+                  hide_diff: hide_diff do
         <<-HAML
-.act{:style=>"clear:both;"}
+.act{style: "clear:both;"}
   .head
     .nr
       = "##{rev_nr}"
@@ -195,13 +195,13 @@ format :html do
             Current
         - elsif act_view == :expanded
           = rollback_link act.relevant_actions_for(card, act.actions.last.draft)
-          = show_or_hide_changes_link hide_diff, :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr
+          = show_or_hide_changes_link hide_diff, act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
   .toggle
-    = fold_or_unfold_link :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr
+    = fold_or_unfold_link act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
 
-  .action-container{:style=>("clear: left;" if act_view == :expanded)}
+  .action-container{style: ("clear: left;" if act_view == :expanded)}
     - act.relevant_actions_for(card).each do |action|
-      = send("_render_action_#{ act_view }", :action=>action )
+      = send("_render_action_#{ act_view }", action: action )
 HAML
       end
     end
@@ -223,10 +223,10 @@ HAML
         name_changes(action, hide_diff)
       else
         link_to name_changes(action, hide_diff),
-                path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}),
-                :class=>'slotter label label-default',
+                path(view: :related, related: {view: "history",name: action.card.name}),
+                class: 'slotter label label-default',
                 'data-slot-selector'=>".card-slot.history-view",
-                :remote=>true
+                remote: true
       end
 
     type_diff =
@@ -235,13 +235,13 @@ HAML
 
     content_diff =
         action.new_content? &&
-        action.card.format.render_content_changes(:action=>action, :diff_type=>action_view, :hide_diff=>hide_diff)
+        action.card.format.render_content_changes(action: action, diff_type: action_view, hide_diff: hide_diff)
 
-    render_haml :action => action,
-                :action_view => action_view,
-                :name_diff => name_diff,
-                :type_diff => type_diff,
-                :content_diff => content_diff do
+    render_haml action: action,
+                action_view: action_view,
+                name_diff: name_diff,
+                type_diff: type_diff,
+                content_diff: content_diff do
       <<-HAML
 .action
   .summary
@@ -305,8 +305,8 @@ HAML
   def rollback_link actions
     not_current = actions.select { |action| action.card.last_action_id != action.id }
     if card.ok?(:update) && not_current.present?
-      "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>not_current),
-        :class=>'slotter','data-slot-selector'=>'.card-slot.history-view', :remote=>true, :method=>:post, :rel=>'nofollow')
+      "| " + link_to('Save as current', path(action: :update, view: :open, action_ids: not_current),
+        class: 'slotter','data-slot-selector'=>'.card-slot.history-view', remote: true, method: :post, rel: 'nofollow')
     end
   end
 
@@ -316,20 +316,20 @@ HAML
     else
       toggled_view = :act_expanded
     end
-    link_to '', args.merge(:view=>toggled_view),
-              :class=>"slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}",
-              :remote=>true
+    link_to '', args.merge(view: toggled_view),
+              class: "slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}",
+              remote: true
   end
 
   def show_or_hide_changes_link hide_diff, args
     "| " +  view_link( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded,
-      :path_opts=>args.merge(:hide_diff=>!hide_diff),
-      :class=>'slotter', :remote=>true )
+      path_opts: args.merge(hide_diff: !hide_diff),
+      class: 'slotter', remote: true )
   end
 end
 
 def diff_args
-  {:format=>:text}
+  {format: :text}
 end
 
 

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

@@ -1,34 +1,34 @@
-    
+
 format :css do
 
   def get_inclusion_defaults nested_card
-    { :view => :raw }
+    { view: :raw }
   end
 
   def show view, args
     view ||= :content
     render view, args
   end
-  
+
   view :titled do |args|
     major_comment( %{ Style Card: "#{ card.name }" } ) +
     _render_core( args )
   end
-  
+
   view :content do |args|
    _render_core( args )
   end
-  
+
   view :missing do |args|
     major_comment "MISSING Style Card: #{card.name}"
   end
-  
+
   view :import do |args|
-    %{\n@import url("#{ _render_url :item=>:import }");\n}
+    %{\n@import url("#{ _render_url item: :import }");\n}
   end
-  
-  view :url, :perms=>:none do |args|
-    page_path card.cardname, :format=>:css, :item=>args[:item]
+
+  view :url, perms: :none do |args|
+    page_path card.cardname, format: :css, item: args[:item]
 #    card_url _render_linkname
   end
 

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

@@ -2,19 +2,19 @@ require 'csv'
 
 format :csv  do
   def get_inclusion_defaults nested_card
-    { :view => :core }
+    { view: :core }
   end
-  
-  def default_item_view 
+
+  def default_item_view
     @depth == 0 ? :csv_row : :name
   end
 
-  
+
   view :csv_row do |args|
     array = _render_raw.scan( /\{\{[^\}]*\}\}/ ).map do |inc|
       process_content( inc ).strip
     end
-    
+
     CSV.generate_line(array).strip
     #strip is because search already joins with newlines
   end
@@ -27,7 +27,7 @@ format :csv  do
     #NOTE: assumes all cards have the same structure!
     begin
       card1 = search_results.first
-    
+
       parsed_content = Card::Content.new card1.raw_content, self
       unless String === parsed_content.__getobj__
         titles = parsed_content.map do |chunk|
@@ -40,7 +40,7 @@ format :csv  do
           end
         end.compact.map {|title| title.to_s.upcase }
         CSV.generate_line titles
-        
+
       else
         ''
       end