sequel-rails 0.7.0 → 0.8.0

data/lib/sequel_rails/shellwords.rb

@@ -1,6 +1,6 @@
 module SequelRails
   begin
-    require "shellwords"
+    require 'shellwords'
     Shellwords = ::Shellwords
   rescue LoadError
     # Taken from shellwords.rb (Ruby 2.0.0p247)
@@ -16,13 +16,13 @@ module SequelRails
         # Treat multibyte characters as is.  It is caller's responsibility
         # to encode the string in the right encoding for the shell
         # environment.
-        str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
+        str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, '\\\\\\1')
 
         # A LF cannot be escaped with a backslash because a backslash + LF
         # combo is regarded as line continuation and simply ignored.
         str.gsub!(/\n/, "'\n'")
 
-        return str
+        str
       end
 
       def self.shelljoin(array)

data/lib/sequel_rails/storage/abstract.rb

@@ -1,7 +1,6 @@
 module SequelRails
   module Storage
     class Abstract
-
       attr_reader :config
 
       def initialize(config)
@@ -10,26 +9,26 @@ module SequelRails
 
       def create
         res = _create
-        puts "[sequel] Created database '#{database}'" if res
+        warn "[sequel] Created database '#{database}'" if res
         res
       end
 
       def drop
         ::Sequel::Model.db.disconnect
         res = _drop
-        puts "[sequel] Dropped database '#{database}'" if res
+        warn "[sequel] Dropped database '#{database}'" if res
         res
       end
 
       def dump(filename)
         res = _dump filename
-        puts "[sequel] Dumped structure of database '#{database}' to '#{filename}'" if res
+        warn "[sequel] Dumped structure of database '#{database}' to '#{filename}'" if res
         res
       end
 
       def load(filename)
         res = _load filename
-        puts "[sequel] Loaded structure of database '#{database}' from '#{filename}'" if res
+        warn "[sequel] Loaded structure of database '#{database}' from '#{filename}'" if res
         res
       end
 
@@ -39,42 +38,42 @@ module SequelRails
       end
 
       def database
-        @database ||= config["database"] || config["path"]
+        @database ||= config['database'] || config['path']
       end
 
       def username
-        @username ||= config["username"] || config["user"] || ""
+        @username ||= config['username'] || config['user'] || ''
       end
 
       def password
-        @password ||= config["password"] || ""
+        @password ||= config['password'] || ''
       end
 
       def host
-        @host ||= config["host"] || ""
+        @host ||= config['host'] || ''
       end
 
       def port
-        @port ||= config["port"] || ""
+        @port ||= config['port'] || ''
       end
 
       def owner
-        @owner ||= config["owner"] || ""
+        @owner ||= config['owner'] || ''
       end
 
       def charset
-        @charset ||= config["charset"] || ENV["CHARSET"] || "utf8"
+        @charset ||= config['charset'] || ENV['CHARSET'] || 'utf8'
       end
 
       def collation
-        @collation ||= config["collation"] || ENV["COLLATION"]
+        @collation ||= config['collation'] || ENV['COLLATION']
       end
 
       private
 
       def add_option(commands, name, value)
         if value.present?
-          separator = name[0,2]=="--" ? "=" : " "
+          separator = name[0, 2] == '--' ? '=' : ' '
           commands << "#{name}#{separator}#{value}"
         end
       end
@@ -87,13 +86,12 @@ module SequelRails
         `#{escaped_command}`
 
         # Evaluate command status as a boolean like `system` does.
-        $?.exitstatus == 0
+        $CHILD_STATUS.exitstatus == 0
       end
 
       def safe_exec(args)
         exec SequelRails::Shellwords.join(Array(args))
       end
-
     end
   end
 end

data/lib/sequel_rails/storage/jdbc.rb

@@ -1,21 +1,20 @@
 module SequelRails
   module Storage
     class Jdbc < Abstract
-
       def _is_mysql?
-        config['adapter'].match(/^jdbc:mysql/)
+        config['adapter'].start_with?('jdbc:mysql')
       end
 
       def _is_postgres?
-        config['adapter'].match(/^jdbc:postgresql/)
+        config['adapter'].start_with?('jdbc:postgresql')
       end
 
       def _is_sqlite?
-        config['adapter'].match(/^jdbc:sqlite/)
+        config['adapter'].start_with?('jdbc:sqlite')
       end
 
       def _root_url
-        config['url'].scan(/^jdbc:mysql:\/\/[\w\.]*:?\d*/).first
+        config['url'].scan(%r{^jdbc:mysql://[\w\.]*:?\d*}).first
       end
 
       def db_name
@@ -59,7 +58,7 @@ module SequelRails
           adapter = ::SequelRails::Storage::Postgres.new(config)
           adapter._dump(filename)
         else
-          raise NotImplementedError
+          fail NotImplementedError
         end
       end
 
@@ -68,21 +67,20 @@ module SequelRails
           adapter = ::SequelRails::Storage::Postgres.new(config)
           adapter._load(filename)
         else
-          raise NotImplementedError
+          fail NotImplementedError
         end
       end
 
       private
 
       def collation
-        @collation ||= super || "utf8_unicode_ci"
+        @collation ||= super || 'utf8_unicode_ci'
       end
 
       def in_memory?
         return false unless _is_sqlite?
-        database == ":memory:"
+        database == ':memory:'
       end
-
     end
   end
 end

data/lib/sequel_rails/storage/mysql.rb

@@ -1,7 +1,6 @@
 module SequelRails
   module Storage
     class Mysql < Abstract
-
       def _create
         execute "CREATE DATABASE IF NOT EXISTS `#{database}` DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
       end
@@ -11,42 +10,41 @@ module SequelRails
       end
 
       def _dump(filename)
-        commands = ["mysqldump"]
+        commands = ['mysqldump']
         add_connection_settings commands
-        add_flag commands, "--no-data"
-        add_option commands, "--result-file", filename
+        add_flag commands, '--no-data'
+        add_option commands, '--result-file', filename
         commands << database
         safe_exec commands
       end
 
       def _load(filename)
-        commands = ["mysql"]
+        commands = ['mysql']
         add_connection_settings commands
-        add_option commands, "--database", database
-        add_option commands, "--execute", %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}
+        add_option commands, '--database', database
+        add_option commands, '--execute', %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}
         safe_exec commands
       end
 
       def collation
-        @collation ||= super || "utf8_unicode_ci"
+        @collation ||= super || 'utf8_unicode_ci'
       end
 
       private
 
       def add_connection_settings(commands)
-        add_option commands, "--user", username
-        add_option commands, "--password", password
-        add_option commands, "--host", host
-        add_option commands, "--port", port.to_s
+        add_option commands, '--user', username
+        add_option commands, '--password', password
+        add_option commands, '--host', host
+        add_option commands, '--port', port.to_s
       end
 
       def execute(statement)
-        commands = ["mysql"]
+        commands = ['mysql']
         add_connection_settings commands
-        add_option commands, "--execute", statement
+        add_option commands, '--execute', statement
         safe_exec commands
       end
-
     end
   end
 end

data/lib/sequel_rails/storage/postgres.rb

@@ -1,19 +1,18 @@
 module SequelRails
   module Storage
     class Postgres < Abstract
-
       def _create
         with_pgpassword do
-          commands = ["createdb"]
+          commands = ['createdb']
           add_connection_settings commands
-          add_option commands, "--maintenance-db", maintenance_db
-          add_option commands, "--encoding", encoding
-          add_option commands, "--locale", locale
-          add_option commands, "--lc-collate", collation
-          add_option commands, "--lc-ctype", ctype
-          add_option commands, "--template", template
-          add_option commands, "--tablespace", tablespace
-          add_option commands, "--owner", owner
+          add_option commands, '--maintenance-db', maintenance_db
+          add_option commands, '--encoding', encoding
+          add_option commands, '--locale', locale
+          add_option commands, '--lc-collate', collation
+          add_option commands, '--lc-ctype', ctype
+          add_option commands, '--template', template
+          add_option commands, '--tablespace', tablespace
+          add_option commands, '--owner', owner
           commands << database
           safe_exec commands
         end
@@ -21,7 +20,7 @@ module SequelRails
 
       def _drop
         with_pgpassword do
-          commands = ["dropdb"]
+          commands = ['dropdb']
           add_connection_settings commands
           commands << database
           safe_exec commands
@@ -30,13 +29,13 @@ module SequelRails
 
       def _dump(filename)
         with_pgpassword do
-          commands = ["pg_dump"]
+          commands = ['pg_dump']
           add_connection_settings commands
-          add_flag commands, "-i"
-          add_flag commands, "-s"
-          add_flag commands, "-x"
-          add_flag commands, "-O"
-          add_option commands, "--file", filename
+          add_flag commands, '-i'
+          add_flag commands, '-s'
+          add_flag commands, '-x'
+          add_flag commands, '-O'
+          add_option commands, '--file', filename
           commands << database
           safe_exec commands
         end
@@ -44,70 +43,68 @@ module SequelRails
 
       def _load(filename)
         with_pgpassword do
-          commands = ["psql"]
+          commands = ['psql']
           add_connection_settings commands
-          add_option commands, "--file", filename
+          add_option commands, '--file', filename
           commands << database
           safe_exec commands
         end
       end
 
       def close_connections
-        begin
-          db = ::Sequel.connect(config)
-          # Will only work on Postgres > 8.4
-          pid_column = db.server_version < 90200 ? "procpid" : "pid"
-          db.execute <<-SQL.gsub(/^\s{12}/,'')
-            SELECT COUNT(pg_terminate_backend(#{pid_column}))
-            FROM pg_stat_activity
-            WHERE datname = '#{database}';
-          SQL
-        rescue => _
-          # Will raise an error as it kills existing process running this
-          # command. Seems to be only way to ensure *all* test connections
-          # are closed
-        end
+        db = ::Sequel.connect(config)
+        # Will only work on Postgres > 8.4
+        pid_column = db.server_version < 90_200 ? 'procpid' : 'pid'
+        db.execute <<-SQL.gsub(/^\s{12}/, '')
+          SELECT COUNT(pg_terminate_backend(#{pid_column}))
+          FROM pg_stat_activity
+          WHERE datname = '#{database}';
+        SQL
+      rescue Sequel::DatabaseDisconnectError
+        # Will raise an error as it kills existing process running this
+        # command. Seems to be only way to ensure *all* test connections
+        # are closed
+        nil
       end
 
       def encoding
-        @encoding ||= config["encoding"] || charset
+        @encoding ||= config['encoding'] || charset
       end
 
       def locale
-        @locale ||= config["locale"] || ""
+        @locale ||= config['locale'] || ''
       end
 
       def template
-        @template ||= config["template"] || ""
+        @template ||= config['template'] || ''
       end
 
       def ctype
-        @ctype ||= config["ctype"] || ""
+        @ctype ||= config['ctype'] || ''
       end
 
       def tablespace
-        @tablespace ||= config["tablespace"] || ""
+        @tablespace ||= config['tablespace'] || ''
       end
 
       def maintenance_db
-        @maintenance_db ||= config["maintenance_db"] || ""
+        @maintenance_db ||= config['maintenance_db'] || ''
       end
 
       private
 
       def with_pgpassword
-        ENV["PGPASSWORD"] = password unless password.blank?
+        ENV['PGPASSWORD'] = password unless password.blank?
         yield
       ensure
-        ENV["PGPASSWORD"] = nil unless password.blank?
+        ENV['PGPASSWORD'] = nil unless password.blank?
       end
 
       def add_connection_settings(commands)
-        add_option commands, "--username", username
-        add_option commands, "--host", host
-        add_option commands, "--port", port.to_s
+        add_option commands, '--username', username
+        add_option commands, '--host', host
+        add_option commands, '--port', port.to_s
       end
-
     end
   end
 end

data/lib/sequel_rails/storage/sqlite.rb

@@ -34,7 +34,6 @@ module SequelRails
       def path
         @path ||= Pathname(File.expand_path(database, Rails.root))
       end
-
     end
   end
 end

data/lib/sequel_rails/storage.rb

@@ -1,10 +1,10 @@
-require "sequel_rails/shellwords"
-require "sequel_rails/storage/abstract"
-require "sequel_rails/storage/sqlite"
-require "sequel_rails/storage/mysql"
-require "sequel_rails/storage/mysql2"
-require "sequel_rails/storage/postgres"
-require "sequel_rails/storage/jdbc"
+require 'sequel_rails/shellwords'
+require 'sequel_rails/storage/abstract'
+require 'sequel_rails/storage/sqlite'
+require 'sequel_rails/storage/mysql'
+require 'sequel_rails/storage/mysql2'
+require 'sequel_rails/storage/postgres'
+require 'sequel_rails/storage/jdbc'
 
 module SequelRails
   module Storage
@@ -59,7 +59,7 @@ module SequelRails
         if config['host'].blank? || %w[ 127.0.0.1 localhost ].include?(config['host'])
           yield config
         else
-          puts "This task only modifies local databases. #{config['database']} is on a remote host."
+          warn "This task only modifies local databases. #{config['database']} is on a remote host."
         end
       end
     end
@@ -72,12 +72,12 @@ module SequelRails
     end
 
     def self.lookup_class(adapter)
-      raise "Adapter not specified in config, please set the :adapter key." unless adapter
+      fail 'Adapter not specified in config, please set the :adapter key.' unless adapter
       return Jdbc if adapter =~ /jdbc/
 
       klass_name = adapter.camelize.to_sym
       unless self.const_defined?(klass_name)
-        raise "Adapter #{adapter} not supported (#{klass_name.inspect})"
+        fail "Adapter #{adapter} not supported (#{klass_name.inspect})"
       end
 
       const_get klass_name

data/lib/sequel_rails/version.rb

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

data/lib/sequel_rails.rb

@@ -1,8 +1,8 @@
-require "sequel_rails/version"
-require "sequel_rails/railtie" if defined? Rails
+require 'sequel_rails/version'
+require 'sequel_rails/railtie' if defined? Rails
 
 module SequelRails
   def self.jruby?
-    (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
+    (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || defined?(JRUBY_VERSION)
   end
 end

data/rubocop-todo.yml

@@ -0,0 +1,24 @@
+# This configuration was generated by `rubocop --auto-gen-config`.
+# The point is for the user to remove these configuration records
+# one by one as the offences are removed from the code base.
+
+ConstantName:
+  Enabled: false
+
+ClassVars:
+  Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Enabled: false

data/sequel-rails.gemspec

@@ -1,30 +1,32 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
-require "sequel_rails/version"
+require 'sequel_rails/version'
 
 Gem::Specification.new do |s|
-  s.name        = "sequel-rails"
+  s.name        = 'sequel-rails'
   s.version     = SequelRails::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Brasten Sager (brasten)", "Jonathan TRON"]
-  s.email       = ["brasten@gmail.com", "jonathan.tron@metrilio.com"]
-  s.homepage    = "http://talentbox.github.io/sequel-rails/"
-  s.description = "Integrate Sequel with Rails 3"
-  s.summary     = "Use Sequel with Rails 3"
+  s.authors     = ['Brasten Sager (brasten)', 'Jonathan TRON']
+  s.email       = ['brasten@gmail.com', 'jonathan.tron@metrilio.com']
+  s.homepage    = 'http://talentbox.github.io/sequel-rails/'
+  s.description = 'Integrate Sequel with Rails (3.x and 4.x)'
+  s.summary     = 'Use Sequel with Rails (3.x and 4.x)'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.extra_rdoc_files = ["LICENSE", "README.md"]
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.license = "MIT"
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.extra_rdoc_files = ['LICENSE', 'README.md']
+  s.rdoc_options = ['--charset=UTF-8']
+  s.license = 'MIT'
 
-  s.add_runtime_dependency "sequel", [">= 3.28", "< 5.0"]
-  s.add_runtime_dependency "railties", ">= 3.2.0"
+  s.add_dependency 'activemodel'
+  s.add_dependency 'railties', '>= 3.2.0'
+  s.add_dependency 'sequel', ['>= 3.28', '< 5.0']
 
-  s.add_development_dependency "rake", ">= 0.8.7"
-  s.add_development_dependency "rspec", "~> 2.7.0"
-  s.add_development_dependency "combustion", "~> 0.5.0"
-  s.add_development_dependency "generator_spec", "~> 0.9.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 'rubocop' unless RUBY_VERSION < '1.9.2'
 end

data/spec/internal/Rakefile

@@ -5,6 +5,6 @@ rescue LoadError
 end
 Bundler.require :default, :development, :test
 
-Combustion.path = ""
-Combustion.initialize! "sequel_rails"
+Combustion.path = ''
+Combustion.initialize! 'sequel_rails'
 Combustion::Application.load_tasks

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

@@ -1 +1 @@
-Combustion::Application.config.session_store :cookie_store, :key => "sequel-rails", :secret => "secret-token"
+Combustion::Application.config.session_store SequelRails::SessionStore

data/spec/internal/db/schema.rb.init

@@ -4,5 +4,11 @@ Sequel.migration do
       primary_key :id
       String      :email
     end
+    create_table :sessions 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