sequel-rails 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f76a96adfae8ea0e88a9309033960f3257abc59
-  data.tar.gz: ee00b69625771c517e4b0c9d595420fac941b62b
+  metadata.gz: 247dcfdfa34d2e6efd0e2f8c8c6bb8335e5fb345
+  data.tar.gz: 96e82e9fd1043aecda045915458cdde8fb94ad36
 SHA512:
-  metadata.gz: 1d988bf8488b10141f59786d78902694cb3f3bc44eaeffcdb09afc885f343b731b7d1faf36f070daa38d0628900e21687726c5f4b477aaf023a21d1ae9b85ec9
-  data.tar.gz: 96fc1e85b462e0d74ba7389f33c7aafe1ed94bd0d9fbbf4eeeb997ce6bb26ec22b25c94c6e99f6f50d19bd36dd77d8ac2bfeb28b680e943ece1ff8d76fdd4b7c
+  metadata.gz: 2e267ef1a1b2d2ba8f73895e8fd663dd0826479d4dac9da11ec0737e4f1863b3f17c961dfd823f65910edab0d8f997e3254e758cd332940cf3fa0bf3503f141e
+  data.tar.gz: 9d4b2d24a2f383d7a1c57b05989881125b03612825cd5f5b914df840330fdef13cb9d950972426ed2fafdda0e5e8a2af161335c4e939f69b831ecb8ece5a97cd

data/.gitignore

@@ -28,5 +28,6 @@ vendor
 .rvmrc
 *.gem
 Gemfile.lock
+*.gemfile.lock
 
 spec/internal/db/database.sqlite3

data/.rubocop.yml

@@ -0,0 +1,13 @@
+AllCops:
+  Includes:
+    - Gemfile
+    - config.ru
+    - Rakefile
+    - '*.rake'
+    - '*.gemfile'
+    - '*.gemspec'
+
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+inherit_from: rubocop-todo.yml

data/.travis.yml

@@ -1,66 +1,38 @@
 language: ruby
 rvm:
+  - ree
+  - 1.8.7
   - 1.9.3
   - 2.0.0
   - jruby-18mode
   - jruby-19mode
+  - jruby-20mode
 env:
-  - "TEST_ADAPTER=postgresql TEST_OWNER=postgres TEST_USERNAME=postgres SEQUEL='~> 3.28'"
-  - "TEST_ADAPTER=mysql TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
-  - "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
-  - "TEST_ADAPTER=sqlite3 TEST_DATABASE='db/database.sqlite3' SEQUEL='~> 3.28'"
-  - "TEST_ADAPTER=postgresql TEST_OWNER=postgres TEST_USERNAME=postgres SEQUEL='~> 4.0.0'"
-  - "TEST_ADAPTER=mysql TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
-  - "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
-  - "TEST_ADAPTER=sqlite3 TEST_DATABASE='db/database.sqlite3' SEQUEL='~> 4.0.0'"
+  - SEQUEL='~> 3.0'
+  - SEQUEL='~> 4.0'
 gemfile:
   - ci/rails-3.2.gemfile
   - ci/rails-4.0.gemfile
 matrix:
   exclude:
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
-      gemfile: ci/rails-3.2.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=mysql TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
-      gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
-      gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=postgresql TEST_OWNER=postgres TEST_USERNAME=postgres SEQUEL='~> 3.28'"
+    - rvm: ree
       gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=sqlite3 TEST_DATABASE='db/database.sqlite3' SEQUEL='~> 3.28'"
-      gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-19mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
-      gemfile: ci/rails-3.2.gemfile
-    - rvm: jruby-19mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 3.28'"
+      env: SEQUEL='~> 3.0'
+    - rvm: ree
       gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
-      gemfile: ci/rails-3.2.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=mysql TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
+      env: SEQUEL='~> 4.0'
+    - rvm: 1.8.7
       gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-18mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
+      env: SEQUEL='~> 3.0'
+    - rvm: 1.8.7
       gemfile: ci/rails-4.0.gemfile
+      env: SEQUEL='~> 4.0'
     - rvm: jruby-18mode
-      env: "TEST_ADAPTER=postgresql TEST_OWNER=postgres TEST_USERNAME=postgres SEQUEL='~> 4.0.0'"
       gemfile: ci/rails-4.0.gemfile
+      env: SEQUEL='~> 3.0'
     - rvm: jruby-18mode
-      env: "TEST_ADAPTER=sqlite3 TEST_DATABASE='db/database.sqlite3' SEQUEL='~> 4.0.0'"
-      gemfile: ci/rails-4.0.gemfile
-    - rvm: jruby-19mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
-      gemfile: ci/rails-3.2.gemfile
-    - rvm: jruby-19mode
-      env: "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8 SEQUEL='~> 4.0.0'"
       gemfile: ci/rails-4.0.gemfile
-script: "rake spec"
+      env: SEQUEL='~> 4.0'
 notifications:
   email:
     - jonathan.tron@metrilio.com

data/Gemfile

@@ -1,21 +1,21 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-gem "fakefs", :require => "fakefs/safe"
-gem "pry"
+gem 'fakefs', :require => 'fakefs/safe'
+gem 'pry'
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  gem "pg"
-  gem "mysql"
-  gem "mysql2"
-  gem "sqlite3"
+  gem 'pg'
+  gem 'mysql'
+  gem 'mysql2'
+  gem 'sqlite3'
 end
 
 # JRuby Adapter Dependencies
 platform :jruby do
-  gem "jdbc-sqlite3"
-  gem "jdbc-mysql"
-  gem "jdbc-postgres"
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
 end

data/History.md

@@ -1,3 +1,11 @@
+0.8.0 (2013-11-10)
+==================
+
+* Simplify and improve TravisCI config (Tamir Duberstein) [#51](https://github.com/TalentBox/sequel-rails/issues/51)
+* Add Rubocop and fix syntax violations (Tamir Duberstein) [#51](https://github.com/TalentBox/sequel-rails/issues/51)
+* Update RSpec and use the new 'expect' syntax (Tamir Duberstein) [#51](https://github.com/TalentBox/sequel-rails/issues/51)
+* Add session_migration generator and cleanup old code [#56](https://github.com/TalentBox/sequel-rails/issues/56)
+
 0.7.0 (2013-10-11)
 ==================
 

data/README.md

@@ -96,6 +96,12 @@ Features provided by `sequel-rails`
    rails generate observer User
    ```
 
+   Session:
+
+   ```ruby
+   rails generate session_migration
+   ```
+
 3. Rake tasks similar to `ActiveRecord`, see
    [Available sequel specific rake tasks](#available-sequel-specific-rake-tasks)
 
@@ -118,6 +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.
+
 Configuration
 =============
 You can configure some options with the usual rails mechanism, in
@@ -212,6 +221,32 @@ 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
+==================================================================
+
+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
+```
+
+You can then generate a migration for the session table using the provided
+generator:
+
+```bash
+rails generate session_migration
+rake db:migrate
+```
+
+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
+```
+
 Available sequel specific rake tasks
 ====================================
 
@@ -295,6 +330,7 @@ Improvements has been made by those awesome contributors:
 * Robert Payne (robertjpayne)
 * Kevin Menard (nirvdrum)
 * Chris Heisterkamp (cheister)
+* Tamir Duberstein (tamird)
 
 Credits
 =======

data/Rakefile

@@ -6,6 +6,74 @@ end
 
 Bundler::GemHelper.install_tasks
 
-require "sequel_rails"
+require 'sequel_rails'
 
-FileList['tasks/**/*.rake'].each { |task| import task }
+begin
+  require 'rspec/core/rake_task'
+
+  desc 'Run RSpec code example (default to only PostgreSQL)'
+  RSpec::Core::RakeTask.new
+
+  namespace :spec do
+    def clean_env
+      %w(
+        TEST_ADAPTER
+        TEST_DATABASE
+        TEST_OWNER
+        TEST_USERNAME
+        TEST_PASSWORD
+        TEST_ENCODING
+      ).each do |name|
+        ENV[name] = nil
+      end
+    end
+
+    configs = {
+      'postgresql' => { 'TEST_ENCODING' => 'unicode' },
+      'mysql'      => { 'TEST_ENCODING' => 'utf8', 'TEST_USERNAME' => 'root' },
+      'sqlite3'    => { 'TEST_DATABASE' => 'db/database.sqlite3' },
+    }
+
+    configs.merge!('mysql2' => configs.fetch('mysql')) unless SequelRails.jruby?
+
+    configs.each do |adapter, config|
+      desc "Run specs for #{adapter} adapter"
+      task adapter do
+        clean_env
+        Rake::Task['spec'].reenable
+        ENV['TEST_ADAPTER'] = adapter
+        config.each do |key, value|
+          ENV[key] = value
+        end
+        Rake::Task['spec'].invoke
+      end
+    end
+
+    desc 'Run specs for all adapters'
+    task :all do
+      configs.keys.map { |adapter| Rake::Task["spec:#{adapter}"].invoke }.all?
+    end
+  end
+
+  begin
+    require 'rubocop/rake_task'
+
+    Rubocop::RakeTask.new do |task|
+      task.patterns = ['-R']
+    end
+  rescue LoadError
+    task :rubocop do
+      abort 'rubocop is not available. In order to run rubocop, you must: bundle install'
+    end
+  end
+
+  task :default do
+    Rake::Task['spec:all'].invoke
+    Rake::Task['rubocop'].invoke if defined?(Rubocop)
+  end
+
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: bundle install'
+  end
+end

data/ci/rails-3.2.gemfile

@@ -1,24 +1,27 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem "railties", "~> 3.2.13"
+gem 'railties', '~> 3.2.13'
 
-gemspec :path => "../"
+gemspec :path => '../'
 
-gem "sequel", "#{ENV["SEQUEL"]}"
+gem 'sequel', "#{ENV["SEQUEL"]}"
 
-gem "fakefs", :require => "fakefs/safe"
+gem 'fakefs', :require => 'fakefs/safe'
+
+# activesupport has an undeclared dependency on tzinfo prior to 4.0.0
+gem 'tzinfo'
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  gem "pg"
-  gem "mysql"
-  gem "mysql2"
-  gem "sqlite3"
+  gem 'pg'
+  gem 'mysql'
+  gem 'mysql2'
+  gem 'sqlite3'
 end
 
 # JRuby Adapter Dependencies
 platform :jruby do
-  gem "jdbc-sqlite3"
-  gem "jdbc-mysql"
-  gem "jdbc-postgres"
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
 end

data/ci/rails-4.0.gemfile

@@ -1,24 +1,24 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem "railties", "~> 4.0.0"
+gem 'railties', '~> 4.0.0'
 
-gemspec :path => "../"
+gemspec :path => '../'
 
-gem "sequel", "#{ENV["SEQUEL"]}"
+gem 'sequel', "#{ENV["SEQUEL"]}"
 
-gem "fakefs", :require => "fakefs/safe"
+gem 'fakefs', :require => 'fakefs/safe'
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do
-  gem "pg"
-  gem "mysql"
-  gem "mysql2"
-  gem "sqlite3"
+  gem 'pg'
+  gem 'mysql'
+  gem 'mysql2'
+  gem 'sqlite3'
 end
 
 # JRuby Adapter Dependencies
 platform :jruby do
-  gem "jdbc-sqlite3"
-  gem "jdbc-mysql"
-  gem "jdbc-postgres"
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
 end

data/config.ru

@@ -3,5 +3,5 @@ require 'bundler'
 
 Bundler.require :default, :development
 
-Combustion.initialize! "sequel_rails"
+Combustion.initialize! 'sequel_rails'
 run Combustion::Application

data/lib/generators/sequel/migration/migration_generator.rb

@@ -1,21 +1,20 @@
-require "generators/sequel"
+require 'generators/sequel'
 
 module Sequel
   class IllegalMigrationNameError < StandardError
     def initialize(name)
-      super("Illegal name for migration file: #{name}\n\t(only lower case letters, numbers, and '_' allowed)")
+      super("Illegal name for migration file: #{name} (only lower case letters, numbers, and '_' allowed)")
     end
   end
 
   module Generators
     class MigrationGenerator < Base #:nodoc:
-
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
 
       def create_migration_file
         set_local_assigns!
         validate_file_name!
-        migration_template "migration.rb.erb", "db/migrate/#{file_name}.rb"
+        migration_template 'migration.rb.erb', "db/migrate/#{file_name}.rb"
       end
 
       attr_reader :migration_action, :table_action, :column_action, :use_change
@@ -25,18 +24,18 @@ module Sequel
       def set_local_assigns!
         if file_name =~ /^(add|drop|remove)_.*_(?:to|from)_(.*)/
           @table_action   = 'alter'
-          @table_name     = $2.pluralize
-          @column_action  = $1 == 'add' ? 'add' : 'drop'
+          @table_name     = Regexp.last_match[2].pluralize
+          @column_action  = Regexp.last_match[1] == 'add' ? 'add' : 'drop'
           @use_change     = @column_action == 'add' ? true : false
         elsif file_name =~ /^(create|drop)_(.*)$/
-          @table_action   = $1
-          @table_name     = $2.pluralize
+          @table_action   = Regexp.last_match[1]
+          @table_name     = Regexp.last_match[2].pluralize
           @column_action  = 'add'
           @use_change     = @table_action == 'create' ? true : false
         else
           @table_action   = 'alter'
           if file_name =~ /^(alter)_(.*)/
-            @table_name   = $2.pluralize
+            @table_name   = Regexp.last_match[2].pluralize
           else
             @table_name   = file_name.pluralize
           end
@@ -46,9 +45,7 @@ module Sequel
       end
 
       def validate_file_name!
-        unless file_name =~ /^[_a-z0-9]+$/
-          raise IllegalMigrationNameError.new(file_name)
-        end
+        fail IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   end

data/lib/generators/sequel/model/model_generator.rb

@@ -1,29 +1,31 @@
-require "generators/sequel"
+require 'generators/sequel'
 
 module Sequel
   module Generators
-
     class ModelGenerator < Base
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
 
       check_class_collision
 
       class_option :migration,  :type => :boolean
       class_option :timestamps, :type => :boolean
-      class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
+      class_option :parent,     :type => :string, :desc => 'The parent class for the generated model'
 
       def create_migration_file
-        return unless options[:migration]
-        migration_template "migration.rb.erb", "db/migrate/create_#{table_name}.rb"
+        migration_template(
+          'migration.rb.erb',
+          File.join('db', 'migrate', "create_#{table_name}.rb")
+        ) if options[:migration]
       end
 
       def create_model_file
-        template 'model.rb.erb', File.join('app/models', class_path, "#{file_name}.rb")
+        template(
+          'model.rb.erb',
+          File.join('app', 'models', class_path, "#{file_name}.rb")
+        )
       end
 
       hook_for :test_framework
-
     end
-
   end
 end

data/lib/generators/sequel/observer/observer_generator.rb

@@ -1,19 +1,18 @@
-require "generators/sequel"
+require 'generators/sequel'
 
 module Sequel
   module Generators
-
     class ObserverGenerator < Base
-
-      check_class_collision :suffix => "Observer"
+      check_class_collision :suffix => 'Observer'
 
       def create_observer_file
-        template 'observer.rb.erb', File.join('app/models', class_path, "#{file_name}_observer.rb")
+        template(
+          'observer.rb.erb',
+          File.join('app', 'models', class_path, "#{file_name}_observer.rb")
+        )
       end
 
       hook_for :test_framework
-
     end
-
   end
 end

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

@@ -0,0 +1,30 @@
+require 'generators/sequel'
+
+module Sequel
+  class IllegalMigrationNameError < StandardError
+    def initialize(name)
+      super("Illegal name for migration file: #{name} (only lower case letters, numbers, and '_' allowed)")
+    end
+  end
+
+  module Generators
+    class SessionMigrationGenerator < Base #:nodoc:
+      argument :name, :type => :string, :default => 'add_sessions_table'
+
+      def create_migration_file
+        validate_file_name!
+        migration_template 'migration.rb.erb', "db/migrate/#{file_name}.rb"
+      end
+
+      protected
+
+      def session_table_name
+        SequelRails::SessionStore.session_class.table_name
+      end
+
+      def validate_file_name!
+        fail IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+      end
+    end
+  end
+end

data/lib/generators/sequel/session_migration/templates/migration.rb.erb

@@ -0,0 +1,10 @@
+Sequel.migration do
+  change do
+    create_table :<%= session_table_name %> do
+      primary_key :id
+      String :session_id, :null => false, :unique => true, :index => true
+      String :data, :text => true, :null => false
+      DateTime :updated_at, :null => true, :index => true
+    end
+  end
+end

data/lib/generators/sequel.rb

@@ -1,16 +1,14 @@
-require "rails/generators/named_base"
-require "rails/generators/migration"
-require "rails/generators/active_model"
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+require 'rails/generators/active_model'
 
 module Sequel
   module Generators
-
     class Base < ::Rails::Generators::NamedBase #:nodoc:
-
       include ::Rails::Generators::Migration
 
       def self.base_name
-        @_sequel_base_name ||= "sequel"
+        @_sequel_base_name ||= 'sequel'
       end
 
       def self.source_root
@@ -32,9 +30,8 @@ module Sequel
       #
       def self.next_migration_number(dirname) #:nodoc:
         next_migration_number = current_migration_number(dirname) + 1
-        [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        [Time.now.utc.strftime('%Y%m%d%H%M%S'), sprintf('%.14d', next_migration_number)].max
       end
-
     end
 
     class ActiveModel < ::Rails::Generators::ActiveModel #:nodoc:
@@ -42,11 +39,11 @@ module Sequel
         "#{klass}.all"
       end
 
-      def self.find(klass, params=nil)
+      def self.find(klass, params = nil)
         "#{klass}.find!(#{params})"
       end
 
-      def self.build(klass, params=nil)
+      def self.build(klass, params = nil)
         if params
           "#{klass}.new(#{params})"
         else
@@ -58,7 +55,7 @@ module Sequel
         "#{name}.save"
       end
 
-      def update_attributes(params=nil)
+      def update_attributes(params = nil)
         "#{name}.update(#{params})"
       end
 
@@ -70,7 +67,6 @@ module Sequel
         "#{name}.destroy"
       end
     end
-
   end
 end
 
@@ -79,7 +75,7 @@ module Rails
     class GeneratedAttribute #:nodoc:
       def type_class
         return 'DateTime' if type.to_s == 'datetime'
-        return type.to_s.camelcase
+        type.to_s.camelcase
       end
     end
   end

data/lib/sequel-rails.rb

@@ -1 +1 @@
-require "sequel_rails"
+require 'sequel_rails'