ddr-models 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d273e1b012bea164a89a6ce3029bae9568c2b1
-  data.tar.gz: 942b1b7201d4426c1df684417d657df550604490
+  metadata.gz: ac3fde76afdd04c188208ae9f82e637fbf7a6c05
+  data.tar.gz: 7bd9cf7895be31f83557505d02256d0f10ab5b7e
 SHA512:
-  metadata.gz: 76c5fdc47393e01d2e3746747f85565c1d17accb24f371e737bb5143abb73364d607315a7f7974bb0c1d95893a2133a9abf78426488209451ad4f1e912e16dff
-  data.tar.gz: 177b2529645a27c5a4c216817b3ab727b6cce26941199f42207668ef0761ab87f9f756e6bd2d98879f7bac4cceb55c57c53d7bea32b713b5bae12547b7415d8c
+  metadata.gz: a498acd13aa0be7b1f7f99db275d1278dda26140960c450fbc27e6c93574f24cb42ce14edcd202b8c78024f5d2ed97a613fe4e25832ad8f2d29eb00794d37930
+  data.tar.gz: 272e6699ccb404fa3c8976ad7ce444c159bc16ff9bbd55aeefd9b27e819f3f187fd1a187b910d16d5e79bc6e5438fe384e1c9c2b9fdd50479315d8cb307b6dfc

data/lib/ddr/auth/auth_context.rb

@@ -30,7 +30,7 @@ module Ddr::Auth
     # Return the user agent for this context.
     # @return [String] or nil, if auth context is anonymous/
     def agent
-      anonymous? ? nil : user.agent
+      user.agent if authenticated?
     end
 
     # Is the authenticated agent a Duke identity?

data/lib/ddr/auth/web_auth_context.rb

@@ -11,12 +11,12 @@ module Ddr::Auth
 
     # @return [Array<String>]
     def affiliation
-      split_env("affiliation").map { |a| a.sub(/@duke\.edu\z/, "") }
+      anonymous? ? super : split_env("affiliation").map { |a| a.sub(/@duke\.edu\z/, "") }
     end
 
     # @return [Array<String>]
     def ismemberof
-      split_env("ismemberof")
+      anonymous? ? super : split_env("ismemberof")
     end
 
     private

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
   end
 end

data/spec/auth/web_auth_context_spec.rb

@@ -3,7 +3,6 @@ module Ddr::Auth
 
     subject { described_class.new(user, env) }
 
-    let(:user) { FactoryGirl.build(:user) }
     let(:mock_ip_middleware) { double(calculate_ip: "8.8.8.8") }
 
     let(:env) do
@@ -13,18 +12,38 @@ module Ddr::Auth
       }
     end
 
-    it_behaves_like "an auth context"
+    shared_examples "a web auth context" do
+      it_behaves_like "an auth context"
+      its(:ip_address) { should eq("8.8.8.8") }
+    end
+
+    describe "authenticated" do
+      let(:user) { FactoryGirl.build(:user) }
 
-    its(:affiliation) { should contain_exactly("staff", "student") }
-    its(:ismemberof) { should contain_exactly("group1", "group2", "group3") }
-    its(:ip_address) { should eq("8.8.8.8") }
+      it_behaves_like "a web auth context"
+      its(:affiliation) { should contain_exactly("staff", "student") }
+      its(:ismemberof) { should contain_exactly("group1", "group2", "group3") }
+
+      describe "when env vars are not present" do
+        let(:env) { {} }
+        its(:affiliation) { should be_empty }
+        its(:ismemberof) { should be_empty }
+        its(:ip_address) { should be_nil }
+      end
+    end
 
-    describe "when env vars are not present" do
-      let(:env) { {} }
+    describe "anonymous" do
+      let(:user) { nil }
+
+      it_behaves_like "a web auth context"
       its(:affiliation) { should be_empty }
       its(:ismemberof) { should be_empty }
-      its(:ip_address) { should be_nil }
+
+      describe "when env vars are not present" do
+        let(:env) { {} }
+        its(:ip_address) { should be_nil }
+      end
     end
-    
+
   end
 end

data/spec/support/shared_examples_for_auth_contexts.rb

@@ -40,7 +40,9 @@ module Ddr::Auth
 
     describe "#agents" do
       before { allow(subject).to receive(:groups) { [ Groups::PUBLIC, Groups::REGISTERED, Group.new("foo") ] } }
-      its(:agents) { should contain_exactly(subject.agent, Groups::PUBLIC.agent, Groups::REGISTERED.agent, "foo") }
+      its(:agents) {
+        are_expected.to match_array([subject.agent, Groups::PUBLIC.agent, Groups::REGISTERED.agent, "foo"].compact)
+      }
     end
 
     describe "#member_of?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails