sequel-rails 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247dcfdfa34d2e6efd0e2f8c8c6bb8335e5fb345
-  data.tar.gz: 96e82e9fd1043aecda045915458cdde8fb94ad36
+  metadata.gz: 395942ff9378ccc865cd522cc7f9007900357a02
+  data.tar.gz: f6f81cc77327938dd8a151e43f3c7edc9fd73b61
 SHA512:
-  metadata.gz: 2e267ef1a1b2d2ba8f73895e8fd663dd0826479d4dac9da11ec0737e4f1863b3f17c961dfd823f65910edab0d8f997e3254e758cd332940cf3fa0bf3503f141e
-  data.tar.gz: 9d4b2d24a2f383d7a1c57b05989881125b03612825cd5f5b914df840330fdef13cb9d950972426ed2fafdda0e5e8a2af161335c4e939f69b831ecb8ece5a97cd
+  metadata.gz: a0bdf0d65e0b1bbb43b59db21e2522f00cea7627c6dd0c944a662c74696f1c30241f4324fc7675decbaa6e7ab48242785924c528b0d518763b25ec29d6f9fb7b
+  data.tar.gz: 2f2159dbe2b44a605860661316f2e803975e21caf15fd4938c18cb12a9da6204dae1a1f8573078a4da7acaddf14ee9ae50ff32f3209ddd55d1b0a9465843457c

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'actionpack'
 gem 'fakefs', :require => 'fakefs/safe'
 gem 'pry'
 

data/History.md

@@ -1,3 +1,25 @@
+0.9.0 (2013-11-16)
+==================
+
+* Add `require 'english'` to ensure we have access to english equivalents of
+  Ruby's special variable [#57](https://github.com/TalentBox/sequel-rails/issues/57)
+* Rename `SequelRails::SessionStore` as `ActionDispatch::Session::SequelStore`
+  and fix methods to be compatible with `Rails` >= 3.2.
+
+  Previous sequel session store did not work and should be enabled using:
+
+  ```ruby
+  MyApplication::Application.config.session_store SequelRails::SessionStore
+  ```
+
+  now you can enable it using:
+
+  ```ruby
+  MyApplication::Application.config.session_store :sequel_store
+  ```
+
+  A basic integration spec was added to ensure it works as expected. [#56](https://github.com/TalentBox/sequel-rails/issues/56)
+
 0.8.0 (2013-11-10)
 ==================
 

data/README.md

@@ -124,8 +124,9 @@ Features provided by `sequel-rails`
 7. Add a hook in `ActionController::Base` so that the sum of SQL queries time
    for the current action is reported as `DB` for the controller's line in logs.
 
-8. Provide a `SequelRails::SessionStore` similar to the `ActiveRecord` one, which stores
-   sessions in database backed by a `Sequel` model.
+8. Provide a `ActionDispatch::Session::SequelStore` similar to the
+   `ActiveRecord` one, which stores sessions in database backed by a `Sequel`
+   model.
 
 Configuration
 =============
@@ -221,15 +222,15 @@ loaded. Loading plugins into `Sequel::Model` after subclasses are already
 created is not supported by Sequel. You can also load extensions in
 `after_connect` or perform any custom actions that you need.
 
-Using the `SequelRails::SessionStore` to store session in database
-==================================================================
+Using the `SequelStore` to store session in database
+====================================================
 
 If you want to store your session in the database you can use the provided
 session store backed by a `Sequel` model. Edit your
 `config/initializers/session.rb` file and replace the existing code with:
 
 ```ruby
-YourAppName::Application.config.session_store SequelRails::SessionStore
+YourAppName::Application.config.session_store :sequel_store
 ```
 
 You can then generate a migration for the session table using the provided
@@ -244,7 +245,7 @@ Optionally if you want to use your own `Sequel` model to handle the session,
 you can do so in your `config/initializers/session.rb`:
 
 ```ruby
-SequelRails::SessionStore.session_class = MyCustomSessionModelClass
+ActionDispatch::Session::SequelStore.session_class = MyCustomSessionModelClass
 ```
 
 Available sequel specific rake tasks

data/lib/action_dispatch/middleware/session/sequel_store.rb

@@ -0,0 +1,62 @@
+require 'sequel'
+require 'action_dispatch/middleware/session/abstract_store'
+
+# Implements Sequel model based session store.
+
+module ActionDispatch
+  module Session
+    class SequelStore < AbstractStore
+      SESSION_RECORD_KEY = 'rack.session.record'.freeze
+      ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
+
+      cattr_accessor :session_class
+      def self.session_class
+        @@session_class ||= begin
+          res = Class.new(Sequel::Model(:sessions))
+          res.plugin :timestamps, :update_on_create => true
+          res.plugin :serialization, :marshal, :data
+          res
+        end
+      end
+
+      private
+
+      def get_session(env, sid)
+        sid ||= generate_sid
+        session = find_session(sid)
+        env[SESSION_RECORD_KEY] = session
+        [sid, session.data]
+      end
+
+      def set_session(env, sid, session_data, options)
+        session      = get_session_model(env, sid)
+        session.data = session_data
+        session.save(:raise_on_failure => false) && sid
+      end
+
+      def destroy_session(env, sid, options)
+        sid = current_session_id(env)
+        if sid
+          get_session_model(env, sid).destroy
+          env[SESSION_RECORD_KEY] = nil
+        end
+
+        generate_sid unless options[:drop]
+      end
+
+      def get_session_model(env, sid)
+        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+          env[SESSION_RECORD_KEY] = find_session(sid)
+        else
+          env[SESSION_RECORD_KEY] ||= find_session(sid)
+        end
+      end
+
+      def find_session(sid)
+        klass = self.class.session_class
+        klass.where(:session_id => sid).first ||
+          klass.new(:session_id => sid, :data => {})
+      end
+    end
+  end
+end

data/lib/generators/sequel/session_migration/session_migration_generator.rb

@@ -19,7 +19,7 @@ module Sequel
       protected
 
       def session_table_name
-        SequelRails::SessionStore.session_class.table_name
+        ActionDispatch::Session::SequelStore.session_class.table_name
       end
 
       def validate_file_name!

data/lib/sequel_rails.rb

@@ -1,5 +1,6 @@
 require 'sequel_rails/version'
 require 'sequel_rails/railtie' if defined? Rails
+require 'English'
 
 module SequelRails
   def self.jruby?

data/lib/sequel_rails/railtie.rb

@@ -17,10 +17,9 @@ require 'sequel_rails/railties/log_subscriber'
 require 'sequel_rails/railties/i18n_support'
 require 'sequel_rails/railties/controller_runtime'
 require 'sequel_rails/sequel/database/active_support_notification'
+require 'action_dispatch/middleware/session/sequel_store'
 
 module SequelRails
-  autoload :SessionStore, 'sequel_rails/session_store'
-
   class Railtie < Rails::Railtie
     ::SequelRails::Railties::LogSubscriber.attach_to :sequel
 

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/sequel-rails.gemspec

@@ -22,11 +22,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemodel'
   s.add_dependency 'railties', '>= 3.2.0'
+  s.add_dependency 'actionpack', '>= 3.2.0'
   s.add_dependency 'sequel', ['>= 3.28', '< 5.0']
 
   s.add_development_dependency 'combustion'
   s.add_development_dependency 'generator_spec'
   s.add_development_dependency 'rake', '>= 0.8.7'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rspec-rails', '~> 2.14'
   s.add_development_dependency 'rubocop' unless RUBY_VERSION < '1.9.2'
 end

data/spec/integration/sessions_controller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe SessionsController do
+  let(:session_class) { ::ActionDispatch::Session::SequelStore.session_class }
+
+  def login
+    post '/session', :status => 'logged_in'
+  end
+
+  describe '#create' do
+    it 'creates a new session' do
+      expect do
+        login
+      end.to change { session_class.count }.from(0).to(1)
+      expect(session[:status]).to eq 'logged_in'
+    end
+  end
+
+  describe '#destroy' do
+    before { login }
+    it 'reset session' do
+      old_session_id = cookies['_session_id']
+      delete '/session'
+      expect(old_session_id).not_to eq cookies['_session_id']
+      expect(session[:status]).to be_nil
+    end
+  end
+end

data/spec/internal/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/internal/app/controllers/sessions_controller.rb

@@ -0,0 +1,11 @@
+class SessionsController < ApplicationController
+  def create
+    session[:status] = params[:status]
+    head :status => 200
+  end
+
+  def destroy
+    reset_session
+    head :status => 200
+  end
+end

data/spec/internal/config/initializers/session_store.rb

@@ -0,0 +1 @@
+Combustion::Application.config.session_store :sequel_store

data/spec/internal/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  #
+  resource :session, :only => [:create, :destroy]
 end

data/spec/spec_helper.rb

@@ -3,8 +3,11 @@ require 'bundler'
 
 Bundler.require :default, :development, :test
 
-# Combustion initialization has to happend before loading rspec/rails
-Combustion.initialize! 'sequel_rails'
+# Combustion initialization has to happen before loading rspec/rails
+Combustion.initialize! :sequel_rails
+
+require 'rspec/rails'
+require 'rspec/autorun'
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,6 +39,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -105,16 +119,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +179,7 @@ files:
 - ci/rails-3.2.gemfile
 - ci/rails-4.0.gemfile
 - config.ru
+- lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb
 - lib/generators/sequel/migration/migration_generator.rb
 - lib/generators/sequel/migration/templates/migration.rb.erb
@@ -173,7 +202,6 @@ files:
 - lib/sequel_rails/railties/log_subscriber.rb
 - lib/sequel_rails/sequel/database/active_support_notification.rb
 - lib/sequel_rails/sequel/plugins/rails_extensions.rb
-- lib/sequel_rails/session_store.rb
 - lib/sequel_rails/shellwords.rb
 - lib/sequel_rails/storage.rb
 - lib/sequel_rails/storage/abstract.rb
@@ -185,10 +213,13 @@ files:
 - lib/sequel_rails/version.rb
 - rubocop-todo.yml
 - sequel-rails.gemspec
+- spec/integration/sessions_controller_spec.rb
 - spec/internal/Rakefile
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/sessions_controller.rb
 - spec/internal/app/models/user.rb
 - spec/internal/config/database.yml
-- spec/internal/config/initializers/session.rb
+- spec/internal/config/initializers/session_store.rb
 - spec/internal/config/routes.rb
 - spec/internal/db/migrate/1273253849_add_twitter_handle_to_users.rb
 - spec/internal/db/schema.rb.init
@@ -232,10 +263,13 @@ signing_key:
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)
 test_files:
+- spec/integration/sessions_controller_spec.rb
 - spec/internal/Rakefile
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/sessions_controller.rb
 - spec/internal/app/models/user.rb
 - spec/internal/config/database.yml
-- spec/internal/config/initializers/session.rb
+- spec/internal/config/initializers/session_store.rb
 - spec/internal/config/routes.rb
 - spec/internal/db/migrate/1273253849_add_twitter_handle_to_users.rb
 - spec/internal/db/schema.rb.init

data/lib/sequel_rails/session_store.rb

@@ -1,44 +0,0 @@
-require 'sequel'
-
-# Implements Sequel-specific session store.
-
-module SequelRails
-  class SessionStore < ActionDispatch::Session::AbstractStore
-    SESSION_RECORD_KEY = 'rack.session.record'.freeze
-
-    cattr_accessor :session_class
-    def self.session_class
-      @@session_class ||= Class.new(Sequel::Model(:sessions))
-    end
-
-    private
-
-    def get_session(env, sid)
-      sid ||= generate_sid
-      session = find_session(sid)
-      env[SESSION_RECORD_KEY] = session
-      [sid, session.data]
-    end
-
-    def set_session(env, sid, session_data)
-      session            = get_session_resource(env, sid)
-      session.data       = session_data
-      session.updated_at = Time.now if session.dirty?
-      session.save
-    end
-
-    def get_session_resource(env, sid)
-      if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
-        env[SESSION_RECORD_KEY] = find_session(sid)
-      else
-        env[SESSION_RECORD_KEY] ||= find_session(sid)
-      end
-    end
-
-    def find_session(sid)
-      klass = self.class.session_class
-
-      klass.where(:session_id => sid).first || klass.new(:session_id => sid)
-    end
-  end
-end

data/spec/internal/config/initializers/session.rb

@@ -1 +0,0 @@
-Combustion::Application.config.session_store SequelRails::SessionStore