pco-url 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4731a995e9e8f3944ba316db910452830ba0a0606f0a9cc07db1a6a51ef7890c
-  data.tar.gz: 436e8ac79dcfe60f89d81676b5b2149269561510e827c90548f2d3c804dd5f1e
+  metadata.gz: 3e4d2b6ccf53cc4ea13cee9a5aa2e4841b2b03a4616b666b33ee4849be22af07
+  data.tar.gz: 6f364718d66b34a75a260111e49ac2a2f69a36f715df6778f167c2f2787215c1
 SHA512:
-  metadata.gz: d587df8300f3b0ff06db697ee73a7c6375a6e1b29122cb67a0730691fb56da073d466fce254f76fee308c17500beeca68731179d02eb18510fbb3b7f265153e5
-  data.tar.gz: b1fc2d8431d4b6abe9b0b21ddef546c095de4b0afdb7d7e168dce643a168dc9bad1692739d3219326a641db467e9a11d6801d44e00c29d3f9d2cacb287267d3c
+  metadata.gz: 3c92f04b27e2244a8baeca932f1ec7bcb4d76ff1c13fe041fb7317fcba07d4b1df17f5e99da95d521f7df1275ad75df0aa73e854e915f95dc8427aef76e3c70a
+  data.tar.gz: dccee0de36fe8d61d63dcab7393e57b77eacc39af63445741119197896509d4d16aff33eb8029efd80dd88a303f8c1882d7f37f7063e0eaf1a7eb81f4e4557c7

data/.circleci/config.yml

@@ -1,70 +1,45 @@
-version: 2 # use CircleCI 2.0
-jobs: # a collection of steps
-  "ruby-2.3": # runs not using Workflows must have a `build` job as entry point
-    docker: # run the steps with Docker
-      - image: circleci/ruby:2.3
-        environment: # environment variables for primary container
+version: 2
+workflows:
+  version: 2
+  commit:
+    jobs:
+      - build
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - build
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.5
+        environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3
           BUNDLE_PATH: vendor/bundle
-    steps: # a collection of executable commands
-      - checkout # special step to check out source code to working directory
-
-      # Restore bundle cache
+    steps:
+      - checkout
       - restore_cache:
           keys:
-            - pco-url-bundle-v2-ruby23-{{ checksum "pco-url.gemspec" }}
-            - pco-url-bundle-v2-ruby23-
-
+            - pco-url-bundle-v2-{{ checksum ".ruby-version" }}-{{ checksum "pco-url.gemspec" }}-{{ checksum "Appraisals" }}
+            - pco-url-bundle-v2-{{ checksum ".ruby-version" }}-{{ checksum "pco-url.gemspec" }}
+            - pco-url-bundle-v2-{{ checksum ".ruby-version" }}-
+            - pco-url-bundle-v2-
       - run:
           name: Bundle Install
           command: bundle check || bundle install
-
-      # Store bundle cache
-      - save_cache:
-          key: pco-url-bundle-v2-ruby23-{{ checksum "pco-url.gemspec" }}
-          paths:
-            - vendor/bundle
-
       - run:
-          name: Run rspec
-          command: |
-            bundle exec rspec --format progress
-
-  "ruby-2.4": # runs not using Workflows must have a `build` job as entry point
-    docker: # run the steps with Docker
-      - image: circleci/ruby:2.4
-        environment: # environment variables for primary container
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-    steps: # a collection of executable commands
-      - checkout # special step to check out source code to working directory
-
-      # Restore bundle cache
-      - restore_cache:
-          keys:
-            - pco-url-bundle-v2-ruby24-{{ checksum "pco-url.gemspec" }}
-            - pco-url-bundle-v2-ruby24-
-
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-
-      # Store bundle cache
+          name: Install appraisal dependencies
+          command: bundle exec appraisal bundle check || bundle exec appraisal bundle install
       - save_cache:
-          key: pco-url-bundle-v2-ruby24-{{ checksum "pco-url.gemspec" }}
+          key: pco-url-bundle-v2-{{ checksum ".ruby-version" }}-{{ checksum "pco-url.gemspec" }}-{{ checksum "Appraisals" }}
           paths:
             - vendor/bundle
-
       - run:
           name: Run rspec
-          command: |
-            bundle exec rspec --format progress
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - "ruby-2.3"
-      - "ruby-2.4"
+          command: bundle exec appraisal rspec --format progress

data/.github/pull_request_template.md

@@ -0,0 +1,15 @@
+### Summary
+
+<!-- Provide a general description of the changes in your pull request -->
+
+### Other Information
+
+<!-- If there's anything else that's important and relevant to your pull
+request, mention that information here. This could include
+benchmarks, or other information. -->
+
+<!-- Make sure you're familiar with the contributing guidelines: https://github.com/ministrycentered/knowledge-base/tree/master/gems#contributing
+
+Before merging please have a +1 from a #platform team member, and another from a developer who's __not__ on your team. This will ensure that the changes are looked at by people who aren't directly working on the same application as you and can approach the changes with a fresh set of eyes.
+
+When you're ready to merge, please follow the release process outlined here: https://github.com/ministrycentered/knowledge-base/tree/master/gems#release-process -->

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 log
+gemfiles/*.gemfile.lock

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Style/StringLiterals:
   Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.3.7
+2.5

data/Appraisals

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.0"
+  gem "sqlite3", "< 1.4"
+end
+
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
+  gem "sqlite3", "< 1.4"
+end
+
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.0"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.0"
+end

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v2.1.1 (2019-12-10)
+
+* Chore: A bunch of maintenance [Shane Bonham]
+* Fix: `NameError` raised by `aci_delete_org` [Shane Bonham]
+
 # v2.1.0 (2019-11-05)
 
 * Feature: Add support in dev for any TLD [Tim Morgan]

data/Guardfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/README.md

@@ -1,5 +1,7 @@
 # PCO::URL
 
+[![CircleCI](https://circleci.com/gh/ministrycentered/pco-url.svg?style=svg)](https://circleci.com/gh/ministrycentered/pco-url)
+
 Fetch the base URL for the current and other applications based on the current application environment.
 
 ## Usage

data/Rakefile

@@ -1,2 +1,9 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require "rspec/core"
+require "rspec/core/rake_task"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec
+task test: :spec

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "sqlite3", "< 1.4"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "sqlite3", "< 1.4"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

data/lib/pco/url/engine/domain_middleware.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "rails/engine"
+
 module PCO
   class URL
     class Engine < Rails::Engine

data/lib/pco/url/version.rb

@@ -1,5 +1,5 @@
 module PCO
   class URL
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/pco-url.gemspec

@@ -1,14 +1,15 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pco/url/version'
+require "pco/url/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "pco-url"
   spec.version       = PCO::URL::VERSION
   spec.authors       = ["James Miller"]
   spec.email         = ["bensie@gmail.com"]
-  spec.summary       = %q{Generate URLs for PCO apps in all environments}
+  spec.summary       = "Generate URLs for PCO apps in all environments"
   spec.homepage      = "https://github.com/ministrycentered/pco-url"
   spec.license       = "MIT"
 
@@ -17,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rails", "~> 5.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", ">= 3.0.0", "< 4"
-  spec.add_development_dependency "rspec-rails", "~> 3.9.0"
-  spec.add_development_dependency "rubocop", "0.54.0"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rubocop"
 end

data/spec/dummy/config/application.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 require_relative "./boot"
 require "action_controller/railtie"
 
-require 'pco/url'
+require "pco/url"
 
 module Dummy
   class Application < Rails::Application
     config.eager_load = false
+    config.hosts << /accounts\.pco\.(test|codes)/ if Rails::VERSION::MAJOR >= 6
+    config.secret_key_base = "123abc"
   end
 end
 

metadata

@@ -1,105 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: pco-url
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - James Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
 description: 
 email:
 - bensie@gmail.com
@@ -109,14 +117,21 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".editorconfig"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/pco/url.rb
 - lib/pco/url/church_center.rb
 - lib/pco/url/encryption.rb