roo_on_rails 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cff300e49683272e9b7624135b56e0e62ffbeda
-  data.tar.gz: 78b553933ddb68cc54b5082352a9faf96edccdea
+  metadata.gz: 0c45afb42c3393f675d0574d777b6608f944bcbf
+  data.tar.gz: f26f2199515da7ab4399301fb9339676a2d8f1c0
 SHA512:
-  metadata.gz: b9f54d9e74c746a4f920aee6769c6f97bbf31ba15c859fe42aa0c6adbf29a997a92c6b7ae9a6cb8d78867efc83b9454926e27f0bc8b5d65416de2f86d872092b
-  data.tar.gz: b922a04d6238856b3d956539a9b8b3f379f85932792cc78f7c6136370b0069ed0c7f6794e4df74431dfdb3ee7f856e7b51d1faa3cea05fea26bd28d626669aab
+  metadata.gz: 16aee8e01002df7a799569af74287305cc64d49f266c2d0ec09f57284a0a445059204c441d870fea6b2df46324fa59d0ced5b0fdfc0eb8bea96722a9f6284850
+  data.tar.gz: bc5068cbd59ec7fa2b69eb2425945fdca17a60ebc07eee44f2b05417ae6dd6944e2b5913afdda072c99cc7382e5a1a051c24a1bf259d782c11022a2c51f55c64

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 _A description of your awesome work here!_
 
+# v1.16.1 (2017-11-20)
+
+Bug fix:
+
+- Auto-load roo identity if configured, prevent failing in CI (#83)
+
 # v1.16.0 (2017-11-17)
 
 Features:

data/README.md

@@ -227,16 +227,9 @@ details.
 
 ### Identity
 
-If your service wants to accept JWTs for identity claims, then adding the `json-jwt` gem
-to your `Gemfile` and the following railtie to your app will ensure any data presented is
-available:
-
-```ruby
-require 'roo_on_rails/railties/roo_identity'
-```
-
-In non-development environments you must also set the `VALID_IDENTITY_URL_PREFIXES` environment
-variable to be a comma separasted list of the URL prefixes which valid JWTs come from, eg:
+If your service wants to accept JWTs for identity claims, then setting the
+`VALID_IDENTITY_URL_PREFIXES` environment variable (to be a comma separasted list of the URL prefixes
+which valid JWTs come from) will set everything up, eg:
 
 ```
 https://deliveroo.co.uk/identity-keys/,https://identity.deliveroo.com/jwks/

data/lib/roo_on_rails/rack/populate_env_from_jwt.rb

@@ -6,22 +6,22 @@ module RooOnRails
   module Rack
     class PopulateEnvFromJWT
       UnacceptableKeyError = Class.new(RuntimeError)
+      VALID_PREFIXES_KEY = 'VALID_IDENTITY_URL_PREFIXES'.freeze
+
+      def self.configured?
+        ENV[VALID_PREFIXES_KEY].present?
+      end
 
       def initialize(app, logger:, skip_sig_verify: true)
         @app = app
         @keys = {}
         @logger = logger
 
-        if skip_sig_verify && development?
+        if skip_sig_verify && non_prod?
           @logger.warn "JWTs signature verifification has been switched off in development."
           @verify_sigs = false
         else
           @verify_sigs = true
-          @key_prefixes = ENV['VALID_IDENTITY_URL_PREFIXES'].split(',')
-
-          if @key_prefixes.empty?
-            raise "No identity service URLs have been set: ENV['VALID_IDENTITY_URL_PREFIXES']"
-          end
         end
       end
 
@@ -40,12 +40,17 @@ module RooOnRails
 
       private
 
-      def development?
+      def key_prefixes
+        return [] unless self.class.configured?
+        ENV[VALID_PREFIXES_KEY].split(',')
+      end
+
+      def non_prod?
         if ENV['RACK_ENV'].nil?
           @logger.warn "Your RACK_ENV isn't set. You probably want it set to 'development' in dev."
         end
 
-        ENV['RACK_ENV'] == 'development'
+        %w(development test).include? ENV['RACK_ENV']
       end
 
       # @raise [UnacceptableKeyError,Faraday::Error,OpenSSL::OpenSSLError] From `#public_key`
@@ -63,7 +68,7 @@ module RooOnRails
 
       def acceptable_key?(key_url)
         return false if key_url.nil?
-        @key_prefixes.any? { |acceptable| key_url.starts_with?(acceptable) }
+        key_prefixes.any? { |acceptable| key_url.starts_with?(acceptable) }
       end
 
       # @raise [UnacceptableKeyError] When the key URL is not from a trusted location

data/lib/roo_on_rails/railties/roo_identity.rb

@@ -1,20 +1,22 @@
-require 'roo_on_rails/config'
+require 'roo_on_rails/rack/populate_env_from_jwt'
 
 module RooOnRails
   module Railties
     class RooIdentity < Rails::Railtie
       initializer 'roo_on_rails.roo_identity.middleware' do |app|
         Rails.logger.with initializer: 'roo_on_rails.roo_identity' do |log|
-          log.debug 'loading'
-          _add_middleware(app, log)
+          if RooOnRails::Rack::PopulateEnvFromJWT.configured?
+            log.debug 'loading'
+            _add_middleware(app, log)
+          else
+            log.warn 'not configured, roo.identity will be unavailable'
+          end
         end
       end
 
       private
 
       def _add_middleware(app, log)
-        require 'roo_on_rails/rack/populate_env_from_jwt'
-
         app.config.middleware.use RooOnRails::Rack::PopulateEnvFromJWT, logger: log
       rescue LoadError
         log.error 'the json-jwt gem is not in the bundle so Roo Identity will not be available'

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '1.16.0'.freeze
+  VERSION = '1.16.1'.freeze
 end

data/lib/roo_on_rails.rb

@@ -14,4 +14,5 @@ if defined?(Rails)
   require 'roo_on_rails/railties/rake_tasks'
   require 'roo_on_rails/railties/google_oauth'
   require 'roo_on_rails/railties/routemaster'
+  require 'roo_on_rails/railties/roo_identity'
 end

data/roo_on_rails.gemspec

@@ -36,9 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'faraday_middleware'
   spec.add_runtime_dependency 'routemaster-client'
-
-  # Optional gems you may add to your project
-  spec.add_development_dependency 'json-jwt', '~> 1.8'
+  spec.add_runtime_dependency 'json-jwt', '~> 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
@@ -233,7 +233,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: