sequel-rails 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b6703d7b0e5a73f9539c3a89e7d4cad0dcfff3
-  data.tar.gz: eb21ad4107e1eacf55d4f21175e815be2ef308b2
+  metadata.gz: f373b19d13b5acc804458b3a6402e1ad71a5480b
+  data.tar.gz: d204a4d3aa6756161d9cc94b8dcf8733b65722da
 SHA512:
-  metadata.gz: b0d73d406b6477ecbe4dc74d3870fd0b70cafaa4b27e1cd1deb14126d4b46c9606aa2225e11f536f0e27f12de3c916bdbcd09f0405f1611c75469b217675afee
-  data.tar.gz: 1a5b250db4634b304caf5e9d9169801e51415e21c3819d8400dacb11126e8985bc2adb52716c360c13d126c870957db4df59b4d648ff3d907c0d07c531ec155e
+  metadata.gz: 06590d5d6130a9ef1a8c81928b6e3cea9fd7aedd85115e133bf2d81a27ef21446e15b9040611a6cedf2a44edee1a555c3e639ed168a8aacaa6821c64cdca40a7
+  data.tar.gz: c244b95d90081edf5fe865ceedaf7b712b3445177a088d0eba8430c0726331945fa52d0550204aa9741973ffa7159d354e0261bf7a02b96bf18159f486be0caf

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - '**/*.gemspec'
   Exclude:
     - 'lib/sequel-rails.rb'
-    - 'ci/*'
+    - 'ci/**/*'
 
 HashSyntax:
   EnforcedStyle: hash_rockets

data/.travis.yml

@@ -6,10 +6,12 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - jruby-18mode
   - jruby-19mode
+  - jruby-9.0.1.0
 env:
   - SEQUEL='~> 3.0'
   - SEQUEL='~> 4.0'
@@ -18,68 +20,49 @@ gemfile:
   - ci/rails-4.0.gemfile
   - ci/rails-4.1.gemfile
   - ci/rails-4.2.gemfile
+  - ci/rails-5.0.gemfile
 matrix:
+  allow_failures:
+    - gemfile: ci/rails-5.0.gemfile
   exclude:
-    - rvm: 2.2
+    - rvm: 2.2.4
       gemfile: ci/rails-3.2.gemfile
-      env: SEQUEL='~> 3.0'
-    - rvm: 2.2
+    - rvm: 2.3.0
+      gemfile: ci/rails-3.2.gemfile
+    - rvm: jruby-9.0.1.0
       gemfile: ci/rails-3.2.gemfile
-      env: SEQUEL='~> 4.0'
-    - rvm: ree
-      gemfile: ci/rails-4.0.gemfile
-      env: SEQUEL='~> 3.0'
     - rvm: ree
       gemfile: ci/rails-4.0.gemfile
-      env: SEQUEL='~> 4.0'
-    - rvm: 1.8.7
-      gemfile: ci/rails-4.0.gemfile
-      env: SEQUEL='~> 3.0'
     - rvm: 1.8.7
       gemfile: ci/rails-4.0.gemfile
-      env: SEQUEL='~> 4.0'
     - rvm: jruby-18mode
       gemfile: ci/rails-4.0.gemfile
-      env: SEQUEL='~> 3.0'
-    - rvm: jruby-18mode
-      gemfile: ci/rails-4.0.gemfile
-      env: SEQUEL='~> 4.0'
     - rvm: ree
       gemfile: ci/rails-4.1.gemfile
-      env: SEQUEL='~> 3.0'
-    - rvm: ree
-      gemfile: ci/rails-4.1.gemfile
-      env: SEQUEL='~> 4.0'
-    - rvm: 1.8.7
-      gemfile: ci/rails-4.1.gemfile
-      env: SEQUEL='~> 3.0'
     - rvm: 1.8.7
       gemfile: ci/rails-4.1.gemfile
-      env: SEQUEL='~> 4.0'
-    - rvm: jruby-18mode
-      gemfile: ci/rails-4.1.gemfile
-      env: SEQUEL='~> 3.0'
     - rvm: jruby-18mode
       gemfile: ci/rails-4.1.gemfile
-      env: SEQUEL='~> 4.0'
-    - rvm: ree
-      gemfile: ci/rails-4.2.gemfile
-      env: SEQUEL='~> 3.0'
     - rvm: ree
       gemfile: ci/rails-4.2.gemfile
-      env: SEQUEL='~> 4.0'
     - rvm: 1.8.7
       gemfile: ci/rails-4.2.gemfile
-      env: SEQUEL='~> 3.0'
-    - rvm: 1.8.7
-      gemfile: ci/rails-4.2.gemfile
-      env: SEQUEL='~> 4.0'
     - rvm: jruby-18mode
       gemfile: ci/rails-4.2.gemfile
-      env: SEQUEL='~> 3.0'
+    - rvm: ree
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: 1.8.7
+      gemfile: ci/rails-5.0.gemfile
     - rvm: jruby-18mode
-      gemfile: ci/rails-4.2.gemfile
-      env: SEQUEL='~> 4.0'
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: jruby-19mode
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: 1.9.3
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: 2.0.0
+      gemfile: ci/rails-5.0.gemfile
+    - rvm: 2.1.8
+      gemfile: ci/rails-5.0.gemfile
 notifications:
   email:
     - jonathan.tron@metrilio.com

data/History.md

@@ -1,3 +1,11 @@
+0.9.12 (2016-01-18)
+===================
+
+* Remove `-i` option from `pg_dump`, removed in PostgreSQL 9.5 (Joseph Halter)
+* Add support for [Spring](https://github.com/rails/spring) (Jan Berdajs) [#99](https://github.com/TalentBox/sequel-rails/pull/99)
+* Allow `config.sequel.logger` to be overridden by environments [#98](https://github.com/TalentBox/sequel-rails/issues/98)
+* Allow Rake tasks `db:` namespace to be reconfigured to something else (John Anderson) [#89](https://github.com/TalentBox/sequel-rails/pull/89)
+
 0.9.11 (2015-03-13)
 ===================
 

data/README.md

@@ -57,6 +57,28 @@ require "action_mailer/railtie"
 require "sprockets/railtie"
 ```
 
+Then you need to get rid of `ActiveRecord` configurations, that is if you
+didn't generate the new app with `-O` (or the long form `--skip-active-record`):
+
+`config/application.rb` and `config/environments/*.rb`
+
+For example in a fresh `Rails 4.2.4`, you would need to remove those lines:
+
+```
+config/application.rb
+line 27:    config.active_record.raise_in_transactional_callbacks = true
+```
+
+```
+config/environments/development.rb
+line 23:  config.active_record.migration_error = :page_load
+```
+
+```
+config/environments/production.rb
+line 78:  config.active_record.dump_schema_after_migration = false
+```
+
 Starting with sequel-rails 0.4.0.pre3 we don't change default Sequel behaviour
 nor include any plugin by default, if you want to get back the previous
 behaviour, you can create a new initializer (eg: `config/initializers/sequel.rb`)
@@ -149,12 +171,22 @@ You can configure some options with the usual rails mechanism, in
     config.sequel.max_connections = 16
     config.sequel.search_path = %w(mine public)
 
-    # Configure whether database's rake tasks will be loaded or not
+    # Configure whether database's rake tasks will be loaded or not.
+    #
+    # If passed a String or Symbol, this will replace the `db:` namespace for
+    # the database's Rake tasks.
+    #
+    # ex: config.sequel.load_database_tasks = :sequel
+    #     will results in `rake db:migrate` to become `rake sequel:migrate`
+    #
     # Defaults to true
     config.sequel.load_database_tasks = false
 
     # This setting disabled the automatic connect after Rails init
     config.sequel.skip_connect = true
+
+    # If you want to use a specific logger
+    config.sequel.logger = MyLogger.new($stdout)
 ```
 
 The connection settings are read from the file `config/database.yml` and is
@@ -327,7 +359,7 @@ Previous maintainer
 Contributors
 ============
 
-Improvements has been made by those awesome contributors:
+Improvements have been made by those awesome contributors:
 
 * Benjamin Atkin (benatkin)
 * Gabor Ratky (rgabo)
@@ -354,11 +386,14 @@ Improvements has been made by those awesome contributors:
 * Nico Rieck (gix)
 * Alexander Birkner (BirknerAlex)
 * kr3ssh (kressh)
+* John Anderson (djellemah)
+* Larivact (Larivact)
+* Jan Berdajs (mrbrdo)
 
 Credits
 =======
 
-The [dm-rails](http://github.com/datamapper/dm-rails) team wrote most of the original code, I just sequel-ized it, but since then most of it as been either adapted or rewritten.
+The [dm-rails](http://github.com/datamapper/dm-rails) team wrote most of the original code, I just sequel-ized it, but since then most of it has been either adapted or rewritten.
 
 Copyright
 =========

data/ci/rails-3.2.gemfile

@@ -14,6 +14,9 @@ gem 'tzinfo'
 if RUBY_VERSION < '1.9'
   gem 'i18n', '< 0.7.0'
 end
+if RUBY_VERSION < '2.0'
+  gem "rack-cache", "< 1.3.0"
+end
 
 # MRI/Rubinius Adapter Dependencies
 platform :ruby do

data/ci/rails-5.0.gemfile

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

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

@@ -7,7 +7,7 @@ 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
+      ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
 
       cattr_accessor :session_class
       def self.session_class

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

@@ -23,27 +23,43 @@ module Sequel
 
       def set_local_assigns!
         if file_name =~ /^(add|drop|remove)_.*_(?:to|from)_(.*)/
-          @table_action   = 'alter'
-          @table_name     = Regexp.last_match[2].pluralize
-          @column_action  = Regexp.last_match[1] == 'add' ? 'add' : 'drop'
-          @use_change     = @column_action == 'add' ? true : false
+          column_action = Regexp.last_match[1]
+          set_alter!(
+            Regexp.last_match[2].pluralize,
+            column_action,
+            column_action == 'add'
+          )
         elsif file_name =~ /^(create|drop)_(.*)$/
-          @table_action   = Regexp.last_match[1]
-          @table_name     = Regexp.last_match[2].pluralize
-          @column_action  = 'add'
-          @use_change     = @table_action == 'create' ? true : false
+          table_action = Regexp.last_match[1]
+          set_other!(
+            Regexp.last_match[2].pluralize,
+            table_action,
+            table_action == 'create'
+          )
         else
-          @table_action   = 'alter'
-          if file_name =~ /^(alter)_(.*)/
-            @table_name   = Regexp.last_match[2].pluralize
-          else
-            @table_name   = file_name.pluralize
-          end
-          @use_change     = false
-          @column_action  = 'add'
+          table_name = if file_name =~ /^(alter)_(.*)/
+                         Regexp.last_match[2].pluralize
+                       else
+                         file_name.pluralize
+                       end
+          set_alter! table_name, 'add', false
         end
       end
 
+      def set_other!(table_name, table_action, use_change)
+        @table_name = table_name
+        @table_action = table_action
+        @column_action = 'add'
+        @use_change = use_change
+      end
+
+      def set_alter!(table_name, column_action, use_change)
+        @table_action = 'alter'
+        @table_name = table_name
+        @column_action = column_action == 'add' ? 'add' : 'drop'
+        @use_change = use_change
+      end
+
       def validate_file_name!
         fail IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
       end

data/lib/sequel_rails.rb

@@ -6,4 +6,27 @@ module SequelRails
   def self.jruby?
     (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') || defined?(JRUBY_VERSION)
   end
+
+  if Hash.public_instance_methods.include? :deep_symbolize_keys
+    def self.deep_symbolize_keys(hash)
+      hash.deep_symbolize_keys
+    end
+  else
+    def self.deep_symbolize_keys(hash)
+      h = {}
+      hash.each { |key, value| h[key.to_sym] = deep_symbolize_keys_map(value) }
+      h
+    end
+
+    def self.deep_symbolize_keys_map(value)
+      case value
+      when Hash
+        deep_symbolize_keys(value)
+      when Array
+        value.map { |v| deep_symbolize_keys_map(v) }
+      else
+        value
+      end
+    end
+  end
 end

data/lib/sequel_rails/configuration.rb

@@ -22,7 +22,7 @@ module SequelRails
       super
       self.root = Rails.root
       self.raw = nil
-      self.logger = Rails.logger
+      self.logger = nil
       self.migration_dir = nil
       self.schema_dump = default_schema_dump
       self.load_database_tasks = true
@@ -39,7 +39,8 @@ module SequelRails
         # default config - use just the environment variable
         Hash.new normalize_repository_config({})
       ) do |normalized, environment|
-        name, config = environment.first, environment.last
+        name = environment.first
+        config = environment.last
         normalized[name] = normalize_repository_config(config)
         normalized
       end
@@ -54,9 +55,9 @@ module SequelRails
       end
 
       if normalized_config['url']
-        ::Sequel.connect normalized_config['url'], normalized_config
+        ::Sequel.connect normalized_config['url'], SequelRails.deep_symbolize_keys(normalized_config)
       else
-        ::Sequel.connect normalized_config
+        ::Sequel.connect SequelRails.deep_symbolize_keys(normalized_config)
       end.tap { after_connect.call if after_connect.respond_to?(:call) }
     end
 

data/lib/sequel_rails/db_config.rb

@@ -25,7 +25,7 @@ module SequelRails
       # the gsub transforms foo:/bar
       # (which jdbc doesn't like)
       # into foo:///bar
-      self[:url] || make_url.to_s.gsub(/:\/(?=\w)/, ':///')
+      self[:url] || make_url.to_s.gsub(%r{:/(?=\w)}, ':///')
     end
 
     private
@@ -48,18 +48,19 @@ module SequelRails
 
     def normalize_db(root)
       return unless include? :adapter
-      if root && adapter.include?('sqlite') && database != ':memory:'
-        # sqlite expects path as the database name
-        self[:database] = File.expand_path database.to_s, root
-      end
+      return unless root
+      return unless adapter.include?('sqlite') && database != ':memory:'
+      # sqlite expects path as the database name
+      self[:database] = File.expand_path database.to_s, root
     end
 
     def make_url
       if adapter =~ /^(jdbc|do):/
         scheme, subadapter = adapter.split ':'
-        return URI::Generic.build \
-            :scheme => scheme,
-            :opaque => build_url(to_hash.merge 'adapter' => subadapter).to_s
+        URI::Generic.build(
+          :scheme => scheme,
+          :opaque => build_url(to_hash.merge 'adapter' => subadapter).to_s
+        )
       else
         build_url to_hash
       end
@@ -67,11 +68,9 @@ module SequelRails
 
     def build_url(cfg)
       if (adapter = cfg['adapter']) =~ /sqlite/ &&
-          (database = cfg['database']) =~ /^:/
+         (database = cfg['database']) =~ /^:/
         # magic sqlite databases
-        return URI::Generic.build \
-            :scheme => adapter,
-            :opaque => database
+        return URI::Generic.build(:scheme => adapter, :opaque => database)
       end
 
       # these four are handled separately
@@ -84,17 +83,18 @@ module SequelRails
       end
 
       path = cfg['database'].to_s
-      path = "/#{path}" if path =~ /^(?!\/)/
+      path = "/#{path}" if path =~ %r{^(?!/)}
 
       q = URI.encode_www_form(params)
       q = nil if q.empty?
 
-      URI::Generic.build \
-          :scheme => cfg['adapter'],
-          :host => cfg['host'],
-          :port => cfg['port'],
-          :path => path,
-          :query => q
+      URI::Generic.build(
+        :scheme => cfg['adapter'],
+        :host => cfg['host'],
+        :port => cfg['port'],
+        :path => path,
+        :query => q
+      )
     end
   end
 end