nobrainer 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd6046706e63442640e96473b737f37ad5a4fea7
-  data.tar.gz: e1634aaf6acfb3c3e5e4287c57151d54cce30ee1
+  metadata.gz: b5ca498dfa914c0c0178f339485d78ba804c5b95
+  data.tar.gz: c0e0c6f35d8927bb6281f860aac769753df59b88
 SHA512:
-  metadata.gz: ac735666befc4a025536e5beb72a8c4d4d79259875a8ad956ae16e4399c17cf5c2dcc7eecf6bcfa4351d56aec14b1a83a7d68cb751723d5beade516011990915
-  data.tar.gz: b6f69cd4dfbd953d9acc06a1c06aa9a27851baa51b1e1a2d0fce0ff320a32131c49724e5ea6aaa8af3a2aaf74bdb661379eb0a4e97abdb98e8084e5fae0516c5
+  metadata.gz: ed914e1eee020658197d596245404a2a088acbf033f5fc3a44cb490620cdc5ef110d62e4da927e7579e5e3383bc90e16dd499269a9bd8952dfa2011d3e2f2a12
+  data.tar.gz: f3204081b4ef7617706ee3c037830bdacbde973ae79e914b782b39fb41f1ec36b0125f78b427d0f21078bdae543ee426f2936ba69a1327bc36176acc6997765e

data/lib/no_brainer/config.rb

@@ -4,7 +4,8 @@ module NoBrainer::Config
   class << self
     mattr_accessor :rethinkdb_url, :logger, :warn_on_active_record,
                    :auto_create_databases, :auto_create_tables,
-                   :max_reconnection_tries, :durability, :colorize_logger
+                   :max_reconnection_tries, :durability, :colorize_logger,
+                   :distributed_lock_class
 
     def apply_defaults
       self.rethinkdb_url           = default_rethinkdb_url
@@ -15,6 +16,7 @@ module NoBrainer::Config
       self.max_reconnection_tries  = 10
       self.durability              = default_durability
       self.colorize_logger         = true
+      self.distributed_lock_class  = nil
     end
 
     def reset!

data/lib/no_brainer/connection.rb

@@ -1,7 +1,7 @@
 require 'rethinkdb'
 
 class NoBrainer::Connection
-  attr_accessor :uri
+  attr_accessor :uri, :parsed_uri
 
   def initialize(uri)
     self.uri = uri
@@ -9,19 +9,21 @@ class NoBrainer::Connection
   end
 
   def parsed_uri
-    require 'uri'
-    uri = URI.parse(self.uri)
+    @parsed_uri ||= begin
+      require 'uri'
+      uri = URI.parse(self.uri)
 
-    if uri.scheme != 'rethinkdb'
-      raise NoBrainer::Error::Connection,
-        "Invalid URI. Expecting something like rethinkdb://host:port/database. Got #{uri}"
-    end
+      if uri.scheme != 'rethinkdb'
+        raise NoBrainer::Error::Connection,
+          "Invalid URI. Expecting something like rethinkdb://host:port/database. Got #{uri}"
+      end
 
-    { :auth_key => uri.password,
-      :host     => uri.host,
-      :port     => uri.port || 28015,
-      :db       => uri.path.gsub(/^\//, ''),
-    }.tap { |result| raise "No database specified in #{uri}" unless result[:db].present? }
+      { :auth_key => uri.password,
+        :host     => uri.host,
+        :port     => uri.port || 28015,
+        :db       => uri.path.gsub(/^\//, ''),
+      }.tap { |result| raise "No database specified in #{uri}" unless result[:db].present? }
+    end
   end
 
   def raw

data/lib/no_brainer/criteria/core.rb

@@ -17,12 +17,7 @@ module NoBrainer::Criteria::Core
 
   def inspect
     # rescue super because sometimes klass is not set.
-    str = to_rql.inspect rescue super
-    if str =~ /Erroneous_Portion_Constructed/
-      # Need to fix the rethinkdb gem.
-      str = "the rethinkdb gem is flipping out with Erroneous_Portion_Constructed"
-    end
-    str
+    to_rql.inspect rescue super
   end
 
   def run(rql=nil)

data/lib/no_brainer/criteria/preload.rb

@@ -12,11 +12,6 @@ module NoBrainer::Criteria::Preload
     chain(:keep_cache => true) { |criteria| criteria._preloads = values }
   end
 
-  def includes(*values)
-    NoBrainer.logger.warn "[NoBrainer] includes() is deprecated and will be removed, use preload() instead."
-    preload(*values)
-  end
-
   def merge!(criteria, options={})
     super
     self._preloads = self._preloads + criteria._preloads

data/lib/no_brainer/criteria/where.rb

@@ -56,14 +56,15 @@ module NoBrainer::Criteria::Where
 
   class BinaryOperator < Struct.new(:key, :op, :value, :criteria)
     def simplify
+      key = cast_key(self.key)
       case op
       when :in then
         case value
-        when Range then BinaryOperator.new(key, :between, (cast(value.min)..cast(value.max)), criteria)
-        when Array then BinaryOperator.new(key, :in, value.map(&method(:cast)).uniq, criteria)
+        when Range then BinaryOperator.new(key, :between, (cast_value(value.min)..cast_value(value.max)), criteria)
+        when Array then BinaryOperator.new(key, :in, value.map(&method(:cast_value)).uniq, criteria)
         else raise ArgumentError.new ":in takes an array/range, not #{value}"
         end
-      else BinaryOperator.new(key, op, cast(value), criteria)
+      else BinaryOperator.new(key, op, cast_value(value), criteria)
       end
     end
 
@@ -77,8 +78,33 @@ module NoBrainer::Criteria::Where
 
     private
 
-    def cast(value)
-      criteria.klass.cast_value_for(key, value)
+    def association
+      # FIXME This leaks memory with dynamic attributes. The internals of type
+      # checking will convert the key to a symbol, and Ruby does not garbage
+      # collect symbols.
+      @association ||= [criteria.klass.association_metadata[key.to_sym]]
+      @association.first
+    end
+
+    def cast_value(value)
+      case association
+      when NoBrainer::Document::Association::BelongsTo::Metadata
+        target_klass = association.target_klass
+        opts = { :attr_name => key, :value => value, :type => target_klass}
+        raise NoBrainer::Error::InvalidType.new(opts) unless value.is_a?(target_klass)
+        value.id
+      else
+        criteria.klass.cast_user_to_db_for(key, value)
+      end
+    end
+
+    def cast_key(key)
+      case association
+      when NoBrainer::Document::Association::BelongsTo::Metadata
+        association.foreign_key
+      else
+        key
+      end
     end
   end
 
@@ -126,8 +152,9 @@ module NoBrainer::Criteria::Where
     when String, Symbol then parse_clause_stub_eq(key, value)
     when NoBrainer::DecoratedSymbol then
       case key.modifier
-      when :ne then parse_clause(:not => { key.symbol => value })
-      when :eq then parse_clause_stub_eq(key.symbol, value)
+      when :nin then parse_clause(:not => { key.symbol.in => value })
+      when :ne  then parse_clause(:not => { key.symbol.eq => value })
+      when :eq  then parse_clause_stub_eq(key.symbol, value)
       else BinaryOperator.new(key.symbol, key.modifier, value, self)
       end
     else raise "Invalid key: #{key}"

data/lib/no_brainer/decorated_symbol.rb

@@ -1,5 +1,6 @@
 class NoBrainer::DecoratedSymbol < Struct.new(:symbol, :modifier, :args)
-  MODIFIERS = { :ne => :ne, :not => :ne, :in => :in, :eq => :eq,
+  MODIFIERS = { :in => :in, :nin => :nin,
+                :eq => :eq, :ne => :ne, :not => :ne,
                 :gt => :gt, :ge => :ge, :gte => :ge,
                 :lt => :lt, :le => :le, :lte => :le}
 

data/lib/no_brainer/document.rb

@@ -5,7 +5,7 @@ module NoBrainer::Document
   extend NoBrainer::Autoload
 
   autoload_and_include :Core, :StoreIn, :InjectionLayer, :Attributes, :Readonly, :Validation, :Types,
-                       :Persistance, :Callbacks, :Dirty, :Id, :Association, :Serialization,
+                       :Persistance, :Uniqueness, :Callbacks, :Dirty, :Id, :Association, :Serialization,
                        :Criteria, :Polymorphic, :Index
 
   autoload :DynamicAttributes, :Timestamps

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

@@ -30,7 +30,6 @@ class NoBrainer::Document::Association::BelongsTo
 
       delegate("#{foreign_key}=", :assign_foreign_key, :call_super => true)
       add_callback_for(:after_validation)
-      # TODO test if we are not overstepping on another foreign_key
     end
 
     eager_load_with :owner_key => ->{ foreign_key }, :target_key => ->{ :id },
@@ -47,7 +46,7 @@ class NoBrainer::Document::Association::BelongsTo
   end
 
   def read
-    return @target_container.first if loaded?
+    return target if loaded?
 
     if fk = owner.read_attribute(foreign_key)
       preload(target_klass.find(fk))
@@ -60,8 +59,12 @@ class NoBrainer::Document::Association::BelongsTo
     preload(target)
   end
 
-  def preload(target)
-    @target_container = [*target] # the * is for the generic eager loading code
+  def preload(targets)
+    @target_container = [*targets] # the * is for the generic eager loading code
+    target
+  end
+
+  def target
     @target_container.first
   end
 
@@ -70,8 +73,8 @@ class NoBrainer::Document::Association::BelongsTo
   end
 
   def after_validation_callback
-    if loaded? && @target_container.first && !@target_container.first.persisted?
-      raise NoBrainer::Error::AssociationNotSaved.new("#{target_name} must be saved first")
+    if loaded? && target && !target.persisted?
+      raise NoBrainer::Error::AssociationNotPersisted.new("#{target_name} must be saved first")
     end
   end
 end

data/lib/no_brainer/document/attributes.rb

@@ -1,5 +1,5 @@
 module NoBrainer::Document::Attributes
-  VALID_FIELD_OPTIONS = [:index, :default, :type, :type_cast_method, :validates, :required, :readonly]
+  VALID_FIELD_OPTIONS = [:index, :default, :type, :cast_user_to_db, :cast_db_to_user, :validates, :required, :unique, :readonly]
   RESERVED_FIELD_NAMES = [:index, :default, :and, :or, :selector, :associations] + NoBrainer::DecoratedSymbol::MODIFIERS.keys
   extend ActiveSupport::Concern
 
@@ -43,13 +43,14 @@ module NoBrainer::Document::Attributes
     @_attributes.clear if options[:pristine]
     if options[:from_db]
       @_attributes.merge!(attrs)
+      clear_dirtiness
     else
+      clear_dirtiness if options[:pristine]
       attrs.each { |k,v| self.write_attribute(k,v) }
     end
     assign_defaults if options[:pristine]
     self
   end
-  def attributes=(*args); assign_attributes(*args); end
 
   def inspectable_attributes
     # TODO test that thing

data/lib/no_brainer/document/callbacks.rb

@@ -1,10 +1,19 @@
 module NoBrainer::Document::Callbacks
   extend ActiveSupport::Concern
 
+  def self.terminator
+    if Gem.loaded_specs['activesupport'].version.release >= Gem::Version.new('4.1')
+      proc { false }
+    else
+      'false'
+    end
+  end
+
   included do
     extend ActiveModel::Callbacks
-    define_model_callbacks :initialize, :create, :update, :save, :destroy, :terminator => 'false'
-    define_model_callbacks :find, :only => [:after], :terminator => 'false'
+
+    define_model_callbacks :initialize, :create, :update, :save, :destroy, :terminator => NoBrainer::Document::Callbacks.terminator
+    define_model_callbacks :find, :only => [:after], :terminator => NoBrainer::Document::Callbacks.terminator
   end
 
   def initialize(*args, &block)

data/lib/no_brainer/document/core.rb

@@ -1,8 +1,15 @@
 module NoBrainer::Document::Core
   extend ActiveSupport::Concern
 
-  singleton_class.send(:attr_accessor, :all)
-  self.all = []
+  singleton_class.class_eval do
+    attr_accessor :_all
+
+    def all
+      Rails.application.eager_load! if defined?(Rails)
+      @_all
+    end
+  end
+  self._all = []
 
   # TODO This assume the primary key is id.
   # RethinkDB can have a custom primary key. careful.
@@ -13,6 +20,6 @@ module NoBrainer::Document::Core
     extend ActiveModel::Naming
     extend ActiveModel::Translation
 
-    NoBrainer::Document::Core.all << self
+    NoBrainer::Document::Core._all << self
   end
 end

data/lib/no_brainer/document/dirty.rb

@@ -6,11 +6,6 @@ module NoBrainer::Document::Dirty
   # things like undefined -> nil. Going through the getters will
   # not give us that.
 
-  def assign_attributes(attrs, options={})
-    clear_dirtiness if options[:pristine]
-    super
-  end
-
   def _create(*args)
     super.tap { clear_dirtiness }
   end

data/lib/no_brainer/document/index.rb

@@ -68,7 +68,7 @@ module NoBrainer::Document::Index
       end
 
       NoBrainer.run(self.rql_table.index_create(index_name, index_args[:options], &index_proc))
-      NoBrainer.run(self.rql_table.index_wait(index_name)) if options[:wait]
+      wait_for_index(index_name) unless options[:wait] == false
       STDERR.puts "Created index #{self}.#{index_name}" if options[:verbose]
     end
 
@@ -90,5 +90,10 @@ module NoBrainer::Document::Index
       end
     end
     alias_method :update_indexes, :perform_update_indexes
+
+    def wait_for_index(index_name=nil, options={})
+      args = [index_name].compact
+      NoBrainer.run(self.rql_table.index_wait(*args))
+    end
   end
 end

data/lib/no_brainer/document/persistance.rb

@@ -1,11 +1,6 @@
 module NoBrainer::Document::Persistance
   extend ActiveSupport::Concern
 
-  included do
-    extend ActiveModel::Callbacks
-    define_model_callbacks :create, :update, :save, :destroy, :terminator => 'false'
-  end
-
   def _initialize(attrs={}, options={})
     @new_record = !options[:from_db]
     super

data/lib/no_brainer/document/types.rb

@@ -1,7 +1,7 @@
 module NoBrainer::Document::Types
   extend ActiveSupport::Concern
 
-  module CastingRules
+  module CastUserToDB
     extend self
     InvalidType = NoBrainer::Error::InvalidType
 
@@ -60,14 +60,23 @@ module NoBrainer::Document::Types
     end
 
     def lookup(type)
-      CastingRules.method(type.to_s)
+      public_method(type.to_s)
     rescue NameError
       proc { raise InvalidType }
     end
+  end
 
-    def cast(value, type, type_cast_method)
-      return value if value.nil? || type.nil? || value.is_a?(type)
-      type_cast_method.call(value)
+  module CastDBToUser
+    extend self
+
+    def Symbol(value)
+      value.to_sym rescue value
+    end
+
+    def lookup(type)
+      public_method(type.to_s)
+    rescue NameError
+      nil
     end
   end
 
@@ -82,6 +91,11 @@ module NoBrainer::Document::Types
       end
     end
     before_validation :add_type_errors
+
+    # Fast access for db->user cast methods for performance when reading from
+    # the database.
+    singleton_class.send(:attr_accessor, :cast_db_to_user_fields)
+    self.cast_db_to_user_fields = Set.new
   end
 
   def add_type_errors
@@ -91,12 +105,27 @@ module NoBrainer::Document::Types
     end
   end
 
+  def assign_attributes(attrs, options={})
+    super
+    if options[:from_db]
+      self.class.cast_db_to_user_fields.each do |attr|
+        field_def = self.class.fields[attr]
+        type = field_def[:type]
+        value = @_attributes[attr.to_s]
+        unless value.nil? || value.is_a?(type)
+          @_attributes[attr.to_s] = field_def[:cast_db_to_user].call(value)
+        end
+      end
+    end
+  end
+
   module ClassMethods
-    def cast_value_for(attr, value)
-      attr = attr.to_sym
-      field_def = fields[attr]
-      return value unless field_def && field_def[:type]
-      NoBrainer::Document::Types::CastingRules.cast(value, field_def[:type], field_def[:type_cast_method])
+    def cast_user_to_db_for(attr, value)
+      field_def = fields[attr.to_sym]
+      return value if !field_def
+      type = field_def[:type]
+      return value if value.nil? || type.nil? || value.is_a?(type)
+      field_def[:cast_user_to_db].call(value)
     rescue NoBrainer::Error::InvalidType => error
       error.type = field_def[:type]
       error.value = value
@@ -104,13 +133,24 @@ module NoBrainer::Document::Types
       raise error
     end
 
+    def inherited(subclass)
+      super
+      subclass.cast_db_to_user_fields = self.cast_db_to_user_fields.dup
+    end
+
     def _field(attr, options={})
       super
 
+      if options[:cast_db_to_user]
+        ([self] + descendants).each do |klass|
+          klass.cast_db_to_user_fields << attr
+        end
+      end
+
       inject_in_layer :types do
         define_method("#{attr}=") do |value|
           begin
-            value = self.class.cast_value_for(attr, value)
+            value = self.class.cast_user_to_db_for(attr, value)
             @pending_type_errors.try(:delete, attr)
           rescue NoBrainer::Error::InvalidType => error
             @pending_type_errors ||= {}
@@ -125,8 +165,9 @@ module NoBrainer::Document::Types
 
     def field(attr, options={})
       if options[:type]
-        type_cast_method = NoBrainer::Document::Types::CastingRules.lookup(options[:type])
-        options = options.merge(:type_cast_method => type_cast_method)
+        options = options.merge(
+          :cast_user_to_db => NoBrainer::Document::Types::CastUserToDB.lookup(options[:type]),
+          :cast_db_to_user => NoBrainer::Document::Types::CastDBToUser.lookup(options[:type]))
       end
       super
     end

data/lib/no_brainer/document/uniqueness.rb

@@ -0,0 +1,97 @@
+module NoBrainer::Document::Uniqueness
+  extend ActiveSupport::Concern
+
+  def _create(options={})
+    lock_unique_fields
+    super
+  ensure
+    unlock_unique_fields
+  end
+
+  def _update_only_changed_attrs(options={})
+    lock_unique_fields
+    super
+  ensure
+    unlock_unique_fields
+  end
+
+  def _lock_key_from_field(field)
+    value = read_attribute(field).to_s
+    ['nobrainer', self.class.database_name || NoBrainer.connection.parsed_uri[:db],
+     self.class.table_name, field, value.empty? ? 'nil' : value].join(':')
+  end
+
+  def lock_unique_fields
+    return unless NoBrainer::Config.distributed_lock_class && !self.class.unique_validators.empty?
+
+    self.class.unique_validators
+      .map { |validator| validator.attributes.map { |attr| [attr, validator] } }
+      .flatten(1)
+      .select { |f, validator| validator.should_validate_uniquess_of?(self, f) }
+      .map { |f, options| _lock_key_from_field(f) }
+      .sort
+      .uniq
+      .each do |key|
+        lock = NoBrainer::Config.distributed_lock_class.new(key)
+        lock.lock
+        @locked_unique_fields ||= []
+        @locked_unique_fields << lock
+      end
+  end
+
+  def unlock_unique_fields
+    return unless @locked_unique_fields
+    @locked_unique_fields.pop.unlock until @locked_unique_fields.empty?
+  end
+
+  included do
+    singleton_class.send(:attr_accessor, :unique_validators)
+    self.unique_validators = []
+  end
+
+  module ClassMethods
+    def validates_uniqueness_of(*attr_names)
+      validates_with UniquenessValidator, _merge_attributes(attr_names)
+    end
+
+    def inherited(subclass)
+      super
+      subclass.unique_validators = self.unique_validators.dup
+    end
+
+  end
+
+  class UniquenessValidator < ActiveModel::EachValidator
+    attr_accessor :scope
+
+    def setup(klass)
+      self.scope = [*options[:scope]]
+      ([klass] + klass.descendants).each do |_klass|
+        _klass.unique_validators << self
+      end
+    end
+
+    def should_validate_uniquess_of?(doc, field)
+      (scope + [field]).any? { |f| doc.__send__("#{f}_changed?") }
+    end
+
+    def validate_each(doc, attr, value)
+      return true unless should_validate_uniquess_of?(doc, attr)
+
+      criteria = doc.root_class.unscoped.where(attr => value)
+      criteria = apply_scopes(criteria, doc)
+      criteria = exclude_doc(criteria, doc) if doc.persisted?
+      is_unique = criteria.count == 0
+      doc.errors.add(attr, :taken, options.except(:scope).merge(:value => value)) unless is_unique
+      is_unique
+    end
+
+    def apply_scopes(criteria, doc)
+      criteria.where(scope.map { |k| {k => doc.read_attribute(k)} })
+    end
+
+    def exclude_doc(criteria, doc)
+      criteria.where(:id.ne => doc.id)
+    end
+  end
+end

data/lib/no_brainer/document/validation.rb

@@ -3,6 +3,12 @@ module NoBrainer::Document::Validation
   include ActiveModel::Validations
   include ActiveModel::Validations::Callbacks
 
+  included do
+    # We don't want before_validation returning false to halt the chain.
+    define_callbacks :validation, :skip_after_callbacks_if_terminated => true, :scope => [:kind, :name],
+                     :terminator => NoBrainer::Document::Callbacks.terminator
+  end
+
   def valid?(context=nil)
     super(context || (new_record? ? :create : :update))
   end
@@ -10,31 +16,9 @@ module NoBrainer::Document::Validation
   module ClassMethods
     def _field(attr, options={})
       super
-      validates(attr, { :presence => true }) if options[:required]
+      validates(attr, { :presence => options[:required] }) if options.has_key?(:required)
+      validates(attr, { :uniqueness => options[:unique] }) if options.has_key?(:unique)
       validates(attr, options[:validates]) if options[:validates]
     end
-
-    def validates_uniqueness_of(*attr_names)
-      validates_with UniquenessValidator, _merge_attributes(attr_names)
-    end
-  end
-
-  class UniquenessValidator < ActiveModel::EachValidator
-    def validate_each(doc, attr, value)
-      criteria = doc.root_class.unscoped.where(attr => value)
-      criteria = apply_scopes(criteria, doc)
-      criteria = exclude_doc(criteria, doc) if doc.persisted?
-      is_unique = criteria.count == 0
-      doc.errors.add(attr, :taken, options.except(:scope).merge(:value => value)) unless is_unique
-      is_unique
-    end
-
-    def apply_scopes(criteria, doc)
-      criteria.where([*options[:scope]].map { |k| {k => doc.read_attribute(k)} })
-    end
-
-    def exclude_doc(criteria, doc)
-      criteria.where(:id.ne => doc.id)
-    end
   end
 end

data/lib/no_brainer/error.rb

@@ -6,7 +6,7 @@ module NoBrainer::Error
   class CannotUseIndex      < RuntimeError; end
   class MissingIndex        < RuntimeError; end
   class InvalidType         < RuntimeError; end
-  class AssociationNotSaved < RuntimeError; end
+  class AssociationNotPersisted < RuntimeError; end
   class ReadonlyField       < RuntimeError; end
 
   class DocumentInvalid < RuntimeError

data/lib/no_brainer/index_manager.rb

@@ -1,6 +1,8 @@
 module NoBrainer::IndexManager
   def self.update_indexes(options={})
-    Rails.application.eager_load! if defined?(Rails)
-    NoBrainer::Document.all.each { |model| model.perform_update_indexes(options) }
+    NoBrainer::Document.all.each { |model| model.perform_update_indexes(options.merge(:wait => false)) }
+    unless options[:wait] == false
+      NoBrainer::Document.all.each { |model| model.wait_for_index(nil) }
+    end
   end
 end

data/lib/no_brainer/loader.rb

@@ -1,5 +1,5 @@
 module NoBrainer::Loader
   def self.cleanup
-    NoBrainer::Document.all.clear
+    NoBrainer::Document::Core._all.clear
   end
 end

data/lib/no_brainer/query_runner.rb

@@ -11,7 +11,7 @@ module NoBrainer::QueryRunner
   end
 
   autoload :Driver, :DatabaseOnDemand, :TableOnDemand, :WriteError,
-           :Connection, :Selection, :RunOptions, :Logger, :MissingIndex
+           :Reconnect, :Selection, :RunOptions, :Logger, :MissingIndex
 
   class << self
     attr_accessor :stack
@@ -27,12 +27,12 @@ module NoBrainer::QueryRunner
   # thread-safe, since require() is ran with a mutex.
   self.stack = ::Middleware::Builder.new do
     use RunOptions
-    use Connection
     use WriteError
     use MissingIndex
     use DatabaseOnDemand
     use TableOnDemand
     use Logger
+    use Reconnect
     use Driver
   end
 end

data/lib/no_brainer/query_runner/logger.rb

@@ -1,29 +1,35 @@
 class NoBrainer::QueryRunner::Logger < NoBrainer::QueryRunner::Middleware
   def call(env)
     start_time = Time.now
-    res = @runner.call(env)
-    if NoBrainer.logger and NoBrainer.logger.debug?
-      duration = Time.now - start_time
-      msg = env[:query].inspect.gsub(/\n/, '').gsub(/ +/, ' ')
+    @runner.call(env).tap { log_query(env, start_time) }
+  rescue Exception => e
+    log_query(env, start_time, e) rescue nil
+    raise e
+  end
 
-      # Need to fix the rethinkdb gem.
-      if msg =~ /Erroneous_Portion_Constructed/
-        msg = "r.the_rethinkdb_gem_is_flipping_out_with_Erroneous_Portion_Constructed"
-      end
+  private
+
+  def log_query(env, start_time, exception=nil)
+    return unless NoBrainer.logger.debug?
 
-      msg = "(#{env[:db_name]}) #{msg}" if env[:db_name]
-      msg = "[#{(duration * 1000.0).round(1)}ms] #{msg}"
+    duration = Time.now - start_time
+    msg = env[:query].inspect.gsub(/\n/, '').gsub(/ +/, ' ')
 
-      if NoBrainer::Config.colorize_logger
+    msg = "(#{env[:db_name]}) #{msg}" if env[:db_name]
+    msg = "[#{(duration * 1000.0).round(1)}ms] #{msg}"
+
+    if NoBrainer::Config.colorize_logger
+      if exception
+        msg = "#{msg} \e[0;31m#{exception.class} #{exception.message.split("\n").first}\e[0m"
+      else
         case NoBrainer::Util.rql_type(env[:query])
         when :write      then msg = "\e[1;31m#{msg}\e[0m" # red
         when :read       then msg = "\e[1;32m#{msg}\e[0m" # green
         when :management then msg = "\e[1;33m#{msg}\e[0m" # yellow
         end
       end
-
-      NoBrainer.logger.debug(msg)
     end
-    res
+
+    NoBrainer.logger.debug(msg)
   end
 end

data/lib/no_brainer/query_runner/{connection.rb → reconnect.rb}

@@ -1,4 +1,4 @@
-class NoBrainer::QueryRunner::Connection < NoBrainer::QueryRunner::Middleware
+class NoBrainer::QueryRunner::Reconnect < NoBrainer::QueryRunner::Middleware
   def call(env)
     @runner.call(env)
   rescue StandardError => e

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0.1
+        version: 1.12.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0.1
+        version: 1.12.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: ORM for RethinkDB
@@ -73,74 +73,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/no_brainer/autoload.rb
+- lib/no_brainer/config.rb
+- lib/no_brainer/connection.rb
+- lib/no_brainer/criteria.rb
+- lib/no_brainer/criteria/after_find.rb
+- lib/no_brainer/criteria/cache.rb
+- lib/no_brainer/criteria/core.rb
+- lib/no_brainer/criteria/count.rb
+- lib/no_brainer/criteria/delete.rb
+- lib/no_brainer/criteria/enumerable.rb
+- lib/no_brainer/criteria/first.rb
+- lib/no_brainer/criteria/limit.rb
+- lib/no_brainer/criteria/order_by.rb
+- lib/no_brainer/criteria/preload.rb
+- lib/no_brainer/criteria/raw.rb
+- lib/no_brainer/criteria/scope.rb
+- lib/no_brainer/criteria/update.rb
+- lib/no_brainer/criteria/where.rb
+- lib/no_brainer/decorated_symbol.rb
+- lib/no_brainer/document.rb
+- lib/no_brainer/document/association.rb
+- lib/no_brainer/document/association/belongs_to.rb
+- lib/no_brainer/document/association/core.rb
+- lib/no_brainer/document/association/eager_loader.rb
+- lib/no_brainer/document/association/has_many.rb
+- lib/no_brainer/document/association/has_many_through.rb
 - lib/no_brainer/document/association/has_one.rb
 - lib/no_brainer/document/association/has_one_through.rb
-- lib/no_brainer/document/association/has_many_through.rb
-- lib/no_brainer/document/association/has_many.rb
-- lib/no_brainer/document/association/eager_loader.rb
-- lib/no_brainer/document/association/core.rb
-- lib/no_brainer/document/association/belongs_to.rb
-- lib/no_brainer/document/polymorphic.rb
-- lib/no_brainer/document/store_in.rb
-- lib/no_brainer/document/core.rb
-- lib/no_brainer/document/serialization.rb
-- lib/no_brainer/document/association.rb
+- lib/no_brainer/document/attributes.rb
 - lib/no_brainer/document/callbacks.rb
-- lib/no_brainer/document/dynamic_attributes.rb
-- lib/no_brainer/document/timestamps.rb
+- lib/no_brainer/document/core.rb
+- lib/no_brainer/document/criteria.rb
 - lib/no_brainer/document/dirty.rb
-- lib/no_brainer/document/index.rb
-- lib/no_brainer/document/validation.rb
-- lib/no_brainer/document/attributes.rb
+- lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/id.rb
+- lib/no_brainer/document/index.rb
 - lib/no_brainer/document/injection_layer.rb
 - lib/no_brainer/document/persistance.rb
+- lib/no_brainer/document/polymorphic.rb
 - lib/no_brainer/document/readonly.rb
+- lib/no_brainer/document/serialization.rb
+- lib/no_brainer/document/store_in.rb
+- lib/no_brainer/document/timestamps.rb
 - lib/no_brainer/document/types.rb
-- lib/no_brainer/document/criteria.rb
+- lib/no_brainer/document/uniqueness.rb
+- lib/no_brainer/document/validation.rb
+- lib/no_brainer/error.rb
+- lib/no_brainer/fork.rb
+- lib/no_brainer/index_manager.rb
+- lib/no_brainer/loader.rb
+- lib/no_brainer/locale/en.yml
+- lib/no_brainer/query_runner.rb
 - lib/no_brainer/query_runner/database_on_demand.rb
-- lib/no_brainer/query_runner/table_on_demand.rb
-- lib/no_brainer/query_runner/write_error.rb
 - lib/no_brainer/query_runner/driver.rb
 - lib/no_brainer/query_runner/logger.rb
 - lib/no_brainer/query_runner/missing_index.rb
+- lib/no_brainer/query_runner/reconnect.rb
 - lib/no_brainer/query_runner/run_options.rb
-- lib/no_brainer/query_runner/connection.rb
+- lib/no_brainer/query_runner/table_on_demand.rb
+- lib/no_brainer/query_runner/write_error.rb
+- lib/no_brainer/railtie.rb
 - lib/no_brainer/railtie/database.rake
-- lib/no_brainer/index_manager.rb
-- lib/no_brainer/loader.rb
-- lib/no_brainer/locale/en.yml
-- lib/no_brainer/fork.rb
-- lib/no_brainer/connection.rb
-- lib/no_brainer/query_runner.rb
 - lib/no_brainer/util.rb
-- lib/no_brainer/decorated_symbol.rb
-- lib/no_brainer/criteria/scope.rb
-- lib/no_brainer/criteria/raw.rb
-- lib/no_brainer/criteria/preload.rb
-- lib/no_brainer/criteria/order_by.rb
-- lib/no_brainer/criteria/limit.rb
-- lib/no_brainer/criteria/first.rb
-- lib/no_brainer/criteria/enumerable.rb
-- lib/no_brainer/criteria/count.rb
-- lib/no_brainer/criteria/cache.rb
-- lib/no_brainer/criteria/after_find.rb
-- lib/no_brainer/criteria/where.rb
-- lib/no_brainer/criteria/update.rb
-- lib/no_brainer/criteria/delete.rb
-- lib/no_brainer/criteria/core.rb
-- lib/no_brainer/railtie.rb
-- lib/no_brainer/config.rb
-- lib/no_brainer/document.rb
-- lib/no_brainer/criteria.rb
-- lib/no_brainer/error.rb
-- lib/no_brainer/autoload.rb
+- lib/nobrainer.rb
 - lib/rails/generators/nobrainer.rb
 - lib/rails/generators/nobrainer/model/model_generator.rb
 - lib/rails/generators/nobrainer/model/templates/model.rb.tt
-- lib/nobrainer.rb
-- README.md
-- LICENSE
 homepage: http://nobrainer.io
 licenses:
 - LGPLv3
@@ -151,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ORM for RethinkDB