wagn 1.16.6 → 1.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267454bd77f3424e88d88f518be50fb80be502b9
-  data.tar.gz: e4e42f2af794c266a95d20bd345e106dabc6641d
+  metadata.gz: e022ed71ca437cff7333660e67f7b84d3f5ccff6
+  data.tar.gz: 2fd40bbdbc0aea83fe083f7baa91039ad76ed7d0
 SHA512:
-  metadata.gz: fea0c3b1ba66379bec1ad728c405537f484c1fff42ffe5d4e892896bf48dcfd8dfbcdedff383c9d84fb04403094ea63039eb9d8fff1673355af1e1ed5eb05d4e
-  data.tar.gz: 92102ee90278f431fae48a911d65ccb3547436a8015a14b279c89adc8b585ba09a6816508604f3380c7257a4dcb883fa4183e3974f720c3ba87a4f0d7e9215f9
+  metadata.gz: d1208c87336996f8fa652b564d14f20b715053711e1bd31c8d6560bd13945a4643c2e87af36d26d2c014108617d6795432d21095274411dc048d5a6d04f137af
+  data.tar.gz: 7f8cce7eb10610672e3f3af79b15cfecbf6f329f226a4bd63fdd7909bd54cbd0f27a363b6f77015ce5bbc3a67d2207b374e253e2a366305e9c66cf014aa54f5c

data/features/step_definitions/email_steps.rb

@@ -63,7 +63,7 @@ Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails? with subject "([
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive an email with the following body:$/ do |address, expected_body|
-  open_email(address, :with_text => expected_body)
+  open_email(address, with_text: expected_body)
 end
 
 #
@@ -76,11 +76,11 @@ When /^(?:I|they|"([^"]*?)") opens? the email$/ do |address|
 end
 
 When /^(?:I|they|"([^"]*?)") opens? the email with subject "([^"]*?)"$/ do |address, subject|
-  open_email(address, :with_subject => subject)
+  open_email(address, with_subject: subject)
 end
 
 When /^(?:I|they|"([^"]*?)") opens? the email with text "([^"]*?)"$/ do |address, text|
-  open_email(address, :with_text => text)
+  open_email(address, with_text: text)
 end
 
 #
@@ -193,10 +193,10 @@ Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
   email = address_for_user username
   begin
     step %{"#{email}" should receive 1 email}
-  rescue RSpec::Expectations::ExpectationNotMetError=>e
+  rescue RSpec::Expectations::ExpectationNotMetError => e
     raise RSpec::Expectations::ExpectationNotMetError, %(#{e.message}\n Found the following emails:\n\n #{all_emails*"\n\n~~~~~~~~\n\n"})
   end
-  open_email(email, :with_subject => /#{subject}/)
+  open_email(email, with_subject: /#{subject}/)
 end
 
 Then /^No notification should be sent$/ do

data/features/step_definitions/wagn_steps.rb

@@ -38,8 +38,8 @@ Given /^I sign in as (.+)$/ do |account_name|
   accounted = Card[account_name]
   @current_id = accounted.id
   visit "/:signin"
-  fill_in "card[subcards][+*email][content]", :with=> accounted.account.email
-  fill_in "card[subcards][+*password][content]", :with=> 'joe_pass'
+  fill_in "card[subcards][+*email][content]", with: accounted.account.email
+  fill_in "card[subcards][+*password][content]", with: 'joe_pass'
   click_button "Sign in"
   page.should have_content(account_name)
 end
@@ -48,7 +48,7 @@ end
 
 Given /^the card (.*) contains "([^\"]*)"$/ do |cardname, content|
   Card::Auth.as_bot do
-    card = Card.fetch cardname, :new=>{}
+    card = Card.fetch cardname, new: {}
     card.content = content
     card.save!
   end
@@ -71,21 +71,21 @@ end
 When /^(.*) edits? "([^\"]*)" setting (.*) to "([^\"]*)"$/ do |username, cardname, field, content|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
-    fill_in 'card[content]', :with=>content
+    fill_in 'card[content]', with: content
     click_button("Submit")
   end
 end
 
 When /^(.*) edits? "([^\"]*)" filling in "([^\"]*)"$/ do |username, cardname, content|
   visit "/card/edit/#{cardname.to_name.url_key}"
-  fill_in 'card[content]', :with=>content
+  fill_in 'card[content]', with: content
 end
 
 When /^(.*) edits? "([^\"]*)" with plusses:/ do |username, cardname, plusses|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
     plusses.hashes.first.each do |name, content|
-      fill_in "card[subcards][#{cardname}+#{name}][content]", :with=>content
+      fill_in "card[subcards][#{cardname}+#{name}][content]", with: content
     end
     click_button("Submit")
   end
@@ -95,7 +95,7 @@ When /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/ do |usern
   create_card(username, cardtype, cardname, content) do
     normal_textarea_card_type = ["JavaScript","CoffeeScript","HTML","CSS","SCSS","Search"]
     if not normal_textarea_card_type.include? cardtype or not page.evaluate_script "typeof ace != 'undefined'"
-      fill_in("card[content]", :with=>content)
+      fill_in("card[content]", with: content)
     else
       page.execute_script %{ace.edit($('.ace_editor').get(0)).getSession().setValue('#{content}')}
     end
@@ -109,7 +109,7 @@ end
 When /^(.*) creates?\s*([^\s]*) card "([^"]*)" with plusses:$/ do |username,cardtype,cardname,plusses|
   create_card(username,cardtype,cardname) do
     plusses.hashes.first.each do |name, content|
-      fill_in "card[subcards][+#{name}][content]", :with=>content
+      fill_in "card[subcards][+#{name}][content]", with: content
     end
   end
 end
@@ -172,7 +172,7 @@ end
 def create_card(username,cardtype,cardname,content="")
   signed_in_as(username) do
     if cardtype=='Pointer'
-      Card.create :name=>cardname, :type=>cardtype, :content=>content
+      Card.create name: cardname, type: cardtype, content: content
     else
       visit "/card/new?card[name]=#{CGI.escape(cardname)}&type=#{cardtype}"
       yield if block_given?
@@ -297,7 +297,7 @@ Then /^In (.*) I should (not )?see a ([^\"]*) with content "([^\"]*)"$/ do |sele
   # checks for existence of a element with a class in a selection context
   element = 'a' if element == 'link'
   within scope_of(selection) do
-    page.send( ( neg ? :should_not : :should ), have_css( element, :text=>content ) )
+    page.send( ( neg ? :should_not : :should ), have_css( element, text: content ) )
   end
 end
 
@@ -331,6 +331,6 @@ Then /^I should see "([^\"]*)" in color (.*)$/ do |text, css_class|
 end
 
 When /^I fill in "([^\"]*)" with$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 

data/features/step_definitions/web_steps.rb

@@ -34,16 +34,16 @@ When /^(?:|I )follow "([^"]*)" within "([^"]*)"$/ do |link, parent|
 end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 
 When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
+  select(value, from: field)
 end
 
 
@@ -63,7 +63,7 @@ end
 # When I select "November 23, 2004 11:20" as the "Preferred" date and time
 # And I select "November 25, 2004 10:30" as the "Alternative" date and time
 When /^(?:|I )select "([^"]*)" as the "([^"]*)" date and time$/ do |datetime, datetime_label|
-  select_datetime(datetime, :from => datetime_label)
+  select_datetime(datetime, from: datetime_label)
 end
 
 # Use this step in conjunction with Rail's time_select helper. For example:
@@ -78,7 +78,7 @@ end
 # specify the name of the time on the form.  For example:
 # When I select "7:30AM" as the "Gym" time
 When /^(?:|I )select "([^"]*)" as the "([^"]*)" time$/ do |time, time_label|
-  select_time(time, :from => time_label)
+  select_time(time, from: time_label)
 end
 
 # Use this step in conjunction with Rail's date_select helper.  For example:
@@ -91,7 +91,7 @@ end
 # you want to specify the name of the date on the form. For example:
 # When I select "April 26, 1982" as the "Date of Birth" date
 When /^(?:|I )select "([^"]*)" as the "([^"]*)" date$/ do |date, date_label|
-  select_date(date, :from => date_label)
+  select_date(date, from: date_label)
 end
 
 When /^(?:|I )check "([^"]*)"$/ do |field|

data/features/support/env.rb

@@ -50,7 +50,7 @@ end
 # See the DatabaseCleaner documentation for details. Example:
 #
 #   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
-#     DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+#     DatabaseCleaner.strategy = :truncation, {except: %w[widgets]}
 #   end
 #
 #   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do

data/lib/decko/engine.rb

@@ -19,20 +19,20 @@ 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 "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"
+              with: File.join( Wagn.gem_root, 'lib/wagn/config/initializers' ), glob: "**/*.rb"
 
-    initializer 'decko.engine.load_config_initializers',  :after => :load_config_initializers do
+    initializer 'decko.engine.load_config_initializers',  after: :load_config_initializers do
       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, and this is needed for both use cases
       Engine.paths['request_log']   = Wagn.paths['request_log']

data/lib/wagn/application.rb

@@ -4,7 +4,7 @@ require 'decko/engine'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  Bundler.require *Rails.groups(assets: %w(development test))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -13,8 +13,8 @@ end
 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"
+    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|
         require environment
       end
@@ -75,7 +75,7 @@ module Wagn
         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/config/environments/development.rb

@@ -44,11 +44,11 @@ Wagn.application.class.configure do
   config.active_record.raise_in_transactional_callbacks = true
 
   # config.performance_logger = {
-  #     :methods   => [:event, :search, :fetch, :view],  # choose methods to log
-  #     :min_time  => 100,                              # show only method calls that are slower than 100ms
-  #     :max_depth => 3,                               # show nested method calls only up to depth 3
-  #     :details   => true                                # show method arguments and sql
-  #     :log_level => :info
+  #     methods:   [:event, :search, :fetch, :view],  # choose methods to log
+  #     min_time:  100,                              # show only method calls that are slower than 100ms
+  #     max_depth: 3,                               # show nested method calls only up to depth 3
+  #     details:   true                                # show method arguments and sql
+  #     log_level: :info
   # }
 
   # Only use best-standards-support built into browsers

data/lib/wagn/config/environments/test.rb

@@ -35,10 +35,10 @@ Wagn.application.class.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
   config.action_mailer.perform_deliveries = true
-  config.action_mailer.default :charset=>"utf-8"
+  config.action_mailer.default charset: "utf-8"
 
   #config.action_mailer.delivery_method = :smtp
-  #config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+  #config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

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

@@ -62,6 +62,7 @@ end
 group :test do
   gem 'rspec'
   gem 'rspec-rails', '~> 3.1.0'                 # behavior-driven-development suite
+  gem 'rspec-html-matchers', "0.6.1"
   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

@@ -25,7 +25,7 @@ module <%= app_const_base %>
     # Example configuration for mailcatcher, a simple smtp server.
     # See http://mailcatcher.me for more information
     # config.action_mailer.delivery_method = :smtp
-    # config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+    # config.action_mailer.smtp_settings = { address: "localhost", port: 1025 }
 
     # The below keys are fine for testing but should not be used in production sites.
 

data/lib/wagn/generators/wagn/wagn_generator.rb

@@ -7,21 +7,21 @@ class WagnGenerator < Rails::Generators::AppBase
 
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :deck_path, :required=>false
+  argument :deck_path, required: false
 
-  class_option :database, :type => :string, :aliases => "-d", :default => "mysql",
-    :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+  class_option :database, type: :string, aliases: "-d", default: "mysql",
+    desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
-  class_option 'core-dev', :type => :boolean, aliases: '-c', :default => false, :group => :runtime,
+  class_option 'core-dev', type: :boolean, aliases: '-c', default: false, group: :runtime,
     desc: "Prepare deck for wagn core testing"
 
-  class_option 'gem-path', :type => :string, aliases: '-g', :default => false, :group => :runtime,
+  class_option 'gem-path', type: :string, aliases: '-g', default: false, group: :runtime,
     desc: "Path to local gem installation (Default, use env WAGN_GEM_PATH)"
 
-  class_option 'mod-dev', :type => :boolean, aliases: '-m', :default => false, :group => :runtime,
+  class_option 'mod-dev', type: :boolean, aliases: '-m', default: false, group: :runtime,
     desc: "Prepare deck for mod testing"
 
-  class_option 'interactive', :type => :boolean, aliases: '-i', :default => false, :group => :runtime,
+  class_option 'interactive', type: :boolean, aliases: '-i', default: false, group: :runtime,
     desc: "Prompt with dynamic installation options"
 
 
@@ -143,7 +143,7 @@ class WagnGenerator < Rails::Generators::AppBase
     directory "script" do |content|
       "#{shebang}\n" + content
     end
-    chmod "script", 0755 & ~File.umask, :verbose => false
+    chmod "script", 0755 & ~File.umask, verbose: false
   end
 
   public_task :run_bundle
@@ -157,26 +157,26 @@ class WagnGenerator < Rails::Generators::AppBase
       database_seeded = proc do
         menu_options['x'][:desc] = "exit"
         menu_options['r'] = {
-          :desc    => 'run wagn server',
-          :command => 'wagn server',
-          :code    => proc { system "cd #{destination_root} && wagn server" }
+          desc:    'run wagn server',
+          command: 'wagn server',
+          code:    proc { system "cd #{destination_root} && wagn server" }
         }
       end
 
       menu_options['d'] = {
-          :desc    => 'edit database configuration file',
-          :command => 'nano config/database.yml',
-          :code    =>  proc { system "nano #{File.join destination_root, 'config', 'database.yml'}" }
+          desc:    'edit database configuration file',
+          command: 'nano config/database.yml',
+          code:     proc { system "nano #{File.join destination_root, 'config', 'database.yml'}" }
         }
       menu_options['c'] =  {
-          :desc    => 'configure Wagn (e.g. email settings)',
-          :command => 'nano config/application.rb',
-          :code    =>  proc { system "nano #{File.join destination_root, 'config', 'application.rb'}" }
+          desc:    'configure Wagn (e.g. email settings)',
+          command: 'nano config/application.rb',
+          code:     proc { system "nano #{File.join destination_root, 'config', 'application.rb'}" }
         }
       menu_options['s'] =  {
-          :desc    => "seed #{Rails.env}#{ " and test" if options['core-dev'] or options['mod-dev']} database",
-          :command => 'wagn seed',
-          :code    => proc do
+          desc:    "seed #{Rails.env}#{ " and test" if options['core-dev'] or options['mod-dev']} database",
+          command: 'wagn seed',
+          code:    proc do
             system("cd #{destination_root} && bundle exec rake wagn:seed")
             if options['core-dev'] or options['mod-dev']
               system("cd #{destination_root} && RAILS_ENV=test bundle exec rake wagn:seed")
@@ -185,9 +185,9 @@ class WagnGenerator < Rails::Generators::AppBase
           end
         }
       menu_options['a'] = {
-          :desc    => 'seed all databases (production, development, and test)',
-          :command => 'wagn seed --all',
-          :code    => proc do
+          desc:    'seed all databases (production, development, and test)',
+          command: 'wagn seed --all',
+          code:    proc do
             %w( production development test ).each do |env|
               system("cd #{destination_root} && RAILS_ENV=#{env} bundle exec rake wagn:seed")
             end
@@ -195,7 +195,7 @@ class WagnGenerator < Rails::Generators::AppBase
           end
         }
       menu_options['x'] =  {
-          :desc    => "exit (run 'wagn seed' to complete the installation later)"
+          desc:    "exit (run 'wagn seed' to complete the installation later)"
         }
 
 

data/lib/wagn/mods_spec_helper.rb

@@ -4,22 +4,22 @@ require 'spork'
 ENV["RAILS_ENV"] = 'test'
 
 Spork.prefork do
-    
+
   if ENV["RAILS_ROOT"]
     require File.join( ENV["RAILS_ROOT"], '/config/environment')
   else
     require File.expand_path( '../../config/environment', __FILE__ )
   end
   require File.join Cardio.gem_root, 'lib', 'card', 'simplecov_helper.rb'
-  
+
   if defined?(Bundler)
     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 }
@@ -29,15 +29,15 @@ Spork.prefork do
 
   RSpec.configure do |config|
     config.include RSpec::Rails::Matchers::RoutingMatchers,  {
-      :file_path => /\bspec\/controllers\//
+      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 ControllerMacros, type: :controllers
 
     # == Mock Framework
     # If you prefer to mock with mocha, flexmock or RR, uncomment the appropriate symbol:

data/rails/controllers/card_controller.rb

@@ -10,10 +10,10 @@ class CardController < ActionController::Base
   include Card::Location
   include Recaptcha::Verify
 
-  before_filter :per_request_setup, :except => [:asset]
-  before_filter :load_id, :only => [ :read ]
-  before_filter :load_card, :except => [:asset]
-  before_filter :refresh_card, :only=> [ :create, :update, :delete, :rollback ]
+  before_filter :per_request_setup, except: [:asset]
+  before_filter :load_id, only: [ :read ]
+  before_filter :load_card, except: [:asset]
+  before_filter :refresh_card, only: [ :create, :update, :delete, :rollback ]
 
   layout nil
 
@@ -43,7 +43,7 @@ class CardController < ActionController::Base
     Rails.logger.info "Routing assets through Card. Recommend symlink from Deck to Card gem using 'rake wagn:update_assets_symlink'"
     asset_path = Decko::Engine.paths['gem-assets'].existent.first
     filename   = [ params[:filename], params[:format] ].join('.')
-    send_file_inside asset_path, filename , :x_sendfile => true
+    send_file_inside asset_path, filename , x_sendfile: true
   end
 
 
@@ -63,7 +63,7 @@ class CardController < ActionController::Base
   def per_request_setup
     request.format = :html if !params[:format] #is this used??
     Card::Cache.renew
-    Card::Env.reset :controller=>self
+    Card::Env.reset controller: self
     Card::Auth.set_current_from_session
 
     if params[:id] && !params[:id].valid_encoding?  # slightly better way to handle encoding issues (than the rescue in load_id)
@@ -76,7 +76,7 @@ class CardController < ActionController::Base
   def load_id
     params[:id] ||= case
       when Card::Auth.needs_setup?
-        params[:card] = { :type_id => Card.default_accounted_type_id }
+        params[:card] = { type_id: Card.default_accounted_type_id }
         params[:view] = 'setup'
         ''
       when params[:card] && params[:card][:name]
@@ -107,7 +107,7 @@ class CardController < ActionController::Base
           Card.new opts
         else
           mark = params[:id] || opts[:name]
-          Card.fetch mark, :new=>opts
+          Card.fetch mark, new: opts
         end
       end
     raise Card::NotFound unless @card
@@ -141,7 +141,7 @@ class CardController < ActionController::Base
     if ajax?
       # lets client reset window location (not just receive redirected response)
       # formerly used 303 response, but that gave IE the fits
-      render :json => {:redirect=> url}
+      render json: {redirect: url}
     else
       redirect_to url
     end
@@ -158,7 +158,7 @@ class CardController < ActionController::Base
     if !ajax? || success.hard_redirect?
       card_redirect success.to_url
     elsif String === success.target
-      render :text => success.target
+      render text: success.target
     else
       if success.soft_redirect?
         self.params = success.params
@@ -210,7 +210,7 @@ class CardController < ActionController::Base
     elsif status == 302
       card_redirect result
     else
-      args = { :text=>result, :status=>status }
+      args = { text: result, status: status }
       args[:content_type] = 'text/text' if format == :file
       render args
     end

data/rails/engine-routes.rb

@@ -6,15 +6,15 @@ Decko::Engine.routes.draw do
   #most common
   root 'card#read'
   get "#{ Decko::Engine.config.files_web_path }/:id/:rev_id(-:size).:format" =>
-                                 'card#read', :id => /[^-]+/, :rev_id=> /[^-]+/, :explicit_file=>true
+                                 'card#read', id: /[^-]+/, rev_id: /[^-]+/, explicit_file: true
   get "#{ Decko::Engine.config.files_web_path }/:id(-:size)-:rev_id.:format" =>
-                                 'card#read', :id => /[^-]+/, :explicit_file=>true  # deprecated
+                                 'card#read', id: /[^-]+/, explicit_file: true  # deprecated
   get "assets/*filename"      => 'card#asset'
   get "javascripts/*filename" => 'card#asset'
   get "jasmine/*filename"     => 'card#asset'
 
-  get 'recent(.:format)'      => 'card#read', :id => ':recent' #obviate by making links use codename
-#  match ':view:(:id(.:format))'          => 'card#read', :via=>:get
+  get 'recent(.:format)'      => 'card#read', id: ':recent' #obviate by making links use codename
+#  match ':view:(:id(.:format))'          => 'card#read', via: :get
   get '(/wagn)/:id(.:format)' => 'card#read'  #/wagn is deprecated
 
 
@@ -23,32 +23,32 @@ Decko::Engine.routes.draw do
   put    '/' => 'card#update'
   delete '/' => 'card#delete'
 
-  match ':id(.:format)' => 'card#create', :via=>:post
-  match ':id(.:format)' => 'card#update', :via=>:put
-  match ':id(.:format)' => 'card#delete', :via=>:delete
+  match ':id(.:format)' => 'card#create', via: :post
+  match ':id(.:format)' => 'card#update', via: :put
+  match ':id(.:format)' => 'card#delete', via: :delete
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~
   # legacy
-  get 'new/:type'                  => 'card#read',   :view=>'new'
-  get 'card/:view(/:id(.:format))' => 'card#read',   :view=> /new|options|edit/
-
-  get 'account/signin'             => 'card#read',   :id=>':signin'
-  get 'account/signout'            => 'card#delete', :id=>':signin'
-  get 'account/signup'             => 'card#read',   :view=>'new',  :card=>{ :type_code=>:signup }
-  get 'account/invite'             => 'card#read',   :view=>'new',  :card=>{ :type_code=>:signup }
-  get 'account/accept'             => 'card#read',   :view=>'edit', :card=>{ :type_code=>:signup }
+  get 'new/:type'                  => 'card#read',   view: 'new'
+  get 'card/:view(/:id(.:format))' => 'card#read',   view: /new|options|edit/
+
+  get 'account/signin'             => 'card#read',   id: ':signin'
+  get 'account/signout'            => 'card#delete', id: ':signin'
+  get 'account/signup'             => 'card#read',   view: 'new',  card: { type_code: :signup }
+  get 'account/invite'             => 'card#read',   view: 'new',  card: { type_code: :signup }
+  get 'account/accept'             => 'card#read',   view: 'edit', card: { type_code: :signup }
   # use type_code rather than id because in some cases (eg populating test data) routes must get loaded without loading Card
 
-  get 'admin/stats'                => 'card#read',   :id=>':stats'
-  get 'admin/:task'                => 'card#update', :id=>':all'
+  get 'admin/stats'                => 'card#read',   id: ':stats'
+  get 'admin/:task'                => 'card#update', id: ':all'
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   # standard non-RESTful
-  get '(card)/:action(/:id(.:format))'  => 'card', :action => /create|read|update|delete|asset/
-  match '(card)/create(/:id(.:format))' => 'card#create', :via=>[:post, :patch]
-  match '(card)/update(/:id(.:format))' => 'card#update', :via=>[:post, :put, :patch]
-  match '(card)/delete(/:id(.:format))' => 'card#delete', :via=>:delete
+  get '(card)/:action(/:id(.:format))'  => 'card', action: /create|read|update|delete|asset/
+  match '(card)/create(/:id(.:format))' => 'card#create', via: [:post, :patch]
+  match '(card)/update(/:id(.:format))' => 'card#update', via: [:post, :put, :patch]
+  match '(card)/delete(/:id(.:format))' => 'card#delete', via: :delete
   # other
-  get '*id' => 'card#read', :view => 'bad_address'
+  get '*id' => 'card#read', view: 'bad_address'
 
 end

data/spec/controllers/card_controller_spec.rb

@@ -11,40 +11,40 @@ describe CardController do
       #require 'rails/application/route_inspector'
       #warn "rountes#{ENV['CONTROLLER']}:\n" + Rails::Application::RouteInspector.new.format(all_routes, ENV['CONTROLLER'])* "\n"
 
-      expect({ :get => "/new/Phrase" }).to route_to( :controller => 'card', :action=>'read', :type=>'Phrase', :view=>'new' )
+      expect({ get: "/new/Phrase" }).to route_to( controller: 'card', action: 'read', type: 'Phrase', view: 'new' )
     end
 
     it "should recognize .rss on /recent" do
-      expect({:get => "/recent.rss"}).to route_to(:controller=>"card", :action=>"read", :id=>":recent", :format=>"rss")
+      expect({get: "/recent.rss"}).to route_to(controller: "card", action: "read", id: ":recent", format: "rss")
     end
 
     it "should handle RESTful posts" do
-      expect({ :put => '/mycard' }).to route_to( :controller=>'card', :action=>'update', :id=>'mycard')
-      expect({ :put => '/' }).to route_to( :controller=>'card', :action=>'update')
+      expect({ put: '/mycard' }).to route_to( controller: 'card', action: 'update', id: 'mycard')
+      expect({ put: '/' }).to route_to( controller: 'card', action: 'update')
 
     end
 
     it "handle asset requests" do
-       expect({ :get => "/asset/application.js" }).to route_to( :controller => 'card',:action=>'asset', :id => 'application', :format=> 'js' )
+       expect({ get: "/asset/application.js" }).to route_to( controller: 'card',action: 'asset', id: 'application', format: 'js' )
     end
 
     ["/wagn",""].each do |prefix|
       describe "routes prefixed with '#{prefix}'" do
         it "should recognize .rss format" do
-          expect({:get => "#{prefix}/*recent.rss"}).to route_to(
-            :controller=>"card", :action=>"read", :id=>"*recent", :format=>"rss"
+          expect({get: "#{prefix}/*recent.rss"}).to route_to(
+            controller: "card", action: "read", id: "*recent", format: "rss"
           )
         end
 
         it "should recognize .xml format" do
-          expect({:get => "#{prefix}/*recent.xml"}).to route_to(
-            :controller=>"card", :action=>"read", :id=>"*recent", :format=>"xml"
+          expect({get: "#{prefix}/*recent.xml"}).to route_to(
+            controller: "card", action: "read", id: "*recent", format: "xml"
           )
         end
 
         it "should accept cards without dots" do
-          expect({:get => "#{prefix}/random"}).to route_to(
-            :controller=>"card",:action=>"read",:id=>"random"
+          expect({get: "#{prefix}/random"}).to route_to(
+            controller: "card",action: "read",id: "random"
           )
         end
 
@@ -62,10 +62,10 @@ describe CardController do
     #  maybe think about refactoring to use mocks etc. to reduce
     #  test dependencies.
     it "creates cards" do
-      post :create, :card => {
-        :name=>"NewCardFoo",
-        :type=>"Basic",
-        :content=>"Bananas"
+      post :create, card: {
+        name: "NewCardFoo",
+        type: "Basic",
+        content: "Bananas"
       }
       assert_response 302
       c=Card["NewCardFoo"]
@@ -74,9 +74,9 @@ describe CardController do
     end
 
     it "handles permission denials" do
-      post :create, :card => {
-        :name => 'LackPerms',
-        :type => 'Html'
+      post :create, card: {
+        name: 'LackPerms',
+        type: 'Html'
       }
       assert_response 403
       expect(Card['LackPerms']).to be_nil
@@ -84,7 +84,7 @@ describe CardController do
 
     # no controller-specific handling.  move test elsewhere
     it "creates cardtype cards" do
-      xhr :post, :create, :card=>{"content"=>"test", :type=>'Cardtype', :name=>"Editor"}
+      xhr :post, :create, card: {"content"=>"test", type: 'Cardtype', name: "Editor"}
       expect(assigns['card']).not_to be_nil
       assert_response 200
       c=Card["Editor"]
@@ -93,9 +93,9 @@ describe CardController do
 
     # no controller-specific handling.  move test elsewhere
     it "pulls deleted cards from trash" do
-      @c = Card.create! :name=>"Problem", :content=>"boof"
+      @c = Card.create! name: "Problem", content: "boof"
       @c.delete!
-      post :create, :card=>{"name"=>"Problem","type"=>"Phrase","content"=>"noof"}
+      post :create, card: {"name"=>"Problem","type"=>"Phrase","content"=>"noof"}
       assert_response 302
       c=Card["Problem"]
       expect(c.type_code).to eq(:phrase)
@@ -116,12 +116,12 @@ describe CardController do
 
       it "creates card with subcards" do
         login_as 'joe_admin'
-        xhr :post, :create, :success=>'REDIRECT: /', :card=>{
-          :name  => "Gala",
-          :type  => "Fruit",
-          :subcards => {
-            "+kind"  => { :content => "apple"} ,
-            "+color" => { :type=>'Phrase', :content => "red"  }
+        xhr :post, :create, success: 'REDIRECT: /', card: {
+          name: "Gala",
+          type: "Fruit",
+          subcards: {
+            "+kind"  => { content: "apple"} ,
+            "+color" => { type: 'Phrase', content: "red"  }
           }
         }
         assert_response 200
@@ -138,7 +138,7 @@ describe CardController do
 
     it "redirects to thanks if present" do
       login_as 'joe_admin'
-      xhr :post, :create, :success => 'REDIRECT: /thank_you', :card => { "name" => "Wombly" }
+      xhr :post, :create, success: 'REDIRECT: /thank_you', card: { "name" => "Wombly" }
       assert_response 200
       json = JSON.parse response.body
       expect(json['redirect']).to match(/^http.*\/thank_you$/)
@@ -146,21 +146,21 @@ describe CardController do
 
     it "redirects to card if thanks is blank" do
       login_as 'joe_admin'
-      post :create, :success => 'REDIRECT: _self', "card" => { "name" => "Joe+boop" }
+      post :create, success: 'REDIRECT: _self', "card" => { "name" => "Joe+boop" }
       assert_redirected_to "/Joe+boop"
     end
 
     it "redirects to previous" do
       # Fruits (from shared_data) are anon creatable but not readable
       login_as :anonymous
-      post :create, { :success=>'REDIRECT: *previous', "card" => { "type"=>"Fruit", :name=>"papaya" } }, :history=>['/blam']
+      post :create, { success: 'REDIRECT: *previous', "card" => { "type"=>"Fruit", name: "papaya" } }, history: ['/blam']
       assert_redirected_to "/blam"
     end
   end
 
   describe "#read" do
     it "works for basic request" do
-      get :read, {:id=>'Sample_Basic'}
+      get :read, {id: 'Sample_Basic'}
       expect(response.body.match(/\<body[^>]*\>/im)).to be_truthy
       # have_selector broke in commit 8d3bf2380eb8197410e962304c5e640fced684b9, presumably because of a gem (like capybara?)
       #response.should have_selector('body')
@@ -171,27 +171,27 @@ describe CardController do
 
     it "handles nonexistent card with create permission" do
       login_as 'joe_user'
-      get :read, {:id=>'Sample_Fako'}
+      get :read, {id: 'Sample_Fako'}
       assert_response :success
     end
 
     it "handles nonexistent card without create permissions" do
-      get :read, {:id=>'Sample_Fako'}
+      get :read, {id: 'Sample_Fako'}
       assert_response 404
     end
 
     it "handles nonexistent card ids" do
-      get :read, {:id=>'~9999999'}
+      get :read, {id: '~9999999'}
       assert_response 404
     end
 
     it "returns denial when no read permission" do
       Card::Auth.as_bot do
-        Card.create! :name=>'Strawberry', :type=>'Fruit' #only admin can read
+        Card.create! name: 'Strawberry', type: 'Fruit' #only admin can read
       end
-      get :read, :id=>'Strawberry'
+      get :read, id: 'Strawberry'
       assert_response 403
-      get :read, :id=>'Strawberry', :format=>'txt'
+      get :read, id: 'Strawberry', format: 'txt'
       assert_response 403
 
     end
@@ -202,37 +202,37 @@ describe CardController do
       end
 
       it "should work on index" do
-        get :read, :view=>'new'
+        get :read, view: 'new'
         expect(assigns['card'].name).to eq('')
         assert_response :success, "response should succeed"
         assert_equal Card::BasicID, assigns['card'].type_id, "@card type should == Basic"
       end
 
       it "new with name" do
-        post :read, :card=>{:name=>"BananaBread"}, :view=>'new'
+        post :read, card: {name: "BananaBread"}, view: 'new'
         assert_response :success, "response should succeed"
         assert_equal 'BananaBread', assigns['card'].name, "@card.name should == BananaBread"
       end
 
       it "new with existing name" do
-        get :read, :card=>{:name=>"A"}, :view=>'new'
+        get :read, card: {name: "A"}, view: 'new'
         assert_response :success, "response should succeed"  #really?? how come this is ok?
       end
 
       it "new with type_code" do
-        post :read, :card => {:type=>'Date'}, :view=>'new'
+        post :read, card: {type: 'Date'}, view: 'new'
         assert_response :success, "response should succeed"
         assert_equal Card::DateID, assigns['card'].type_id, "@card type should == Date"
       end
 
       it "new should work for creatable nonviewable cardtype" do
         login_as :anonymous
-        get :read, :type=>"Fruit", :view=>'new'
+        get :read, type: "Fruit", view: 'new'
         assert_response :success
       end
 
       it "should use card params name over id in new cards" do
-        get :read, :id=>'my_life', :card=>{:name =>'My LIFE'}, :view=>'new'
+        get :read, id: 'my_life', card: {name: 'My LIFE'}, view: 'new'
         expect(assigns['card'].name).to eq('My LIFE')
       end
 
@@ -247,7 +247,7 @@ describe CardController do
       end
 
       it 'creates missing machine output file' do
-        args = { :id=>@all_style.machine_output_card.name, :format=>'css', :explicit_file=>true }
+        args = { id: @all_style.machine_output_card.name, format: 'css', explicit_file: true }
         get :read, args
         output_card = Card[ "#{ Card[:all].name }+#{ Card[:style].name }+#{ Card[:machine_output].name}" ]
         expect(response).to redirect_to( @all_style.machine_output_url )
@@ -260,23 +260,23 @@ describe CardController do
     context "file" do
       before do
         Card::Auth.as_bot do
-          Card.create :name => "mao2", :type_code=>'image', :image=>File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
-          Card.create :name => 'mao2+*self+*read', :content=>'[[Administrator]]'
+          Card.create name: "mao2", type_code: 'image', image: File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
+          Card.create name: 'mao2+*self+*read', content: '[[Administrator]]'
         end
       end
 
       it "handles image with no read permission" do
-        get :read, :id=>'mao2'
+        get :read, id: 'mao2'
         assert_response 403, "should deny html card view"
-        get :read, :id=>'mao2', :format=>'jpg'
+        get :read, id: 'mao2', format: 'jpg'
         assert_response 403, "should deny simple file view"
       end
 
       it "handles image with read permission" do
         login_as :joe_admin
-        get :read, :id=>'mao2'
+        get :read, id: 'mao2'
         assert_response 200
-        get :read, :id=>'mao2', :format=>'jpg'
+        get :read, id: 'mao2', format: 'jpg'
         assert_response 200
       end
 
@@ -287,17 +287,17 @@ describe CardController do
   describe "#asset" do
     it 'serves file' do
       filename = "asset-test.txt"
-      args = { :id=>filename, :format=>'txt', :explicit_file=>true }
+      args = { id: filename, format: 'txt', explicit_file: true }
       path = File.join( Decko::Engine.paths['gem-assets'].existent.first, filename)
       File.open(path, "w") { |f| f.puts "test" }
-      args = { :filename => "#{filename}" }
+      args = { filename: "#{filename}" }
       visit "/assets/#{filename}"
       expect(page.body).to eq ("test\n")
       FileUtils.rm path
     end
 
     it 'denies access to other directories' do
-      args = { :filename => "/../../Gemfile" }
+      args = { filename: "/../../Gemfile" }
       get :asset, args
       expect(response.status).to eq(404)
     end
@@ -312,17 +312,17 @@ describe CardController do
 
     describe "#update" do
       it "works" do
-        xhr :post, :update, { :id=>"~#{@simple_card.id}",
-          :card=>{:content=>'brand new content' }}
+        xhr :post, :update, { id: "~#{@simple_card.id}",
+          card: {content: 'brand new content' }}
         assert_response :success, "edited card"
         assert_equal 'brand new content', Card['Sample Basic'].content, "content was updated"
       end
 
       it "rename without update references should work" do
-        f = Card.create! :type=>"Cardtype", :name=>"Apple"
-        xhr :post, :update, :id => "~#{f.id}", :card => {
-          :name => "Newt",
-          :update_referencers => "false",
+        f = Card.create! type: "Cardtype", name: "Apple"
+        xhr :post, :update, id: "~#{f.id}", card: {
+          name: "Newt",
+          update_referencers: "false",
         }
         expect(assigns['card'].errors.empty?).not_to be_nil
         assert_response :success
@@ -330,7 +330,7 @@ describe CardController do
       end
 
       it "update type_code" do
-        xhr :post, :update, :id=>"~#{@simple_card.id}", :card=>{ :type=>"Date" }
+        xhr :post, :update, id: "~#{@simple_card.id}", card: { type: "Date" }
         assert_response :success, "changed card type"
         expect(Card['Sample Basic'].type_code).to eq(:date)
       end
@@ -339,8 +339,8 @@ describe CardController do
 
     describe "delete" do
       it "works" do
-        c = Card.create( :name=>"Boo", :content=>"booya")
-        post :delete, :id=>"~#{c.id}"
+        c = Card.create( name: "Boo", content: "booya")
+        post :delete, id: "~#{c.id}"
         assert_response :redirect
         expect(Card["Boo"]).to eq(nil)
       end
@@ -349,18 +349,18 @@ describe CardController do
       it "returns to previous undeleted card after deletion" do
         t1 = t2 = nil
         Card::Auth.as_bot do
-          t1 = Card.create! :name => "Testable1", :content => "hello"
-          t2 = Card.create! :name => "Testable1+bandana", :content => "world"
+          t1 = Card.create! name: "Testable1", content: "hello"
+          t2 = Card.create! name: "Testable1+bandana", content: "world"
         end
 
-        get :read, :id => t1.key
-        get :read, :id => t2.key
+        get :read, id: t1.key
+        get :read, id: t2.key
 
-        post :delete, :id=> '~'+t2.id.to_s
+        post :delete, id: '~'+t2.id.to_s
         assert_nil Card[ t2.name ]
         assert_redirected_to "/#{t1.name}"
 
-        post :delete, :id => '~'+t1.id.to_s
+        post :delete, id: '~'+t1.id.to_s
         assert_redirected_to '/'
         assert_nil Card[ t1.name ]
       end
@@ -369,9 +369,9 @@ describe CardController do
 
     it "should comment" do
       Card::Auth.as_bot do
-        Card.create :name => 'basicname+*self+*comment', :content=>'[[Anyone Signed In]]'
+        Card.create name: 'basicname+*self+*comment', content: '[[Anyone Signed In]]'
       end
-      post :update, :id=>'basicname', :card=>{:comment => " and more\n  \nsome lines\n\n"}
+      post :update, id: 'basicname', card: {comment: " and more\n  \nsome lines\n\n"}
       cont = Card['basicname'].content
       expect(cont).to match(/basiccontent/)
       expect(cont).to match(/some lines/)

data/spec/controllers/location_spec.rb

@@ -12,14 +12,14 @@ describe CardController, "location test from old integration" do
 
   describe 'previous location'do
     it "gets updated after viewing" do
-      get :read, :id=>"Joe_User"
+      get :read, id: "Joe_User"
       assert_equal "/Joe_User", Card::Env.previous_location
     end
 
     it "doesn't link to nonexistent cards" do
-      get :read, :id=>"Joe_User"
-      get :read, :id=>"Not_Me"
-      get :read, :id=>'*previous'
+      get :read, id: "Joe_User"
+      get :read, id: "Not_Me"
+      get :read, id: '*previous'
       assert_redirected_to '/Joe_User'
     end
 

data/test/performance/card_create_test.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'test_helper'
 require 'rails/performance_test_help'
- 
+
 class CardCreateTest < ActionDispatch::PerformanceTest
 
   def initialize *args
@@ -11,12 +11,12 @@ class CardCreateTest < ActionDispatch::PerformanceTest
   end
 
   def test_card_create_simple
-    Card.create :name =>@name, :content=>"test content"
+    Card.create name: @name, content: "test content"
     @name = @name.next
   end
 
   def test_card_create_links
-    Card.create :name =>@name, :content=>"test [[CardA]]"
+    Card.create name: @name, content: "test [[CardA]]"
     @name = @name.next
   end
 end

data/test/performance/render_test.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require 'test_helper'
 require 'rails/performance_test_help'
- 
+
 class RenderTest < ActionDispatch::PerformanceTest
   Card
   def render_test
-     Card.new( :name => "hi", :content => "{{+plus1}} {{+plus2}} {{+plus3}}" .format).render :core
+     Card.new( name: "hi", content: "{{+plus1}} {{+plus2}} {{+plus3}}" .format).render :core
   end
 end

data/test/test_helper.rb

@@ -15,8 +15,8 @@ unless defined? TEST_ROOT
     #fixtures :all
 
     # Add more helper methods to be used by all tests here...
-    
-    
+
+
     # Transactional fixtures accelerate your tests by wrapping each test method
     # in a transaction that's rolled back on completion.  This ensures that the
     # test database remains unchanged so your fixtures don't have to be reloaded
@@ -81,7 +81,7 @@ unless defined? TEST_ROOT
       def initialize(test_class,url,args={})
         @test_class,@url = test_class,url
 
-        args[:users] ||= { :anonymous=>200 }
+        args[:users] ||= { anonymous: 200 }
         args[:cardtypes] ||= ['Basic']
         if args[:cardtypes]==:all
           # FIXME: need a better data source for this?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.16.6
+  version: 1.16.7
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-02 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.6
+        version: 1.16.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.6
+        version: 1.16.7
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org