wagn 1.18.6 → 1.19.0

data/features/structure.feature

@@ -1,3 +1,4 @@
+@javascript
 Feature: Structure Rules
   In order to have patterned content
   As a Wagneer

data/features/support/delayed_job.rb

@@ -0,0 +1,18 @@
+Before("@delayed-jobs") do
+  Delayed::Worker.delay_jobs = true
+end
+
+After("@delayed-jobs") do
+  Delayed::Worker.delay_jobs = false
+end
+
+Before("@background-jobs") do
+  Delayed::Worker.delay_jobs = true
+  system "env RAILS_ENV=cucumber rake jobs:work &"
+end
+
+After("@background-jobs") do
+  Delayed::Worker.delay_jobs = false
+  system "ps -ef | grep 'rake jobs:work' | grep -v grep | awk '{print $2}' | "\
+         "xargs kill -9"
+end

data/features/support/env.rb

@@ -1,33 +1,49 @@
 # -*- encoding : utf-8 -*-
-ENV['RAILS_ENV'] = 'cucumber'
+ENV["RAILS_ENV"] = "cucumber"
 
-require File.expand_path('../../../lib/wagn/simplecov_helper.rb', __FILE__)
-require 'simplecov'
-require 'minitest/autorun'
+require File.expand_path("../../../lib/wagn/simplecov_helper.rb", __FILE__)
+require "simplecov"
+require "minitest/autorun"
 
-require 'pry'
+require "rspec/expectations"
+World(RSpec::Matchers)
+require "rspec-html-matchers"
+World(RSpecHtmlMatchers)
+
+require "pry"
 
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
 # It is recommended to regenerate this file in the future when you upgrade to a
 # newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
+# instead of editing this one. Cucumber will automatically load all
+# features/**/*.rb files.
+Before("@background-jobs, @delayed-jobs, @javascript") do
+  DatabaseCleaner.strategy = :truncation
+end
+Before("~@background-jobs", "~@delayed-jobs", "~@javascript") do
+  DatabaseCleaner.strategy = :transaction
+end
+After("@background-jobs, @delayed-jobs, @javascript") do
+  Card.seed_test_db
+end
 
-require 'cucumber/rails'
+require "cucumber/rails"
+require "test_after_commit"
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
-Capybara.default_wait_time = 60
+Capybara.default_wait_time = 30
 # By default, any exception happening in your Rails application will bubble up
 # to Cucumber so that your scenario will fail. This is a different from how
-# your application behaves in the production environment, where an error page will
-# be rendered instead.
+# your application behaves in the production environment, where an error page
+# will be rendered instead.
 #
 # Sometimes we want to override this default behaviour and allow Rails to rescue
-# exceptions and display an error page (just like when the app is running in production).
+# exceptions and display an error page
+# (just like when the app is running in production).
 # Typical scenarios where you want to do this is when you test your error pages.
 # There are two ways to allow Rails to rescue exceptions:
 #
@@ -39,26 +55,29 @@ Capybara.default_wait_time = 60
 ActionController::Base.allow_rescue = false
 
 # Remove/comment out the lines below if your app doesn't have a database.
-# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
-begin
-  DatabaseCleaner.strategy = :transaction
-rescue NameError
-  raise 'You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it.'
-end
+# For some databases (like MongoDB and CouchDB) you may need to
+# use :truncation instead.
+# begin
+#   DatabaseCleaner.strategy = :transaction
+# rescue NameError
+#   raise 'You need to add database_cleaner to your Gemfile (in the :test group)
+# if you wish to use it.'
+# end
 
-# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
+# You may also want to configure DatabaseCleaner to use different strategies for
+# certain features and scenarios.
 # See the DatabaseCleaner documentation for details. Example:
 #
-#   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+#   Before('@no-txn,@selenium,@celerity,@javascript') do
 #     DatabaseCleaner.strategy = :truncation, {except: %w[widgets]}
 #   end
 #
-#   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
-#     DatabaseCleaner.strategy = :transaction
-#   end
+#   Before('~@no-txn', '~@selenium', ~@celerity', '~@javascript') do
+#   DatabaseCleaner.strategy = :transaction
+# end
 #
 
 # Possible values are :truncation and :transaction
 # The :transaction strategy is faster, but might give you threading problems.
 # See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
-Cucumber::Rails::Database.javascript_strategy = :transaction
+Cucumber::Rails::Database.javascript_strategy = :truncation

data/features/support/paths.rb

@@ -10,13 +10,13 @@ module NavigationHelpers
     case page_name
 
     when /the home\s?page/
-      '/'
+      "/"
 
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #
     #   when /^(.*)'s profile page$/i
-    #     user_profile_path(Auth[ $1 ])
+    #     user_profile_path(Auth.find_account_by_email( $1 ))
 
     when /card (.*) with (.*) layout$/
       "/#{Regexp.last_match(1).to_name.url_key}?layout=$2"
@@ -40,7 +40,7 @@ module NavigationHelpers
       "/new/#{Regexp.last_match(1).to_name.url_key}"
 
     when /kml source/
-      '/House+*type+by_name.kml'
+      "/House+*type+by_name.kml"
 
     when /url "(.*)"/
       Regexp.last_match(1).to_s
@@ -49,7 +49,7 @@ module NavigationHelpers
       begin
         page_name =~ /the (.*) page/
         path_components = Regexp.last_match(1).split(/\s+/)
-        send(path_components.push('path').join('_').to_sym)
+        send(path_components.push("path").join("_").to_sym)
       rescue Object => e
         raise "#{e.message} Can't find mapping from \"#{page_name}\" to a path.\n" \
               "Now, go and add a mapping in #{__FILE__}"

data/features/support/scopes.rb

@@ -4,22 +4,22 @@ module ScopeHelpers
     case section
 
     when /main card content/
-      '#main > .card-slot > .card-frame > .card-content'
+      "#main > .card-slot > .card-frame > .card-content"
 
     when /pointer card content/
-      '#main > .card-slot > .card-frame > .card-content > .pointer-list'
+      "#main > .card-slot > .card-frame > .card-content > .pointer-list"
 
     when /main card header/
-      '#main > .card-slot > .card-frame > .card-header'
+      "#main > .card-slot > .card-frame > .card-header"
 
     when /main card menu/
-      '#main > .card-slot > .menu-slot > .card-menu'
+      "#main > .card-slot > .menu-slot > .card-menu"
 
     when /main card toolbar/
-      '#main > .card-slot > .card-frame > nav.toolbar'
+      "#main > .card-slot > .card-frame > nav.toolbar"
 
     when /main card frame/
-      '#main > .card-slot > .card-frame'
+      "#main > .card-slot > .card-frame"
 
     else
       raise "Can't find mapping from \"#{section}\" to a scope.\n" \

data/features/support/wagn_env.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'email_spec'
-require 'email_spec/cucumber'
+require "email_spec"
+require "email_spec/cucumber"
 
 Capybara.configure do |config|
   config.match = :prefer_exact

data/features/table_of_contents.feature

@@ -1,3 +1,4 @@
+@javascript
 Feature: Table of Contents
   In order to add a table of contents to a card
   As a Wagneer

data/features/update_includers.feature

@@ -1,3 +1,4 @@
+@javascript @delayed-jobs
 Feature: Updates for Children of watched cards
   In order to keep track of changes that are important to me
   As an Editor
@@ -16,7 +17,7 @@ Feature: Updates for Children of watched cards
     #And He should see "added Ulysses+author" in the email  -- FIXME need multiline matching
     Then Joe Admin should be notified that "Joe User created \"Ulysses\+author\""
     And Joe Camel should be notified that "Joe User created \"Ulysses\+author\""
-    When Joe Admin edits "Ulysses\+author" setting content to "Jim"
+    When Joe Admin edits "Ulysses+author" setting content to "Jim"
     Then Joe Camel should be notified that "Joe Admin updated \"Ulysses\+author\""
     #And Joe Admin should be notified that "Joe User updated \"Ulysses\""
 
@@ -62,7 +63,6 @@ Feature: Updates for Children of watched cards
       |color|flavor|
       |green|mushy|
     Then No notification should be sent
-    
 
   Scenario: Watching a plus card & including card on regular edit
     When I create card "Ulysses+author" with content "Joyce"
@@ -70,5 +70,3 @@ Feature: Updates for Children of watched cards
     When Joe Camel is watching "Ulysses+author+*self"
     And I edit "Ulysses+author" setting content to "Jim"
     Then Joe Camel should be notified that "Joe User updated \"Ulysses\+author\""
-
-

data/lib/decko/engine.rb

@@ -1,45 +1,46 @@
 
-require 'rails/all'
-require 'cardio'
+require "rails/all"
+require "cardio"
 
 # TODO: Move these to modules that use them
-require 'htmlentities'
-require 'recaptcha'
-require 'coderay'
-require 'haml'
-require 'kaminari'
-require 'bootstrap-kaminari-views'
-require 'diff/lcs'
-require 'builder'
+require "htmlentities"
+require "recaptcha"
+require "coderay"
+require "haml"
+require "kaminari"
+require "bootstrap-kaminari-views"
+require "diff/lcs"
+require "builder"
 
-require 'wagn'
+require "wagn"
 
 module Decko
   class Engine < ::Rails::Engine
-    paths.add 'app/controllers',  with: 'rails/controllers', eager_load: true
-    paths.add 'gem-assets',       with: 'rails/assets'
-    paths.add 'config/routes.rb', with: 'rails/engine-routes.rb'
-    paths.add 'lib/tasks', with: "#{::Wagn.gem_root}/lib/wagn/tasks",
-                           glob: '**/*.rake'
-    paths.add 'lib/wagn/config/initializers',
-              with: File.join(Wagn.gem_root, 'lib/wagn/config/initializers'),
-              glob: '**/*.rb'
+    paths.add "app/controllers",  with: "rails/controllers", eager_load: true
+    paths.add "gem-assets",       with: "rails/assets"
+    paths.add "config/routes.rb", with: "rails/engine-routes.rb"
+    paths.add "lib/tasks", with: "#{::Wagn.gem_root}/lib/wagn/tasks",
+                           glob: "**/*.rake"
+    paths["lib/tasks"] << "#{::Cardio.gem_root}/lib/card/tasks"
+    paths.add "lib/wagn/config/initializers",
+              with: File.join(Wagn.gem_root, "lib/wagn/config/initializers"),
+              glob: "**/*.rb"
 
-    initializer 'decko.engine.load_config_initializers',
+    initializer "decko.engine.load_config_initializers",
                 after: :load_config_initializers do
-      paths['lib/wagn/config/initializers'].existent.sort.each do |initializer|
+      paths["lib/wagn/config/initializers"].existent.sort.each do |initializer|
         load(initializer)
       end
     end
 
-    initializer 'engine.copy_configs',
-                before: 'decko.engine.load_config_initializers' do
+    initializer "engine.copy_configs",
+                before: "decko.engine.load_config_initializers" do
       # this code should all be in Wagn somewhere, and it is now, gem-wize
       # Ideally railties would do this for us; this is needed for both use cases
-      Engine.paths['request_log']   = Wagn.paths['request_log']
-      Engine.paths['log']           = Wagn.paths['log']
-      Engine.paths['lib/tasks']     = Wagn.paths['lib/tasks']
-      Engine.paths['config/routes'] = Wagn.paths['config/routes']
+      Engine.paths["request_log"]   = Wagn.paths["request_log"]
+      Engine.paths["log"]           = Wagn.paths["log"]
+      Engine.paths["lib/tasks"]     = Wagn.paths["lib/tasks"]
+      Engine.paths["config/routes"] = Wagn.paths["config/routes"]
     end
 
     initializer :connect_on_load do
@@ -48,7 +49,7 @@ module Decko
       end
       ActiveSupport.on_load(:after_initialize) do
         begin
-          require_dependency 'card' unless defined?(Card)
+          require_dependency "card" unless defined?(Card)
         rescue ActiveRecord::StatementInvalid => e
           ::Rails.logger.warn "database not available[#{::Rails.env}] #{e}"
         end

data/lib/wagn.rb

@@ -1,6 +1,6 @@
 
 module Wagn
-  WAGN_GEM_ROOT = File.expand_path('../..', __FILE__)
+  WAGN_GEM_ROOT = File.expand_path("../..", __FILE__)
 
   class << self
     def root

data/lib/wagn/all.rb

@@ -1 +1 @@
-require 'wagn/application'
+require "wagn/application"

data/lib/wagn/application.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-require 'decko/engine'
+require "decko/engine"
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
@@ -13,8 +13,8 @@ module Wagn
   class Application < Rails::Application
     initializer :load_wagn_environment_config,
                 before: :load_environment_config, group: :all do
-      add_path paths, 'lib/wagn/config/environments', glob: "#{Rails.env}.rb"
-      paths['lib/wagn/config/environments'].existent.each do |environment|
+      add_path paths, "lib/wagn/config/environments", glob: "#{Rails.env}.rb"
+      paths["lib/wagn/config/environments"].existent.each do |environment|
         require environment
       end
     end
@@ -58,7 +58,7 @@ module Wagn
         # config.active_record.raise_in_transactional_callbacks = true
 
         config.assets.enabled = false
-        config.assets.version = '1.0'
+        config.assets.version = "1.0"
 
         config.filter_parameters += [:password]
         config
@@ -70,13 +70,13 @@ module Wagn
         paths = super
         Cardio.set_paths paths
 
-        paths['mod'] << 'mod'
-        paths.add 'files'
+        paths["mod"] << "mod"
+        paths.add "files"
 
-        paths['app/models'] = []
-        paths['app/mailers'] = []
+        paths["app/models"] = []
+        paths["app/mailers"] = []
 
-        add_path paths, 'config/routes.rb', with: 'rails/application-routes.rb'
+        add_path paths, "config/routes.rb", with: "rails/application-routes.rb"
 
         Cardio.set_mod_paths # really this should happen later
 

data/lib/wagn/cli.rb

@@ -1,17 +1,17 @@
-require 'rbconfig'
-require 'wagn/script_wagn_loader'
+require "rbconfig"
+require "wagn/script_wagn_loader"
 
 # If we are inside a Wagn application this method performs an exec and thus
 # the rest of this script is not run.
 Wagn::ScriptWagnLoader.exec_script_wagn!
 
-require 'rails/ruby_version_check'
-Signal.trap('INT') { puts; exit(1) }
+require "rails/ruby_version_check"
+Signal.trap("INT") { puts; exit(1) }
 
 # if ARGV.first == 'plugin'
 #  ARGV.shift
 #  require 'wagn/commands/plugin_new'
 # else
 
-require 'wagn/commands/application'
+require "wagn/commands/application"
 # end

data/lib/wagn/commands.rb

@@ -1,87 +1,88 @@
-require 'optparse'
+require "optparse"
 
 # add method in? to Object class
-require 'active_support/core_ext/object/inclusion'
-require 'wagn/parser'
+require "active_support/core_ext/object/inclusion"
+require "wagn/parser"
 
 def load_rake_tasks
-  require './config/environment'
-  require 'rake'
+  require "./config/environment"
+  require "rake"
   Wagn::Application.load_tasks
 end
 
 RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console
                      server dbconsole application runner ).freeze
 ALIAS = {
-  'rs' => 'rspec',
-  'cc' => 'cucumber',
-  'jm' => 'jasmine',
-  'g'  => 'generate',
-  'd'  => 'destroy',
-  'c'  => 'console',
-  's'  => 'server',
-  'db' => 'dbconsole',
-  'r'  => 'runner'
+  "rs" => "rspec",
+  "cc" => "cucumber",
+  "jm" => "jasmine",
+  "g"  => "generate",
+  "d"  => "destroy",
+  "c"  => "console",
+  "s"  => "server",
+  "db" => "dbconsole",
+  "r"  => "runner"
 }.freeze
 
-ARGV << '--help' if ARGV.empty?
+ARGV << "--help" if ARGV.empty?
 
 def supported_rails_command? arg
   arg.in?(RAILS_COMMANDS) || ALIAS[arg].in?(RAILS_COMMANDS)
 end
 
 def find_spec_file filename, base_dir
-  file, line = filename.split(':')
-  if file.include?('_spec.rb') && File.exist?(file)
+  file, line = filename.split(":")
+  if file.include?("_spec.rb") && File.exist?(file)
     filename
   else
-    file = File.basename(file, '.rb').sub(/_spec$/, '')
+    file = File.basename(file, ".rb").sub(/_spec$/, "")
     Dir.glob("#{base_dir}/**/#{file}_spec.rb").flatten.map do |spec_file|
       line ? "#{spec_file}:#{line}" : file
-    end.join(' ')
+    end.join(" ")
   end
 end
 
+def exit_with_child_status command
+  command += " 2>&1"
+  exit $CHILD_STATUS.exitstatus unless system command
+end
+
 WAGN_DB_TASKS = %w(seed reseed load update).freeze
 
 if supported_rails_command? ARGV.first
-  ENV['PRY_RESCUE_RAILS'] = '1' if ARGV.delete('--rescue')
+  ENV["PRY_RESCUE_RAILS"] = "1" if ARGV.delete("--rescue")
   command = ARGV.first
   command = ALIAS[command] || command
 
   # without this, the card generators don't list with: wagn g --help
-  require 'generators/card' if command == 'generate'
-  require 'rails/commands'
+  require "generators/card" if command == "generate"
+  require "rails/commands"
 else
   command = ARGV.shift
   command = ALIAS[command] || command
 
   case command
-  when 'cucumber'
-    require 'wagn'
-    require './config/environment'
-    feature_paths = Card::Loader.mod_dirs.map do |p|
+  when "cucumber"
+    require "wagn"
+    require "./config/environment"
+    feature_paths = Card::Mod::Loader.mod_dirs.map do |p|
       Dir.glob "#{p}/features"
     end.flatten
     require_args = "-r #{Wagn.gem_root}/features "
-    require_args += feature_paths.map { |path| "-r #{path}" }.join(' ')
-    feature_args = ARGV.empty? ? feature_paths.join(' ') : ARGV.shelljoin
-    unless system 'RAILS_ROOT=. bundle exec cucumber ' \
-                  "#{require_args} #{feature_args} 2>&1"
-      exit $CHILD_STATUS.exitstatus
-    end
-  when 'jasmine'
-    unless system 'RAILS_ENV=test bundle exec rake spec:javascript 2>&1'
-      exit $CHILD_STATUS.exitstatus
-    end
-  when 'rspec'
-    require 'rspec/core'
-    require 'wagn/application'
+    require_args += feature_paths.map { |path| "-r #{path}" }.join(" ")
+    feature_args = ARGV.empty? ? feature_paths.join(" ") : ARGV.shelljoin
+    exit_with_child_status "RAILS_ROOT=. bundle exec cucumber " \
+                           "#{require_args} #{feature_args}"
+  when "jasmine"
+    exit_with_child_status "RAILS_ENV=test bundle exec rake spec:javascript"
+  when "rspec"
+    require "rspec/core"
+    require "wagn/application"
 
     before_split = true
     wagn_args, rspec_args =
       ARGV.partition do |a|
-        before_split = (a == '--' ? false : before_split)
+        before_split = (a == "--" ? false : before_split)
       end
     rspec_args.shift
     opts = {}
@@ -89,14 +90,13 @@ else
 
     rspec_command =
       "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} " \
-      " #{opts[:rescue]} rspec #{rspec_args.shelljoin} #{opts[:files]}
-2>&1"
-    exit $CHILD_STATUS.exitstatus unless system rspec_command
-  when '--version', '-v'
+      " #{opts[:rescue]} rspec #{rspec_args.shelljoin} #{opts[:files]}"
+    exit_with_child_status rspec_command
+  when "--version", "-v"
     puts "Wagn #{Card::Version.release}"
-  when 'new'
-    if ARGV.first.in?(['-h', '--help'])
-      require 'wagn/commands/application'
+  when "new"
+    if ARGV.first.in?(["-h", "--help"])
+      require "wagn/commands/application"
     else
       puts "Can't initialize a new deck within the directory of another, " \
            "please change to a non-deck directory first.\n"
@@ -118,7 +118,7 @@ else
     end
 
   else
-    puts 'Error: Command not recognized' unless command.in?(['-h', '--help'])
+    puts "Error: Command not recognized" unless command.in?(["-h", "--help"])
     puts <<-EOT
   Usage: wagn COMMAND [ARGS]