wagn 1.17.4 → 1.18.0

data/lib/wagn/mods_spec_helper.rb

@@ -1,16 +1,15 @@
 # -*- encoding : utf-8 -*-
-require "codeclimate-test-reporter"
+require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 require 'spork'
 
-ENV["RAILS_ENV"] = 'test'
+ENV['RAILS_ENV'] = 'test'
 
 Spork.prefork do
-
-  if ENV["RAILS_ROOT"]
-    require File.join( ENV["RAILS_ROOT"], '/config/environment')
+  if ENV['RAILS_ROOT']
+    require File.join(ENV['RAILS_ROOT'], '/config/environment')
   else
-    require File.expand_path( '../../config/environment', __FILE__ )
+    require File.expand_path('../../config/environment', __FILE__)
   end
   require File.join Cardio.gem_root, 'lib', 'card', 'simplecov_helper.rb'
 
@@ -18,28 +17,24 @@ Spork.prefork do
     Bundler.require(:test)   # if simplecov is activated in the Gemfile, it has to be required here
   end
 
-
-
   require 'rspec/rails'
 
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
-#  Dir[ File.join(Wagn.gem_root, "spec/support/**/*.rb") ].each { |f| require f }
+  #  Dir[ File.join(Wagn.gem_root, "spec/support/**/*.rb") ].each { |f| require f }
 
-#  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+  #  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
   JOE_USER_ID = Card['joe_user'].id
 
   RSpec.configure do |config|
-    config.include RSpec::Rails::Matchers::RoutingMatchers,  {
-      file_path: /\bspec\/controllers\//
-    }
+    config.include RSpec::Rails::Matchers::RoutingMatchers,        file_path: /\bspec\/controllers\//
     config.infer_spec_type_from_file_location!
     # format_index = ARGV.find_index {|arg| arg =~ /--format/ }
     # formatter = format_index ? ARGV[ format_index + 1 ] : 'documentation'
     # config.add_formatter formatter
 
-    #config.include CustomMatchers
-    #config.include ControllerMacros, type: :controllers
+    # config.include CustomMatchers
+    # config.include ControllerMacros, type: :controllers
 
     # == Mock Framework
     # If you prefer to mock with mocha, flexmock or RR, uncomment the appropriate symbol:
@@ -50,7 +45,6 @@ Spork.prefork do
     config.use_transactional_fixtures = true
     config.use_instantiated_fixtures  = false
 
-
     config.before(:each) do
       Card::Auth.current_id = JOE_USER_ID
       Card::Cache.restore
@@ -62,7 +56,6 @@ Spork.prefork do
   end
 end
 
-
 Spork.each_run do
   # This code will be run each time you run your specs.
 end
@@ -70,5 +63,3 @@ end
 require File.join Cardio.gem_root, 'lib', 'card', 'spec_helper.rb'
 
 RSpec::Core::ExampleGroup.send :include, Card::SpecHelper
-
-

data/lib/wagn/parser.rb

@@ -54,9 +54,9 @@ module Wagn
           parser.on('-m', '--mod MODNAME',
                     'Run all specs for a mod or matching a mod') do |file|
             opts[:files] =
-              if File.exists?("mod/#{file}")
+              if File.exist?("mod/#{file}")
                 "#{Cardio.gem_root}/mod/#{file}"
-              elsif File.exists?("#{Cardio.gem_root}/mod/#{file}")
+              elsif File.exist?("#{Cardio.gem_root}/mod/#{file}")
                 "#{Cardio.gem_root}/mod/#{file}"
               elsif (files = find_spec_file(file, 'mod')) && files.present?
                 files
@@ -78,7 +78,7 @@ module Wagn
             if spring
               opts[:executer] = 'spring'
               if opts[:rescue]
-                opts[:rescue]  = ''
+                opts[:rescue] = ''
                 puts 'Disabled pry-rescue. Not compatible with spring.'
               end
             else

data/lib/wagn/script_wagn_loader.rb

@@ -2,14 +2,14 @@ require 'pathname'
 
 module Wagn
   module ScriptWagnLoader
-    RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
+    RUBY = File.join(*RbConfig::CONFIG.values_at('bindir', 'ruby_install_name')) + RbConfig::CONFIG['EXEEXT']
     SCRIPT_WAGN = File.join('script', 'wagn')
 
     def self.exec_script_wagn!
       cwd = Dir.pwd
       return unless in_wagn_application? || in_wagn_application_subdirectory?
       exec RUBY, SCRIPT_WAGN, *ARGV if in_wagn_application?
-      Dir.chdir("..") do
+      Dir.chdir('..') do
         # Recurse in a chdir block: if the search fails we want to be sure
         # the application is generated in the original working directory.
         exec_script_wagn! unless cwd == Dir.pwd
@@ -19,11 +19,11 @@ module Wagn
     end
 
     def self.in_wagn_application?
-      File.exists?(SCRIPT_WAGN)
+      File.exist?(SCRIPT_WAGN)
     end
 
-    def self.in_wagn_application_subdirectory?(path = Pathname.new(Dir.pwd))
-      File.exists?(File.join(path, SCRIPT_WAGN)) || !path.root? && in_wagn_application_subdirectory?(path.parent)
+    def self.in_wagn_application_subdirectory? path=Pathname.new(Dir.pwd)
+      File.exist?(File.join(path, SCRIPT_WAGN)) || !path.root? && in_wagn_application_subdirectory?(path.parent)
     end
   end
-end
+end

data/lib/wagn/simplecov_helper.rb

@@ -2,31 +2,30 @@ def card_simplecov_filters
   add_filter 'spec/'
   add_filter '/config/'
   add_filter '/tasks/'
-	
-	# filter all card mods
+
+  # filter all card mods
   add_filter do |src_file|
-    src_file.filename =~ /tmp\// and not
-    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+    src_file.filename =~ /tmp\// && !/\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
   end
-	
-	# add group for each deck mod
-  Dir['mod/*'].map{ |path| path.sub('mod/','') }.each do |mod|
+
+  # add group for each deck mod
+  Dir['mod/*'].map { |path| path.sub('mod/', '') }.each do |mod|
     add_group mod.capitalize do |src_file|
-      src_file.filename =~ /mod\/#{mod}\// or 
+      src_file.filename =~ /mod\/#{mod}\// ||
         (
-          src_file.filename =~ /tmp\// and
-          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1]}"].present? } 
+          src_file.filename =~ /tmp\// &&
+          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1]}"].present? }
         )
     end
   end
 
   add_group 'Sets' do |src_file|
-    src_file.filename =~ /tmp\/set\// and
-    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+    src_file.filename =~ /tmp\/set\// &&
+      /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
   end
   add_group 'Set patterns' do |src_file|
-    src_file.filename =~ /tmp\/set_pattern\// and
-    /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
+    src_file.filename =~ /tmp\/set_pattern\// &&
+      /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/**/#{m[1]}"].present? }
   end
   add_group 'Formats' do |src_file|
     src_file.filename =~ /mod\/[^\/]+\/formats/
@@ -40,8 +39,8 @@ def card_core_dev_simplecov_filters
   filters.clear # This will remove the :root_filter that comes via simplecov's defaults
   add_filter do |src|
     !(src.filename =~ /^#{SimpleCov.root}/) unless src.filename =~ /wagn/
-  end    
-  
+  end
+
   add_filter '/spec/'
   add_filter '/features/'
   add_filter '/config/'
@@ -49,7 +48,7 @@ def card_core_dev_simplecov_filters
   add_filter '/generators/'
   add_filter 'lib/card'
 
-  add_group 'Card', 'lib/card'  
+  add_group 'Card', 'lib/card'
   add_group 'Set Patterns', 'tmp/set_pattern/'
   add_group 'Sets',         'tmp/set/'
   add_group 'Formats' do |src_file|

data/lib/wagn/tasks/cucumber.rake

@@ -4,52 +4,49 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
+unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gems:* tasks
 
-unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
-
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+  vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
 $LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
 
 begin
   require 'cucumber/rake/task'
 
   namespace :cucumber do
-    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+    Cucumber::Rake::Task.new({ ok: 'db:test:prepare' }, 'Run features that should pass') do |t|
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
     end
 
-    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+    Cucumber::Rake::Task.new({ wip: 'db:test:prepare' }, 'Run features that are being worked on') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'wip'
     end
 
-    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+    Cucumber::Rake::Task.new({ rerun: 'db:test:prepare' }, 'Record failing features and run only them if any exist') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'rerun'
     end
 
     desc 'Run all features'
-    task :all => [:ok, :wip]
+    task all: [:ok, :wip]
 
     task :statsetup do
       require 'rails/code_statistics'
       ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
-      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
-      ::STATS_DIRECTORIES << %w(Mods mods) if File.exist?('mods') #hack!  should be elsewhere
-      
-      
+      ::CodeStatistics::TEST_TYPES << 'Cucumber features' if File.exist?('features')
+      ::STATS_DIRECTORIES << %w(Mods mods) if File.exist?('mods') # hack!  should be elsewhere
     end
   end
   desc 'Alias for cucumber:ok'
-  task :cucumber => 'cucumber:ok'
+  task cucumber: 'cucumber:ok'
 
-  task :default => :cucumber
+  task default: :cucumber
 
-  task :features => :cucumber do
+  task features: :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
 
@@ -57,7 +54,7 @@ begin
   task 'db:test:prepare' do
   end
 
-  task :stats => 'cucumber:statsetup'
+  task stats: 'cucumber:statsetup'
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do

data/lib/wagn/tasks/db.rake

@@ -7,12 +7,11 @@ require 'rake'
 unless Rake::TaskManager.methods.include?(:redefine_task)
   module Rake
     module TaskManager
-
-      def redefine_task(task_class, args, &block)
+      def redefine_task task_class, args, &block
         task_name, arg_names, deps = resolve_args(args)
         task_name = task_class.scope_name(@scope, task_name)
         deps = [deps] unless deps.respond_to?(:to_ary)
-        deps = deps.collect {|d| d.to_s }
+        deps = deps.map(&:to_s)
         task = @tasks[task_name.to_s] = task_class.new(task_name, self)
         task.application = self
         @last_comment = nil
@@ -22,7 +21,7 @@ unless Rake::TaskManager.methods.include?(:redefine_task)
     end
     class Task
       class << self
-        def redefine_task(args, &block)
+        def redefine_task args, &block
           Rake.application.redefine_task(self, [args], &block)
         end
       end
@@ -30,13 +29,12 @@ unless Rake::TaskManager.methods.include?(:redefine_task)
   end
 end
 
-
 namespace :db do
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-    task :load => :environment do
+    task load: :environment do
       require 'active_record/fixtures'
-      fixture_path = File.join(Cardio.gem_root, 'db','seed', 'test', 'fixtures')
+      fixture_path = File.join(Cardio.gem_root, 'db', 'seed', 'test', 'fixtures')
       ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(fixture_path, '*.{yml,csv}'))).each do |fixture_file|
         ActiveRecord::FixtureSet.create_fixtures(fixture_path, File.basename(fixture_file, '.*'))
@@ -46,15 +44,12 @@ namespace :db do
 
   namespace :test do
     desc 'Prepare the test database and load the schema'
-    Rake::Task.redefine_task( :prepare => :environment ) do
+    Rake::Task.redefine_task(prepare: :environment) do
       if ENV['RELOAD_TEST_DATA'] == 'true' || ENV['RUN_CODE_RUN']
         puts `env RAILS_ENV=test rake wagn:seed`
       else
-        puts "skipping loading test data.  to force, run `env RELOAD_TEST_DATA=true rake db:test:prepare`"
+        puts 'skipping loading test data.  to force, run `env RELOAD_TEST_DATA=true rake db:test:prepare`'
       end
     end
   end
 end
-
-
-

data/lib/wagn/tasks/test.rake

@@ -1,9 +1,9 @@
 TEST_SEED_PATH = File.join(
-  ENV['DECKO_SEED_REPO_PATH'] || [Cardio.gem_root, 'db','seed'], 'test'
+  ENV['DECKO_SEED_REPO_PATH'] || [Cardio.gem_root, 'db', 'seed'], 'test'
 )
 
 namespace :test do
-  task :all => :environment do
+  task all: :environment do
     puts 'This is not yet working; only first invocation takes effect'
     Rake::Task['test:functionals'].invoke
     puts 'put 2'
@@ -17,43 +17,40 @@ namespace :test do
 
   ## FIXME: this generates an "Adminstrator links" card with the wrong reader_id, I have been
   ##  setting it by hand after fixture generation.
-  desc "recreate test fixtures from fresh db"
-  task :generate_fixtures => :environment do
+  desc 'recreate test fixtures from fresh db'
+  task generate_fixtures: :environment do
     ENV['GENERATE_FIXTURES'] = 'true'
-    raise "must be test env" unless Rails.env == 'test'
+    raise 'must be test env' unless Rails.env == 'test'
 
     Rake::Task['wagn:reset_cache']
 
-    puts "reseed test db"
+    puts 'reseed test db'
     Rake::Task['wagn:seed'].invoke
 
-    puts ">>populating test data"
+    puts '>>populating test data'
     puts `rake test:populate_template_database --trace`
 
-    puts ">>extracting to fixtures"
+    puts '>>extracting to fixtures'
     puts `rake test:extract_fixtures --trace`
   end
 
+  desc 'dump current db to test fixtures'
+  task extract_fixtures: :environment do
+    raise 'must be test env' unless Rails.env == 'test'
+    YAML::ENGINE.yamler = 'syck' if RUBY_VERSION !~ /^(2|1\.9)/
+    # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
+    # which dumps with slashes that syck can't understand (also !!null stuff)
 
-  desc "dump current db to test fixtures"
-  task :extract_fixtures => :environment do
-    raise "must be test env" unless Rails.env == 'test'
-    if RUBY_VERSION !~ /^(2|1\.9)/
-      YAML::ENGINE.yamler = 'syck'
-    end
-      # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
-      # which dumps with slashes that syck can't understand (also !!null stuff)
-
-    sql = "SELECT * FROM %s"
-    tables = %w{ cards card_acts card_actions card_changes card_references }
+    sql = 'SELECT * FROM %s'
+    tables = %w( cards card_acts card_actions card_changes card_references )
     ActiveRecord::Base.establish_connection
     tables.each do |table_name|
-      i = "000"
-      File.open("#{ TEST_SEED_PATH }/fixtures/#{table_name}.yml", 'w') do |file|
+      i = '000'
+      File.open("#{TEST_SEED_PATH}/fixtures/#{table_name}.yml", 'w') do |file|
         data = ActiveRecord::Base.connection.select_all(sql % table_name)
         file.write data.inject({}) { |hash, record|
-          record['trash'] = false if record.has_key? 'trash'
-          record['draft'] = false if record.has_key? 'draft'
+          record['trash'] = false if record.key? 'trash'
+          record['draft'] = false if record.key? 'draft'
           hash["#{table_name}_#{i.succ!}"] = record
           hash
         }.to_yaml
@@ -61,12 +58,11 @@ namespace :test do
     end
   end
 
-  desc "create sample data for testing"
-  task :populate_template_database => :environment do
-    raise "must be test env" unless Rails.env == 'test'
+  desc 'create sample data for testing'
+  task populate_template_database: :environment do
+    raise 'must be test env' unless Rails.env == 'test'
     puts "populate test data\n"
-    load "#{ TEST_SEED_PATH }/seed.rb"
+    load "#{TEST_SEED_PATH}/seed.rb"
     SharedData.add_test_data
   end
-
 end

data/lib/wagn/tasks/wagn.rake

@@ -1,7 +1,7 @@
 require 'wagn/application'
 
-WAGN_SEED_TABLES = %w{ cards card_actions card_acts card_changes
-                       card_references }
+WAGN_SEED_TABLES = %w( cards card_actions card_acts card_changes
+                       card_references ).freeze
 WAGN_SEED_PATH = File.join(
   ENV['DECKO_SEED_REPO_PATH'] || [Cardio.gem_root, 'db', 'seed'], 'new'
 )
@@ -86,7 +86,7 @@ namespace :wagn do
     end
     Dir.mkdir Wagn.paths['tmp'].first
     Rake::Task['wagn:migrate'].invoke
-    # FIXME remove tmp dir / clear cache
+    # FIXME: remove tmp dir / clear cache
     puts 'set symlink for assets'
     Rake::Task['wagn:update_assets_symlink'].invoke
   end
@@ -99,7 +99,7 @@ namespace :wagn do
   desc 'set symlink for assets'
   task :update_assets_symlink do
     assets_path = File.join(Rails.public_path, 'assets')
-    if Rails.root.to_s != Wagn.gem_root and not File.exists? assets_path
+    if Rails.root.to_s != Wagn.gem_root && !File.exist?(assets_path)
       FileUtils.rm assets_path if File.symlink? assets_path
       FileUtils.ln_s(Decko::Engine.paths['gem-assets'].first, assets_path)
     end
@@ -114,21 +114,20 @@ namespace :wagn do
 
     puts 'migrating structure'
     Rake::Task['wagn:migrate:structure'].invoke
-    if stamp
-      Rake::Task['wagn:migrate:stamp'].invoke :structure
-    end
+    Rake::Task['wagn:migrate:stamp'].invoke :structure if stamp
 
     puts 'migrating core cards'
     Card::Cache.reset_all
-    Rake::Task['wagn:migrate:core_cards'].execute #not invoke because we don't want to reload environment
+    # not invoke because we don't want to reload environment
+    Rake::Task['wagn:migrate:core_cards'].execute
     if stamp
       Rake::Task['wagn:migrate:stamp'].reenable
       Rake::Task['wagn:migrate:stamp'].invoke :core_cards
     end
 
-
     puts 'migrating deck cards'
-    Rake::Task['wagn:migrate:deck_cards'].execute #not invoke because we don't want to reload environment
+    # not invoke because we don't want to reload environment
+    Rake::Task['wagn:migrate:deck_cards'].execute
     if stamp
       Rake::Task['wagn:migrate:stamp'].reenable
       Rake::Task['wagn:migrate:stamp'].invoke :deck_cards
@@ -194,9 +193,9 @@ namespace :wagn do
       end
     end
 
-# maybe we should move this to a method?
+    # maybe we should move this to a method?
     desc 'write the version to a file (not usually called directly)'
-    task :stamp, :type do |t, args|
+    task :stamp, :type do |_t, args|
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       Cardio.config.action_mailer.perform_deliveries = false
 
@@ -204,7 +203,7 @@ namespace :wagn do
 
       Cardio.schema_mode args[:type] do
         version = ActiveRecord::Migrator.current_version
-        if version.to_i > 0 and file = open(stamp_file, 'w')
+        if version.to_i > 0 && (file = open(stamp_file, 'w'))
           puts ">>  writing version: #{version} to #{stamp_file}"
           file.puts version
         end
@@ -212,33 +211,30 @@ namespace :wagn do
     end
   end
 
-
   namespace :emergency do
     task rescue_watchers: :environment do
       follower_hash = Hash.new { |h, v| h[v] = [] }
 
       Card.where('right_id' => 219).each do |watcher_list|
         watcher_list.include_set_modules
-        if watcher_list.left
-          watching = watcher_list.left.name
-          watcher_list.item_names.each do |user|
-            follower_hash[user] << watching
-          end
+        next unless watcher_list.left
+        watching = watcher_list.left.name
+        watcher_list.item_names.each do |user|
+          follower_hash[user] << watching
         end
       end
 
-      Card.search(right: {codename: 'following'}).each do |following|
+      Card.search(right: { codename: 'following' }).each do |following|
         Card::Auth.as_bot do
           following.update_attributes! content: ''
         end
       end
 
       follower_hash.each do |user, items|
-        if card=Card.fetch(user) and card.account
-          Card::Auth.as(user) do
-            following = card.fetch trait: 'following', new: {}
-            following.items = items
-          end
+        next unless (card = Card.fetch(user)) && card.account
+        Card::Auth.as(user) do
+          following = card.fetch trait: 'following', new: {}
+          following.items = items
         end
       end
     end
@@ -259,14 +255,12 @@ namespace :wagn do
     task dump: :environment do
       Card::Cache.reset_all
 
-      # FIXME temporarily taking this out!!
+      # FIXME: temporarily taking this out!!
       Rake::Task['wagn:bootstrap:copy_mod_files'].invoke
 
-      if RUBY_VERSION !~ /^(2|1\.9)/
-        YAML::ENGINE.yamler = 'syck'
-      end
-      # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
-      # which dumps with slashes that syck can't understand
+      YAML::ENGINE.yamler = 'syck' if RUBY_VERSION !~ /^(2|1\.9)/
+      # use old engine while we're supporting ruby 1.8.7 because it can't
+      # support Psych, which dumps with slashes that syck can't understand
 
       WAGN_SEED_TABLES.each do |table|
         i = '000'
@@ -274,29 +268,28 @@ namespace :wagn do
           data = ActiveRecord::Base.connection.select_all(
             "select * from #{table}"
           )
-          file.write YAML::dump( data.inject({}) do |hash, record|
-            record['trash'] = false if record.has_key? 'trash'
-            record['draft'] = false if record.has_key? 'draft'
-            if record.has_key? 'content'
-              record['content'] = record['content'].gsub /\u00A0/, '&nbsp;'
-              # sych was handling nonbreaking spaces oddly.  would not be needed with psych.
+          file.write YAML.dump(data.inject({}) do |hash, record|
+            record['trash'] = false if record.key? 'trash'
+            record['draft'] = false if record.key? 'draft'
+            if record.key? 'content'
+              record['content'] = record['content'].gsub(/\u00A0/, '&nbsp;')
+              # sych was handling nonbreaking spaces oddly.
+              # would not be needed with psych.
             end
             hash["#{table}_#{i.succ!}"] = record
             hash
           end)
         end
       end
-
     end
 
     desc 'copy files from template database to standard mod and update cards'
     task copy_mod_files: :environment do
-
       source_files_dir = "#{Wagn.root}/files"
 
       # mark mod files as mod files
       Card::Auth.as_bot do
-        Card.search(type: ['in', 'Image', 'File'], ne: '').each do |card|
+        Card.search(type: %w(in Image File), ne: '').each do |card|
           if card.mod_file? || card.codename == 'new_file' ||
              card.codename == 'new_image'
             puts "skipping #{card.name}: already in code"
@@ -307,15 +300,21 @@ namespace :wagn do
 
           raise 'need codename for file' unless card.codename.present?
 
-          files = {original: card.attachment.path}
+          files = { original: card.attachment.path }
           card.attachment.versions.each_key do |version|
             files[version] = card.attachment.path(version)
           end
 
           # make card a mod file card
-          mod_name = (l = card.left) && l.type_id==Card::SkinID ? '06_bootstrap' : '05_standard'
-          card.update_column :db_content, card.attachment.db_content(mod: mod_name)
-          card.last_action.change_for(2).first.update_column :value, card.attachment.db_content(mod: mod_name)
+          mod_name = if (l = card.left) && l.type_id == Card::SkinID
+                       '06_bootstrap'
+                     else
+                       '05_standard'
+                     end
+          card.update_column :db_content,
+                             card.attachment.db_content(mod: mod_name)
+          card.last_action.change_for(2).first
+              .update_column :value, card.attachment.db_content(mod: mod_name)
           card.expire
           card = Card.fetch card.name
 
@@ -340,8 +339,8 @@ namespace :wagn do
 end
 
 def correct_time_and_user_stamps
-  conn =  ActiveRecord::Base.connection
-  who_and_when = [ Card::WagnBotID, Time.now.utc.to_s(:db) ]
+  conn = ActiveRecord::Base.connection
+  who_and_when = [Card::WagnBotID, Time.now.utc.to_s(:db)]
   card_sql = "update cards set creator_id=%1$s, created_at='%2$s', updater_id=%1$s, updated_at='%2$s'"
   conn.update(card_sql                                          % who_and_when)
   conn.update("update card_acts set actor_id=%s, acted_at='%s'" % who_and_when)
@@ -350,15 +349,13 @@ end
 def delete_unwanted_cards
   Card::Auth.as_bot do
     if ignoramus = Card['*ignore']
-      ignoramus.item_cards.each do |card|
-        card.delete!
-      end
+      ignoramus.item_cards.each(&:delete!)
     end
     Card::Cache.reset_all
     # FIXME: can this be associated with the machine module somehow?
-    %w{ machine_input machine_output }.each do |codename|
-      Card.search(:right=>{:codename=>codename }).each do |card|
-        FileUtils.rm_rf File.join('files', card.id.to_s ), :secure=>true
+    %w( machine_input machine_output ).each do |codename|
+      Card.search(right: { codename: codename }).each do |card|
+        FileUtils.rm_rf File.join('files', card.id.to_s), secure: true
         card.delete!
       end
     end
@@ -369,12 +366,12 @@ def clear_history
   Card::Action.delete_old
   Card::Change.delete_actionless
 
-  conn =  ActiveRecord::Base.connection
-  conn.execute( "truncate card_acts" )
-  conn.execute( "truncate sessions" )
+  conn = ActiveRecord::Base.connection
+  conn.execute('truncate card_acts')
+  conn.execute('truncate sessions')
   act = Card::Act.create! actor_id: Card::WagnBotID,
-                          :card_id=>Card::WagnBotID
+                          card_id: Card::WagnBotID
   Card::Action.find_each do |action|
-    action.update_attributes!(:card_act_id=>act.id)
+    action.update_attributes!(card_act_id: act.id)
   end
 end