warden-github 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d16b8a0ce775cffede49bad96b407ea7bb03814
-  data.tar.gz: ad6b95da408a4163251445886b2638c2061b48f2
+  metadata.gz: ea7be457e43d5d73595605d0f6107797007b36f0
+  data.tar.gz: 39e3ccc8f12771f33e456a7d2609bf9b810d0ddb
 SHA512:
-  metadata.gz: f6cd9e974843071be78465b45b44c3332d3ad9ec44069d91768868d85141f9b94415543ee026c88c097e5c27aca85042dd1838ed414085221a9545b47678fff3
-  data.tar.gz: a06e7b94ddafc1eafa30cfb5257e17cf7f8c3077b4660def2cd60f08043aa113365963d00db5eed1db976518aff381cc7fc8a26fbdcf8e1718c2d191f96c6c92
+  metadata.gz: 223429bf4759f89e7eedccea6724c7a9f50526517302386cf63f11d2fcdfcbebd73a96eaab044ac388867cd3f7bfca9cbf241377aeb98eabd6bf6192e5d2e3c2
+  data.tar.gz: 30bc47e8d9762afe87fdf58567005a605a8381cc71bfc9904a04d5d258f27f44a64696dd7db71ded800672b8f1ea3715dcf92c943094a9b3d5e4783dc4cf9dec

data/.travis.yml

@@ -1,10 +1,4 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - ree
+  - 2.3.0
   - ruby-head

data/lib/warden/github/membership_cache.rb

@@ -3,9 +3,13 @@ module Warden
     # A hash subclass that acts as a cache for organization and team
     # membership states. Only membership states that are true are cached. These
     # are invalidated after a certain time.
-    class MembershipCache < ::Hash
+    class MembershipCache
       CACHE_TIMEOUT = 60 * 5
 
+      def initialize(data)
+        @data = data
+      end
+
       # Fetches a membership status by type and id (e.g. 'org', 'my_company')
       # from cache. If no cached value is present or if the cached value
       # expired, the block will be invoked and the return value, if true,
@@ -27,10 +31,10 @@ module Warden
       private
 
       def cached_membership_valid?(type, id)
-        timestamp = fetch(type).fetch(id)
+        timestamp = @data.fetch(type).fetch(id)
 
         if Time.now.to_i > timestamp + CACHE_TIMEOUT
-          fetch(type).delete(id)
+          @data.fetch(type).delete(id)
           false
         else
           true
@@ -40,7 +44,7 @@ module Warden
       end
 
       def cache_membership(type, id)
-        hash = self[type] ||= {}
+        hash = @data[type] ||= {}
         hash[id] = Time.now.to_i
       end
     end

data/lib/warden/github/user.rb

@@ -1,6 +1,6 @@
 module Warden
   module GitHub
-    class User < Struct.new(:attribs, :token, :browser_session_id)
+    class User < Struct.new(:attribs, :token, :browser_session_id, :memberships)
       ATTRIBUTES = %w[id login name gravatar_id avatar_url email company site_admin].freeze
 
       def self.load(access_token, browser_session_id = nil)
@@ -32,7 +32,7 @@ module Warden
       #
       # Returns: true if the user is publicized as an org member
       def organization_public_member?(org_name)
-        memberships.fetch_membership(:org_pub, org_name) do
+        membership_cache.fetch_membership(:org_pub, org_name) do
           api.organization_public_member?(org_name, login)
         end
       end
@@ -46,7 +46,7 @@ module Warden
       #
       # Returns: true if the user has access, false otherwise
       def organization_member?(org_name)
-        memberships.fetch_membership(:org, org_name) do
+        membership_cache.fetch_membership(:org, org_name) do
           api.organization_member?(org_name, login)
         end
       end
@@ -57,7 +57,7 @@ module Warden
       #
       # Returns: true if the user has access, false otherwise
       def team_member?(team_id)
-        memberships.fetch_membership(:team, team_id) do
+        membership_cache.fetch_membership(:team, team_id) do
           api.team_member?(team_id, login)
         end
       end
@@ -105,8 +105,9 @@ module Warden
 
       private
 
-      def memberships
-        attribs['member'] ||= MembershipCache.new
+      def membership_cache
+        self.memberships ||= {}
+        @membership_cache ||= MembershipCache.new(memberships)
       end
     end
   end

data/lib/warden/github/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module GitHub
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/spec/unit/membership_cache_spec.rb

@@ -1,19 +1,17 @@
 require 'spec_helper'
 
 describe Warden::GitHub::MembershipCache do
-  subject(:cache) do
-    described_class.new
-  end
-
   describe '#fetch_membership' do
     it 'returns false by default' do
+      cache = described_class.new({})
       cache.fetch_membership('foo', 'bar').should be_falsey
     end
 
     context 'when cache valid' do
-      before do
-        cache['foo'] = {}
-        cache['foo']['bar'] = Time.now.to_i - described_class::CACHE_TIMEOUT + 5
+      let(:cache) do
+        described_class.new('foo' => {
+          'bar' => Time.now.to_i - described_class::CACHE_TIMEOUT + 5
+        })
       end
 
       it 'returns true' do
@@ -27,9 +25,10 @@ describe Warden::GitHub::MembershipCache do
     end
 
     context 'when cache expired' do
-      before do
-        cache['foo'] = {}
-        cache['foo']['bar'] = Time.now.to_i - described_class::CACHE_TIMEOUT - 5
+      let(:cache) do
+        described_class.new('foo' => {
+          'bar' => Time.now.to_i - described_class::CACHE_TIMEOUT - 5
+        })
       end
 
       context 'when no block given' do
@@ -38,11 +37,6 @@ describe Warden::GitHub::MembershipCache do
         end
       end
 
-      it 'deletes the cached value' do
-        cache.fetch_membership('foo', 'bar')
-        cache['foo'].should_not have_key('bar')
-      end
-
       it 'invokes the block' do
         expect { |b| cache.fetch_membership('foo', 'bar', &b) }.
           to yield_control
@@ -50,13 +44,40 @@ describe Warden::GitHub::MembershipCache do
     end
 
     it 'caches the value when block returns true' do
+      cache = described_class.new({})
       cache.fetch_membership('foo', 'bar') { true }
       cache.fetch_membership('foo', 'bar').should be_truthy
     end
 
     it 'does not cache the value when block returns false' do
+      cache = described_class.new({})
       cache.fetch_membership('foo', 'bar') { false }
       cache.fetch_membership('foo', 'bar').should be_falsey
     end
   end
+
+  it 'uses the hash that is passed to the initializer as storage' do
+    time = Time.now.to_i
+    hash = {
+      'foo' => {
+        'valid' => time,
+        'timedout' => time - described_class::CACHE_TIMEOUT - 5
+      }
+    }
+    cache = described_class.new(hash)
+
+    # Verify that existing data in the hash is used:
+    expect(cache.fetch_membership('foo', 'valid')).to be_true
+    expect(cache.fetch_membership('foo', 'timedout')).to be_false
+
+    # Add new data to the hash:
+    cache.fetch_membership('foo', 'new') { true }
+    cache.fetch_membership('foo', 'false') { false }
+
+    # Verify the final hash state:
+    expect(hash).to eq('foo' => {
+      'valid' => time,
+      'new' => time
+    })
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-github
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: warden-github
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A warden strategy for easy oauth integration with github