wagn 1.17.4 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb318e1936d35df9506dbaad6d532c3aa04bb00
-  data.tar.gz: e00a5f64958deaed66d86f60faac607f9fee02d6
+  metadata.gz: db58a4a4675681de858310ae6ae98a97e3627a22
+  data.tar.gz: 7cd9465e0d9b19a9c7813f588431c6ab7c740b44
 SHA512:
-  metadata.gz: f3b2af23091d31d7bae896654f8707775f0785b3521dcaeb23d781cb4beb41df4664fffdf23f973c5ee2342eb6a249135983d05922819df1249fd702df42d049
-  data.tar.gz: 673bc99e55659ac4a1800a8afb627c739f7b12c80d59b20941fe96a42f2f9fb44146de34e2fc09248aed9a383f1227e24cd0fa37b860c503efdf3054c8a2ccec
+  metadata.gz: 35c942ff3d452913629f879640ad445ed1db871877e02a2cb04410c956d4584b1e4d3223be89eea6c928d8fb9dacbd5c6cefb685eacc8cb210ebfa1a0e85aa21
+  data.tar.gz: d713f160f746785569b5a1b03f2947df48f88916ff7759301b007f175c9ad25267b9b8a9fce6822b2366c9e4047db9d92a31980c37ec6cff4c5a6e7fa8a534a8

data/Guardfile

@@ -1,35 +1,32 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-#guard :rspec, cmd: 'bundle exec env COVERAGE=false rspec' do
+# guard :rspec, cmd: 'bundle exec env COVERAGE=false rspec' do
 guard :rspec, cmd: 'bundle exec wagn rspec' do
-  
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 
   # Rails example
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-#  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-#  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  
-#  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-#  watch('config/routes.rb')                           { "spec/routing" }
-#  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  #  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  #  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+
+  #  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  #  watch('config/routes.rb')                           { "spec/routing" }
+  #  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
 
   # Capybara features specs
-#  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+  #  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
 
   # Wagn mods
   watch(%r{^mod/(.+)\.rb})                            { |m| "mod/spec/#{m[1]}_spec.rb" }
   watch(%r{^tmp/mod/(.+)\.rb})                            { |m| "mod/spec/#{m[1]}_spec.rb" }
 
-
   # Turnip features and steps
-#  watch(%r{^spec/acceptance/(.+)\.feature$})
-#  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-  
-  #callback(:start_begin) { puts "guard-rspec is watching ..." }
-  #callback(:run_on_modifications_begin) { puts "<script>document.body.innerHTML = '';</script>" } # use js to clear textmate's html view
-end
+  #  watch(%r{^spec/acceptance/(.+)\.feature$})
+  #  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 
+  # callback(:start_begin) { puts "guard-rspec is watching ..." }
+  # callback(:run_on_modifications_begin) { puts "<script>document.body.innerHTML = '';</script>" } # use js to clear textmate's html view
+end

data/bin/wagn

@@ -4,6 +4,6 @@ git_path = File.expand_path('../../../.git', __FILE__)
 
 if File.exist?(git_path)
   railties_path = File.expand_path('../../lib', __FILE__)
-  $:.unshift(railties_path)
+  $LOAD_PATH.unshift(railties_path)
 end
-require "wagn/cli"
+require 'wagn/cli'

data/features/step_definitions/email_steps.rb

@@ -58,8 +58,8 @@ Then /^(?:I|they|"([^"]*?)") should have (an|no|\d+) emails?$/ do |address, amou
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails? with subject "([^"]*?)"$/ do |address, amount, subject|
-#  address = address_for_user address
-  expect(unread_emails_for(address).select { |m| m.subject =~ Regexp.new(subject) }.size).to eq(parse_email_count(amount))
+  #  address = address_for_user address
+  expect(unread_emails_for(address).count { |m| m.subject =~ Regexp.new(subject) }).to eq(parse_email_count(amount))
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive an email with the following body:$/ do |address, expected_body|
@@ -96,11 +96,11 @@ Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
 end
 
 Then /^(?:I|they) should see \|(.*)\| in the email body$/ do |text|
-  expect(current_email.text_part.body.raw_source).to include("#{text}")
+  expect(current_email.text_part.body.raw_source).to include(text.to_s)
 end
 
 Then /^(?:I|they) should see "(.*)" in the email body$/ do |text|
-  expect(current_email.text_part.body.raw_source).to include("#{text}")
+  expect(current_email.text_part.body.raw_source).to include(text.to_s)
 end
 
 Then /^(?:I|they) should see \/([^\/]*?)\/ in the email body$/ do |text|
@@ -128,7 +128,7 @@ Then /^(?:I|they) should see (an|no|\d+) attachments? with the email$/ do |amoun
 end
 
 Then /^there should be (an|no|\d+) attachments? named "([^"]*?)"$/ do |amount, filename|
-  expect(current_email_attachments.select { |a| a.original_filename == filename }.size).to eq(parse_email_count(amount))
+  expect(current_email_attachments.count { |a| a.original_filename == filename }).to eq(parse_email_count(amount))
 end
 
 Then /^attachment (\d+) should be named "([^"]*?)"$/ do |index, filename|
@@ -136,7 +136,7 @@ Then /^attachment (\d+) should be named "([^"]*?)"$/ do |index, filename|
 end
 
 Then /^there should be (an|no|\d+) attachments? of type "([^"]*?)"$/ do |amount, content_type|
-  expect(current_email_attachments.select { |a| a.content_type == content_type }.size).to eq(parse_email_count(amount))
+  expect(current_email_attachments.count { |a| a.content_type == content_type }).to eq(parse_email_count(amount))
 end
 
 Then /^attachment (\d+) should be of type "([^"]*?)"$/ do |index, content_type|
@@ -150,7 +150,7 @@ Then /^all attachments should not be blank$/ do
 end
 
 Then /^show me a list of email attachments$/ do
-  EmailSpec::EmailViewer::save_and_open_email_attachments_list(current_email)
+  EmailSpec::EmailViewer.save_and_open_email_attachments_list(current_email)
 end
 
 #
@@ -172,29 +172,27 @@ end
 #
 
 Then /^save and open current email$/ do
-  EmailSpec::EmailViewer::save_and_open_email(current_email)
+  EmailSpec::EmailViewer.save_and_open_email(current_email)
 end
 
 Then /^save and open all text emails$/ do
-  EmailSpec::EmailViewer::save_and_open_all_text_emails
+  EmailSpec::EmailViewer.save_and_open_all_text_emails
 end
 
 Then /^save and open all html emails$/ do
-  EmailSpec::EmailViewer::save_and_open_all_html_emails
+  EmailSpec::EmailViewer.save_and_open_all_html_emails
 end
 
 Then /^save and open all raw emails$/ do
-  EmailSpec::EmailViewer::save_and_open_all_raw_emails
+  EmailSpec::EmailViewer.save_and_open_all_raw_emails
 end
 
-
-
 Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
   email = address_for_user username
   begin
-    step %{"#{email}" should receive 1 email}
+    step %("#{email}" should receive 1 email)
   rescue RSpec::Expectations::ExpectationNotMetError => e
-    raise RSpec::Expectations::ExpectationNotMetError, %(#{e.message}\n Found the following emails:\n\n #{all_emails*"\n\n~~~~~~~~\n\n"})
+    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}/)
 end
@@ -203,8 +201,7 @@ Then /^No notification should be sent$/ do
   expect(all_emails).to be_empty
 end
 
-
 def address_for_user username
-  card_with_acct = username=='I' ? Auth.current : Card[username]
+  card_with_acct = username == 'I' ? Auth.current : Card[username]
   card_with_acct ? card_with_acct.account.email : username
 end

data/features/step_definitions/history_steps.rb

@@ -1,3 +1,3 @@
 When /^I expand act (\d+)$/ do |index|
-  all("a.arrow-right")[-index.to_i].click
+  all('a.arrow-right')[-index.to_i].click
 end

data/features/step_definitions/wagn_steps.rb

@@ -28,9 +28,7 @@ end
 
 Given /^I am signed out$/ do
   visit '/'
-  if page.has_content? 'Sign out'
-    step 'I follow "Sign out"'
-  end
+  step 'I follow "Sign out"' if page.has_content? 'Sign out'
 end
 
 # Given /^I sign in as (.+)$/ do |account_name|
@@ -164,9 +162,7 @@ end
 
 When /^I wait until ajax response done$/ do
   Timeout.timeout(Capybara.default_wait_time) do
-    while page.evaluate_script('jQuery.active') != 0
-      sleep(0.5)
-    end
+    sleep(0.5) while page.evaluate_script('jQuery.active') != 0
   end
 end
 
@@ -200,9 +196,7 @@ def signed_in_as username
   sameuser = (username == 'I')
   sameuser ||= (Card::Auth.current.key == username.to_name.key)
   was_signed_in = Card::Auth.current_id if Card::Auth.signed_in?
-  unless sameuser
-    step "I am signed in as #{username}"
-  end
+  step "I am signed in as #{username}" unless sameuser
   yield
   return if sameuser
   msg = if was_signed_in
@@ -317,7 +311,7 @@ Then class_re do |selection, neg, element, selector|
   element = 'a' if element == 'link'
   within scope_of(selection) do
     verb = neg ? :should_not : :should
-    page.send(verb, have_css([element, selector] * '.'))
+    page.send(verb, have_css([element, selector].join('.')))
   end
 end
 
@@ -372,7 +366,7 @@ end
 img_should = /^I should see a non-mod image of size "(.+)" and type "(.+)"$/
 Then img_should do |size, type|
   element = find("img[src*='#{size}.#{type}']")
-  expect(element[:src]).to match(%r(/~\d+/))
+  expect(element[:src]).to match(%r{/~\d+/})
 end
 
 Then /^I should see "([^\"]*)" in color (.*)$/ do |text, css_class|

data/features/step_definitions/web_steps.rb

@@ -5,10 +5,9 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-
 require 'uri'
 require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'support', 'paths'))
 
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
@@ -41,12 +40,10 @@ When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
   fill_in(field, with: value)
 end
 
-
 When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
   select(value, from: field)
 end
 
-
 # Use this step in conjunction with Rail's datetime_select helper. For example:
 # When I select "December 25, 2008 10:00" as the date and time
 When /^(?:|I )select "([^"]*)" as the date and time$/ do |time|
@@ -110,17 +107,17 @@ end
 # passed to attach_file() you will get a "Photo file is not one of the allowed file types."
 # error message
 When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
-  type = path.split(".")[1]
+  type = path.split('.')[1]
 
   case type
-  when "jpg"
-    type = "image/jpg"
-  when "jpeg"
-    type = "image/jpeg"
-  when "png"
-    type = "image/png"
-  when "gif"
-    type = "image/gif"
+  when 'jpg'
+    type = 'image/jpg'
+  when 'jpeg'
+    type = 'image/jpeg'
+  when 'png'
+    type = 'image/png'
+  when 'gif'
+    type = 'image/gif'
   end
 
   attach_file(field, path, type)
@@ -134,7 +131,5 @@ Then /^(?:|I )should not see "([^"]*)"$/ do |text|
   expect(page).to_not have_content(text)
 end
 
-
 Then /^show me the page$/ do
-  save_and_open_page
 end

data/features/step_definitions/window_steps.rb

@@ -1,23 +1,23 @@
 When /^I open a new window for (.*)$/ do |account_name|
-str =
-<<END_TAG
+  str =
+    <<END_TAG
   window.open("", "#{account_name}", "height=600,width=800");
 END_TAG
   page.execute_script(str)
-  page.driver.browser.switch_to.window( page.driver.browser.window_handles.last )
+  page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
   accounted = Card[account_name]
   visit "/update/:signin?card[subcards][%2B*email][content]=#{accounted.account.email}&card[subcards][%2B*password][content]=joe_pass"
 end
 
 When /I switch to (.+) window$/ do |window|
   if window == 'first'
-    page.driver.browser.switch_to.window( page.driver.browser.window_handles.first )
+    page.driver.browser.switch_to.window(page.driver.browser.window_handles.first)
   elsif window == 'last'
-    page.driver.browser.switch_to.window( page.driver.browser.window_handles.last )
+    page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
   end
 end
 
 When /^I close window$/ do
-  page.execute_script("window.close();")
-  page.driver.browser.switch_to.window( page.driver.browser.window_handles.last )
+  page.execute_script('window.close();')
+  page.driver.browser.switch_to.window(page.driver.browser.window_handles.last)
 end

data/features/support/env.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
-ENV['RAILS_ENV'] = "cucumber"
+ENV['RAILS_ENV'] = 'cucumber'
 
-require File.expand_path( '../../../lib/wagn/simplecov_helper.rb', __FILE__ )
+require File.expand_path('../../../lib/wagn/simplecov_helper.rb', __FILE__)
 require 'simplecov'
 require 'minitest/autorun'
 
@@ -43,7 +43,7 @@ ActionController::Base.allow_rescue = false
 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."
+  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.

data/features/support/paths.rb

@@ -6,7 +6,7 @@ module NavigationHelpers
   #
   # step definition in web_steps.rb
   #
-  def path_to(page_name)
+  def path_to page_name
     case page_name
 
     when /the home\s?page/
@@ -19,37 +19,37 @@ module NavigationHelpers
     #     user_profile_path(Auth[ $1 ])
 
     when /card (.*) with (.*) layout$/
-      "/#{$1.to_name.url_key}?layout=$2"
+      "/#{Regexp.last_match(1).to_name.url_key}?layout=$2"
 
     when /card (.*)$/
-      "/#{$1.to_name.url_key}"
+      "/#{Regexp.last_match(1).to_name.url_key}"
 
     when /new (.*) presetting name to "(.*)" and author to "(.*)"/
-      url = "/new/#{$1}?card[name]=#{$2.to_name.url_key}&_author=#{CGI.escape($3)}"
+      url = "/new/#{Regexp.last_match(1)}?card[name]=#{Regexp.last_match(2).to_name.url_key}&_author=#{CGI.escape(Regexp.last_match(3))}"
 
     when /new card named (.*)$/
-      "/card/new?card[name]=#{CGI.escape($1)}"
+      "/card/new?card[name]=#{CGI.escape(Regexp.last_match(1))}"
 
     when /edit (.*)$/
-      "/#{$1.to_name.url_key}?view=edit"
+      "/#{Regexp.last_match(1).to_name.url_key}?view=edit"
 
     when /new (.*)$/
-      "/new/#{$1.to_name.url_key}"
+      "/new/#{Regexp.last_match(1).to_name.url_key}"
 
     when /kml source/
-       "/House+*type+by_name.kml"
+      '/House+*type+by_name.kml'
 
     when /url "(.*)"/
-      "#{$1}"
+      Regexp.last_match(1).to_s
 
     else
       begin
         page_name =~ /the (.*) page/
-        path_components = $1.split(/\s+/)
-        self.send(path_components.push('path').join('_').to_sym)
+        path_components = Regexp.last_match(1).split(/\s+/)
+        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__}"
+        raise "#{e.message} Can't find mapping from \"#{page_name}\" to a path.\n" \
+              "Now, go and add a mapping in #{__FILE__}"
       end
     end
   end

data/features/support/scopes.rb

@@ -22,8 +22,8 @@ module ScopeHelpers
       '#main > .card-slot > .card-frame'
 
     else
-      raise "Can't find mapping from \"#{section}\" to a scope.\n" +
-        "Now, go and add a mapping in #{__FILE__}"
+      raise "Can't find mapping from \"#{section}\" to a scope.\n" \
+            "Now, go and add a mapping in #{__FILE__}"
     end
   end
 end

data/lib/decko/engine.rb

@@ -16,15 +16,13 @@ require 'builder'
 require 'wagn'
 
 module Decko
-
   class Engine < ::Rails::Engine
-
-    paths.add "app/controllers", with: 'rails/controllers', eager_load: true
+    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
       paths['lib/wagn/config/initializers'].existent.sort.each do |initializer|
@@ -33,8 +31,8 @@ module Decko
     end
 
     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
+      # 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']
       Engine.paths['log']           = Wagn.paths['log']
       Engine.paths['lib/tasks']     = Wagn.paths['lib/tasks']
@@ -46,13 +44,12 @@ module Decko
         ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
       end
       ActiveSupport.on_load(:after_initialize) do
-          begin
-            require_dependency 'card' unless defined?(Card)
-          rescue ActiveRecord::StatementInvalid => e
-            ::Rails.logger.warn "database not available[#{::Rails.env}] #{e}"
-          end
+        begin
+          require_dependency 'card' unless defined?(Card)
+        rescue ActiveRecord::StatementInvalid => e
+          ::Rails.logger.warn "database not available[#{::Rails.env}] #{e}"
+        end
       end
     end
   end
 end
-