aaf-gumboot 1.0.0.pre.alpha.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e952df6d99ca0bf6a4318eaa499ed7c77a89c141
-  data.tar.gz: c87a7d4266d7e3cfea893b31864c095c6cdb940b
+  metadata.gz: 52e23f002b6d20c1fba12e280d0e29c9bc83100c
+  data.tar.gz: a7bdbb8590251322dbee584a1b2a002377fdb465
 SHA512:
-  metadata.gz: 6939763db4326b84e5df6b9ff948db76520132cafbee27578ed5c0dd3e358b24138589052092cce16b2eba42a21a95932d054c22bfc27fd1d31f22a94efc71b7
-  data.tar.gz: 74e51eee1bfacd930826ade7230aecc10fbf5e463dd0b9ef61907f95c4d5e89a2b63eb1ca7125c52e13a44ce371e43f1b36a037f481a8c77bb7c79963150f2ac
+  metadata.gz: cea623e1c262ac3d6cf901a19d1a21f8c4a8bf40950da383a62497e23b3a1211fbd579b11e9448b740ecea912495fbf2b54ff833e5b4cf9a8e7aeaf2f5b66dea
+  data.tar.gz: 748e84bca55148e59168e3bca922d88aab8b99750eb22d88bf2fed361016b7e0d960da6988615b6d5ca430f7bc9d9da3448aaecbe1131dd9e4c6b8ed9230ceb2

data/.rubocop.yml

@@ -1,15 +1,13 @@
-Style/Documentation:
-  Enabled: false
+inherit_from:
+  - aaf-rubocop.yml
 
 Style/FileName:
   Exclude:
     - lib/aaf-gumboot.rb
 
-AllCops:
-  TargetRubyVersion: 2.1
-
 Metrics/BlockLength:
   Exclude:
-    - aaf-gumboot.gemspec
+    - "*.gemspec"
     - spec/**/*.rb
-    - lib/**/*.rb
+    - lib/tasks/*.rake
+    - lib/gumboot/**/*.rb

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in aaf-gumboot.gemspec

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard :bundler do
   watch('Gemfile')
   watch(/^.+\.gemspec/)

data/README.md

@@ -24,7 +24,7 @@ Gumboot sloshes through these **muddy** topics for AAF applications, bringing do
 ![](http://i.imgur.com/XP4Yw6e.jpg)
 
 ```
-Copyright 2014-2015, Australian Access Federation
+Copyright 2014-2017, Australian Access Federation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ Before you get started you should ensure your development machine has the follow
 
     Generate a secret to use with Rapid Connect with the following:
 
-        $> tr -dc '[[:alnum:][:punct:]]' < /dev/urandom | head -c32 ;echo
+        $> LC_CTYPE=C tr -dc '[[:alnum:][:punct:]]' < /dev/urandom | head -c32 ;echo
 
     Access [https://rapid.test.aaf.edu.au](https://rapid.test.aaf.edu.au) and register using your secret created above and the callback URL of `http://localhost:8080/auth/jwt`
 
@@ -100,39 +100,43 @@ Of course ACTUAL comments describing something you've written that is a little b
 The way we build ruby applications has tried to be standardised as much as possible at a base layer. You're likely going to want all these Gems in your Gemfile for a Rails app or a considerable subset of them for a non Rails app.
 
 ```ruby
-gem 'rails', '4.2.3' # Ensure latest release
 gem 'mysql2'
+gem 'rails', '>= 5.0.0', '< 5.1' # Ensure latest release
 
-gem 'valhammer'
+gem 'aaf-secure_headers'
+gem 'aaf-lipstick'
 gem 'accession'
+gem 'valhammer'
 
-gem 'puma', require: false
 gem 'god', require: false
+gem 'puma', require: false
 
-group :development, :test do
-  gem 'rspec-rails', '~> 3.3.0'
-  gem 'shoulda-matchers'
+gem 'local_time'
 
+gem 'rails_admin'
+gem 'rails_admin_aaf_theme'
+
+group :development, :test do
+  gem 'aaf-gumboot'
+  gem 'bullet'
+  gem 'database_cleaner'
   gem 'factory_girl_rails'
   gem 'faker'
-  gem 'timecop'
-  gem 'database_cleaner'
-
-  gem 'rubocop', require: false
-  gem 'simplecov', require: false
-
-  gem 'capybara', require: false
-  gem 'poltergeist', require: false
-  gem 'phantomjs', require: 'phantomjs/poltergeist'
-
   gem 'guard', require: false
+  gem 'guard-brakeman', require: false
   gem 'guard-bundler', require: false
-  gem 'guard-rubocop', require: false
   gem 'guard-rspec', require: false
-  gem 'guard-brakeman', require: false
+  gem 'guard-rubocop', require: false
+  gem 'pry'
+  gem 'rails-controller-testing'
+  gem 'rspec-rails', '~> 3.5.0.beta4'
+  gem 'rubocop', require: false
+  gem 'shoulda-matchers'
+  gem 'simplecov', require: false
   gem 'terminal-notifier-guard', require: false
-
-  gem 'aaf-gumboot'
+  gem 'timecop'
+  gem 'web-console', '~> 2.0', require: false
+  gem 'webmock', require: false
 end
 ```
 
@@ -166,28 +170,8 @@ Modify the generated RSpec config file as follows `.rspec`:
 Add a Rubocop config file `.rubocop.yml`:
 
 ```
-AllCops:
-  TargetRubyVersion: 2.3
-  Exclude:
-    - db/schema.rb
-
-Rails:
-  Enabled: true
-
-Rails/Output:
-  Exclude:
-    - db/seeds.rb
-
-Style/Documentation:
-  Enabled: false
-
-Metrics/MethodLength:
-  Exclude:
-    - db/migrate/*.rb
-
-Metrics/AbcSize:
-  Exclude:
-    - db/migrate/*.rb
+inherit_gem:
+  aaf-gumboot: aaf-rubocop.yml
 ```
 
 ### Simplecov
@@ -246,6 +230,7 @@ Add the following gem to your Gemfile in the default group:
 
 ``` ruby
 gem 'rapid-rack'
+gem 'super-identity'
 ```
 
 Execute:
@@ -277,6 +262,7 @@ module Authentication
   class SubjectReceiver
     include RapidRack::DefaultReceiver
     include RapidRack::RedisRegistry
+    include SuperIdentity::Client
 
     def map_attributes(_env, attrs)
       {}
@@ -436,6 +422,8 @@ require 'gumboot/shared_examples/database_schema'
 
 RSpec.describe 'Database Schema' do
   let(:connection) { ActiveRecord::Base.connection.raw_connection }
+  # Use the following (as an example) for column based exemptions
+  let(:collation_exemptions) { { table_name: %i[column_name] } }
 
   include_context 'Database Schema'
 end
@@ -761,7 +749,9 @@ You should now follow the documention for [https://github.com/ausaccessfed/rapid
 
 ## Controllers
 
-AAF applications must utilise controllers which default to verifying authentication and access control on every request. This can be changed as implementations require to be publicly accessible for example but must be explicitly configured in code to make it clear to all.
+AAF applications must utilise controllers which default to verifying authentication
+and access control on every request. This can be changed as implementations require
+to be publicly accessible for example but must be explicitly configured in code to make it clear to all.
 
 ##### Rails 4.x
 See `spec/dummy/app/controllers/application_controller.rb` for the implementation this example is based on

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -5,4 +7,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/aaf-gumboot.gemspec

@@ -1,4 +1,6 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gumboot/version'

data/aaf-rubocop.yml

@@ -0,0 +1,50 @@
+# https://rubocop.readthedocs.io/en/latest/configuration/#inheritance
+
+# If you override a setting in a project's local .rubocop.yml file
+# you must add the pre-existing exceptions found here as well.
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - db/schema.rb
+
+Rails:
+  Enabled: true
+
+Rails/NotNullColumn:
+  Enabled: false
+
+Rails/ReversibleMigration:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Exclude:
+    - db/migrate/*.rb
+
+Rails/Output:
+  Exclude:
+    - db/seeds.rb
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/MethodLength:
+  Exclude:
+    - db/migrate/*.rb
+    - config/**/*.rb
+
+Metrics/AbcSize:
+  Exclude:
+    - db/migrate/*.rb
+
+Metrics/BlockLength:
+  Exclude:
+    - "*.gemspec"
+    - spec/**/*.rb
+    - lib/tasks/*.rake
+    - config/**/*.rb
+    - db/**/*.rb
+
+Metrics/LineLength:
+  Exclude:
+    - db/migrate/*.rb

data/lib/aaf-gumboot.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'gumboot'

data/lib/gumboot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gumboot
   # Your code goes here...
 end

data/lib/gumboot/shared_examples/anonymous_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'Anon controller' do
   controller(described_class) do
     def an_action

data/lib/gumboot/shared_examples/api_constraints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'API constraints' do
   context 'AAF shared implementation' do
     context '#matches?' do

data/lib/gumboot/shared_examples/api_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'gumboot/shared_examples/anonymous_controller'
 
 RSpec.shared_examples 'API base controller' do

data/lib/gumboot/shared_examples/api_subjects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'API Subjects' do
   context 'AAF shared implementation' do
     subject { build :api_subject }

data/lib/gumboot/shared_examples/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gumboot/shared_examples/anonymous_controller'
 
 RSpec.shared_examples 'Application controller' do

data/lib/gumboot/shared_examples/database_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'Database Schema' do
   context 'AAF shared implementation' do
     RSpec::Matchers.define :have_collation do |expected, name|
@@ -24,6 +26,8 @@ RSpec.shared_examples 'Database Schema' do
     end
 
     it 'has the correct collation' do
+      exemptions = defined?(collation_exemptions) ? collation_exemptions : []
+
       db_collation = query('SHOW VARIABLES LIKE "collation_database"')
                      .first[:Value]
       expect(db_collation).to eq('utf8_bin')
@@ -33,8 +37,14 @@ RSpec.shared_examples 'Database Schema' do
         next if table_name == 'schema_migrations'
         expect(table).to have_collation('utf8_bin', "`#{table_name}`")
 
-        query("SHOW FULL COLUMNS FROM #{table[:Name]}").each do |column|
+        query("SHOW FULL COLUMNS FROM #{table_name}").each do |column|
           next unless column[:Collation]
+          next if exemptions.any? do |except_table, except_columns|
+                    except_table == table_name.to_sym &&
+                    except_columns.any? do |except_column|
+                      except_column == column[:Field].to_sym
+                    end
+                  end
           expect(column)
             .to have_collation('utf8_bin',
                                " `#{table_name}`.`#{column[:Field]}`")

data/lib/gumboot/shared_examples/foreign_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'Gumboot Foreign Keys' do
   RSpec.shared_examples 'gumboot fk' do
     let(:conn) do

data/lib/gumboot/shared_examples/permissions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'Permissions' do
   context 'AAF shared implementation' do
     subject { build :permission }

data/lib/gumboot/shared_examples/roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'Roles' do
   context 'AAF shared implementation' do
     subject { build :role }

data/lib/gumboot/shared_examples/subjects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples 'Subjects' do
   context 'AAF shared implementation' do
     subject { build :subject }

data/lib/gumboot/strap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'active_support/core_ext/hash/deep_merge'
 
@@ -25,7 +27,7 @@ module Gumboot
       adapter, database = db.values_at('adapter', 'database')
       raise('Only supports mysql2 adapter') unless adapter == 'mysql2'
 
-      puts "Ensuring database `#{database}` exists"
+      Rails.logger.info "Ensuring database `#{database}` exists"
       client.query("CREATE DATABASE IF NOT EXISTS `#{database}` " \
                    'CHARACTER SET utf8 COLLATE utf8_bin')
     end
@@ -36,7 +38,10 @@ module Gumboot
 
       raise('Only supports mysql2 adapter') unless adapter == 'mysql2'
 
-      puts "Ensuring access to `#{database}` for #{username} user is granted"
+      Rails.logger.info(
+        "Ensuring access to `#{database}` for #{username} user is granted"
+      )
+
       client.query("GRANT ALL PRIVILEGES ON `#{database}`.* " \
                    "TO '#{client.escape(username)}'@'localhost' " \
                    "IDENTIFIED BY '#{client.escape(password)}'")
@@ -46,11 +51,11 @@ module Gumboot
       message 'Loading database schema'
 
       if ActiveRecord::Base.connection.execute('SHOW TABLES').count.zero?
-        puts 'No tables exist yet, loading schema'
+        Rails.logger.info 'No tables exist yet, loading schema'
         system 'rake db:schema:load'
       end
 
-      puts 'Running migrations'
+      Rails.logger.info 'Running migrations'
       system 'rake db:migrate'
     end
 
@@ -106,12 +111,16 @@ module Gumboot
     private
 
     def message(msg)
-      puts "\n== #{msg} =="
+      Rails.logger.info "\n== #{msg} =="
+    end
+
+    def safe_load(yaml)
+      YAML.safe_load(yaml, [Symbol])
     end
 
     def merge_config(src, dest)
-      new_config = YAML.load(File.read(src))
-      old_config = File.exist?(dest) ? YAML.load(File.read(dest)) : {}
+      new_config = safe_load(File.read(src))
+      old_config = File.exist?(dest) ? safe_load(File.read(dest)) : {}
 
       File.open(dest, 'w') do |f|
         f.write(YAML.dump(new_config.deep_merge(old_config)))

data/lib/gumboot/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gumboot
-  VERSION = '1.0.0-alpha.2'.freeze
+  VERSION = '1.1.0'
 end

data/spec/dummy/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from:
+  - ../../aaf-rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - db/schema.rb

data/spec/dummy/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../config/application', __FILE__)
 
 Rails.application.load_tasks

data/spec/dummy/app/controllers/api/api_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'openssl'
 
 module API
@@ -45,7 +47,6 @@ module API
       ]
 
       x509_dn_hash['CN'] || raise(Unauthorized, 'Subject CN invalid')
-
     rescue OpenSSL::X509::NameError
       raise(Unauthorized, 'Subject DN invalid')
     end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   Forbidden = Class.new(StandardError)
   private_constant :Forbidden
@@ -12,7 +14,7 @@ class ApplicationController < ActionController::Base
   after_action :ensure_access_checked
 
   def subject
-    subject = session[:subject_id] && Subject.find_by_id(session[:subject_id])
+    subject = session[:subject_id] && Subject.find_by(id: session[:subject_id])
     return nil unless subject.try(:functioning?)
     @subject = subject
   end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end

data/spec/dummy/app/models/api_subject.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'accession'
 
-class APISubject < ActiveRecord::Base
+class APISubject < ApplicationRecord
   include Accession::Principal
 
   has_many :api_subject_roles

data/spec/dummy/app/models/api_subject_role.rb

@@ -1,4 +1,6 @@
-class APISubjectRole < ActiveRecord::Base
+# frozen_string_literal: true
+
+class APISubjectRole < ApplicationRecord
   belongs_to :api_subject
   belongs_to :role
 

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/permission.rb

@@ -1,4 +1,6 @@
-class Permission < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Permission < ApplicationRecord
   belongs_to :role
 
   valhammer

data/spec/dummy/app/models/role.rb

@@ -1,4 +1,6 @@
-class Role < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Role < ApplicationRecord
   has_many :api_subject_roles
   has_many :api_subjects, through: :api_subject_roles
 

data/spec/dummy/app/models/subject.rb

@@ -1,4 +1,6 @@
-class Subject < ActiveRecord::Base
+# frozen_string_literal: true
+
+class Subject < ApplicationRecord
   include Accession::Principal
 
   has_many :subject_roles

data/spec/dummy/app/models/subject_role.rb

@@ -1,4 +1,6 @@
-class SubjectRole < ActiveRecord::Base
+# frozen_string_literal: true
+
+class SubjectRole < ApplicationRecord
   belongs_to :subject
   belongs_to :role
 

data/spec/dummy/bin/bundle

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/rake

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/spec/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment', __FILE__)

data/spec/dummy/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:

data/spec/dummy/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 

data/spec/dummy/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
 require File.expand_path('../application', __FILE__)
 

data/spec/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   config.cache_classes = false
 

data/spec/dummy/config/environments/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   config.cache_classes = true
 

data/spec/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   config.cache_classes = true
 

data/spec/dummy/config/initializers/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

data/spec/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/spec/dummy/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/spec/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 ActiveSupport.on_load(:action_controller) do
   wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end

data/spec/dummy/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
 end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define(version: 0) do
   create_table :roles do |t|
     t.string :name, null: false
@@ -8,7 +10,7 @@ ActiveRecord::Schema.define(version: 0) do
     t.string :value, null: false
     t.belongs_to :role, null: false
     t.timestamps null: false
-    t.index [:role_id, :value], unique: true
+    t.index %i[role_id value], unique: true
   end
 
   create_table :api_subjects do |t|

data/spec/dummy/lib/api_constraints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class APIConstraints
   def initialize(version:, default: false)
     @version = version

data/spec/factories/api_subjects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :api_subject, class: API::APISubject do
     x509_cn { Faker::Lorem.word }

data/spec/factories/permissions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :permission do
     association :role

data/spec/factories/roles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :role, class: 'Role' do
     name { Faker::Lorem.word }

data/spec/factories/subjects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :subject do
     name { Faker::Name.name }

data/spec/gumboot/api_constraints_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/api_constraints'

data/spec/gumboot/api_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/api_controller'

data/spec/gumboot/api_subjects_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/api_subjects'

data/spec/gumboot/application_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/application_controller'

data/spec/gumboot/foreign_keys_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/foreign_keys'

data/spec/gumboot/permissions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/permissions'

data/spec/gumboot/roles_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/roles'

data/spec/gumboot/subjects_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'gumboot/shared_examples/subjects'

data/spec/lib/gumboot/strap_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'mysql2'
@@ -127,7 +129,7 @@ RSpec.describe Gumboot::Strap do
     end
 
     context 'when a database already exists' do
-      let(:tables) { %w(schema_migrations) }
+      let(:tables) { %w[schema_migrations] }
 
       it 'runs the migrations' do
         expect(subject.kernel).to receive(:system).with('rake db:migrate')
@@ -179,19 +181,19 @@ RSpec.describe Gumboot::Strap do
       expect(FileUtils).to receive(:ln_s).with("#{base}/b", 'config/b')
       expect(FileUtils).to receive(:ln_s).with("#{base}/c", 'config/c')
 
-      subject.link_global_configuration(%w(a b c))
+      subject.link_global_configuration(%w[a b c])
     end
 
     it 'skips an existing file' do
       allow(File).to receive(:exist?).and_return(true)
       expect(FileUtils).not_to receive(:ln_s)
 
-      subject.link_global_configuration(%w(a))
+      subject.link_global_configuration(%w[a])
     end
 
     it 'raises an error for a missing file' do
       allow(File).to receive(:exist?).and_return(false)
-      expect { subject.link_global_configuration(%w(a)) }
+      expect { subject.link_global_configuration(%w[a]) }
         .to raise_error(/Missing global config file/)
     end
   end
@@ -223,7 +225,7 @@ RSpec.describe Gumboot::Strap do
 
     def updated_config
       expect(written).not_to be_empty
-      YAML.load(written.join)
+      YAML.safe_load(written.join, [Symbol])
     end
 
     context 'when the target does not exist' do
@@ -286,6 +288,16 @@ RSpec.describe Gumboot::Strap do
         expect { run }.to raise_error(/Missing dist config file/)
       end
     end
+
+    context 'when the files contain symbol keys' do
+      let(:dist) { YAML.dump(a: 2) }
+      let(:target) { YAML.dump(a: 3) }
+
+      it 'merges the new configuration option' do
+        run
+        expect(updated_config).to eq(a: 3)
+      end
+    end
   end
 
   describe '#install_dist_template' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'factory_girl'
 require 'rails/all'
@@ -13,7 +15,7 @@ end
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../dummy/config/environment.rb', __FILE__)
 
-load Rails.root.join('db/schema.rb')
+load Rails.root.join('db', 'schema.rb')
 
 FactoryGirl.find_definitions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-gumboot
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Bradley Beddoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: accession
@@ -280,6 +280,7 @@ files:
 - README.md
 - Rakefile
 - aaf-gumboot.gemspec
+- aaf-rubocop.yml
 - lib/aaf-gumboot.rb
 - lib/gumboot.rb
 - lib/gumboot/shared_examples/anonymous_controller.rb
@@ -294,6 +295,7 @@ files:
 - lib/gumboot/shared_examples/subjects.rb
 - lib/gumboot/strap.rb
 - lib/gumboot/version.rb
+- spec/dummy/.rubocop.yml
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
@@ -307,6 +309,7 @@ files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/api_subject.rb
 - spec/dummy/app/models/api_subject_role.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/permission.rb
 - spec/dummy/app/models/role.rb
@@ -375,12 +378,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Kick off subject and API structure for AAF applications