nobrainer 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28eb4dcb91f5c381ec20a21ed37d01992a3d6eb7
-  data.tar.gz: 395bfd26595f42e290805ebb9ebfa82dda89b99a
+  metadata.gz: df0adf36ad09c91dff1d954dd2f82ed93a26be28
+  data.tar.gz: 8c7f6c102a9be2b93a8086ac1d2969e3800ac2c3
 SHA512:
-  metadata.gz: 390139f43cf843350f0c345f42b15dfef87174961123376643d193dfd0265975daf4c2b3979f6497b605d4ed08175570df76e96e907a01ab3ed8168e71d27253
-  data.tar.gz: 5fb98fd5f37020b9bda60837a0e86d1f761953a5b0c0220a1e22e79d2f823419a39a927e1c6592791bd6e90111c1cc9bf1f33c48137a01cd6d33e40fb545792a
+  metadata.gz: 9fac2dbf39646bf1cee3a0921101a41453cdf82577733347d327026e0c05306faaf10622d281de9f0cb4c41d5f94f3b527135e7136ef8edd0cc6bfd25d5ac884
+  data.tar.gz: 825bfeb592461326469dd3fdef0f74ac0d0877297dbbf0cdd291f6b0721144de9df10661dad60427be7be693606234af843f4bdab99f6d361669562344c7d998

data/lib/no_brainer/config.rb

@@ -10,9 +10,10 @@ module NoBrainer::Config
     :logger                 => { :default => ->{ default_logger } },
     :colorize_logger        => { :default => ->{ true }, :valid_values => [true, false] },
     :warn_on_active_record  => { :default => ->{ true }, :valid_values => [true, false] },
-    :durability             => { :default => ->{ default_durability }, :valid_values => [:hard, :soft] },
+    :durability             => { :default => ->{ nil } }, # legacy
     :table_options          => { :default => ->{ {:shards => 1, :replicas => 1, :write_acks => :majority} },
                                  :valid_keys => [:shards, :replicas, :primary_replica_tag, :write_acks, :durability] },
+    :run_options            => { :default => ->{ {:durability => default_durability} } },
     :max_string_length      => { :default => ->{ 255 } },
     :user_timezone          => { :default => ->{ :local }, :valid_values => [:unchanged, :utc, :local] },
     :db_timezone            => { :default => ->{ :utc }, :valid_values => [:unchanged, :utc, :local] },
@@ -51,6 +52,10 @@ module NoBrainer::Config
       @geo_options = value.try(:symbolize_keys)
     end
 
+    def run_options=(value)
+      @run_options = value.try(:symbolize_keys)
+    end
+
     def assert_valid_options
       SETTINGS.each do |k,v|
         assert_value_in(k, v[:valid_values]) if v[:valid_values]
@@ -119,9 +124,10 @@ module NoBrainer::Config
       db ||= "#{self.app_name}_#{self.environment}" if self.app_name && self.environment
       host = ENV['RETHINKDB_HOST'] || ENV['RDB_HOST'] || 'localhost'
       port = ENV['RETHINKDB_PORT'] || ENV['RDB_PORT']
-      auth = ENV['RETHINKDB_AUTH'] || ENV['RDB_AUTH']
+      user = ENV['RETHINKDB_USER'] || ENV['RDB_USER']
+      pass = ENV['RETHINKDB_PASSWORD'] || ENV['RDB_PASSWORD'] || ENV['RETHINKDB_AUTH'] || ENV['RDB_AUTH']
       url = ENV['RETHINKDB_URL'] || ENV['RDB_URL']
-      url ||= "rethinkdb://#{":#{auth}@" if auth}#{host}#{":#{port}" if port}/#{db}" if db
+      url ||= "rethinkdb://#{"#{user}:#{pass}@" if (user || pass)}#{host}#{":#{port}" if port}/#{db}" if db
       url
     end
 
@@ -133,7 +139,8 @@ module NoBrainer::Config
     end
 
     def default_logger
-      defined?(Rails.logger) ? Rails.logger : Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
+      (Rails.logger if defined?(Rails.logger)) ||
+         Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
     end
 
     def default_durability

data/lib/no_brainer/connection.rb

@@ -18,7 +18,9 @@ class NoBrainer::Connection
           "Invalid URI. Expecting something like rethinkdb://host:port/database. Got #{uri}"
       end
 
-      { :auth_key => uri.password,
+      {
+        :user     => uri.user && URI.decode(uri.user),
+        :password => uri.password && URI.decode(uri.password),
         :host     => uri.host,
         :port     => uri.port || 28015,
         :db       => uri.path.gsub(/^\//, ''),
@@ -27,7 +29,7 @@ class NoBrainer::Connection
   end
 
   def uri
-    "rethinkdb://#{'****@' if parsed_uri[:auth_key]}#{parsed_uri[:host]}:#{parsed_uri[:port]}/#{parsed_uri[:db]}"
+    "rethinkdb://#{'****@' if parsed_uri[:password]}#{parsed_uri[:host]}:#{parsed_uri[:port]}/#{parsed_uri[:db]}"
   end
 
   def raw
@@ -45,6 +47,6 @@ class NoBrainer::Connection
   end
 
   def current_db
-    NoBrainer.current_run_options.try(:[], :db) || default_db
+    NoBrainer.current_run_options[:db] || default_db
   end
 end

data/lib/no_brainer/criteria/update.rb

@@ -16,6 +16,6 @@ module NoBrainer::Criteria::Update
     # can't use without_distinct when passed a block as the operation may be
     # performed many times, which might not be idempotent.
     clause = block ? self : without_distinct
-    run { clause.without_plucking.to_rql.__send__(type, *args, &block) }
+    run { clause.without_plucking.without_ordering.to_rql.__send__(type, *args, &block) }
   end
 end

data/lib/no_brainer/document/association/belongs_to.rb

@@ -35,7 +35,7 @@ class NoBrainer::Document::Association::BelongsTo
     end
 
     def base_criteria
-      target_model.without_ordering.unscoped
+      target_model.without_ordering
     end
 
     def hook

data/lib/no_brainer/document/association/has_many.rb

@@ -97,13 +97,16 @@ class NoBrainer::Document::Association::HasMany
     ->(target){ set_inverses_of([target]) if target.is_a?(NoBrainer::Document) }
   end
 
+  def dependent_criteria
+    target_criteria.unscoped
+  end
+
   def before_destroy_callback
-    criteria = target_criteria.unscoped.without_cache
     case metadata.options[:dependent]
-    when :destroy  then criteria.destroy_all
-    when :delete   then criteria.delete_all
-    when :nullify  then criteria.update_all(foreign_key => nil)
-    when :restrict then raise NoBrainer::Error::ChildrenExist unless criteria.count.zero?
+    when :destroy  then dependent_criteria.destroy_all
+    when :delete   then dependent_criteria.delete_all
+    when :nullify  then dependent_criteria.update_all(foreign_key => nil)
+    when :restrict then raise NoBrainer::Error::ChildrenExist unless dependent_criteria.empty?
     end
   end
 end

data/lib/no_brainer/document/attributes.rb

@@ -70,6 +70,7 @@ module NoBrainer::Document::Attributes
   end
 
   def assign_attributes(attrs, options={})
+    attrs = attrs.to_h if !attrs.is_a?(Hash) && attrs.respond_to?(:to_h)
     raise ArgumentError, "To assign attributes, please pass a hash instead of `#{attrs.class}'" unless attrs.is_a?(Hash)
 
     if options[:pristine]

data/lib/no_brainer/document/index/meta_store.rb

@@ -10,7 +10,7 @@ class NoBrainer::Document::Index::MetaStore
 
   field :table_name,   :type => String, :required => true
   field :index_name,   :type => String, :required => true
-  field :rql_function, :type => String, :required => true
+  field :rql_function, :type => Text,   :required => true
 
   def rql_function=(value)
     super(JSON.dump(value))

data/lib/no_brainer/document/types/geo.rb

@@ -1 +1 @@
-# Look in lib/no_brainer/geo.rb instead
+# Look in lib/no_brainer/geo/*.rb instead

data/lib/no_brainer/lock.rb

@@ -8,7 +8,7 @@ class NoBrainer::Lock
   # Since PKs are limited to 127 characters, we can't use the user's key as a PK
   # as it could be arbitrarily long.
   field :key_hash,       :type => String, :primary_key => true, :default => ->{ Digest::SHA1.base64digest(key.to_s) }
-  field :key,            :type => String
+  field :key,            :type => Text
   field :instance_token, :type => String, :default => ->{ get_new_instance_token }
   field :expires_at,     :type => Time
 
@@ -27,6 +27,7 @@ class NoBrainer::Lock
       @default_options = options.slice(:expire, :timeout)
       options.delete(:expire); options.delete(:timeout);
 
+      key = key.to_s if key.is_a?(Symbol)
       super(options.merge(:key => key))
       raise ArgumentError unless valid?
     end

data/lib/no_brainer/query_runner/reconnect.rb

@@ -16,7 +16,8 @@ class NoBrainer::QueryRunner::Reconnect < NoBrainer::QueryRunner::Middleware
     when RethinkDB::RqlError
       e.message =~ /lost contact/ ||
       e.message =~ /(P|p)rimary .* not available/||
-      e.message =~ /Connection.*closed/
+      e.message =~ /Connection.*closed/ ||
+      e.message =~ /Connection.*refused/
     else
       false
     end

data/lib/no_brainer/query_runner/run_options.rb

@@ -10,7 +10,10 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
   end
 
   def self.current_run_options
-    Thread.current[:nobrainer_run_with] || {}
+    options = NoBrainer::Config.run_options
+    options = options.merge(:durability => NoBrainer::Config.durability) if NoBrainer::Config.durability
+    options = options.merge(Thread.current[:nobrainer_run_with]) if Thread.current[:nobrainer_run_with]
+    options
   end
 
   def self.run_with(options={}, &block)
@@ -29,17 +32,9 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
   end
 
   def call(env)
-    options = env[:options].symbolize_keys
-    options = self.class.current_run_options.merge(options)
-
-    if NoBrainer::Config.durability.to_s != 'hard'
-      options[:durability] ||= NoBrainer::Config.durability
-    end
-
-    options[:db] = options[:db].to_s if options[:db]
-    if options[:db].blank? || options[:db] == NoBrainer.default_db
-      options.delete(:db)
-    end
+    options = self.class.current_run_options
+    options = options.merge(env[:options].symbolize_keys)
+    options = prune_default_run_options(options)
 
     env[:criteria] = options.delete(:criteria)
 
@@ -52,4 +47,14 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
     env[:options] = options
     @runner.call(env)
   end
+
+  def prune_default_run_options(options)
+    options = options.dup
+    options.delete(:durability) if options[:durability].to_s == 'hard'
+
+    options[:db] = options[:db].to_s if options[:db]
+    options.delete(:db) if options[:db].blank? || options[:db] == NoBrainer.default_db
+
+    options
+  end
 end

data/lib/no_brainer/railtie.rb

@@ -26,8 +26,10 @@ class NoBrainer::Railtie < Rails::Railtie
   config.after_initialize do
     NoBrainer::Config.configure unless NoBrainer::Config.configured?
 
-    (NoBrainer.rails5? ? ActiveSupport::Reloader : ActionDispatch::Reloader).to_prepare do
-      NoBrainer::Loader.cleanup
+    if NoBrainer.rails5?
+      ActiveSupport::Reloader.before_class_unload { NoBrainer::Loader.cleanup }
+    else
+      ActionDispatch::Reloader.to_prepare { NoBrainer::Loader.cleanup }
     end
   end
 

data/lib/rails/generators/nobrainer/install_generator.rb

@@ -34,7 +34,9 @@ module NoBrainer::Generators
     end
 
     def remove_active_record
-      (Dir['config/environments/*'] + ['config/application.rb']).each do |config_file|
+      (Dir['config/environments/*'] +
+       Dir['config/initializers/*'] +
+       ['config/application.rb']).each do |config_file|
         comment_lines(config_file, /active_record/)
       end
 

data/lib/rails/generators/templates/nobrainer.rb

@@ -13,9 +13,8 @@ NoBrainer.configure do |config|
   # The default is to use localhost, with a database name matching the
   # application name and the environment.
   # NoBrainer also reads environment variables when defined:
-  # * RETHINKDB_URL, RDB_URL
-  # * RETHINKDB_HOST, RETHINKDB_PORT, RETHINKDB_DB, RETHINKDB_AUTH
-  # * RDB_HOST, RDB_PORT, RDB_DB, RDB_AUTH
+  # * RDB_URL, RDB_USER, RDB_PASSWORD, RDB_HOST, RDB_PORT, RDB_DB
+  # * All the above, but with RETHINKDB instead of RDB
   # config.rethinkdb_urls = [config.default_rethinkdb_url]
 
   # ssl_options may be set to {:ca_certs => '/path/to/ca.crt'} to establish
@@ -43,9 +42,10 @@ NoBrainer.configure do |config|
   # You can turn off the warning if you want to use both.
   # config.warn_on_active_record = true
 
-  # Configures the durability for database writes.
-  # The default is :soft for development or test environment, otherwise :hard.
-  # config.durability = config.default_durability
+  # Configures the run options passed to r.run() when executing queries.
+  # The options are listed in the RethinkDB run() documentation.
+  # The default durability is :soft for development or test environments, otherwise :hard.
+  # config.run_options = { :durability => config.default_durability }
 
   # Configures the default table configuration options. These values are
   # reflected to the database when running `rake nobrainer:sync_schema'.
@@ -56,17 +56,17 @@ NoBrainer.configure do |config|
   # config.max_string_length = 255
 
   # user_timezone can be configured with :utc, :local, or :unchanged.
-  # When reading an attribute from a model which type is Time, the timezone
-  # of that time is translated according to this setting.
+  # When reading a Time attribute from a model, the timezone of that attribute
+  # is set according to the following setting.
   # config.user_timezone = :local
 
   # db_timezone can be configured with :utc, :local, or :unchanged.
-  # When writting to the database, the timezone of Time attributes are
-  # translated according to this setting.
+  # When writing a Time attribute into the database, the timezone of that
+  # attribute is set according to the following setting.
   # config.db_timezone = :utc
 
   # Default options used when compiling geo queries.
-  # config.geo_options => { :geo_system => 'WGS84', :unit => 'm' }
+  # config.geo_options = { :geo_system => 'WGS84', :unit => 'm' }
 
   # Configures which mechanism to use in order to perform non-racy uniqueness
   # validations. More about this behavior in the Distributed Locks section.
@@ -90,7 +90,7 @@ NoBrainer.configure do |config|
   # generated without conflicts.
   # config.machine_id = config.default_machine_id
 
-  # Criteria cache elements. For example, the result of a has_many association
+  # Criteria cache documents. For example, the result of a has_many association
   # is cached. The per criteria cache is disabled if it grows too big to avoid
   # out of memory issues.
   # config.criteria_cache_max_entries = 10_000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement