cookieless_sessions 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be96a253a2a981bc0a4e8a251958f0b3a566187
-  data.tar.gz: fe0c0bd04483b7bef37ba52dd36a1be6bb01a5c6
+  metadata.gz: f8f1c9a54ca095e017552171b3a394659fad22f0
+  data.tar.gz: 83cc2e45e98c1c1b45e112f1ec8090661b268071
 SHA512:
-  metadata.gz: 33b9090e3083f82fa21ef0917be80c3a375360a908b972d8ba0170b642721a363fc8afd53d0c1eab356104eb6a77a0907777c5097b2f6e362654ce4c62de4d9f
-  data.tar.gz: 649e6a656a8392a97f9822dee205c64b088f208aa6e3757663378f10066171c1c9978dc786ce9591cfce99a3786f7026e64fe6f799c406b1f615f2e668da0a38
+  metadata.gz: 32104fd93315c65ea6b282c6edd184ab2ead06cd8e292269df47a4443de2c33d7c70146a877ae9cbbf28e7ae8ecc8286a8a215cf54563bb758ac12b0e50ce784
+  data.tar.gz: 43ad499eb42eb20c48acc718b02fc3d3bc39e7fc066fc508498b0d8f30ed402503d564475a7311884e370ac22fd84e3190a54d528a2394dd2ce41452c6af3067

data/.travis.yml

@@ -2,17 +2,39 @@ language: ruby
 rvm:
   - '1.9.3'
   - '2.0.0'
-  - '2.1.0'
   - '2.1.1'
+  - '2.2.7'
+  - '2.3.4'
   - ruby-head
 services:
   - redis-server
 gemfile:
-  - Gemfile.rails-3.2.x
   - Gemfile.rails-4.0.x
   - Gemfile.rails-4.1.x
+  - Gemfile.rails-4.2.x
+  - Gemfile.rails-5.0.x
   - Gemfile.rails-head
 matrix:
   allow_failures:
+    - rvm: '1.9.3'
     - rvm: ruby-head
     - gemfile: Gemfile.rails-head
+  exclude:
+    - rvm: '1.9.3'
+      gemfile: Gemfile.rails-5.0.x
+    - rvm: '2.0.0'
+      gemfile: Gemfile.rails-5.0.x
+    - rvm: '2.1.1'
+      gemfile: Gemfile.rails-5.0.x
+    - rvm: '2.2.7'
+      gemfile: Gemfile.rails-4.0.x
+    - rvm: '2.2.7'
+      gemfile: Gemfile.rails-4.1.x
+    - rvm: '2.2.7'
+      gemfile: Gemfile.rails-4.2.x
+    - rvm: '2.3.4'
+      gemfile: Gemfile.rails-4.0.x
+    - rvm: '2.3.4'
+      gemfile: Gemfile.rails-4.1.x
+    - rvm: '2.3.4'
+      gemfile: Gemfile.rails-4.2.x

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cookieless_sessions.gemspec
-gemspec
+gemspec

data/{Gemfile.rails-3.2.x → Gemfile.rails-4.2.x}

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in frikandel.gemspec
 gemspec
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.2.0'

data/Gemfile.rails-5.0.x

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in frikandel.gemspec
+gemspec
+
+gem 'rails', '~> 5.0.0'

data/README.md

@@ -1,7 +1,8 @@
 # CookielessSessions
-[![Gem Version](https://badge.fury.io/rb/cookieless_sessions.png)](http://badge.fury.io/rb/cookieless_sessions) 
+[![Gem Version](https://badge.fury.io/rb/cookieless_sessions.png)](http://badge.fury.io/rb/cookieless_sessions)
 [![Build Status](https://api.travis-ci.org/taktsoft/cookieless_sessions.png)](https://travis-ci.org/taktsoft/cookieless_sessions)
 [![Code Climate](https://codeclimate.com/github/taktsoft/cookieless_sessions.png)](https://codeclimate.com/github/taktsoft/cookieless_sessions)
+[![Dependency Status](https://gemnasium.com/taktsoft/cookieless_sessions.svg)](https://gemnasium.com/taktsoft/cookieless_sessions)
 
 CookielessSessions implements a fallback mechanism for keeping Session-IDs _(via GET-Parameter)_ on clients that doesn't support or allow cookies.
 
@@ -17,7 +18,7 @@ Rails uses the result of _default_url_options_ method for Path / URL generation.
 
 ## Requirements
 
-An application based on Rails 3.x or 4.x configured with a session storage that supports the _cookie_only: false_ option (e.g. [redis-session-store](https://rubygems.org/gems/redis-session-store)).
+An application based on Rails 4.x or 5.0 configured with a session storage that supports the _cookie_only: false_ option (e.g. [redis-session-store](https://rubygems.org/gems/redis-session-store)).
 
 ## Installation
 
@@ -91,12 +92,14 @@ Two countermeasure could be to bind sessions to the client's IP-Address and add
 
 To run the test suite with different rails version by selecting the corresponding gemfile. You can use this one liners:
 
-    $ export BUNDLE_GEMFILE=Gemfile.rails-3.2.x && bundle update && bundle exec rake spec
     $ export BUNDLE_GEMFILE=Gemfile.rails-4.0.x && bundle update && bundle exec rake spec
     $ export BUNDLE_GEMFILE=Gemfile.rails-4.1.x && bundle update && bundle exec rake spec
+    $ export BUNDLE_GEMFILE=Gemfile.rails-4.2.x && bundle update && bundle exec rake spec
+    $ export BUNDLE_GEMFILE=Gemfile.rails-5.0.x && bundle update && bundle exec rake spec
 
 ## Changes
 
+* v1.1.0 -- added support for rails-5.0; remove support for rails-3.2
 * v1.0.1 -- added Rails32DestroyableSessionPatch: sets SID in options on destroy
 * v1.0.0 -- first release with complete README; no code changes
 * v0.0.2 -- improved and more flexible version with tests

data/cookieless_sessions.gemspec

@@ -18,15 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version     = '>= 1.9.3'
+  spec.required_rubygems_version = ">= 1.3.6"
+
+  spec.add_runtime_dependency "redis-session-store", "~> 0.7"
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec-rails", "~> 2.14"
+  spec.add_development_dependency 'rspec-rails', '~> 3.6', '>= 3.6.1'
   spec.add_development_dependency "guard-rspec", "~> 4.2"
   spec.add_development_dependency "capybara", "~> 2.2"
   spec.add_development_dependency "launchy", "~> 2.4"
   spec.add_development_dependency "poltergeist", "~> 1.5"
   spec.add_development_dependency "pry", "~> 0.9"
-  spec.add_development_dependency "rails", [">= 3.2.0", "< 5.0"]
+  spec.add_development_dependency "rails", [">= 4.0.0", "<= 5.1.0"]
   spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "redis-session-store", "~> 0.7"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "test-unit"
 end

data/lib/cookieless_sessions.rb

@@ -1,5 +1,4 @@
 require "cookieless_sessions/version"
-require "cookieless_sessions/rails_32_patch"
 
 module CookielessSessions
   module EnabledController
@@ -22,7 +21,7 @@ module CookielessSessions
     end
 
     def session_id
-      request.session_options[:id]
+      request.session.id
     end
 
     def session_is_not_cookie_only?

data/lib/cookieless_sessions/version.rb

@@ -1,3 +1,3 @@
 module CookielessSessions
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/controllers/cookieless_controller_spec.rb

@@ -8,31 +8,31 @@ describe CookielessController do
         { application_controller_option: 1337 }
       })
 
-    controller.send(:default_url_options).should include(:application_controller_option)
+    expect(controller.send(:default_url_options)).to include(:application_controller_option)
   end
 
   it "includes session_key in default_url_options" do
-    controller.send(:default_url_options).should include(rails_app_session_key)
+    expect(controller.send(:default_url_options)).to include(rails_app_session_key)
   end
 
   it "doesn't include session_key in default_url_options if session_id isn't present" do
-    controller.stub(:session_id).and_return(nil)
+    allow(controller).to receive(:session_id).and_return(nil)
 
-    controller.send(:default_url_options).should_not include(rails_app_session_key)
+    expect(controller.send(:default_url_options)).not_to include(rails_app_session_key)
   end
 
   it "generates pathes with session_key=session_id in params" do
-    controller.stub(:session_key).and_return('some_session_key')
-    controller.stub(:session_id).and_return('some_session_id')
+    allow(controller).to receive(:session_key).and_return('some_session_key')
+    allow(controller).to receive(:session_id).and_return('some_session_id')
 
-    controller.root_path.should include("some_session_key=some_session_id")
+    expect(controller.root_path).to include("some_session_key=some_session_id")
   end
 
   it "generates urls with session_key=session_id in params" do
-    controller.stub(:session_key).and_return('some_session_key')
-    controller.stub(:session_id).and_return('some_session_id')
+    allow(controller).to receive(:session_key).and_return('some_session_key')
+    allow(controller).to receive(:session_id).and_return('some_session_id')
 
-    controller.redirect_to_root_url.should include("some_session_key=some_session_id")
+    expect(controller.redirect_to_root_url).to include("some_session_key=some_session_id")
   end
 
 end

data/spec/controllers/sub_cookie_controller_from_cookieless_controller_spec.rb

@@ -19,18 +19,18 @@ end
 describe SubCookieController do
 
   it "doesn't include session_key in default_url_options" do
-    controller.stub(:session_key).and_return('some_session_key')
-    controller.stub(:session_id).and_return('some_session_id')
+    allow(controller).to receive(:session_key).and_return('some_session_key')
+    allow(controller).to receive(:session_id).and_return('some_session_id')
 
-    controller.send(:default_url_options).should_not include('some_session_key')
+    expect(controller.send(:default_url_options)).not_to include('some_session_key')
   end
 
   it "doesn't include session_key=session_id in generated path or url" do
-    controller.stub(:session_key).and_return('some_session_key')
-    controller.stub(:session_id).and_return('some_session_id')
+    allow(controller).to receive(:session_key).and_return('some_session_key')
+    allow(controller).to receive(:session_id).and_return('some_session_id')
 
-    controller.root_path.should_not include("some_session_key=some_session_id")
-    controller.root_url.should_not include("some_session_key=some_session_id")
+    expect(controller.root_path).not_to include("some_session_key=some_session_id")
+    expect(controller.root_url).not_to include("some_session_key=some_session_id")
   end
 
 end

data/spec/dummy/config/database.yml

@@ -7,19 +7,19 @@
 default: &default
   adapter: sqlite3
   pool: 5
-  timeout: 5000
+  timeout: 500
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: ':memory:'
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: ':memory:'
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: ':memory:'

data/spec/features/cookieless_spec.rb

@@ -1,80 +1,80 @@
 require 'spec_helper'
 require 'support/cookieless_controller'
 
-describe 'Cookieless', js: true do
+describe 'Cookieless', :js do
   # We've set js: true because we want to use poltergeist in ths tests.
 
   context "with cookies disabled" do
     before(:each) do
-      Capybara.current_session.driver.cookies_enabled = false
+      Capybara.current_session.driver.browser.cookies_enabled = false
     end
 
     after(:each) do
-      Capybara.current_session.driver.cookies_enabled = true
+      Capybara.current_session.driver.browser.cookies_enabled = true
     end
 
     it "uses session_id from params" do
       visit root_path # visit first time to get a valid session_id
 
       session_id = extract_session_id_from_headers(page.response_headers)
-      session_id.should be_present
+      expect(session_id).to be_present
 
-      page.should have_content("'#{session_id}'")
+      expect(page).to have_content("'#{session_id}'")
 
       visit root_path(rails_app_session_key => "some_not_invalid_session_id")
 
-      page.should have_no_content("'some_not_invalid_session_id'")
-      page.should have_no_content("'#{session_id}'")
+      expect(page).to have_no_content("'some_not_invalid_session_id'")
+      expect(page).to have_no_content("'#{session_id}'")
 
       visit root_path(rails_app_session_key => session_id)
 
-      page.should have_content("'#{session_id}'")
+      expect(page).to have_content("'#{session_id}'")
     end
 
     it "returns a session_id with reset_session before" do
       visit reset_root_path
 
       session_id = extract_session_id_from_headers(page.response_headers)
-      session_id.should be_present
+      expect(session_id).to be_present
 
-      page.should have_content("'#{session_id}'")
+      expect(page).to have_content("'#{session_id}'")
     end
   end
 
 
   context "with cookies enabled" do
     before(:each) do
-      Capybara.current_session.driver.cookies_enabled = true
+      Capybara.current_session.driver.browser.cookies_enabled = true
     end
 
     after(:each) do
-      Capybara.current_session.driver.cookies_enabled = true
+      Capybara.current_session.driver.browser.cookies_enabled = true
     end
 
     it "uses session_id only from cookie" do
       visit root_path # visit first time to get a valid session_id.
 
       session_id = extract_session_id_from_headers(page.response_headers)
-      session_id.should be_present
+      expect(session_id).to be_present
 
-      page.should have_content("'#{session_id}'")
+      expect(page).to have_content("'#{session_id}'")
 
       visit root_path # visit second time. should keep session_id.
-      page.should have_content("'#{session_id}'")
+      expect(page).to have_content("'#{session_id}'")
 
       page.reset_session!
       visit root_path # visit again with fresh session to get a new session_id.
 
       other_session_id = extract_session_id_from_headers(page.response_headers)
-      other_session_id.should be_present
+      expect(other_session_id).to be_present
 
-      page.should have_content("'#{other_session_id}'")
+      expect(page).to have_content("'#{other_session_id}'")
 
       visit root_path # visit fourth time. should keep other_session_id.
-      page.should have_content("'#{other_session_id}'")
+      expect(page).to have_content("'#{other_session_id}'")
 
       visit root_path(rails_app_session_key => session_id) # visit with other session_id in get param than in cookie
-      page.should have_content("'#{other_session_id}'")
+      expect(page).to have_content("'#{other_session_id}'")
     end
   end
 

data/spec/spec_helper.rb

@@ -18,9 +18,9 @@ Capybara.javascript_driver = :poltergeist
 
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.infer_spec_type_from_file_location!
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

data/spec/support/cookieless_controller.rb

@@ -17,13 +17,21 @@ class CookielessController < ApplicationController
   def index
     session[:useless] = :content
 
-    render text: "CookielessController#Index\r\nSession-Key: '#{session_key}'\r\nSession-ID: '#{session_id}'\r\nRails-Version: '#{Rails.version}'\r\n"
+    if Rails::VERSION::MAJOR >= 4.1
+      render plain: "CookielessController#Index\r\nSession-Key: '#{session_key}'\r\nSession-ID: '#{session_id}'\r\nRails-Version: '#{Rails.version}'\r\n"
+    else
+      render text: "CookielessController#Index\r\nSession-Key: '#{session_key}'\r\nSession-ID: '#{session_id}'\r\nRails-Version: '#{Rails.version}'\r\n"
+    end
   end
 
   def reset_index
     reset_session
 
-    render text: "CookielessController#Index\r\nSession-Key: '#{session_key}'\r\nSession-ID: '#{session_id}'\r\nRails-Version: '#{Rails.version}'\r\n"
+    if Rails::VERSION::MAJOR >= 4.1
+      render plain: "CookielessController#Index\r\nSession-Key: '#{session_key}'\r\nSession-ID: '#{session_id}'\r\nRails-Version: '#{Rails.version}'\r\n"
+    else
+      render text: "CookielessController#Index\r\nSession-Key: '#{session_key}'\r\nSession-ID: '#{session_id}'\r\nRails-Version: '#{Rails.version}'\r\n"
+    end
   end
 
   def redirect_to_root

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cookieless_sessions
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Taktsoft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: redis-session-store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +148,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<"
+        version: 4.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "<"
+        version: 4.0.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -157,19 +177,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: redis-session-store
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: cookieless_sessions implements a fallback mechanism for keeping Session-IDs
   (via GET-Parameter) on clients that doesn't support or allow cookies.
 email:
@@ -182,9 +216,10 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.rails-3.2.x
 - Gemfile.rails-4.0.x
 - Gemfile.rails-4.1.x
+- Gemfile.rails-4.2.x
+- Gemfile.rails-5.0.x
 - Gemfile.rails-head
 - Guardfile
 - LICENSE.txt
@@ -192,7 +227,6 @@ files:
 - Rakefile
 - cookieless_sessions.gemspec
 - lib/cookieless_sessions.rb
-- lib/cookieless_sessions/rails_32_patch.rb
 - lib/cookieless_sessions/version.rb
 - spec/controllers/cookieless_controller_spec.rb
 - spec/controllers/sub_cookie_controller_from_cookieless_controller_spec.rb
@@ -251,15 +285,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: cookieless_sessions implements a fallback mechanism for keeping Session-IDs

data/lib/cookieless_sessions/rails_32_patch.rb

@@ -1,18 +0,0 @@
-module CookielessSessions
-  module Rails32DestroyableSessionPatch
-    def destroy
-      clear
-      options = @env[Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY] if @env
-      options ||= {}
-      options[:id] = @by.send(:destroy_session, @env, options[:id], options) if @by
-      @loaded = false
-    end
-  end
-
-
-  if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
-    ActiveSupport.on_load(:action_controller) do
-      ::Rack::Session::Abstract::SessionHash.send(:include, Rails32DestroyableSessionPatch)
-    end
-  end
-end