card 1.17.4 → 1.18.0

data/db/migrate_core_cards/20140725180118_config_card_updates.rb

@@ -2,8 +2,8 @@
 
 class ConfigCardUpdates < Card::CoreMigration
   def up
-    raw_json = File.read( data_path '1.13_config_text.json' )
+    raw_json = File.read(data_path '1.13_config_text.json')
     json = JSON.parse raw_json
-    Card.merge_list json["card"]["value"], output_file: "tmp/unmerged_config_text.json"
+    Card.merge_list json['card']['value'], output_file: 'tmp/unmerged_config_text.json'
   end
 end

data/db/migrate_core_cards/20141111083921_delete_machine_output.rb

@@ -2,8 +2,6 @@
 
 class DeleteMachineOutput < Card::CoreMigration
   def up
-    Card.search( right: { codename: 'machine_output' } ).each do |card|
-      card.delete!
-    end
+    Card.search(right: { codename: 'machine_output' }).each(&:delete!)
   end
 end

data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb

@@ -2,9 +2,9 @@
 
 class ConfigDescriptionsEtc < Card::CoreMigration
   def up
-    raw_json = File.read( data_path '1.14_config_descriptions_etc.json' )
+    raw_json = File.read(data_path '1.14_config_descriptions_etc.json')
     json = JSON.parse raw_json
-    Card.merge_list json["card"]["value"], output_file: "tmp/unmerged_config_text.json"
+    Card.merge_list json['card']['value'], output_file: 'tmp/unmerged_config_text.json'
 
     # fix missing +*from card
     c = Card.fetch "follower notification email+#{Card[:from].name}", new: {}

data/db/migrate_core_cards/20141119001955_make_symlinks_relative.rb

@@ -2,11 +2,11 @@
 
 class MakeSymlinksRelative < Card::Migration
   def up
-    Card.paths['files'].each do |file_path| 
+    Card.paths['files'].each do |file_path|
       files = Dir.glob(File.join file_path, '**', '*')
-      symlinks = files.select {|f| File.symlink? f }
+      symlinks = files.select { |f| File.symlink? f }
       symlinks.each do |symlink|
-        base = File.basename( File.readlink(symlink) )
+        base = File.basename(File.readlink(symlink))
         File.delete symlink
         File.symlink base, symlink
       end

data/db/migrate_core_cards/20141120120605_fix_notification_html_message.rb

@@ -5,6 +5,6 @@ class FixNotificationHtmlMessage < Card::CoreMigration
     codename = :follower_notification_email
     dir = File.join data_path, 'mailer'
     html_message = Card[codename].fetch trait: 'html_message'
-    html_message.update_attributes! content: File.read( File.join( dir, "#{codename}.html" ))
+    html_message.update_attributes! content: File.read(File.join(dir, "#{codename}.html"))
   end
 end

data/db/migrate_core_cards/20141204061304_watchers_to_following.rb

@@ -2,10 +2,9 @@
 
 class WatchersToFollowing < Card::CoreMigration
   def up
-
     follower_hash = Hash.new { |h, v| h[v] = [] }
 
-    #NOTE: this migration must find cards in the trash, because the original (1.14.0) migration attempt
+    # NOTE: this migration must find cards in the trash, because the original (1.14.0) migration attempt
     # did not successfully migration to the +*following card but did successfully delete +*watchers cards.
     # Therefore cards migrated using 1.14.0 or 1.14.1 will not have the correct migrations
 
@@ -13,19 +12,17 @@ class WatchersToFollowing < Card::CoreMigration
       Card.find_by_sql("select * from cards where right_id = #{watcher_card.id}").each do |card|
         card.include_set_modules
 
-        if watched = card.left
-          card.item_names.each do |user_name|
-            follower_hash[user_name] << watched.name
-          end
+        next unless watched = card.left
+        card.item_names.each do |user_name|
+          follower_hash[user_name] << watched.name
         end
       end
 
       follower_hash.each do |user, items|
-        if card=Card.fetch(user) and card.account
-          following = card.fetch trait: 'following',  new: {type_code: :pointer}
-          items.each { |item| following.add_item item }
-          following.save!
-        end
+        next unless (card = Card.fetch(user)) && card.account
+        following = card.fetch trait: 'following',  new: { type_code: :pointer }
+        items.each { |item| following.add_item item }
+        following.save!
       end
     end
 
@@ -33,6 +30,5 @@ class WatchersToFollowing < Card::CoreMigration
       watchers.update_attributes codename: nil
       watchers.delete!
     end
-
   end
 end

data/db/migrate_core_cards/20141208162106_add_ace_script.rb

@@ -2,9 +2,8 @@
 
 class AddAceScript < Card::CoreMigration
   def up
-    Card[:all].fetch(trait: :script).add_item!  "script: ace"
-
-    Card.create! name: "script: ace",codename: "script_ace",type: "JavaScript"
+    Card[:all].fetch(trait: :script).add_item! 'script: ace'
 
+    Card.create! name: 'script: ace', codename: 'script_ace', type: 'JavaScript'
   end
 end

data/db/migrate_core_cards/20141216155251_add_more_following_cards.rb

@@ -2,23 +2,23 @@
 
 class AddMoreFollowingCards < Card::CoreMigration
   def up
-    Card.create! name: "*follow", codename: "follow", type_code: :setting
+    Card.create! name: '*follow', codename: 'follow', type_code: :setting
     Card.create! name: '*follow+*right+*default', type_code: :pointer
-    Card.create! name: '*follow+*right+*input', type_code: :pointer, content: "[[radio]]"
+    Card.create! name: '*follow+*right+*input', type_code: :pointer, content: '[[radio]]'
     Card.create! name: '*follow+*right+*help', content: 'Get notified about changes', type_code: :phrase
 
-    Card.create! name: "*followers", codename: "followers"
-    Card.create! name: "*follow fields", codename: "follow_fields", type_code: :setting
-    Card.create! name: "*follow fields+*right+*help", content: ""
-    Card.create! name: "*follow fields+*right+*default", type_code: :pointer
-    Card.create! name: "*all+*follow fields", content: "[[*include]]", type_code: :pointer
+    Card.create! name: '*followers', codename: 'followers'
+    Card.create! name: '*follow fields', codename: 'follow_fields', type_code: :setting
+    Card.create! name: '*follow fields+*right+*help', content: ''
+    Card.create! name: '*follow fields+*right+*default', type_code: :pointer
+    Card.create! name: '*all+*follow fields', content: '[[*include]]', type_code: :pointer
 
     # follow options
-    Card.create! name: "*always", codename: "always"
-    Card.create! name: "*never", codename: "never"
+    Card.create! name: '*always', codename: 'always'
+    Card.create! name: '*never', codename: 'never'
 
     # default follow rule
     Card.create! name: '*follow defaults', codename: 'follow_defaults', type_code: :pointer
-    Card.create! name: "*all+*all+*follow", type_code: :pointer, content: '[[*never]]'
+    Card.create! name: '*all+*all+*follow', type_code: :pointer, content: '[[*never]]'
   end
 end

data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb

@@ -2,23 +2,23 @@
 
 class ImportBootstrapLayout < Card::CoreMigration
   def up
-    layout = Card.fetch "Default Layout"
+    layout = Card.fetch 'Default Layout'
     if layout
-      layout.name = "Classic Layout"
+      layout.name = 'Classic Layout'
       layout.update_referers = true
       layout.save!
     end
 
-    import_json "bootstrap_layout.json"#, pristine: true, output_file: nil
+    import_json 'bootstrap_layout.json' # , pristine: true, output_file: nil
     if layout && layout.pristine? &&
-      all = Card[:all]
+       all = Card[:all]
       layout_rule_card = all.fetch trait: :layout
       style_rule_card  = all.fetch trait: :style
       if layout_rule_card.pristine? && style_rule_card.pristine?
         layout_rule_card.update_attributes! content: '[[Default Layout]]'
         if style_rule_card.item_names.first == 'customized classic skin'
           Card.create! name: 'customized bootstrap skin', type: 'Skin',
-            content: "[[classic bootstrap skin]]\n[[*css]]"
+                       content: "[[classic bootstrap skin]]\n[[*css]]"
           style_rule_card.update_attributes! content: '[[customized bootstrap skin]]'
         else
           style_rule_card.update_attributes! content: '[[classic bootstrap skin]]'
@@ -26,7 +26,7 @@ class ImportBootstrapLayout < Card::CoreMigration
       end
     end
 
-    Card.create! name: "*header+*self+*read", content: '[[Anyone]]'
+    Card.create! name: '*header+*self+*read', content: '[[Anyone]]'
 
     # merge "style: functional" and "style: standard" into "style: cards"
     old_func = Card[:style_functional]
@@ -39,7 +39,6 @@ class ImportBootstrapLayout < Card::CoreMigration
     old_stand.codename = nil
     old_stand.delete!
 
-
     # these are hard-coded
     Card.create! name: 'theme: bootstrap_default', type_code: :css, codename: 'theme_bootstrap_default'
     Card.create! name: 'style: bootstrap',         type_code: :css, codename: 'bootstrap_css'
@@ -55,16 +54,15 @@ class ImportBootstrapLayout < Card::CoreMigration
     # retain old behavior (default view was content, now titled)
     Card.create! name: '*all+*default html view', content: 'content'
 
-    # update layouts to have explicit views in inclusions
-    Card.search( type_id: Card::LayoutTypeID ) do |lcard|
+    # update layouts to have explicit views in nests
+    Card.search(type_id: Card::LayoutTypeID) do |lcard|
       lcontent = Card::Content.new lcard.content, lcard
-      lcontent.find_chunks( Card::Chunk::Include ).each do |nest|
-        nest.explicit_view = (nest.options[:inc_name]=='_main' ? 'open' : 'core')
+      lcontent.find_chunks(Card::Chunk::Include).each do |nest|
+        nest.explicit_view = (nest.options[:inc_name] == '_main' ? 'open' : 'core')
       end
       lcard.update_attributes! content: lcontent.to_s
     end
 
     Card::Cache.reset_all
-
   end
 end

data/db/migrate_core_cards/20150220134731_following_to_follow_rule.rb

@@ -2,15 +2,15 @@
 
 class FollowingToFollowRule < Card::CoreMigration
   def up
-    Card.search(right: {codename: 'following'}, left: {type: 'user'}).each do |following_card|
+    Card.search(right: { codename: 'following' }, left: { type: 'user' }).each do |following_card|
       user_name = following_card.cardname.left
       following_card.item_names.each do |followed_set_name|
         set_card = Card.fetch(followed_set_name, new: {})
-        if (set_card.type_code != :set)
+        if set_card.type_code != :set
           set_card = set_card.default_follow_set_card
         end
-        rule = Card.fetch set_card.follow_rule_name(user_name), new: {type: 'pointer'}
-        rule.content = "[[*always]]"
+        rule = Card.fetch set_card.follow_rule_name(user_name), new: { type: 'pointer' }
+        rule.content = '[[*always]]'
         rule.save!
       end
     end

data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb

@@ -3,7 +3,7 @@
 class BootstrapThemes < Card::CoreMigration
   def up
     Card.create! name: 'themeless bootstrap skin', type_code: :skin, content: "[[style: bootstrap]]\n[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: bootstrap cards]]"
-    %w{cerulean cosmo cyborg darkly flatly journal lumen paper readable sandstone simplex slate spacelab superhero united yeti }.each do |theme|
+    %w(cerulean cosmo cyborg darkly flatly journal lumen paper readable sandstone simplex slate spacelab superhero united yeti ).each do |theme|
       Card.create! name: "theme: #{theme}", type_code: :css, codename: "theme_#{theme}"
       Card.create! name: "#{theme} skin", type_code: :skin, codename: "#{theme}_skin", content: "[[themeless bootstrap skin]]\n[[theme: #{theme}]]"
     end
@@ -16,7 +16,7 @@ class BootstrapThemes < Card::CoreMigration
     style_right = Card[:style].fetch trait: :right, new: {}
 
     style_right_options = style_right.fetch trait: :options, new: {}
-    style_right_options.content = %[{"type":"Skin","sort":"name"}]
+    style_right_options.content = %({"type":"Skin","sort":"name"})
     style_right_options.save!
 
     style_right_input = style_right.fetch trait: :input, new: {}
@@ -30,7 +30,7 @@ class BootstrapThemes < Card::CoreMigration
     import_json 'skin_images.json'
 
     if sidebar_card = Card['*sidebar']
-      new_content = sidebar_card.content.gsub( /(\*(logo|credit))\|content/, '\1|content_panel' )
+      new_content = sidebar_card.content.gsub(/(\*(logo|credit))\|content/, '\1|content_panel')
       sidebar_card.update_attributes! content: new_content
     end
   end

data/db/migrate_core_cards/20150326205655_bootswatch_themes.rb

@@ -2,7 +2,7 @@
 
 class BootswatchThemes < Card::CoreMigration
   def up
-    themeless = Card.fetch 'themeless bootstrap skin', new: {type_code: :skin}
+    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
@@ -10,18 +10,18 @@ class BootswatchThemes < Card::CoreMigration
 
     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|
+    %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')}
+          '+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/20150429090551_search_card_context.rb

@@ -2,32 +2,30 @@
 
 class SearchCardContext < Card::CoreMigration
   def up
-    sep = %r{\W}
+    sep = /\W/
     replace = [
-      ['[lr]+','l\\1'],
-      ['[LR]+','L\\1'],
-      ['(?=[LR]*[lr]+)(?=[lr]*[LR]+)[lrLR]+','l\\1'],   # mix of lowercase and uppercase l's and r's
-      ['left',   'LL'],
-      ['right',  'LR'],
-      ['self',   'left'],
-      ['',       'left'],
+      ['[lr]+', 'l\\1'],
+      ['[LR]+', 'L\\1'],
+      ['(?=[LR]*[lr]+)(?=[lr]*[LR]+)[lrLR]+', 'l\\1'],   # mix of lowercase and uppercase l's and r's
+      %w(left LL),
+      %w(right LR),
+      %w(self left),
+      ['',       'left']
     ]
     Card.search(type_id: ['in', Card::SearchTypeID, Card::SetID]).each do |card|
-      if card.cardname.junction? && card.real?
-        content = card.content
+      next unless card.cardname.junction? && card.real?
+      content = card.content
+      replace.each do |key, val|
+        content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")
+      end
+      card.update_column :db_content, content
+      card.actions.each do |action|
+        next unless (content_change = action.change_for(:db_content).first)
+        content = content_change.value
         replace.each do |key, val|
           content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")
         end
-        card.update_column :db_content, content
-        card.actions.each do |action|
-          if (content_change = action.change_for(:db_content).first)
-            content = content_change.value
-            replace.each do |key, val|
-              content.gsub!(/(#{sep})_(#{key})(?=#{sep})/, "\\1_#{val}")
-            end
-            content_change.update_column :value, content
-          end
-        end
+        content_change.update_column :value, content
       end
     end
   end

data/db/migrate_core_cards/20150508212032_menu_compatibility.rb

@@ -2,11 +2,10 @@
 
 class MenuCompatibility < Card::CoreMigration
   def up
-
     # Add bootswatch shared to old skins so that menu works
     bootswatch_shared = Card[:bootswatch_shared]
     Card.search(type_id: Card::SkinID) do |skin|
-      if skin.item_cards.find { |item_card| item_card.codename.to_s == 'style_bootstrap_compatible'}
+      if skin.item_cards.find { |item_card| item_card.codename.to_s == 'style_bootstrap_compatible' }
         skin.add_item! bootswatch_shared.name
       end
     end
@@ -16,11 +15,8 @@ class MenuCompatibility < Card::CoreMigration
     [:style, :script].each do |setting|
       Card.search(
         right_id: Card::MachineOutputID,
-        left: { right: {codename: setting.to_s } }
-      ).each do |output_card|
-        output_card.delete!
-      end
+        left: { right: { codename: setting.to_s } }
+      ).each(&:delete!)
     end
-
   end
 end

data/db/migrate_core_cards/20150510031118_fix_skin_images.rb

@@ -2,12 +2,11 @@
 
 class FixSkinImages < Card::CoreMigration
   def up
-
     # This is needed because the bootswatch_themes migration removed codenames.
     # 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|
+    %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

@@ -2,12 +2,12 @@
 
 class AddSessionCardtype < Card::CoreMigration
   def up
-    session_card_name = Card.exists?( 'Session' ) ? 'BrowserSession' : 'Session'
+    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.
+                 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.'}}
+                  of shopping basket.' } }
     Card::Cache.reset_all
     Card.create! name: '*edit toolbar pinned', type_code: :session, codename: 'edit_toolbar_pinned'
     Card.create! name: '*toolbar pinned', type_code: :session, codename: 'toolbar_pinned'

data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb

@@ -3,10 +3,10 @@
 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]]'}
+      '+*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/20150610171702_add_debugger_session_card.rb

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