rails-auth 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b92868091d02352a61ab49fd57ff7c661e896d5e
-  data.tar.gz: 00216460fde31f72a5e27ef4cec18a856a65eba9
+  metadata.gz: 64b07b9bd8dd9957bc0762d864c405c3d6c04da5
+  data.tar.gz: 4b87e9e0994d8d02b51c16efc1c98e3bad4402a2
 SHA512:
-  metadata.gz: 816e1c6b079531407868899e8d38cd60b23052de9b1e690ee1e8fa567d43981f2fa1710541a5ede5e56af05f3004ad87d06dcd61dbd63851d2fc5614886a722d
-  data.tar.gz: 6529e98a1bae73735564ab86b8502e9f676b6a3729e0b3bd9cab39e27f0ba89cdd528394798a95c2c263345b62a259f600713adf8aed0944d966d215f57ec6a9
+  metadata.gz: 3bf4cb730c096d16d98b31223d726a8885e7df1ce4178ba90549c02111dcd944a894378e54ec43a1636f9467400529c84fdd8f819561378a9f2ef60875d19d4a
+  data.tar.gz: 7151a42a23717f89a3bc00c6c6e2298148b0b98154ac909ba2969c40c17164380b02c23a1827aef1eee6a0455c7d52c9cb4972e63db7518668a7cf1a9e54ab66

data/CHANGES.md

@@ -1,3 +1,13 @@
+### 2.0.3 (2016-07-20)
+
+* [#39](https://github.com/square/rails-auth/pull/39)
+  Make credentials idempotent.
+  ([@tarcieri])
+
+* [#38](https://github.com/square/rails-auth/pull/38)
+  Monitor callback must respond to :call.
+  ([@tarcieri])
+
 ### 2.0.2 (2016-07-19)
 
 * [#37](https://github.com/square/rails-auth/pull/37)

data/lib/rails/auth/credentials.rb

@@ -10,7 +10,7 @@ module Rails
       extend Forwardable
       include Enumerable
 
-      def_delegators :@credentials, :[], :fetch, :empty?, :key?, :each, :to_hash
+      def_delegators :@credentials, :fetch, :empty?, :key?, :each, :to_hash
 
       def self.from_rack_env(env)
         new(env.fetch(Rails::Auth::Env::CREDENTIALS_ENV_KEY, {}))
@@ -22,10 +22,15 @@ module Rails
       end
 
       def []=(type, value)
+        return if @credentials.key?(type) && @credentials[type] == value
         raise TypeError, "expected String for type, got #{type.class}" unless type.is_a?(String)
         raise AlreadyAuthorizedError, "credential '#{type}' has already been set" if @credentials.key?(type)
         @credentials[type] = value
       end
+
+      def [](type)
+        @credentials[type.to_s]
+      end
     end
   end
 end

data/lib/rails/auth/monitor/middleware.rb

@@ -5,7 +5,7 @@ module Rails
       # or failure. Useful for logging or monitoring systems for AuthZ failures
       class Middleware
         def initialize(app, callback)
-          raise TypeError, "expected Proc callback, got #{callback.class}" unless callback.is_a?(Proc)
+          raise ArgumentError, "callback must respond to :call" unless callback.respond_to?(:call)
 
           @app      = app
           @callback = callback

data/lib/rails/auth/version.rb

@@ -3,6 +3,6 @@
 module Rails
   # Pluggable authentication and authorization for Rack/Rails
   module Auth
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
   end
 end

data/spec/rails/auth/credentials_spec.rb

@@ -21,10 +21,29 @@ RSpec.describe Rails::Auth::Credentials do
     end
   end
 
-  describe "[]=" do
-    it "raises AlreadyAuthorizedError if credential has already been set" do
+  context "when called twice for the same credential type" do
+    let(:example_credential) { double(:credential1) }
+    let(:second_credential)  { double(:credential2) }
+
+    let(:example_env) { Rack::MockRequest.env_for("https://www.example.com") }
+
+    it "succeeds if the credentials are the same" do
+      allow(example_credential).to receive(:==).and_return(true)
+
+      Rails::Auth.add_credential(example_env, example_credential_type, example_credential)
+
+      expect do
+        Rails::Auth.add_credential(example_env, example_credential_type, second_credential)
+      end.to_not raise_error
+    end
+
+    it "raises Rails::Auth::AlreadyAuthorizedError if the credentials are different" do
+      allow(example_credential).to receive(:==).and_return(false)
+
+      Rails::Auth.add_credential(example_env, example_credential_type, example_credential)
+
       expect do
-        credentials[example_credential_type] = example_credential_value
+        Rails::Auth.add_credential(example_env, example_credential_type, second_credential)
       end.to raise_error(Rails::Auth::AlreadyAuthorizedError)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-auth
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack