card 1.16.6 → 1.16.7

data/db/migrate_core_cards/20150326205655_bootswatch_themes.rb

@@ -2,27 +2,27 @@
 
 class BootswatchThemes < Card::CoreMigration
   def up
-    themeless = Card.fetch 'themeless bootstrap skin', :new=>{:type_code=>:skin}
-    themeless.update_attributes! :content=> "[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: bootstrap cards]]"
+    themeless = Card.fetch 'themeless bootstrap skin', new: {type_code: :skin}
+    themeless.update_attributes! content: "[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: bootstrap cards]]"
     bs = Card[:bootstrap_css]
-    bs.update_attributes! :codename=>nil
+    bs.update_attributes! codename: nil
     bs.delete!
 
-    Card.create! :name=>'bootswatch shared', :type_code=>:scss, :codename=>'bootswatch_shared'
-    Card.create! :name=>'bootswatch theme+*right+*structure', :type_id=>Card::ScssID, :content=>'{{_left+variables}}{{bootswatch shared}}{{_left+style}}'
+    Card.create! name: 'bootswatch shared', type_code: :scss, codename: 'bootswatch_shared'
+    Card.create! name: 'bootswatch theme+*right+*structure', type_id: Card::ScssID, content: '{{_left+variables}}{{bootswatch shared}}{{_left+style}}'
     %w{bootstrap_default cerulean cosmo cyborg darkly flatly journal lumen paper readable sandstone simplex slate spacelab superhero united yeti }.each do |theme_name|
       path = data_path "themes/#{theme_name}"
       theme = Card.fetch "#{theme_name} skin"
 
       if theme
-        theme.update_attributes! :type_id=>Card::SkinID, :content => "[[themeless bootstrap skin]]\n[[+bootswatch theme]]", :subcards=> {
-          "+variables" => {:type_id=>Card::ScssID, :content=>File.read(File.join path, '_variables.scss')},
-          "+style"     => {:type_id=>Card::ScssID, :content=>File.read(File.join path, '_bootswatch.scss')}
+        theme.update_attributes! type_id: Card::SkinID, content: "[[themeless bootstrap skin]]\n[[+bootswatch theme]]", subcards: {
+          "+variables" => {type_id: Card::ScssID, content: File.read(File.join path, '_variables.scss')},
+          "+style"     => {type_id: Card::ScssID, content: File.read(File.join path, '_bootswatch.scss')}
         }
       else
-        Card.create! :name=>"#{theme_name.sub('_',' ')} skin", :type_id=>Card::SkinID, :content => "[[themeless bootstrap skin]]\n[[+bootswatch theme]]", :subcards=> {
-          "+variables" => {:type_id=>Card::ScssID, :content=>File.read(File.join path, '_variables.scss')},
-          "+style"     => {:type_id=>Card::ScssID, :content=>File.read(File.join path, '_bootswatch.scss')}
+        Card.create! name: "#{theme_name.sub('_',' ')} skin", type_id: Card::SkinID, content: "[[themeless bootstrap skin]]\n[[+bootswatch theme]]", subcards: {
+          "+variables" => {type_id: Card::ScssID, content: File.read(File.join path, '_variables.scss')},
+          "+style"     => {type_id: Card::ScssID, content: File.read(File.join path, '_bootswatch.scss')}
         }
       end
     end

data/db/migrate_core_cards/20150331135745_new_card_menu.rb

@@ -3,6 +3,6 @@
 class NewCardMenu < Card::CoreMigration
   def up
     menu_js = Card[:script_card_menu]
-    menu_js.update_attributes! :type_id=>Card::CoffeeScriptID
+    menu_js.update_attributes! type_id: Card::CoffeeScriptID
   end
 end

data/db/migrate_core_cards/20150429090551_search_card_context.rb

@@ -12,7 +12,7 @@ class SearchCardContext < Card::CoreMigration
       ['self',   'left'],
       ['',       'left'],
     ]
-    Card.search(:type_id=>['in', Card::SearchTypeID, Card::SetID]).each do |card|
+    Card.search(type_id: ['in', Card::SearchTypeID, Card::SetID]).each do |card|
       if card.cardname.junction? && !card.virtual?
         content = card.content
         replace.each do |key, val|

data/db/migrate_core_cards/20150508212032_menu_compatibility.rb

@@ -5,7 +5,7 @@ class MenuCompatibility < Card::CoreMigration
 
     # Add bootswatch shared to old skins so that menu works
     bootswatch_shared = Card[:bootswatch_shared]
-    Card.search(:type_id=>Card::SkinID) do |skin|
+    Card.search(type_id: Card::SkinID) do |skin|
       if skin.item_cards.find { |item_card| item_card.codename.to_s == 'style_bootstrap_compatible'}
         skin.add_item! bootswatch_shared.name
       end
@@ -15,8 +15,8 @@ class MenuCompatibility < Card::CoreMigration
     # (this can be removed if/when later migrations update those things directly)
     [:style, :script].each do |setting|
       Card.search(
-        :right_id=>Card::MachineOutputID,
-        :left=>{ :right=>{:codename=>setting.to_s } }
+        right_id: Card::MachineOutputID,
+        left: { right: {codename: setting.to_s } }
       ).each do |output_card|
         output_card.delete!
       end

data/db/migrate_core_cards/20150510031118_fix_skin_images.rb

@@ -7,7 +7,7 @@ class FixSkinImages < Card::CoreMigration
     # They were no longer needed for style handling but are still needed for images
     %w{bootstrap_default cerulean cosmo cyborg darkly flatly journal lumen paper readable sandstone simplex slate spacelab superhero united yeti }.each do |theme_name|
       theme_name = "#{theme_name}_skin"
-      Card.fetch( theme_name ).update_attributes! :codename=>theme_name
+      Card.fetch( theme_name ).update_attributes! codename: theme_name
     end
   end
 end

data/db/migrate_core_cards/20150528084659_add_session_cardtype.rb

@@ -3,13 +3,13 @@
 class AddSessionCardtype < Card::CoreMigration
   def up
     session_card_name = Card.exists?( 'Session' ) ? 'BrowserSession' : 'Session'
-    Card.create! :name=>session_card_name, :type_code=>:cardtype, :codename=>'session',
-                :subcards=>{'+description'=>{:content=>'Session cards are for non-permanent content.
+    Card.create! name: session_card_name, type_code: :cardtype, codename: 'session',
+                subcards: {'+description'=>{content: 'Session cards are for non-permanent content.
                   They are not stored in the database and can have different values for different users.
                   You can use a Session card to keep track of certain state of a particular user like the content
                   of shopping basket.'}}
     Card::Cache.reset_global
-    Card.create! :name=>'*edit toolbar pinned', :type_code=>:session, :codename=>'edit_toolbar_pinned'
-    Card.create! :name=>'*toolbar pinned', :type_code=>:session, :codename=>'toolbar_pinned'
+    Card.create! name: '*edit toolbar pinned', type_code: :session, codename: 'edit_toolbar_pinned'
+    Card.create! name: '*toolbar pinned', type_code: :session, codename: 'toolbar_pinned'
   end
 end

data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb

@@ -2,11 +2,11 @@
 
 class AddRecentSettingSessionCard < Card::CoreMigration
   def up
-    Card.create! :name=>'*recent settings', :codename=>'recent_settings', :type_code=>:pointer, :subcards=>{
-      '+*self+*options' => {:type_code=>:search_type, :content=>'{"type":"setting"}'},
-      '+*self+*update'  => {:content=>'[[Anyone]]'},
-      '+*self**create'  => {:content=>'[[Anyone]]'},
-      '+*self**read'    => {:content=>'[[Anyone]]'}
+    Card.create! name: '*recent settings', codename: 'recent_settings', type_code: :pointer, subcards: {
+      '+*self+*options' => {type_code: :search_type, content: '{"type":"setting"}'},
+      '+*self+*update'  => {content: '[[Anyone]]'},
+      '+*self**create'  => {content: '[[Anyone]]'},
+      '+*self**read'    => {content: '[[Anyone]]'}
     }
   end
 end

data/db/migrate_core_cards/20150605115802_add_performance_log_card.rb

@@ -2,6 +2,6 @@
 
 class AddPerformanceLogCard < Card::CoreMigration
   def up
-    Card.create! :name=>'*performance log', :type_code=>:pointer, :codename=>:performance_log
+    Card.create! name: '*performance log', type_code: :pointer, codename: :performance_log
   end
 end

data/db/migrate_core_cards/20150610171702_add_debugger_session_card.rb

@@ -2,8 +2,8 @@
 
 class AddDebuggerSessionCard < Card::CoreMigration
   def up
-    Card.create! :name=>'*debugger', :type_code=>:session, :codename=>'debugger',
-      :subcards=>{
+    Card.create! name: '*debugger', type_code: :session, codename: 'debugger',
+      subcards: {
         '+*self+*options'=>'[[on]]',
         '+*self+*input'=>'[[checkbox]]',
         '+*self+*help'=>'show more useful error pages'}

data/db/migrate_core_cards/20150611203506_rails_inflection_updates.rb

@@ -17,7 +17,7 @@ class RailsInflectionUpdates < Card::CoreMigration
         twin.destroy
         yield
       elsif !card.trash
-        raise Card::Oops.new ("Your deck has two different cards with names '#{card.name}' and '#{twin.name}'. After this update it's no longer possible to differentiate between those two names. Please rename or delete one of the two cards and run the update again." )
+        raise Card::Oops.new("Your deck has two different cards with names '#{card.name}' and '#{twin.name}'. After this update it's no longer possible to differentiate between those two names. Please rename or delete one of the two cards and run the update again." )
       end
     else
       yield
@@ -47,7 +47,7 @@ class RailsInflectionUpdates < Card::CoreMigration
         if name =~ plural
           # can't use fetch, because it uses the wrong key
           # find_by_name is case-insensitve and finds the wrong cards for camel case names
-          card = Card.where(:name=>name).select {|card| card.name == name}.first
+          card = Card.where(name: name).select {|card| card.name == name}.first
 
           unless_name_collision(card) do
             apply_to_content << i
@@ -55,14 +55,14 @@ class RailsInflectionUpdates < Card::CoreMigration
             if Card.find_by_key new_key
               puts "Could not update #{name}. Key '#{new_key}' already exists."
             else
-              card.update_attributes! :key=>new_key
+              card.update_attributes! key: new_key
             end
           end
         end
       end
     end
 
-    cards_with_css = Card.search :type=>['in','html', 'css', 'scss']
+    cards_with_css = Card.search type: ['in','html', 'css', 'scss']
     cards_with_css.each do |card|
       new_content = card.content
       content_changed = false
@@ -75,7 +75,7 @@ class RailsInflectionUpdates < Card::CoreMigration
         end
       end
       if content_changed
-        card.update_attributes! :content=>new_content
+        card.update_attributes! content: new_content
       end
     end
   end

data/db/migrate_core_cards/20150627205133_fix_script_bootstrap_card_type.rb

@@ -2,6 +2,6 @@
 
 class FixScriptBootstrapCardType < Card::CoreMigration
   def up
-    Card[:bootstrap_js].update_attributes! :type_id=>Card::JavaScriptID
+    Card[:bootstrap_js].update_attributes! type_id: Card::JavaScriptID
   end
 end

data/db/migrate_core_cards/20150702130543_remove_edit_toolbar_pinned.rb

@@ -3,7 +3,7 @@
 class RemoveEditToolbarPinned < Card::CoreMigration
   def up
     card = Card[:edit_toolbar_pinned]
-    card.update_attributes! :codename=>nil
+    card.update_attributes! codename: nil
     card.delete
   end
 end

data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb

@@ -14,23 +14,23 @@ class UpdateFileAndImageCards < Card::CoreMigration
   def up
     # use codenames for the filecards not for the left parts
     if (credit = Card[:credit]) && (card = Card.fetch "#{credit.name}+image")
-      card.update_attributes! :codename=>'credit_image'
+      card.update_attributes! codename: 'credit_image'
     end
     %w( cerulean_skin cosmo_skin cyborg_skin darkly_skin flatly_skin journal_skin lumen_skin paper_skin readable_skin sandstone_skin simplex_skin slate_skin spacelab_skin superhero_skin united_skin yeti_skin ).each do |name|
       if (card=Card[name.to_sym])
-        card.update_attributes! :codename=>nil
+        card.update_attributes! codename: nil
         if (card = Card.fetch "#{name}+image")
-          card.update_attributes! :codename=>"#{name}_image"
+          card.update_attributes! codename: "#{name}_image"
         end
       end
     end
 
     Card::Cache.reset_global
-    Card.search(:type=>[:in, 'file', 'image']).each do |card|
+    Card.search(type: [:in, 'file', 'image']).each do |card|
       card.actions.each do |action|
         if (content_change = action.change_for(:db_content).first)
           original_filename = content_change.value.split("\n").first
-          action.update_attributes! :comment=>original_filename
+          action.update_attributes! comment: original_filename
         end
       end
       if card.content.present?

data/db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb

@@ -2,7 +2,7 @@
 
 class CreateReferencesForSearchCards < Card::CoreMigration
   def up
-    Card.where(:type_id=>Card::SearchTypeID).find_each.with_index do |card, index|
+    Card.where(type_id: Card::SearchTypeID).find_each.with_index do |card, index|
       card.update_references
       puts "completed #{index} search cards" if index % 100 == 0
     end

data/db/migrate_core_cards/20150824135418_update_file_history.rb

@@ -2,7 +2,7 @@
 
 class UpdateFileHistory < Card::CoreMigration
   def up
-    Card.search(:type=>[:in, 'file', 'image']).each do |card|
+    Card.search(type: [:in, 'file', 'image']).each do |card|
       card.actions.each do |action|
         if (content_change = action.change_for(:db_content).first)
           original_filename, file_type, action_id, mod  = content_change.value.split("\n")
@@ -13,12 +13,12 @@ class UpdateFileHistory < Card::CoreMigration
               else
                 "~#{card.id}/#{action_id}#{::File.extname(original_filename)}"
               end
-            content_change.update_attributes! :value=>value
+            content_change.update_attributes! value: value
           end
         end
       end
     end
-    Card.search( :right => { :codename => 'machine_output' } ).each do |card|
+    Card.search( right: { codename: 'machine_output' } ).each do |card|
       card.delete!
     end
   end

data/db/migrate_core_cards/20150903130006_attachment_upload_cards.rb

@@ -2,8 +2,8 @@
 
 class AttachmentUploadCards < Card::CoreMigration
   def up
-    Card.create! :name=>'*new file', :type=>'File', :codename=>'new_file'
-    Card.create! :name=>'*new image', :type=>'Image', :codename=>'new_image'
+    Card.create! name: '*new file', type: 'File', codename: 'new_file'
+    Card.create! name: '*new image', type: 'Image', codename: 'new_image'
 
     if js_output = Card['*all+*script+*machine output']
       #perhaps too narrow?

data/db/migrate_core_cards/20150910085603_remove_performance_log_card.rb

@@ -3,7 +3,7 @@
 class RemovePerformanceLogCard < Card::CoreMigration
   def up
     if card = Card[:performance_log]
-      card.update_attributes! :codename=>nil
+      card.update_attributes! codename: nil
       card.delete
     end
   end

data/lib/card.rb

@@ -34,11 +34,11 @@ class Card < ActiveRecord::Base
   require_dependency 'card/reference'
   require_dependency 'card/view_cache'
 
-  has_many :references_from, :class_name => :Reference, :foreign_key => :referee_id
-  has_many :references_to,   :class_name => :Reference, :foreign_key => :referer_id
+  has_many :references_from, class_name: :Reference, foreign_key: :referee_id
+  has_many :references_to,   class_name: :Reference, foreign_key: :referer_id
   has_many :acts, -> { order :id }
-  has_many :actions, -> { where( :draft=>[nil,false]).order :id }
-  has_many :drafts, -> { where( :draft=>true ).order :id }, :class_name=> :Action
+  has_many :actions, -> { where( draft: [nil,false]).order :id }
+  has_many :drafts, -> { where( draft: true ).order :id }, class_name: :Action
 
   cattr_accessor :set_patterns, :error_codes, :serializable_attributes, :set_specific_attributes
   @@set_patterns, @@error_codes = [], {}

data/lib/card/active_record_ext.rb

@@ -28,11 +28,11 @@ module ActiveRecord
       end
 
       def custom_cast_types
-        { :string  => { :name=>'char'    },
-          :integer => { :name=>'signed'  },
-          :text    => { :name=>'char'    },
-          :float   => { :name=>'decimal' },
-          :binary  => { :name=>'binary'  }  }
+        { string:  { name: 'char'    },
+          integer: { name: 'signed'  },
+          text:    { name: 'char'    },
+          float:   { name: 'decimal' },
+          binary:  { name: 'binary'  }  }
       end
     end
 
@@ -50,13 +50,13 @@ module ActiveRecord
       end
     end
   end
-  
+
   module Transactions
     #FIXME!!
     # the following code is already in Rails 4 (see https://github.com/rails/rails/commit/c8792c7b2ea4f5fe7a5610225433ea8dd8d0f83e)
     # it allows manual rollbacks in after_save (eg store events) to reset the object correctly
     #  hopefully we can soon get rid of this code!
-    
+
     def with_transaction_returning_status
       status = nil
       self.class.transaction do
@@ -73,5 +73,5 @@ module ActiveRecord
       status
     end
   end
-  
+
 end

data/lib/card/auth.rb

@@ -34,9 +34,9 @@ class Card
       # find accounted by email
       def [] email
         Auth.as_bot do
-          Card.search( :right_plus=>[
-            {:id=>Card::AccountID},
-            {:right_plus=>[{:id=>Card::EmailID},{ :content=>email.strip.downcase }]}
+          Card.search( right_plus: [
+            {id: Card::AccountID},
+            {right_plus: [{id: Card::EmailID},{ content: email.strip.downcase }]}
           ]).first
         end
       end
@@ -163,17 +163,17 @@ class Card
 
       def createable_types
         type_names = Auth.as_bot do
-          Card.search :type=>Card::CardtypeID, :return=>:name, :not => { :codename => ['in'] + NON_CREATEABLE_TYPES }
+          Card.search type: Card::CardtypeID, return: :name, not: { codename: ['in'] + NON_CREATEABLE_TYPES }
         end
         type_names.reject do |name|
-          !Card.new( :type=>name ).ok? :create
+          !Card.new( type: name ).ok? :create
         end.sort
       end
 
       private
 
       def account_count
-        as_bot { Card.count_by_wql :right=>Card[:account].name }
+        as_bot { Card.count_by_wql right: Card[:account].name }
       end
 
     end

data/lib/card/cache.rb

@@ -25,7 +25,7 @@ class Card
     class << self
       def [] klass
         raise "nil klass" if klass.nil?
-        cache_by_class[klass] ||= new :class=>klass, :store=>(@@no_rails_cache ? nil : Cardio.cache)
+        cache_by_class[klass] ||= new class: klass, store: (@@no_rails_cache ? nil : Cardio.cache)
       end
 
       def renew

data/lib/card/chunk.rb

@@ -21,7 +21,7 @@ class Card
 
     class << self
       def register_class klass, hash
-        klass.config = hash.merge :class => klass
+        klass.config = hash.merge class: klass
         prefix_index = hash[:idx_char] || :default  # this is gross and needs to be moved out.
         prefix_map[prefix_index] = klass.config
       end

data/lib/card/content.rb

@@ -10,7 +10,7 @@ class Card
     def initialize content, format_or_card, opts={}
       @format =
         if Card===format_or_card
-          Format.new format_or_card, :format=>nil
+          Format.new format_or_card, format: nil
         else
           format_or_card
         end

data/lib/card/diff.rb

@@ -38,7 +38,7 @@ module Card::Diff
     #   :pointer = remove all double square brackets
     #   :raw     = escape html tags and compare everything
     #
-    # :summary => {:length=><number> , :joint=><string> }
+    # summary: {length: <number> , joint: <string> }
 
     def initialize(old_version, new_version, opts={})
       @new_version = new_version
@@ -141,12 +141,12 @@ module Card::Diff
         new_words, new_ex = separate_comparables_from_excludees new_text
 
         @words = {
-          :old => old_words,
-          :new => new_words
+          old: old_words,
+          new: new_words
         }
         @excludees = {
-          :old => ExcludeeIterator.new(old_ex),
-          :new => ExcludeeIterator.new(new_ex)
+          old: ExcludeeIterator.new(old_ex),
+          new: ExcludeeIterator.new(new_ex)
         }
       end
 
@@ -283,9 +283,9 @@ module Card::Diff
           list.each_with_index.inject([[],[]]) do |res, pair|
             element, index = pair
             if element.match @disjunction_pattern
-              res[1] << {:chunk_index=>index, :element=>element, :type=>:disjunction}
+              res[1] << {chunk_index: index, element: element, type: :disjunction}
             elsif element.match @exclude_pattern
-              res[1] << {:chunk_index=>index, :element=>element, :type=>:excludee}
+              res[1] << {chunk_index: index, element: element, type: :excludee}
             else
               res[0] << element
             end
@@ -357,7 +357,7 @@ module Card::Diff
 
         def add_chunk text, action
           if @remaining_chars > 0
-            @chunks << {:action => action, :text=>text}
+            @chunks << {action: action, text: text}
             @remaining_chars -= text.size
           end
         end
@@ -382,9 +382,9 @@ module Card::Diff
                 @chunks.pop
                 if index-1 >= 0
                   if @chunks[index-1][:action] == :added
-                    @chunks << {:action => :ellipsis, :text=>@joint}
+                    @chunks << {action: :ellipsis, text: @joint}
                   elsif @chunks[index-1][:action] == :deleted
-                    @chunks << {:action => :added, :text=>@joint}
+                    @chunks << {action: :added, text: @joint}
                   end
                 end
                 break