stitches 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e738a0238c3e9c1fa75e0ce2e2a68cebee5da4c
-  data.tar.gz: cf38c953435d6038a35be3352921f3d26a52746f
+  metadata.gz: 24af3456bfbce2bea0930b87b486a22d5ff0018c
+  data.tar.gz: d5069bfe4189e10b001b281e551dfa7ec68b9f17
 SHA512:
-  metadata.gz: 92b1ef8e3e29103b8d064b5b67d298c4caf785778762caa88c4834671c84b01525697a9f34fc0409d682580d5d1b667965141d7e4f7bca6b4e2b76d71a265ee0
-  data.tar.gz: ad71cc03cae3b594f8a63a96a21d5162cafa69e787cdce9cabb1013613dda15bab1b65d81c49b8b04d998a4713d067671c7fffceca222f40d2f5986800258f32
+  metadata.gz: 0aba572158c721799fe513f012b1e83d23bee5969025510096e678135bc5e7462ae73acd668e8f9e41420a19cc9a1e9fcc8667ae5088039a8be5292b5950f361
+  data.tar.gz: c375dd0a56a17eb67f0c4efd26866ced81d7bcab37b5643b44b018a97e5e25eb0760616cb9a5a627dd446b4446119989dadade686287f54721e7ffce36014659

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stitches (3.1.0)
+    stitches (3.2.0)
       apitome
       pg
       rails
@@ -50,11 +50,11 @@ GEM
       kramdown
       railties
       rspec_api_documentation
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
@@ -65,7 +65,7 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mustache (0.99.8)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -102,15 +102,15 @@ GEM
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -124,7 +124,7 @@ GEM
       json (~> 1.4, >= 1.4.6)
       mustache (~> 0.99, >= 0.99.4)
       rspec (>= 3.0.0)
-    sprockets (3.2.0)
+    sprockets (3.3.0)
       rack (~> 1.0)
     sprockets-rails (2.3.2)
       actionpack (>= 3.0)
@@ -141,3 +141,6 @@ PLATFORMS
 DEPENDENCIES
   rake
   stitches!
+
+BUNDLED WITH
+   1.10.6

data/lib/stitches/api_key.rb

@@ -35,6 +35,7 @@ module Stitches
           client = ::ApiClient.where(key: key).first
           if client.present?
             env[@configuration.env_var_to_hold_api_client_primary_key] = client.id
+            env[@configuration.env_var_to_hold_api_client] = client
             @app.call(env)
           else
             UnauthorizedResponse.new("key invalid",@realm,@configuration.custom_http_auth_scheme)
@@ -56,4 +57,4 @@ module Stitches
     end
 
   end
-end
+end

data/lib/stitches/configuration.rb

@@ -12,6 +12,7 @@ class Stitches::Configuration
     @whitelist_regexp = nil
     @custom_http_auth_scheme = UnsetString.new("custom_http_auth_scheme")
     @env_var_to_hold_api_client_primary_key = NonNullString.new("env_var_to_hold_api_client_primary_key","STITCHES_API_CLIENT_ID")
+    @env_var_to_hold_api_client= NonNullString.new("env_var_to_hold_api_client","STITCHES_API_CLIENT")
   end
 
   # A RegExp that whitelists URLS around the mime type and api key requirements.
@@ -45,6 +46,14 @@ class Stitches::Configuration
     @env_var_to_hold_api_client_primary_key = NonNullString.new("env_var_to_hold_api_client_primary_key",new_env_var_to_hold_api_client_primary_key)
   end
 
+  def env_var_to_hold_api_client
+    @env_var_to_hold_api_client.to_s
+  end
+
+  def env_var_to_hold_api_client=(new_env_var_to_hold_api_client)
+    @env_var_to_hold_api_client= NonNullString.new("env_var_to_hold_api_client",new_env_var_to_hold_api_client)
+  end
+
 private
 
   class NonNullString

data/lib/stitches/generator_files/app/controllers/api/api_controller.rb

@@ -13,7 +13,9 @@ class Api::ApiController < ActionController::Base
 protected
 
   def api_client
-    @api_client ||= ::ApiClient.find(request.env[Stitches.configuration.env_var_to_hold_api_client_primary_key])
+    @api_client ||= request.env[Stitches.configuration.env_var_to_hold_api_client]
+    # Use this if you want to look up the ApiClient instead of using the one placed into the env
+    # @api_client ||= ApiClient.find(request.env[Stitches.configuration.env_var_to_hold_api_client_primary_key])
   end
 
 end

data/lib/stitches/spec/test_headers.rb

@@ -43,7 +43,7 @@ private
       if api_client_key.kind_of?(Array)
         headers["Authorization"] = api_client_key.join(" ")
       else
-        headers["Authorization"] = "CustomKeyAuth key=#{api_client_key}"
+        headers["Authorization"] = "#{Stitches.configuration.custom_http_auth_scheme} key=#{api_client_key}"
       end
     end
   end

data/lib/stitches/version.rb

@@ -1,3 +1,3 @@
 module Stitches
-  VERSION = '3.1.0'
-end
+  VERSION = '3.2.0'
+end

data/spec/api_key_spec.rb

@@ -154,6 +154,10 @@ describe Stitches::ApiKey do
       it "sets the api_client's ID in the environment" do
         expect(env[Stitches.configuration.env_var_to_hold_api_client_primary_key]).to eq(api_clients.first.id)
       end
+
+      it "sets the api_client itself in the environment" do
+        expect(env[Stitches.configuration.env_var_to_hold_api_client]).to eq(api_clients.first)
+      end
     end
 
     context "unauthorized responses" do

data/stitches.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "stitches"
   s.version     = Stitches::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Dave Copeland']
-  s.email       = ['dave@stitchfix.com', 'opensource@stitchfix.com']
+  s.authors     = ["Stitch Fix Engineering","Andrew Peterson","Dave Copeland","Jonathan Dean"]
+  s.email       = ["opensource@stitchfix.com","andy@ndpsoftware.com","davetron5000@gmail.com","jon@jonathandean.com"]
   s.homepage    = "https://github.com/stitchfix/stitches"
   s.summary     = "You'll be in stitches at how easy it is to create a service at Stitch Fix"
   s.description = "You'll be in stitches at how easy it is to create a service at Stitch Fix"

metadata

@@ -1,14 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: stitches
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
+- Stitch Fix Engineering
+- Andrew Peterson
 - Dave Copeland
+- Jonathan Dean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,8 +100,10 @@ dependencies:
 description: You'll be in stitches at how easy it is to create a service at Stitch
   Fix
 email:
-- dave@stitchfix.com
 - opensource@stitchfix.com
+- andy@ndpsoftware.com
+- davetron5000@gmail.com
+- jon@jonathandean.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -170,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: You'll be in stitches at how easy it is to create a service at Stitch Fix