stitches 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac1389298b9ccff356bb73c3e925501265eddb4d68932ac7bc6e41ab35535353
-  data.tar.gz: c800e4a091a67181e065cb0d42c45a7a730b710ce4a83fb513b6606ea7e6e47d
+  metadata.gz: ad83ebbf3aed8767a280f814d64be8819dd200586bd737de0cdb402516539476
+  data.tar.gz: fba83f42359be56a03517351dab3bb877bf9fc50d7acfb6de6c48117544472e3
 SHA512:
-  metadata.gz: 439faf8691f51448dad6b45b35c77a63e5b31075181a55e6fe03ec1381bfe91841cc2a73172390d6e32b5f1f38f7fd3ea069b15c98d8086f4fd21b1c0842b241
-  data.tar.gz: 8c435dc519da97c5cc3aec267dffcb0ffb96e2479b98c14ac44217b5dd4de50afdd818c18063f7d126e7cb56a97f197bd592235591fe9e982243f12314b633d0
+  metadata.gz: 5288beef3b5831fbade2a210b5b18c404ceae447833e35303c4cdc041888c0fbd8a71e2d343b10387316c5bfa2b13d04a3727c5b83fcf3114cf7b2c26a7a043b
+  data.tar.gz: 0fc6d6ba8044ba4df0fcd57826c6028926158a0201b96c27122e66d73070288a148bfee47d8352345f4e7840dd85531182ced2f933c39f1b10dc398e3c83d70d

data/.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2
 jobs:
   release:
     docker:
-    - image: circleci/ruby:2.6.4
+    - image: circleci/ruby:2.7.0
     steps:
     - checkout
     - run: bundle config stitchfix01.jfrog.io $ARTIFACTORY_USER:$ARTIFACTORY_TOKEN
@@ -17,9 +17,9 @@ jobs:
     - run:
         name: Build/release gem to artifactory
         command: bundle exec rake push_artifactory
-  ruby-2.6.4-rails-6.0:
+  ruby-2.7.0-rails-6.0:
     docker:
-    - image: circleci/ruby:2.6.4
+    - image: circleci/ruby:2.7.0
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-6.0
     working_directory: "~/stitches"
@@ -35,13 +35,13 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#devex-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.5.6-rails-6.0:
+  ruby-2.6.5-rails-6.0:
     docker:
-    - image: circleci/ruby:2.5.6
+    - image: circleci/ruby:2.6.5
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-6.0
     working_directory: "~/stitches"
@@ -57,13 +57,13 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#devex-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.6.4-rails-5.2:
+  ruby-2.7.0-rails-5.2:
     docker:
-    - image: circleci/ruby:2.6.4
+    - image: circleci/ruby:2.7.0
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-5.2
     working_directory: "~/stitches"
@@ -79,13 +79,13 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#devex-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-2.5.6-rails-5.2:
+  ruby-2.6.5-rails-5.2:
     docker:
-    - image: circleci/ruby:2.5.6
+    - image: circleci/ruby:2.6.5
       environment:
         BUNDLE_GEMFILE: Gemfile.rails-5.2
     working_directory: "~/stitches"
@@ -101,7 +101,7 @@ jobs:
           fi
     - run:
         name: Notify Pager Duty
-        command: bundle exec y-notify "#eng-platform-alerts"
+        command: bundle exec y-notify "#devex-alerts"
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
@@ -112,31 +112,31 @@ workflows:
     - release:
         context: org-global
         requires:
-        - ruby-2.6.4-rails-6.0
-        - ruby-2.5.6-rails-6.0
-        - ruby-2.6.4-rails-5.2
-        - ruby-2.5.6-rails-5.2
+        - ruby-2.7.0-rails-6.0
+        - ruby-2.6.5-rails-6.0
+        - ruby-2.7.0-rails-5.2
+        - ruby-2.6.5-rails-5.2
         filters:
           tags:
             only: /^[0-9]+\.[0-9]+\.[0-9]+(\.?RC[-\.]?\d*)?$/
           branches:
             ignore: /.*/
-    - ruby-2.6.4-rails-6.0:
+    - ruby-2.7.0-rails-6.0:
         context: org-global
         filters:
           tags:
             only: &1 /.*/
-    - ruby-2.5.6-rails-6.0:
+    - ruby-2.6.5-rails-6.0:
         context: org-global
         filters:
           tags:
             only: *1
-    - ruby-2.6.4-rails-5.2:
+    - ruby-2.7.0-rails-5.2:
         context: org-global
         filters:
           tags:
             only: *1
-    - ruby-2.5.6-rails-5.2:
+    - ruby-2.6.5-rails-5.2:
         context: org-global
         filters:
           tags:
@@ -150,11 +150,11 @@ workflows:
             only:
             - master
     jobs:
-    - ruby-2.6.4-rails-6.0:
+    - ruby-2.7.0-rails-6.0:
         context: org-global
-    - ruby-2.5.6-rails-6.0:
+    - ruby-2.6.5-rails-6.0:
         context: org-global
-    - ruby-2.6.4-rails-5.2:
+    - ruby-2.7.0-rails-5.2:
         context: org-global
-    - ruby-2.5.6-rails-5.2:
+    - ruby-2.6.5-rails-5.2:
         context: org-global

data/{CODEOWNERS → .github/CODEOWNERS}

@@ -8,4 +8,4 @@
 # This file uses the GitHub CODEOWNERS convention to assign PR reviewers:
 # https://help.github.com/articles/about-codeowners/
 
-* @brettfishman @bwebster
+* @brettfishman @bwebster @stitchfix/devex

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.0

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 rvm:
-  - 2.4.4
-  - 2.5.1
+  - 2.6
+  - 2.7
   - ruby-head
 notifications:
   email: false
+jobs:
+  allow_failures:
+    - rvm: ruby-head

data/lib/stitches/api_key.rb

@@ -20,11 +20,6 @@ module Stitches
   # ApiClient that it maps to.
   class ApiKey < Stitches::AllowlistMiddleware
 
-    def initialize(app,options = {})
-      super(app,options)
-      @realm = rails_app_module
-    end
-
   protected
 
     def do_call(env)
@@ -45,13 +40,13 @@ module Stitches
             env[@configuration.env_var_to_hold_api_client] = client
             @app.call(env)
           else
-            UnauthorizedResponse.new("key invalid",@realm,@configuration.custom_http_auth_scheme)
+            unauthorized_response("key invalid")
           end
         else
-          UnauthorizedResponse.new("bad authorization type",@realm,@configuration.custom_http_auth_scheme)
+          unauthorized_response("bad authorization type")
         end
       else
-        UnauthorizedResponse.new("no authorization header",@realm,@configuration.custom_http_auth_scheme)
+        unauthorized_response("no authorization header")
       end
     end
 
@@ -68,10 +63,11 @@ module Stitches
       parent.to_s
     end
 
-    class UnauthorizedResponse < Rack::Response
-      def initialize(reason,realm,custom_http_auth_scheme)
-        super("Unauthorized - #{reason}", 401, { "WWW-Authenticate" => "#{custom_http_auth_scheme} realm=#{realm}" })
-      end
+    def unauthorized_response(reason)
+      status = 401
+      body = "Unauthorized - #{reason}"
+      header = { "WWW-Authenticate" => "#{@configuration.custom_http_auth_scheme} realm=#{rails_app_module}" }
+      Rack::Response.new(body, status, header).finish
     end
 
   end

data/lib/stitches/valid_mime_type.rb

@@ -16,16 +16,17 @@ module Stitches
       if accept =~ %r{application/json} && accept =~ %r{version=\d+}
         @app.call(env)
       else
-        NotAcceptableResponse.new(accept)
+        not_acceptable_response(accept)
       end
     end
 
     private
 
-    class NotAcceptableResponse < Rack::Response
-      def initialize(accept_header)
-        super("Not Acceptable - '#{accept_header}' didn't have the right mime type or version number. We only accept application/json with a version", 406)
-      end
+    def not_acceptable_response(accept_header)
+      status = 406
+      body = "Not Acceptable - '#{accept_header}' didn't have the right mime type or version number. We only accept application/json with a version"
+      header = { "WWW-Authenticate" => accept_header }
+      Rack::Response.new(body, status, header).finish
     end
 
   end

data/lib/stitches/version.rb

@@ -1,3 +1,3 @@
 module Stitches
-  VERSION = '3.8.1'
+  VERSION = "3.8.2"
 end

data/owners.json

@@ -1,7 +1,7 @@
 {
   "owners": [
     {
-      "team": "platform"
+      "team": "devex"
     }
   ]
 }

data/spec/api_key_spec.rb

@@ -34,16 +34,19 @@ describe Stitches::ApiKey do
 
   shared_examples "an unauthorized response" do
     it "returns a 401" do
-      expect(@response.status).to eq(401)
+      status, _headers, _body = @response
+      expect(status).to eq(401)
     end
     it "sets the proper header" do
-      expect(@response.headers["WWW-Authenticate"]).to eq("MyAwesomeInternalScheme realm=MyApp")
+      _status, headers, _body = @response
+      expect(headers["WWW-Authenticate"]).to eq("MyAwesomeInternalScheme realm=MyApp")
     end
     it "stops the call chain preventing anything from happening" do
       expect(app).not_to have_received(:call)
     end
     it "sends a reasonable message" do
-      expect(@response.body).to eq([expected_body])
+      _status, _headers, body = @response
+      expect(body).to eq([expected_body])
     end
   end
 
@@ -166,7 +169,6 @@ describe Stitches::ApiKey do
     context "unauthorized responses" do
       before do
         @response = middleware.call(env)
-        @response.finish
       end
       context "invalid key" do
         let(:env) {

data/spec/valid_mime_type_spec.rb

@@ -11,13 +11,15 @@ describe Stitches::ValidMimeType do
 
   shared_examples "an unacceptable response" do
     it "returns a 406" do
-      expect(@response.status).to eq(406)
+      status, _headers, _body = @response
+      expect(status).to eq(406)
     end
     it "stops the call chain preventing anything from happening" do
       expect(app).not_to have_received(:call)
     end
     it "sends a reasonable message" do
-      expect(@response.body.first).to match(/didn't have the right mime type or version number. We only accept application\/json/)
+      _status, _headers, body = @response
+      expect(body.first).to match(/didn't have the right mime type or version number. We only accept application\/json/)
     end
   end
 
@@ -133,7 +135,6 @@ describe Stitches::ValidMimeType do
     context "unacceptable responses" do
       before do
         @response = middleware.call(env)
-        @response.finish
       end
       context "no header" do
         let(:env) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stitches
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,11 +95,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/CODEOWNERS"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
-- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -109,7 +110,6 @@ files:
 - Gemfile.rails-5.2
 - Gemfile.rails-6.0
 - LICENSE.txt
-- PULL_REQUEST_TEMPLATE.md
 - README.md
 - Rakefile
 - build-matrix.json