card 1.16.6 → 1.16.7

data/db/migrate/20141121172918_rename_card_migration_table.rb

@@ -3,12 +3,12 @@ class RenameCardMigrationTable < ActiveRecord::Migration
     if ActiveRecord::Base.connection.table_exists? :schema_migrations_cards
       rename_table :schema_migrations_cards, :schema_migrations_core_cards
     else
-      create_table "schema_migrations_core_cards", :id => false, :force => true do |t|
-        t.string "version", :null => false
+      create_table "schema_migrations_core_cards", id: false, force: true do |t|
+        t.string "version", null: false
       end
     end
-  end 
-  
+  end
+
   def self.down
     rename_table :schema_migrations_core_cards, :schema_migrations_cards
   end

data/db/migrate_core_cards/20130419215612_import_help_text.rb

@@ -2,12 +2,12 @@
 
 class ImportHelpText < Card::CoreMigration
   def up
-    dir = data_path '1.11_help_text.json' 
+    dir = data_path '1.11_help_text.json'
     data = JSON.parse( File.read dir )
     data.each do |atom|
       c = atom['card']
-      Card.merge c['name'], { :type=>c['type'], :content=>atom['views'][0]['parts'] }, :pristine=>true
-    end      
+      Card.merge c['name'], { type: c['type'], content: atom['views'][0]['parts'] }, pristine: true
+    end
   end
 
 end

data/db/migrate_core_cards/20130823192433_add_style_cards.rb

@@ -4,47 +4,46 @@ class AddStyleCards < Card::CoreMigration
   def up
     # TAKE "CSS" CODENAME FROM OLD *CSS CARD
     old_css = Card[:css]
-    old_css.update_attributes :codename=>nil  #old *css card no longer needs this codename
-    
+    old_css.update_attributes codename: nil  #old *css card no longer needs this codename
+
 
     # CREATE CSS AND SCSS TYPES
     # following avoids name conflicts (create statements do not).  need better api to support this?
-    css_attributes = { :codename=>:css, :type_id=>Card::CardtypeID }
-    new_css = Card.fetch 'CSS', :new=>css_attributes
+    css_attributes = { codename: :css, type_id: Card::CardtypeID }
+    new_css = Card.fetch 'CSS', new: css_attributes
     new_css.update_attributes(css_attributes) unless new_css.new_card?
     new_css.save!
-    
-    old_css.update_attributes :type_id=>new_css.id
-    
-    Card.create! :name=>'SCSS', :codename=>:scss, :type_id=>Card::CardtypeID
-    
-    
-    skin_attributes = { :codename=>:skin, :type_id=>Card::CardtypeID }
-    skin_card = Card.fetch 'Skin', :new=>skin_attributes
+
+    old_css.update_attributes type_id: new_css.id
+
+    Card.create! name: 'SCSS', codename: :scss, type_id: Card::CardtypeID
+
+
+    skin_attributes = { codename: :skin, type_id: Card::CardtypeID }
+    skin_card = Card.fetch 'Skin', new: skin_attributes
     skin_card.update_attributes( skin_attributes ) unless skin_card.new_card?
     skin_card.save!
-    
-    
+
+
     # PERMISSIONS FOR CSS AND SCSS TYPES
-    
+
     ['CSS', 'SCSS', 'Skin'].each do |type|
       [ :create, :update, :delete].each do |action|
-        Card.create! :name=>"#{type}+#{Card[:type].name}+#{Card[action].name}",
-          :content=>"[[#{Card[:administrator].name}]]"
+        Card.create! name: "#{type}+#{Card[:type].name}+#{Card[action].name}",
+          content: "[[#{Card[:administrator].name}]]"
       end
     end
-    
-    Card.create! :name=>'*style', :codename=>:style, :type_id=>Card::SettingID
+
+    Card.create! name: '*style', codename: :style, type_id: Card::SettingID
     style_set = "*style+#{Card[:right].name}"
-    Card.create! :name=>"#{style_set}+#{Card[:default].name}", :type_id=>Card::PointerID
-    Card.create! :name=>"#{style_set}+#{Card[:read].name}",    :content=>"[[#{Card[:anyone].name}]]"
-    Card.create! :name=>"#{style_set}+#{Card[:options].name}", :content=>%({"type":"Skin"}), :type=>Card::SearchTypeID
-    Card.create! :name=>"#{style_set}+#{Card[:input].name}",   :content=>'select'
-    Card.create! :name=>"#{style_set}+#{Card[:help].name}",    :content=>
-      %{Skin (collection of stylesheets) for card's page. [[http://wagn.org/skins|more]]}
-    
+    Card.create! name: "#{style_set}+#{Card[:default].name}", type_id: Card::PointerID
+    Card.create! name: "#{style_set}+#{Card[:read].name}",    content: "[[#{Card[:anyone].name}]]"
+    Card.create! name: "#{style_set}+#{Card[:options].name}", content: %({"type":"Skin"}), type: Card::SearchTypeID
+    Card.create! name: "#{style_set}+#{Card[:input].name}",   content: 'select'
+    Card.create! name: "#{style_set}+#{Card[:help].name}",    content:       %{Skin (collection of stylesheets) for card's page. [[http://wagn.org/skins|more]]}
+
     # IMPORT STYLESHEETS
-    
+
     simple_styles, classic_styles = [], []
     %w{
       jquery-ui-smoothness.css functional.scss standard.scss right_sidebar.scss common.scss classic_cards.scss traditional.scss
@@ -52,34 +51,33 @@ class AddStyleCards < Card::CoreMigration
       name, type = sheet.split '.'
       name.gsub! '_', ' '
       index < 5 ? simple_styles << name : classic_styles << name
-      Card.create! :name=>"style: #{name}", :type=>type, :codename=>"style_#{name.to_name.key}"
+      Card.create! name: "style: #{name}", type: type, codename: "style_#{name.to_name.key}"
     end
-          
+
     # CREATE SKINS
-    
-    Card.create! :name=>"simple skin", :type=>'Skin', :content=>
-      simple_styles.map { |s| "[[style: #{s}]]" } * "\n"
-    Card.create! :name=>"classic skin", :type=>'Skin', :content=>
-      "[[simple skin]]\n" + ( classic_styles.map { |s| "[[style: #{s}]]" }.join"\n" )
-    
+
+    Card.create! name: "simple skin", type: 'Skin', content:       simple_styles.map { |s| "[[style: #{s}]]" } * "\n"
+    Card.create! name: "classic skin", type: 'Skin', content:       "[[simple skin]]\n" + ( classic_styles.map { |s| "[[style: #{s}]]" }.join"\n" )
+
     # CREATE DEFAULT STYLE RULE
     # (this auto-generates cached file)
-    
-    default_skin = if old_css.content =~ /\S/
-      name = 'customized classic skin'
-      Card.create! :name=>name, :type=>'Skin', :content=>"[[classic skin]]\n[[*css]]"
-      name
-    else
-      old_css.delete!
-      'classic skin'
-    end
-    
+
+    default_skin =
+      if old_css.content =~ /\S/
+        name = 'customized classic skin'
+        Card.create! name: name, type: 'Skin', content: "[[classic skin]]\n[[*css]]"
+        name
+      else
+        old_css.delete!
+        'classic skin'
+      end
+
     Card::Cache.reset_global
     begin
-      Card.create! :name=>"#{Card[:all].name}+*style", :content=>"[[#{default_skin}]]"
+      Card.create! name: "#{Card[:all].name}+*style", content: "[[#{default_skin}]]"
     rescue
       if default_skin =~ /customized/
-        Card["#{Card[:all].name}+*style"].update_attributes :content=>"[[classic skin]]"
+        Card["#{Card[:all].name}+*style"].update_attributes content: "[[classic skin]]"
       end
     end
   end

data/db/migrate_core_cards/20130910183318_move_styles_to_content.rb

@@ -4,7 +4,7 @@ class MoveStylesToContent < Card::CoreMigration
   def up
     dir = File.join data_path, "1.12_stylesheets"
     %w{ right_sidebar common classic_cards traditional }.each do |sheetname|
-      Card["style: #{sheetname}"].update_attributes! :codename=>nil, :content=>File.read("#{dir}/#{sheetname}.scss")
+      Card["style: #{sheetname}"].update_attributes! codename: nil, content: File.read("#{dir}/#{sheetname}.scss")
     end
   end
 

data/db/migrate_core_cards/20130920214038_jsonize_tinymce.rb

@@ -4,9 +4,9 @@ class JsonizeTinymce < Card::CoreMigration
   def up
     card = Card[:tiny_mce]
     cleaned_rows = card.content.strip.split( /\s*\,\s+/ ).map do |row|
-      key, val = row.split /\s*\:\s*/
-      val.gsub! /\"\s*\+\s*\"/, ''
-      val.gsub! "'", '"'
+      key, val = row.split(/\s*\:\s*/)
+      val.gsub!(/\"\s*\+\s*\"/, '')
+      val.gsub! "'", '"‚'
       %("#{key}":#{val})
     end
     card.content = %({\n#{ cleaned_rows.join ",\n" }\n})

data/db/migrate_core_cards/20130920291703_update_stylesheets.rb

@@ -6,11 +6,11 @@ class UpdateStylesheets < Card::CoreMigration
     %w{ common traditional }.each do |sheetname|
       card = Card["style: #{sheetname}"]
       if card && card.pristine?
-        card.update_attributes! :content=>File.read("#{dir}/#{sheetname}.scss")
+        card.update_attributes! content: File.read("#{dir}/#{sheetname}.scss")
       end
     end
-    
-    if c = Card['*all+*style+file']
+
+    if (c = Card['*all+*style+file'])
       c.delete!
     end
   end

data/db/migrate_core_cards/20130927191728_account_events.rb

@@ -2,18 +2,18 @@
 
 class AccountEvents < Card::CoreMigration
   def up
-    aa = Card.fetch "#{ Card[ :signup ].name }+#{ Card[ :type ].name}+#{ Card[:accountable ].name}", :new=>{}
+    aa = Card.fetch "#{ Card[ :signup ].name }+#{ Card[ :type ].name}+#{ Card[:accountable ].name}", new: {}
     aa.content = "1"
     aa.save!
-    
+
     role_right = "#{ Card[ :roles ].name }+#{ Card[ :right ].name }"
-    
-    r_options = Card.fetch "#{ role_right }+#{ Card[ :options ].name }", :new=>{}
+
+    r_options = Card.fetch "#{ role_right }+#{ Card[ :options ].name }", new: {}
     r_options.type_id = Card::SearchTypeID
     r_options.content = %({"type":"role", "not":{"codename":["in","anyone","anyone_signed_in"]}})
     r_options.save!
-    
-    r_input = Card.fetch "#{ role_right }+#{ Card[ :input ].name }", :new=>{}
+
+    r_input = Card.fetch "#{ role_right }+#{ Card[ :input ].name }", new: {}
     r_input.content = '[[checkbox]]'
     r_input.save!
   end

data/db/migrate_core_cards/20131016172445_common_css_patch.rb

@@ -5,7 +5,7 @@ class CommonCssPatch < Card::CoreMigration
     dir = File.join data_path, "1.12_stylesheets"
     card = Card["style: common"]
     if card && card.pristine?
-      card.update_attributes! :content=>File.read("#{dir}/common.scss")
+      card.update_attributes! content: File.read("#{dir}/common.scss")
     end
   end
 

data/db/migrate_core_cards/20140110193325_reset_account_request_type.rb

@@ -4,7 +4,7 @@ class ResetAccountRequestType < Card::CoreMigration
   def up
     arcard = Card[:signup]
     if arcard.type_code != :cardtype
-      arcard.update_attributes :type_id=>Card::CardtypeID
+      arcard.update_attributes type_id: Card::CardtypeID
     end
   end
 

data/db/migrate_core_cards/20140307231621_user_data_to_cards.rb

@@ -4,55 +4,55 @@ class User < ActiveRecord::Base
 end
 
 class UserDataToCards < Card::CoreMigration
-  
+
   def up
-      
+
     puts "adding new codename cards"
     [ :password, :token, :salt, :status, :signin, :stats ].each do |codename|
-      Card.create! :name=>"*#{codename}", :codename=>codename
+      Card.create! name: "*#{codename}", codename: codename
     end
-    
+
     Card::Codename.reset_cache
-    
+
     puts "setting read permissions for account cards (Administrator)"
     [ :password, :token, :salt, :status, :email, :account ].each do |codename|
       rule_name = [ codename, :right, :read ].map { |code| Card[code].name } * '+'
-      rule_card = Card.fetch rule_name, :new=>{}
+      rule_card = Card.fetch rule_name, new: {}
       rule_card.content = '[[Administrator]]'
       rule_card.save!
     end
-    
+
     puts "making email and password fields default to Phrase cards"
     [:email, :password].each do |field|
       rulename = [field, :right, :default].map { |code| Card[code].name } * '+'
-      Card.create! :name=>rulename, :type_id=>Card::PhraseID
+      Card.create! name: rulename, type_id: Card::PhraseID
     end
-    
+
     puts "signin permissions"
     [:read, :update].each do |setting|
       rulename = [ :signin, :self, setting ].map { |code| Card[code].name } * '+'
-      Card.create! :name=>rulename, :content=>"[[#{Card[:anyone].name}]]"
+      Card.create! name: rulename, content: "[[#{Card[:anyone].name}]]"
     end
-          
+
     puts "supporting legacy handling of +*email on User cards"
     oldname = [       :email,           :right, :structure].map { |code| Card[code].name } * '+'
     newname = [:user, :email, :type_plus_right, :structure].map { |code| Card[code].name } * '+'
-    Card[oldname].update_attributes! :name=>newname
-    
-    
+    Card[oldname].update_attributes! name: newname
+
+
     puts "importing all user details (for those not in trash) into +*account attributes"
     Card::Env[:no_password_encryptions] = true
     User.all.each do |user|
       base = Card[user.card_id]
       if base and !base.trash
         puts "~ importing details for #{base.name}"
-        date_args = { :created_at => user.created_at, :updated_at => user.updated_at }
+        date_args = { created_at: user.created_at, updated_at: user.updated_at }
         [ :email, :salt, :password, :status ].each do |field|
           cardname = "#{base.name}+#{Card[:account].name}+#{Card[field].name}"
           user_field = ( field==:password ? :crypted_password : field )
-          if content = user.send( user_field )
+          if (content = user.send( user_field ))
             begin
-              Card.create! date_args.merge( :name=>cardname, :content=>content)
+              Card.create! date_args.merge( name: cardname, content: content)
             rescue => e
               puts "error importing #{cardname}: #{e.message}"
             end
@@ -60,7 +60,7 @@ class UserDataToCards < Card::CoreMigration
         end
       end
     end
-      
+
   end
 
 end
@@ -68,6 +68,6 @@ end
 
 #FIXME
 # before 1.13!
-# but add read permission migration for *stats and 
+# but add read permission migration for *stats and
 # structure for *stats+*right
 

data/db/migrate_core_cards/20140317035504_account_requests_to_signups.rb

@@ -5,16 +5,15 @@ class AccountRequestsToSignups < Card::CoreMigration
 
     newname = 'Sign up'
     newname = '*signup' if Card.exists? newname
-    
+
     #get old codename and name out of the way
     old_signup = Card[:signup]
-    old_signup_name = old_signup.name
     old_signup.name = "#{newname} - old"
     old_signup.codename = nil
     old_signup.save!
 
     Card::Codename.reset_cache
-    
+
     # rename Account Request to "Sign up"
     new_signup = Card[:account_request]
     new_signup.name = newname
@@ -23,27 +22,27 @@ class AccountRequestsToSignups < Card::CoreMigration
     new_signup.save!
 
     Card::Codename.reset_cache
-    
+
     # move old "*signup+*thanks" to "Sign up+*type+*thanks"
     thanks = Card[:thanks]
-    if signup_thanks = Card["#{old_signup.name}+#{thanks.name}"]
-      signup_thanks.name = "#{new_signup.name}+#{Card[:type].name}+#{thanks.name}" 
+    if (signup_thanks = Card["#{old_signup.name}+#{thanks.name}"])
+      signup_thanks.name = "#{new_signup.name}+#{Card[:type].name}+#{thanks.name}"
       signup_thanks.update_referencers = true
       signup_thanks.save!
     end
-    
+
     # get rid of old signup card unless there is other data there (most likely +*subject and +*message)
-    unless Card.search(:return=>:id, :left_id=>old_signup.id).first
+    unless Card.search(return: :id, left_id: old_signup.id).first
       old_signup.delete!
     end
-    
+
     # turn captcha off by default on signup
     rulename = [:signup, :type, :captcha].map { |code| Card[code].name } * '+'
-    captcha_rule = Card.fetch rulename, :new=>{}
+    captcha_rule = Card.fetch rulename, new: {}
     captcha_rule.content = '0'
     captcha_rule.save!
-    
-    
+
+
   end
 
 end

data/db/migrate_core_cards/20140512155840_add_script_cards.rb

@@ -3,17 +3,17 @@
 class Card
   def self.gimme! name, args = {}
     Card::Auth.as_bot do
-      c = Card.fetch( name, :new => args )
+      c = Card.fetch( name, new: args )
       c.putty args
-      Card.fetch name 
-    end    
+      Card.fetch name
+    end
   end
-    
+
   def putty args = {}
     Card::Auth.as_bot do
-      if args.present? 
-        update_attributes! (args) 
-      else 
+      if args.present?
+        update_attributes! args
+      else
         save!
       end
     end
@@ -21,62 +21,61 @@ class Card
 end
 
 class AddScriptCards < Card::CoreMigration
-  def up    
+  def up
     # JavaScript and CoffeeScript types
-    card = Card.fetch "CoffeeScript", :new => {}
+    card = Card.fetch "CoffeeScript", new: {}
     card.codename = "coffee_script"
     card.type_id = Card::CardtypeID
     card.save!
-    
-    card = Card.fetch "JavaScript", :new => {}
+
+    card = Card.fetch "JavaScript", new: {}
     card.codename = "java_script"
     card.type_id = Card::CardtypeID
     card.save!
-    #Card.create! :name=>'JavaScript', :codename=>:java_script, :type_id=>Card::CardtypeID
-    #Card.create! :name=>'CoffeeScript', :codename=>:coffee_script, :type_id=>Card::CardtypeID
-    
+    #Card.create! name: 'JavaScript', codename: :java_script, type_id: Card::CardtypeID
+    #Card.create! name: 'CoffeeScript', codename: :coffee_script, type_id: Card::CardtypeID
+
     # Permissions for JavaScript and CoffeeScript types
     # ( the same as for CSS and SCSS)
     ['JavaScript', 'CoffeeScript'].each do |type|
       [ :create, :update, :delete].each do |action|
-        Card.gimme!( "#{type}+#{Card[:type].name}+#{Card[action].name}", 
-          :content=>"[[#{Card[:administrator].name}]]")
+        Card.gimme!( "#{type}+#{Card[:type].name}+#{Card[action].name}",
+          content: "[[#{Card[:administrator].name}]]")
       end
     end
-    
+
     # +*script rules
-    Card.create! :name=>'*script', :codename=>:script, :type_id=>Card::SettingID
+    Card.create! name: '*script', codename: :script, type_id: Card::SettingID
     script_set = "*script+#{Card[:right].name}"
-    Card.create! :name=>"#{script_set}+#{Card[:default].name}", :type_id=>Card::PointerID
-    Card.create! :name=>"#{script_set}+#{Card[:read].name}",    :content=>"[[#{Card[:anyone].name}]]"
-    Card.create! :name=>"#{script_set}+#{Card[:options].name}", :content=>%( {"type":["in", "JavaScript", "CoffeeScript"] }), :type=>Card::SearchTypeID  
-    Card.create! :name=>"#{script_set}+#{Card[:input].name}",   :content=>'list'
-    Card.create! :name=>"#{script_set}+#{Card[:help].name}",    :content=>
-      %{ JavaScript (or CoffeeScript) for card's page. }  #TODO  help link?
-    
-   
+    Card.create! name: "#{script_set}+#{Card[:default].name}", type_id: Card::PointerID
+    Card.create! name: "#{script_set}+#{Card[:read].name}",    content: "[[#{Card[:anyone].name}]]"
+    Card.create! name: "#{script_set}+#{Card[:options].name}", content: %( {"type":["in", "JavaScript", "CoffeeScript"] }), type: Card::SearchTypeID
+    Card.create! name: "#{script_set}+#{Card[:input].name}",   content: 'list'
+    Card.create! name: "#{script_set}+#{Card[:help].name}",    content:       %{ JavaScript (or CoffeeScript) for card's page. }  #TODO  help link?
+
+
     # Machine inputs and outputs
     default_rule_ending = "#{ Card[:right].name }+#{ Card[ :default ].name }"
-    Card.create! :name=>'*machine output', :codename=>:machine_output
-    Card.create! :name=>"*machine output+#{default_rule_ending}", :type_id=>Card::FileID
-    Card.create! :name=>"*machine output+#{ Card[:right].name}+#{Card[:read].name}", :content=>'_left'
-    Card.create! :name=>'*machine input', :codename=>:machine_input
-    Card.create! :name=>"*machine input+#{default_rule_ending}", :type_id=>Card::PointerID
-    
+    Card.create! name: '*machine output', codename: :machine_output
+    Card.create! name: "*machine output+#{default_rule_ending}", type_id: Card::FileID
+    Card.create! name: "*machine output+#{ Card[:right].name}+#{Card[:read].name}", content: '_left'
+    Card.create! name: '*machine input', codename: :machine_input
+    Card.create! name: "*machine input+#{default_rule_ending}", type_id: Card::PointerID
+
     # create default script rule
     card_type = { 'js' => "java_script", 'coffee' => "coffee_script"}
     scripts        = %w{ jquery tinymce slot     card_menu jquery_helper html5shiv_printshiv  }
     types          = %w{ js     js      coffee   js        js            js                   }
     # jquery.mobile  (in jquery_helper) must be after card to avoid mobileinit nastiness
     cardnames = scripts.map { |name| "script: #{name.gsub( '_', ' ' )}" }
-    
+
     scripts.each_with_index do |name, index|
-      Card.create! :name=>cardnames[index], :type=>card_type[types[index]], :codename=>"script_#{name}"
+      Card.create! name: cardnames[index], type: card_type[types[index]], codename: "script_#{name}"
     end
-    
+
     cardnames.pop # html5shiv_printshiv not in default list, only used for IE9 (handled in head.rb)
     Card::Cache.reset_global
-    Card.create! :name=>"#{Card[:all].name}+*script", :content=>cardnames.map { |name| "[[#{ name }]]" }.join("\n")
+    Card.create! name: "#{Card[:all].name}+*script", content: cardnames.map { |name| "[[#{ name }]]" }.join("\n")
 
   end
 end