wagn 1.16.15 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91193f2217c2ee149afd3789dd7d13ef3b87831d
-  data.tar.gz: 997c9cb094906484298a44ece969f143282859e8
+  metadata.gz: 7fe31485e1ace44582b1be0422e6669462f1dcb4
+  data.tar.gz: 16a2fb47d3f565766c96d6a6a053391801bddc64
 SHA512:
-  metadata.gz: b036a8603a038b8cfcdad0594c4aecac81fda0e609e55c9c8f731eef827b21e5dda4487f3cac2d981b71b09442d81838baf5b3bbfb392abe3381ea53e4bae77a
-  data.tar.gz: 451b6152b9ef511a1ec0a019b843c3016da86bb2a9d4aa75acdc660482fc2f7fda1efcc4bfd7af89dd5c387b5a2d19f313554af81151d7f2c653003adcf0b745
+  metadata.gz: f427c740a3e6b5d0535f2f6f0b356779061213f9d4e5bcb4967195c8c6c55b7350ae211f71a8b249038a453eca6cafeba1bb1e609224fe8b32602c97971b6926
+  data.tar.gz: 551e5a86477b36aab96f9f3b2a6edecb4025ca7d5797163798255f65d66d11c665291aeab437b5d55e88334c82723dba2a1012c74976ffbee4e890a8b81d21b1

data/features/signup.feature

@@ -23,6 +23,7 @@ Feature: Signing up
     When I open the email
     And I click the first link in the email
     Then I should see "Wanna B"
+    And "Wanna B" should be signed in
 
     When I go to the home page
     And I follow "Sign out"
@@ -33,7 +34,7 @@ Feature: Signing up
     And I enter "wanna_pass" into "*password"
     And I press "Sign in"
     Then I should see "Wanna B"
-
+    And "Wanna B" should be signed in
   Scenario: Signing up with approval
     #When I go to card "AccountRequest"
     #And In the main card content I click "Wanna B"

data/features/step_definitions/wagn_steps.rb

@@ -341,6 +341,10 @@ Then /^"([^"]*)" should be selected for "([^"]*)"$/ do |value, field|
   expect(selected.inner_html).to match /#{value}/
 end
 
+Then /^"([^"]*)" should be signed in$/ do |user|  # "
+  has_css?('#my-card-link', text: user)
+end
+
 When /^I press enter to search$/ do
   find('#_keyword').native.send_keys(:return)
 end

data/lib/wagn/commands.rb

@@ -1,5 +1,8 @@
 require 'optparse'
-require 'active_support/core_ext/object/inclusion' # adds method in? to Object class
+
+# add method in? to Object class
+require 'active_support/core_ext/object/inclusion'
+require 'wagn/parser'
 
 def load_rake_tasks
   require './config/environment'
@@ -7,7 +10,8 @@ def load_rake_tasks
   Wagn::Application.load_tasks
 end
 
-RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console server dbconsole application runner )
+RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console
+                     server dbconsole application runner )
 ALIAS = {
   'rs' => 'rspec',
   'cc' => 'cucumber',
@@ -23,65 +27,51 @@ ALIAS = {
 ARGV << '--help' if ARGV.empty?
 
 def supported_rails_command? arg
-  arg.in? RAILS_COMMANDS or ALIAS[arg].in? RAILS_COMMANDS
+  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' and File.exist?(file)
+  if file.include?('_spec.rb') && File.exist?(file)
     filename
   else
-    file = File.basename(file,".rb").sub(/_spec$/,'')
-    Dir.glob("#{base_dir}/**/#{file}_spec.rb").flatten.map{ |file| line ? "#{file}:#{line}" : file}.join(' ')
+    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
 end
 
-TASK_COMMANDS = %w[seed reseed load update]
+WAGN_DB_TASKS = %w[seed reseed load update]
 
 if supported_rails_command? ARGV.first
   if ARGV.delete('--rescue')
-    ENV["PRY_RESCUE_RAILS"]="1"
+    ENV['PRY_RESCUE_RAILS'] = '1'
   end
   command = ARGV.first
   command = ALIAS[command] || command
-  require 'generators/card' if command == 'generate' # without this, the card generators don't list with: wagn g --help
+
+  # without this, the card generators don't list with: wagn g --help
+  require 'generators/card' if command == 'generate'
   require 'rails/commands'
 else
   command = ARGV.shift
   command = ALIAS[command] || command
 
   case command
-  when *TASK_COMMANDS
-    envs = []
-    parser = OptionParser.new do |parser|
-      parser.banner = "Usage: wagn #{command} [options]\n\nRun wagn:#{command} task on the production database specified in config/database.yml\n\n"
-      parser.on('--production','-p', "#{command} production database (default)") do
-        envs = ['production']
-      end
-      parser.on('--test','-t', "#{command} test database") do
-        envs = ['test']
-      end
-      parser.on('--development', '-d', "#{command} development database") do
-        envs = ['development']
-      end
-      parser.on('--all', '-a', "#{command} production, test, and development database") do
-        envs = %w( production development test)
-      end
-    end
-    parser.parse!(ARGV)
-    task_cmd="bundle exec rake wagn:#{command}"
-    if envs.empty?
+  when *WAGN_DB_TASKS
+    opts = {}
+    Wagn::Parser.db_task(command, opts).parse!(ARGV)
+    task_cmd = "bundle exec rake wagn:#{command}"
+    if !opts[:envs] || opts[:envs].empty?
       puts task_cmd
       puts `#{task_cmd}`
     else
-      envs.each do |env|
+      opts[:envs].each do |env|
         puts "env RAILS_ENV=#{env} #{task_cmd}"
         puts `env RAILS_ENV=#{env} #{task_cmd}`
       end
     end
-#  when 'update'
-#    load_rake_tasks
-#    Rake::Task['wagn:update'].invoke
   when 'cucumber'
     require 'wagn'
     require './config/environment'
@@ -89,76 +79,31 @@ else
       Dir.glob "#{p}/features"
     end.flatten
     require_args = "-r #{Wagn.gem_root}/features "
-    require_args += feature_paths.map { |path| "-r #{path}"}.join(' ')
+    require_args += feature_paths.map { |path| "-r #{path}" }.join(' ')
     feature_args = ARGV.empty? ? feature_paths.join(' ') : ARGV.join(' ')
-    unless system "RAILS_ROOT=. bundle exec cucumber #{require_args} #{feature_args} 2>&1"
+    unless system 'RAILS_ROOT=. bundle exec cucumber ' \
+                  "#{require_args} #{feature_args} 2>&1"
       exit $?.exitstatus
     end
   when 'jasmine'
-    unless system "RAILS_ENV=test bundle exec rake spec:javascript 2>&1"
+    unless system 'RAILS_ENV=test bundle exec rake spec:javascript 2>&1'
       exit $?.exitstatus
     end
   when 'rspec'
-    opts = {}
     require 'rspec/core'
     require 'wagn/application'
-    parser = RSpec::Core::Parser.new.parser(opts)
-    parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\nRSPEC ARGS"
-    parser.separator <<-WAGN
-
-WAGN ARGS
-
-  You don't have to give a full path for FILENAME, the basename is enough
-  If FILENAME does not include '_spec' rspec searches for the corresponding spec file.
-  The line number always referes to example in the (corresponding) spec file.
-
-WAGN
-
-    parser.on('-d', '--spec FILENAME(:LINE)', 'Run spec for a Wagn deck file') do |file|
-      opts[:files] = find_spec_file( file, "#{Wagn.root}/mod")
-    end
-    parser.on('-c', '--core-spec FILENAME(:LINE)', 'Run spec for a Wagn core file') do |file|
-      opts[:files] = find_spec_file( file, Cardio.gem_root)
-    end
-    parser.on('-m', '--mod MODNAME', 'Run all specs for a mod or matching a mod') do |file|
-      if File.exists? mod_path = "mod/#{file}"
-        opts[:files] = "#{Cardio.gem_root}/mod/#{file}"
-      elsif File.exists? mod_path = "#{Cardio.gem_root}/mod/#{file}"
-        opts[:files] = "#{Cardio.gem_root}/mod/#{file}"
-      elsif (opts[:files] = find_spec_file( file, "mod")).present?
-      else
-        opts[:files] = find_spec_file( file, "#{Cardio.gem_root}/mod")
-      end
-    end
-    parser.on('-s', '--[no-]simplecov', 'Run with simplecov') do |s|
-      opts[:simplecov] = s ? '' : 'COVERAGE=false'
-    end
-    parser.on('--rescue', 'Run with pry-rescue') do
-      if opts[:executer] == 'spring'
-        puts "Disabled pry-rescue. Not compatible with spring."
-      else
-        opts[:rescue] = 'rescue '
-      end
-    end
-    parser.on('--[no-]spring', 'Run with spring') do |spring|
-      if spring
-        opts[:executer] = 'spring'
-        if opts[:rescue]
-          opts[:rescue]  = ''
-          puts "Disabled pry-rescue. Not compatible with spring."
-        end
-      else
-        opts[:executer] = 'bundle exec'
-      end
-    end
-    parser.separator "\n"
 
     before_split = true
-    wagn_args, rspec_args = ARGV.partition {|a| before_split = a=='--' ? false : before_split}
+    wagn_args, rspec_args =
+      ARGV.partition do |a|
+        before_split = (a == '--' ? false : before_split)
+      end
     rspec_args.shift
-
-    parser.parse!(wagn_args)
-    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args*' '} #{opts[:files]} 2>&1"
+    opts = {}
+    Wagn::Parser.rspec(opts).parse!(wagn_args)
+    rspec_command =
+      "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} " \
+      " #{opts[:rescue]} rspec #{rspec_args.join(' ')} #{opts[:files]} 2>&1"
     unless system rspec_command
       exit $?.exitstatus
     end
@@ -168,13 +113,14 @@ WAGN
     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"
+      puts "Can't initialize a new deck within the directory of another, " \
+           "please change to a non-deck directory first.\n"
       puts "Type 'wagn' for help."
       exit(1)
     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]
 
@@ -192,6 +138,7 @@ WAGN
    cucumber     Run cucumber features (short-cut alias: "cc")
    rspec        Run rspec tests (short-cut alias: "rs")
    update       Run card migrations
+   load         Load bootstrap data into database
 
   In addition to those, there are the standard rails commands:
    generate     Generate new code (short-cut alias: "g")
@@ -207,5 +154,3 @@ WAGN
     exit(1)
   end
 end
-
-

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -60,9 +60,9 @@ group :development do
 end
 
 group :test do
-  gem 'rspec'
-  gem 'rspec-rails', '~> 3.1.0'                 # behavior-driven-development suite
-  gem 'rspec-html-matchers', "0.6.1"
+  gem 'rspec', '~> 3.4'
+  gem 'rspec-rails'         # behavior-driven-development suite
+  gem 'rspec-html-matchers'
   gem 'spork', '>=0.9'
   gem 'rr'#, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage

data/lib/wagn/generators/wagn/templates/config/application.rb

@@ -8,14 +8,6 @@ module <%= app_const_base %>
 
     # Wagn inherits Rails configuration options.  See http://guides.rubyonrails.org/configuring.html
 
-    config.recaptcha_public_key  = '6LdhRssSAAAAAFfLt1Wkw43hoaA8RTIgso9-tvtc'
-    config.recaptcha_private_key = '6LdhRssSAAAAAGwzl069pJQBdmzCZigm1nV-dmqK'
-    # config.recaptcha_proxy = ...
-    #
-    # IMPORTANT: please be sure to register for your own recaptcha keys before deploying a live site
-    # It's quick and easy.  Just follow instructions at https://www.google.com/recaptcha/admin/create
-
-
     # Email configuration
 
     config.action_mailer.perform_deliveries = false

data/lib/wagn/parser.rb

@@ -0,0 +1,93 @@
+# -*- encoding : utf-8 -*-
+
+module Wagn
+  class Parser
+    class << self
+      def db_task command, opts
+        OptionParser.new do |parser|
+          parser.banner = "Usage: wagn #{command} [options]\n\n" \
+                          "Run wagn:#{command} task on the production "\
+                          " database specified in config/database.yml\n\n"
+          parser.on('--production', '-p',
+                    "#{command} production database (default)") do
+            opts[:envs] = ['production']
+          end
+          parser.on('--test', '-t',
+                    "#{command} test database") do
+            opts[:envs] = ['test']
+          end
+          parser.on('--development', '-d',
+                    "#{command} development database") do
+            opts[:envs] = ['development']
+          end
+          parser.on('--all', '-a',
+                    "#{command} production, test, and development database") do
+            opts[:envs] = %w( production development test)
+          end
+        end
+      end
+
+      def rspec opts
+        OptionParser.new do |parser|
+          parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\n" \
+                          'RSPEC ARGS'
+          parser.separator <<-WAGN
+
+      WAGN ARGS
+
+        You don't have to give a full path for FILENAME, the basename is enough
+        If FILENAME does not include '_spec' rspec searches for the
+        corresponding spec file.
+        The line number always referes to example in the (corresponding) spec
+        file.
+
+      WAGN
+
+          parser.on('-d', '--spec FILENAME(:LINE)',
+                    'Run spec for a Wagn deck file') do |file|
+            opts[:files] = find_spec_file(file, "#{Wagn.root}/mod")
+          end
+          parser.on('-c', '--core-spec FILENAME(:LINE)',
+                    'Run spec for a Wagn core file') do |file|
+            opts[:files] = find_spec_file(file, Cardio.gem_root)
+          end
+          parser.on('-m', '--mod MODNAME',
+                    'Run all specs for a mod or matching a mod') do |file|
+            opts[:files] =
+              if File.exists?("mod/#{file}")
+                "#{Cardio.gem_root}/mod/#{file}"
+              elsif File.exists?("#{Cardio.gem_root}/mod/#{file}")
+                "#{Cardio.gem_root}/mod/#{file}"
+              elsif (files = find_spec_file(file, 'mod')) && files.present?
+                files
+              else
+                find_spec_file(file, "#{Cardio.gem_root}/mod")
+              end
+          end
+          parser.on('-s', '--[no-]simplecov', 'Run with simplecov') do |s|
+            opts[:simplecov] = s ? '' : 'COVERAGE=false'
+          end
+          parser.on('--rescue', 'Run with pry-rescue') do
+            if opts[:executer] == 'spring'
+              puts 'Disabled pry-rescue. Not compatible with spring.'
+            else
+              opts[:rescue] = 'rescue '
+            end
+          end
+          parser.on('--[no-]spring', 'Run with spring') do |spring|
+            if spring
+              opts[:executer] = 'spring'
+              if opts[:rescue]
+                opts[:rescue]  = ''
+                puts 'Disabled pry-rescue. Not compatible with spring.'
+              end
+            else
+              opts[:executer] = 'bundle exec'
+            end
+          end
+          parser.separator "\n"
+        end
+      end
+    end
+  end
+end

data/lib/wagn/tasks/wagn.rake

@@ -7,7 +7,7 @@ WAGN_SEED_PATH = File.join(
 )
 
 def prepare_migration
-  Card::Cache.reset_global
+  Card::Cache.reset_all
   Card.config.action_mailer.perform_deliveries = false
   Card.reset_column_information
   # this is needed in production mode to insure core db
@@ -93,7 +93,7 @@ namespace :wagn do
 
   desc 'reset cache'
   task reset_cache: :environment do
-    Card::Cache.reset_global
+    Card::Cache.reset_all
   end
 
   desc 'set symlink for assets'
@@ -119,7 +119,7 @@ namespace :wagn do
     end
 
     puts 'migrating core cards'
-    Card::Cache.reset_global
+    Card::Cache.reset_all
     Rake::Task['wagn:migrate:core_cards'].execute #not invoke because we don't want to reload environment
     if stamp
       Rake::Task['wagn:migrate:stamp'].reenable
@@ -134,7 +134,7 @@ namespace :wagn do
       Rake::Task['wagn:migrate:stamp'].invoke :deck_cards
     end
 
-    Card::Cache.reset_global
+    Card::Cache.reset_all
   end
 
   desc 'insert existing card migrations into schema_migrations_cards to avoid re-migrating'
@@ -165,7 +165,7 @@ namespace :wagn do
     task core_cards: :environment do
       require 'card/core_migration'
 
-      Card::Cache.reset_global
+      Card::Cache.reset_all
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
       paths = Cardio.migration_paths(:core_cards)
@@ -183,7 +183,7 @@ namespace :wagn do
     task deck_cards: :environment do
       require 'card/migration'
 
-      Card::Cache.reset_global
+      Card::Cache.reset_all
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
       paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:deck_cards)
@@ -247,17 +247,17 @@ namespace :wagn do
   namespace :bootstrap do
     desc 'rid template of unneeded cards, acts, actions, changes, and references'
     task clean: :environment do
-      Card::Cache.reset_global
+      Card::Cache.reset_all
       clear_history
       delete_unwanted_cards
       Card.empty_trash
       correct_time_and_user_stamps
-      Card::Cache.reset_global
+      Card::Cache.reset_all
     end
 
     desc 'dump db to bootstrap fixtures'
     task dump: :environment do
-      Card::Cache.reset_global
+      Card::Cache.reset_all
 
       # FIXME temporarily taking this out!!
       Rake::Task['wagn:bootstrap:copy_mod_files'].invoke
@@ -354,7 +354,7 @@ def delete_unwanted_cards
         card.delete!
       end
     end
-    Card::Cache.reset_global
+    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|

data/rails/controllers/card_controller.rb

@@ -128,7 +128,7 @@ class CardController < ActionController::Base
     when Card::Format.tagged(params[:view], :unknown_ok)
       ''
     else
-      Card.setting(:home) || 'Home'
+      Card.global_setting(:home) || 'Home'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.16.15
+  version: 1.17.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.15
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.15
+        version: 1.17.0
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org
@@ -155,6 +155,7 @@ files:
 - lib/wagn/generators/wagn/templates/spec/spec_helper.rb
 - lib/wagn/generators/wagn/wagn_generator.rb
 - lib/wagn/mods_spec_helper.rb
+- lib/wagn/parser.rb
 - lib/wagn/script_wagn_loader.rb
 - lib/wagn/simplecov_helper.rb
 - lib/wagn/tasks/.gitkeep