warden-github-rails 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b7ef20208b4fc31f37b9647b14c136e1b65294
-  data.tar.gz: 8a193975cdef69665791456cf3c14f803e95685a
+  metadata.gz: 7f3cc06e90da76617d5fd6e220ebba3827b86c97
+  data.tar.gz: eb0ee4af0658eb0cf9b5a5e7e1b7a8dd200284e3
 SHA512:
-  metadata.gz: 8bb8fbfcbc533ef853b20c8f41c7d335070878f2937597df3ad7665ad2317bfc46914dc27390641ff0826386cf232bccc735abe1472346d75bfb65eb27a8899c
-  data.tar.gz: 77dd68fa6b1e0f99ddc6d06c9dcf2efeb891b4e0ebe51e95835a7a1caea59cb8facc4f2e2d9ff735dd7d28a8dc3cae4d5452d52d3a2785cf044f2c728eef798f
+  metadata.gz: 1c2ce60318b2cb2b9e6c5b1f47609d85fd364809fb71831aaf0a2ed2c746f1c387f6f00d0b2025df8a004353585c471b24fe8d6b6a7b9a0141a4f2a8728e88b1
+  data.tar.gz: beaa4a6322bc4a4ac0ebe41dac94fe459c37f55c007fee66decf4faa2a02fe585711126af781fe4cde136c7128aae34239422bdefbbccbafbc145d03db6615f4

data/.travis.yml

@@ -11,11 +11,12 @@ env:
   global:
     - JRUBY_OPTS="--2.0"
   matrix:
-    - RAILS_VERSION=3
     - RAILS_VERSION=4
+    - RAILS_VERSION=5.beta
     - RAILS_VERSION=master
 matrix:
   fast_finish: true
   allow_failures:
+    - env: RAILS_VERSION=5.beta
     - env: RAILS_VERSION=master
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.2.3
+
+- Use custom session serialization for proper compatibility with mock users
+  (#16)
+
 ## v1.2.2
 
 - Improve serialization and devise compatibility

data/README.md

@@ -85,7 +85,7 @@ To play with it, follow these steps:
 To use this gem, add it to your `Gemfile`:
 
 ```ruby
-gem 'warden-github-rails', '~> 1.1.0'
+gem 'warden-github-rails'
 ```
 
 If you're using devise, make sure to use version 2.2.4 or newer.

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/warden/github/rails/railtie.rb

@@ -2,6 +2,13 @@ module Warden
   module GitHub
     module Rails
       class Railtie < ::Rails::Railtie
+        SERIALIZE_FROM_SESSION = -> ((class_name, data)) do
+          class_name.constantize.new.tap { |user| user.marshal_load(data) }
+        end
+        SERIALIZE_INTO_SESSION = -> (user) do
+          [user.class.name, user.marshal_dump]
+        end
+
         initializer 'warden-github-rails.warden' do |app|
           # When devise is used, it inserts a warden middlware. Multiple warden
           # middlewares do not work properly. Devise allows for a block to be
@@ -28,8 +35,8 @@ module Warden
           Rails.scopes.each do |scope, scope_config|
             config.scope_defaults scope, strategies: [:github],
                                          config: scope_config
-            config.serialize_from_session(scope) { |key| Verifier.load(key) }
-            config.serialize_into_session(scope) { |user| Verifier.dump(user) }
+            config.serialize_from_session(scope, &SERIALIZE_FROM_SESSION)
+            config.serialize_into_session(scope, &SERIALIZE_INTO_SESSION)
           end
         end
 

data/lib/warden/github/rails/test_helpers/mock_user.rb

@@ -31,7 +31,8 @@ module Warden
           end
 
           def marshal_load(data)
-            @memberships, super_data = data
+            memberships, super_data = data
+            @memberships = memberships.symbolize_keys
             super(super_data)
           end
         end

data/spec/integration/controller_helpers_spec.rb

@@ -79,14 +79,14 @@ describe 'controller helpers' do
 
         context 'when not logged in' do
           it 'returns nil' do
-            expect(request.body).to be_blank
+            expect(request.body).to eq('null')
           end
         end
 
         context 'when logged in' do
           it "returns the user's session" do
             github_login(scope)
-            expect(request.body).to eq({ foo: :bar }.to_s)
+            expect(request.body).to eq({ foo: :bar }.to_json)
           end
         end
       end

data/spec/rails_app/app/controllers/scoped_controller.rb

@@ -1,28 +1,28 @@
 class ScopedController < ActionController::Base
   def authenticate
     github_authenticate!(:admin)
-    render nothing: true
+    head :ok
   end
 
   def logout
     was_logged_in = !github_user(:admin).nil?
     github_logout(:admin)
-    render text: was_logged_in
+    render plain: was_logged_in
   end
 
   def authenticated
-    render text: github_authenticated?(:admin)
+    render plain: github_authenticated?(:admin)
   end
 
   def user
-    render text: github_user(:admin)
+    render plain: github_user(:admin)
   end
 
   def session
-    if (session = github_session(:admin))
-      session[:foo] = :bar
+    if github_session(:admin)
+      github_session(:admin)[:foo] = :bar
     end
 
-    render text: github_session(:admin)
+    render json: github_session(:admin)
   end
 end

data/spec/rails_app/app/controllers/unscoped_controller.rb

@@ -1,28 +1,28 @@
 class UnscopedController < ActionController::Base
   def authenticate
     github_authenticate!
-    render nothing: true
+    head :ok
   end
 
   def logout
     was_logged_in = !github_user.nil?
     github_logout
-    render text: was_logged_in
+    render plain: was_logged_in
   end
 
   def authenticated
-    render text: github_authenticated?
+    render plain: github_authenticated?
   end
 
   def user
-    render text: github_user
+    render plain: github_user
   end
 
   def session
-    if (session = github_session)
-      session[:foo] = :bar
+    if github_session
+      github_session[:foo] = :bar
     end
 
-    render text: github_session
+    render json: github_session
   end
 end

data/spec/rails_app/config/environments/production.rb

@@ -3,7 +3,6 @@ RailsApp::Application.configure do
   config.cache_classes = true
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  config.serve_static_assets = false
   config.i18n.fallbacks = true
   config.active_support.deprecation = :notify
 end

data/spec/rails_app/config/environments/test.rb

@@ -1,8 +1,6 @@
 RailsApp::Application.configure do
   config.eager_load = true
   config.cache_classes = true
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
   config.whiny_nils = true
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/spec/rails_app/config/initializers/cookies_serializer.rb

@@ -0,0 +1 @@
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/rails_app/config/secrets.yml

@@ -0,0 +1,4 @@
+development: &dev
+  secret_key_base: '566d4b32c28c60a1d533156df89a3ee3e44c2a35de63833f3ef912b7c69547d4f5d0c412e221fe635640b75295f452340c5456bb79466abf5fec59b6006ea859'
+
+test: *dev

data/spec/unit/mock_user_spec.rb

@@ -19,10 +19,14 @@ describe Warden::GitHub::Rails::TestHelpers::MockUser do
     end
   end
 
-  it 'can be marshaled' do
+  it 'can be serialized and deserialized with JSON' do
     user = described_class.new
     user.stub_membership(org: ['apple', 'facebook'], team: [12, 34])
-    marshaled_user = Marshal.load(Marshal.dump(user))
+
+    json = ActiveSupport::JSON.encode(user.marshal_dump)
+    marshaled_user = described_class.new.tap do |u|
+      u.marshal_load(ActiveSupport::JSON.decode(json))
+    end
 
     expect(marshaled_user.memberships).to eq(user.memberships)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-github-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -156,11 +156,13 @@ files:
 - spec/rails_app/config/environments/development.rb
 - spec/rails_app/config/environments/production.rb
 - spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/cookies_serializer.rb
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/initializers/session_store.rb
 - spec/rails_app/config/initializers/warden_github_rails.rb
 - spec/rails_app/config/initializers/wrap_parameters.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/config/secrets.yml
 - spec/rails_app/script/rails
 - spec/spec_helper.rb
 - spec/unit/config_spec.rb
@@ -209,11 +211,13 @@ test_files:
 - spec/rails_app/config/environments/development.rb
 - spec/rails_app/config/environments/production.rb
 - spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/cookies_serializer.rb
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/initializers/session_store.rb
 - spec/rails_app/config/initializers/warden_github_rails.rb
 - spec/rails_app/config/initializers/wrap_parameters.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/config/secrets.yml
 - spec/rails_app/script/rails
 - spec/spec_helper.rb
 - spec/unit/config_spec.rb