nobrainer 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f0fb2d3cb21fba6fad94403706e6f5274f72f4
-  data.tar.gz: 74bfea6252ccc4eee6e67c003ed3facc7bbffe69
+  metadata.gz: dd6046706e63442640e96473b737f37ad5a4fea7
+  data.tar.gz: e1634aaf6acfb3c3e5e4287c57151d54cce30ee1
 SHA512:
-  metadata.gz: 8da93f62774128bc6bfc485c356fd1e27b68ae0f3c5ccd0e9e81545210856a9282dccf0936369d3b92da90904e598d1c16d264a36b82e050e328ad02bda2758c
-  data.tar.gz: c8f6e9c112d89df7062d2ffde33952e688d6c7c47becde0d3391949abac41851149a3d3625025908f00429565152157366bf90d1147bf4d0e705e68e57b1c31a
+  metadata.gz: ac735666befc4a025536e5beb72a8c4d4d79259875a8ad956ae16e4399c17cf5c2dcc7eecf6bcfa4351d56aec14b1a83a7d68cb751723d5beade516011990915
+  data.tar.gz: b6f69cd4dfbd953d9acc06a1c06aa9a27851baa51b1e1a2d0fce0ff320a32131c49724e5ea6aaa8af3a2aaf74bdb661379eb0a4e97abdb98e8084e5fae0516c5

data/lib/no_brainer/autoload.rb

@@ -2,7 +2,7 @@ module NoBrainer::Autoload
   include ActiveSupport::Autoload
 
   def self.extended(base)
-    ActiveSupport::Autoload.extended(base)
+    ActiveSupport::Autoload.send(:extended, base)
   end
 
   def autoload(*constants)

data/lib/no_brainer/criteria.rb

@@ -3,6 +3,5 @@ require 'rethinkdb'
 class NoBrainer::Criteria
   extend NoBrainer::Autoload
   autoload_and_include :Core, :Scope, :Raw, :AfterFind, :Where, :OrderBy, :Limit,
-                       :Count, :Delete, :Enumerable, :First, :Preload, :Inc,
-                       :Update, :Cache
+                       :Count, :Delete, :Enumerable, :First, :Preload, :Update, :Cache
 end

data/lib/no_brainer/criteria/core.rb

@@ -26,7 +26,7 @@ module NoBrainer::Criteria::Core
   end
 
   def run(rql=nil)
-    NoBrainer.run(rql || to_rql)
+    NoBrainer.run(:criteria => self) { (rql || to_rql) }
   end
 
   def merge!(criteria, options={})

data/lib/no_brainer/criteria/delete.rb

@@ -2,7 +2,7 @@ module NoBrainer::Criteria::Delete
   extend ActiveSupport::Concern
 
   def delete_all
-    run(to_rql.delete)['deleted']
+    run(to_rql.delete)
   end
 
   def destroy_all

data/lib/no_brainer/criteria/update.rb

@@ -1,13 +1,11 @@
 module NoBrainer::Criteria::Update
   extend ActiveSupport::Concern
 
-  def update_all(attrs={}, &block)
-    block = proc { attrs } unless block_given?
-    run(to_rql.update(&block))['replaced']
+  def update_all(*args, &block)
+    run(to_rql.update(*args, &block))
   end
 
-  def replace_all(attrs={}, &block)
-    block = proc { attrs } unless block_given?
-    run(to_rql.replace(&block))['replaced']
+  def replace_all(*args, &block)
+    run(to_rql.replace(*args, &block))
   end
 end

data/lib/no_brainer/document.rb

@@ -4,7 +4,7 @@ module NoBrainer::Document
   extend ActiveSupport::Concern
   extend NoBrainer::Autoload
 
-  autoload_and_include :Core, :StoreIn, :InjectionLayer, :Attributes, :Validation, :Types,
+  autoload_and_include :Core, :StoreIn, :InjectionLayer, :Attributes, :Readonly, :Validation, :Types,
                        :Persistance, :Callbacks, :Dirty, :Id, :Association, :Serialization,
                        :Criteria, :Polymorphic, :Index
 

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

@@ -2,7 +2,7 @@ class NoBrainer::Document::Association::BelongsTo
   include NoBrainer::Document::Association::Core
 
   class Metadata
-    VALID_OPTIONS = [:foreign_key, :class_name, :index, :validates]
+    VALID_OPTIONS = [:foreign_key, :class_name, :index, :validates, :required]
     include NoBrainer::Document::Association::Core::Metadata
     extend NoBrainer::Document::Association::EagerLoader::Generic
 
@@ -25,6 +25,7 @@ class NoBrainer::Document::Association::BelongsTo
       # are likely to be related to each other. So we don't know the type
       # of the primary key of the target.
       owner_klass.field(foreign_key, :index => options[:index])
+      owner_klass.validates(target_name, { :presence => true }) if options[:required]
       owner_klass.validates(target_name, options[:validates]) if options[:validates]
 
       delegate("#{foreign_key}=", :assign_foreign_key, :call_super => true)

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]
+  VALID_FIELD_OPTIONS = [:index, :default, :type, :type_cast_method, :validates, :required, :readonly]
   RESERVED_FIELD_NAMES = [:index, :default, :and, :or, :selector, :associations] + NoBrainer::DecoratedSymbol::MODIFIERS.keys
   extend ActiveSupport::Concern
 
@@ -39,13 +39,13 @@ module NoBrainer::Document::Attributes
     end
   end
 
-  def _assign_attributes(attrs, options={})
-    attrs.each { |k,v| self.write_attribute(k,v) }
-  end
-
   def assign_attributes(attrs, options={})
     @_attributes.clear if options[:pristine]
-    _assign_attributes(attrs, options)
+    if options[:from_db]
+      @_attributes.merge!(attrs)
+    else
+      attrs.each { |k,v| self.write_attribute(k,v) }
+    end
     assign_defaults if options[:pristine]
     self
   end
@@ -71,33 +71,33 @@ module NoBrainer::Document::Attributes
       subclass.fields = self.fields.dup
     end
 
-    def field(name, options={})
-      name = name.to_sym
+    def _field(attr, options={})
+      # Using a layer so the user can use super when overriding these methods
+      attr = attr.to_s
+      inject_in_layer :attributes do
+        define_method("#{attr}=") { |value| @_attributes[attr] = value }
+        define_method("#{attr}")  { @_attributes[attr] }
+      end
+    end
+
+    def field(attr, options={})
+      attr = attr.to_sym
 
       options.assert_valid_keys(*VALID_FIELD_OPTIONS)
-      if name.in?(RESERVED_FIELD_NAMES)
-        raise "Cannot use a reserved field name: #{name}"
+      if attr.in?(RESERVED_FIELD_NAMES)
+        raise "Cannot use a reserved field attr: #{attr}"
       end
 
       ([self] + descendants).each do |klass|
-        klass.fields[name] ||= {}
-        klass.fields[name].merge!(options)
+        klass.fields[attr] ||= {}
+        klass.fields[attr].deep_merge!(options)
       end
 
-      # Using a layer so the user can use super when overriding these methods
-      inject_in_layer :attributes, <<-RUBY, __FILE__, __LINE__ + 1
-        def #{name}=(value)
-          @_attributes['#{name}'] = value
-        end
-
-        def #{name}
-          @_attributes['#{name}']
-        end
-      RUBY
+      _field(attr, self.fields[attr])
     end
 
-    def has_field?(name)
-      !!fields[name.to_sym]
+    def has_field?(attr)
+      !!fields[attr.to_sym]
     end
   end
 end

data/lib/no_brainer/document/callbacks.rb

@@ -7,31 +7,23 @@ module NoBrainer::Document::Callbacks
     define_model_callbacks :find, :only => [:after], :terminator => 'false'
   end
 
-  def initialize(*args)
+  def initialize(*args, &block)
     run_callbacks(:initialize) { _initialize(*args); true }
   end
 
-  def _create(*args)
+  def _create(*args, &block)
     run_callbacks(:create) { super }
   end
 
-  def update(*args, &block)
+  def _update_only_changed_attrs(*args, &block)
     run_callbacks(:update) { super }
   end
 
-  def replace(*args, &block)
-    run_callbacks(:update) { super }
-  end
-
-  def _update_changed(*args)
-    run_callbacks(:update) { super }
-  end
-
-  def save(*args)
+  def save(*args, &block)
     run_callbacks(:save) { super }
   end
 
-  def destroy(*args)
+  def destroy(*args, &block)
     run_callbacks(:destroy) { super }
   end
 end

data/lib/no_brainer/document/criteria.rb

@@ -19,7 +19,6 @@ module NoBrainer::Document::Criteria
              :includes, :preload,            # Preload
              :each, :to_a,                   # Enumerable
              :first, :last, :first!, :last!, # First
-             :inc_all, :dec_all,             # Inc
              :update_all, :replace_all,      # Update
              :to => :all
 

data/lib/no_brainer/document/dirty.rb

@@ -1,25 +1,27 @@
 module NoBrainer::Document::Dirty
   extend ActiveSupport::Concern
+  # We need to save the changes as seen through read_attribute because
+  # the user sees attributes through the read_attribute getters.
+  # But we want to detect changes based on @_attributes to track
+  # things like undefined -> nil. Going through the getters will
+  # not give us that.
 
-  # We are not using ActiveModel::Dirty because it's using
-  # ActiveModel::AttributeMethods which gives pretty violent method_missing()
-  # capabilities, such as giving a getter/setter method for any keys within the
-  # attributes keys. We don't want that.
-  # Also it doesn't work properly with array and hashes
-
-  included { after_save { clear_dirtiness } }
+  def assign_attributes(attrs, options={})
+    clear_dirtiness if options[:pristine]
+    super
+  end
 
-  def old_attributes_values
-    @old_attributes_values ||= {}.with_indifferent_access
+  def _create(*args)
+    super.tap { clear_dirtiness }
   end
 
-  def clear_dirtiness
-    @old_attributes_values.try(:clear)
+  def _update(*args)
+    super.tap { clear_dirtiness }
   end
 
-  def _assign_attributes(attrs, options={})
-    super
-    clear_dirtiness if options[:from_db]
+  def clear_dirtiness
+    @_old_attributes = {}.with_indifferent_access
+    @_old_attributes_keys = @_attributes.keys # to track undefined -> nil changes
   end
 
   def changed?
@@ -32,51 +34,52 @@ module NoBrainer::Document::Dirty
 
   def changes
     result = {}.with_indifferent_access
-    old_attributes_values.each do |attr, old_value|
+    @_old_attributes.each do |attr, old_value|
       current_value = read_attribute(attr)
-      result[attr] = [old_value, current_value] if current_value != old_value
+      if current_value != old_value || !@_old_attributes_keys.include?(attr)
+        result[attr] = [old_value, current_value]
+      end
     end
     result
   end
 
   def attribute_may_change(attr, current_value)
-    unless old_attributes_values.has_key?(attr)
-      old_attributes_values[attr] = current_value.deep_dup
+    unless @_old_attributes.has_key?(attr)
+      @_old_attributes[attr] = current_value.deep_dup
     end
   end
 
   module ClassMethods
-    def field(name, options={})
+    def _field(attr, options={})
       super
+      attr = attr.to_s
 
       inject_in_layer :dirty_tracking do
-        define_method("#{name}_change") do
-          if old_attributes_values.has_key?(name)
-            result = [old_attributes_values[name], read_attribute(name)]
-            result = nil if result.first == result.last
-            result
+        define_method("#{attr}_change") do
+          if @_old_attributes.has_key?(attr)
+            result = [@_old_attributes[attr], read_attribute(attr)]
+            result if result.first != result.last || !@_old_attributes_keys.include?(attr)
           end
         end
 
-        define_method("#{name}_changed?") do
-          !!__send__("#{name}_change")
+        define_method("#{attr}_changed?") do
+          !!__send__("#{attr}_change")
         end
 
-        define_method("#{name}_was") do
-          old_attributes_values.has_key?(name) ?
-            old_attributes_values[name] : read_attribute(name)
+        define_method("#{attr}_was") do
+          @_old_attributes.has_key?(attr) ? @_old_attributes[attr] : read_attribute(attr)
         end
 
-        define_method("#{name}") do
+        define_method("#{attr}") do
           super().tap do |value|
             # This take care of string/arrays/hashes that could change without going
             # through the setter.
-            attribute_may_change(name, value) if value.respond_to?(:size)
+            attribute_may_change(attr, value) if value.respond_to?(:size)
           end
         end
 
-        define_method("#{name}=") do |value|
-          attribute_may_change(name, read_attribute(name))
+        define_method("#{attr}=") do |value|
+          attribute_may_change(attr, read_attribute(attr))
           super(value)
         end
       end

data/lib/no_brainer/document/id.rb

@@ -6,7 +6,7 @@ module NoBrainer::Document::Id
   extend ActiveSupport::Concern
 
   included do
-    self.field :id, :type => String, :default => ->{ NoBrainer::Document::Id.generate }
+    self.field :id, :type => String, :default => ->{ NoBrainer::Document::Id.generate }, :readonly => true
   end
 
   def ==(other)

data/lib/no_brainer/document/index.rb

@@ -41,21 +41,19 @@ module NoBrainer::Document::Index
       !!indexes[name.to_sym]
     end
 
-    def field(name, options={})
-      name = name.to_sym
-
-      if has_index?(name) && indexes[name][:kind] != :single
-        raise "Cannot reuse index name #{name}"
+    def _field(attr, options={})
+      if has_index?(attr) && indexes[attr][:kind] != :single
+        raise "Cannot reuse index attr #{attr}"
       end
 
       super
 
       case options[:index]
       when nil    then
-      when Hash   then index(name, options[:index])
-      when Symbol then index(name, options[:index] => true)
-      when true   then index(name)
-      when false  then remove_index(name)
+      when Hash   then index(attr, options[:index])
+      when Symbol then index(attr, options[:index] => true)
+      when true   then index(attr)
+      when false  then remove_index(attr)
       end
     end
 

data/lib/no_brainer/document/injection_layer.rb

@@ -2,10 +2,9 @@ module NoBrainer::Document::InjectionLayer
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def inject_in_layer(name, code=nil, file=nil, line=nil, &block)
+    def inject_in_layer(name, &block)
       mod = class_eval "module NoBrainerLayer; module #{name.to_s.camelize}; self; end; end"
-      mod.module_eval(code, file, line) if code
-      mod.module_exec(&block) if block
+      mod.module_exec(&block)
       include mod
     end
   end

data/lib/no_brainer/document/persistance.rb

@@ -7,8 +7,8 @@ module NoBrainer::Document::Persistance
   end
 
   def _initialize(attrs={}, options={})
-    super
     @new_record = !options[:from_db]
+    super
   end
 
   def new_record?
@@ -38,43 +38,29 @@ module NoBrainer::Document::Persistance
     true
   end
 
-  def update(options={}, &block)
-    return false if options[:validate] && !valid?
-    selector.update_all(&block)
-    true
-  end
-
-  def replace(options={}, &block)
-    return false if options[:validate] && !valid?
-    selector.replace_all(&block)
-    true
-  end
-
-  def _update_changed_attributes(changed_attrs)
-    # If we have a hash to save, we replace the entire document
-    # instead of doing some smart update. This is because RethinkDB
-    # will merge the existing hash with the given hash. If the
-    # user has deleted some keys, we won't remove them.
-    if changed_attrs.values.any? { |v| v.is_a?(Hash) }
-      selector.replace_all { @_attributes }
-    else
-      selector.update_all { changed_attrs }
-    end
+  def _update(attrs)
+    selector.update_all(attrs)
   end
 
-  def _update_changed(options={})
+  def _update_only_changed_attrs(options={})
     return false if options[:validate] && !valid?
 
     # We won't be using the `changes` values, because they went through
     # read_attribute(), and we want the raw values.
-    changed_attrs = Hash[self.changed.map { |k| [k, @_attributes[k]] }]
-    _update_changed_attributes(changed_attrs) if changed_attrs.present?
+    attrs = Hash[self.changed.map do |k|
+      attr = @_attributes[k]
+      # If we have a hash to save, we need to specify r.literal(),
+      # otherwise, the hash would just get merged with the existing one.
+      attr = RethinkDB::RQL.new.literal(attr) if attr.is_a?(Hash)
+      [k, attr]
+    end]
+    _update(attrs) if attrs.present?
     true
   end
 
   def save(options={})
     options = options.reverse_merge(:validate => true)
-    new_record? ? _create(options) : _update_changed(options)
+    new_record? ? _create(options) : _update_only_changed_attrs(options)
   end
 
   def save!(*args)

data/lib/no_brainer/document/readonly.rb

@@ -0,0 +1,19 @@
+module NoBrainer::Document::Readonly
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def _field(attr, options={})
+      super
+      inject_in_layer :readonly do
+        if options[:readonly]
+          define_method("#{attr}=") do |value|
+            raise NoBrainer::Error::ReadonlyField.new("#{attr} is readonly") unless new_record?
+            super(value)
+          end
+        else
+          remove_method("#{attr}=") if method_defined?("#{attr}=")
+        end
+      end
+    end
+  end
+end

data/lib/no_brainer/document/timestamps.rb

@@ -4,16 +4,15 @@ module NoBrainer::Document::Timestamps
   included do
     field :created_at, :type => Time
     field :updated_at, :type => Time
+  end
 
-    before_create { self.created_at = self.updated_at = Time.now }
-    # Not using the before_update callback as it would mess
-    # with the dirty tracking. We want to bypass the database
-    # call if nothing has changed.
+  def _create(options={})
+    self.created_at = self.updated_at = Time.now
+    super
   end
 
-  def _update_changed_attributes(changed_attrs)
+  def _update(attrs)
     self.updated_at = Time.now
-    changed_attrs['updated_at'] = @_attributes['updated_at']
-    super
+    super(attrs.merge('updated_at' => @_attributes['updated_at']))
   end
 end

data/lib/no_brainer/document/types.rb

@@ -92,41 +92,43 @@ module NoBrainer::Document::Types
   end
 
   module ClassMethods
-    def cast_value_for(name, value)
-      name = name.to_sym
-      field_def = fields[name]
+    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])
     rescue NoBrainer::Error::InvalidType => error
       error.type = field_def[:type]
       error.value = value
-      error.attr_name = name
+      error.attr_name = attr
       raise error
     end
 
-    def field(name, options={})
-      return super unless options.has_key?(:type)
-
-      name = name.to_sym
-      type = options[:type]
-      options[:type_cast_method] = NoBrainer::Document::Types::CastingRules.lookup(type)
-
+    def _field(attr, options={})
       super
 
       inject_in_layer :types do
-        define_method("#{name}=") do |value|
+        define_method("#{attr}=") do |value|
           begin
-            value = self.class.cast_value_for(name, value)
-            @pending_type_errors.try(:delete, name)
+            value = self.class.cast_value_for(attr, value)
+            @pending_type_errors.try(:delete, attr)
           rescue NoBrainer::Error::InvalidType => error
             @pending_type_errors ||= {}
-            @pending_type_errors[name] = error
+            @pending_type_errors[attr] = error
           end
           super(value)
         end
 
-        define_method("#{name}?") { !!read_attribute(name) } if type == Boolean
+        define_method("#{attr}?") { !!read_attribute(attr) } if options[:type] == Boolean
+      end
+    end
+
+    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)
       end
+      super
     end
   end
 end

data/lib/no_brainer/document/validation.rb

@@ -8,9 +8,10 @@ module NoBrainer::Document::Validation
   end
 
   module ClassMethods
-    def field(name, options={})
+    def _field(attr, options={})
       super
-      validates(name.to_sym, options[:validates]) if options[:validates]
+      validates(attr, { :presence => true }) if options[:required]
+      validates(attr, options[:validates]) if options[:validates]
     end
 
     def validates_uniqueness_of(*attr_names)

data/lib/no_brainer/error.rb

@@ -1,13 +1,24 @@
 module NoBrainer::Error
   class Connection          < RuntimeError; end
   class DocumentNotFound    < RuntimeError; end
-  class DocumentInvalid     < RuntimeError; end
   class DocumentNotSaved    < RuntimeError; end
   class ChildrenExist       < RuntimeError; end
   class CannotUseIndex      < RuntimeError; end
   class MissingIndex        < RuntimeError; end
   class InvalidType         < RuntimeError; end
   class AssociationNotSaved < RuntimeError; end
+  class ReadonlyField       < RuntimeError; end
+
+  class DocumentInvalid < RuntimeError
+    attr_accessor :instance
+    def initialize(instance)
+      @instance = instance
+    end
+
+    def message
+      "#{instance} is invalid: #{instance.errors.full_messages.join(", ")}"
+    end
+  end
 
   class InvalidType < RuntimeError
     attr_accessor :attr_name, :value, :type

data/lib/no_brainer/query_runner/connection.rb

@@ -1,17 +1,44 @@
 class NoBrainer::QueryRunner::Connection < NoBrainer::QueryRunner::Middleware
   def call(env)
     @runner.call(env)
-  rescue RuntimeError, NoBrainer::Error::DocumentNotSaved => e
-    if e.message =~ /cannot perform (read|write): lost contact with master/
-      env[:connection_retries] ||= 0
-      # TODO sleep in between? timing out should be time based?
+  rescue StandardError => e
+    # TODO test that thing
+    if is_connection_error_exception?(e)
+      retry if reconnect
+    end
+    raise
+  end
+
+  private
 
-      # XXX Possibly dangerous, as we could reexecute a non idempotent operation
-      # Check the semantics of the db
+  def reconnect
+    # FIXME thread safety? perhaps we need to use a connection pool
+    # XXX Possibly dangerous, as we could reexecute a non idempotent operation
+    # Check the semantics of the db
+    NoBrainer::Config.max_reconnection_tries.times do
+      begin
+        NoBrainer.logger.try(:warn, "Lost connection to #{NoBrainer::Config.rethinkdb_url}, retrying...")
+        sleep 1
+        NoBrainer.connection.reconnect(:noreply_wait => false)
+        return true
+      rescue StandardError => e
+        retry if is_connection_error_exception?(e)
+        raise
+      end
+    end
+    false
+  end
 
-      # TODO Unit test
-      retry if (env[:connection_retries] += 1) < NoBrainer::Config.max_reconnection_tries
+  def is_connection_error_exception?(e)
+    case e
+    when Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE,
+      Errno::ECONNRESET, Errno::ETIMEDOUT, IOError
+      true
+    when RethinkDB::RqlRuntimeError
+      e.message =~ /cannot perform (read|write): No master available/ ||
+      e.message =~ /Error: Connection Closed/
+    else
+      false
     end
-    raise e
   end
 end

data/lib/no_brainer/query_runner/run_options.rb

@@ -16,11 +16,11 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
   def call(env)
     env[:options].symbolize_keys!
     if Thread.current[:nobrainer_options]
-      env[:options] = env[:options].reverse_merge(Thread.current[:nobrainer_options])
+      env[:options].reverse_merge!(Thread.current[:nobrainer_options])
     end
 
     if NoBrainer::Config.durability.to_s != 'hard'
-      env[:options] = env[:options].reverse_merge(:durability => NoBrainer::Config.durability)
+      env[:options].reverse_merge!(:durability => NoBrainer::Config.durability)
     end
 
     if env[:options][:db] && !env[:options][:db].is_a?(RethinkDB::RQL)
@@ -28,6 +28,8 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
       env[:options][:db] = RethinkDB::RQL.new.db(env[:db_name])
     end
 
+    env[:criteria] = env[:options].delete(:criteria)
+
     @runner.call(env)
   end
 end

data/lib/nobrainer.rb

@@ -1,7 +1,3 @@
-if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9')
-  raise 'Please use Ruby 1.9 or later'
-end
-
 require 'active_support'
 %w(module/delegation module/attribute_accessors class/attribute object/blank object/inclusion object/deep_dup
    object/try hash/keys hash/indifferent_access hash/reverse_merge hash/deep_merge array/extract_options)
@@ -12,7 +8,7 @@ module NoBrainer
   extend NoBrainer::Autoload
 
   # We eager load things that could be loaded for the first time during the web request
-  autoload :Document, :DocumentWithTimestamps, :IndexManager, :Loader, :Fork, :DecoratedSymbol
+  autoload :Document, :IndexManager, :Loader, :Fork, :DecoratedSymbol
   eager_autoload :Config, :Connection, :Error, :QueryRunner, :Criteria, :Util
 
   class << self
@@ -28,7 +24,7 @@ module NoBrainer
     end
 
     def disconnect
-      @connection.try(:disconnect)
+      @connection.try(:disconnect, :noreply_wait => true)
       @connection = nil
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -25,25 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.11.0.1
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - <
+        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: '5'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -70,33 +78,34 @@ files:
 - 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/belongs_to.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/injection_layer.rb
 - lib/no_brainer/document/core.rb
-- lib/no_brainer/document/criteria.rb
-- lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/serialization.rb
 - lib/no_brainer/document/association.rb
-- lib/no_brainer/document/index.rb
-- lib/no_brainer/document/validation.rb
 - lib/no_brainer/document/callbacks.rb
-- lib/no_brainer/document/dirty.rb
-- lib/no_brainer/document/persistance.rb
+- lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/timestamps.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/id.rb
+- lib/no_brainer/document/injection_layer.rb
+- lib/no_brainer/document/persistance.rb
+- lib/no_brainer/document/readonly.rb
 - lib/no_brainer/document/types.rb
-- lib/no_brainer/query_runner/connection.rb
+- lib/no_brainer/document/criteria.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/run_options.rb
 - lib/no_brainer/query_runner/logger.rb
 - lib/no_brainer/query_runner/missing_index.rb
+- lib/no_brainer/query_runner/run_options.rb
+- lib/no_brainer/query_runner/connection.rb
 - lib/no_brainer/railtie/database.rake
 - lib/no_brainer/index_manager.rb
 - lib/no_brainer/loader.rb
@@ -104,30 +113,28 @@ files:
 - lib/no_brainer/fork.rb
 - lib/no_brainer/connection.rb
 - lib/no_brainer/query_runner.rb
-- lib/no_brainer/config.rb
-- lib/no_brainer/autoload.rb
 - lib/no_brainer/util.rb
-- lib/no_brainer/document.rb
-- lib/no_brainer/document_with_timestamps.rb
 - lib/no_brainer/decorated_symbol.rb
-- lib/no_brainer/criteria/update.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/inc.rb
 - lib/no_brainer/criteria/first.rb
 - lib/no_brainer/criteria/enumerable.rb
-- lib/no_brainer/criteria/delete.rb
 - lib/no_brainer/criteria/count.rb
-- lib/no_brainer/criteria/core.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/railtie.rb
+- lib/no_brainer/autoload.rb
 - lib/rails/generators/nobrainer.rb
 - lib/rails/generators/nobrainer/model/model_generator.rb
 - lib/rails/generators/nobrainer/model/templates/model.rb.tt
@@ -146,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='

data/lib/no_brainer/criteria/inc.rb

@@ -1,14 +0,0 @@
-module NoBrainer::Criteria::Inc
-  extend ActiveSupport::Concern
-
-  def inc_all(field, value=1)
-    # TODO The useful inc() is on a model instance.
-    # But then do we want to postpone the inc() to the next save?
-    # It might make sense (because we don't have transactions).
-    update_all { |doc| { field => doc[field] + value } }
-  end
-
-  def dec_all(field, value=1)
-    inc_all(field, -value)
-  end
-end

data/lib/no_brainer/document_with_timestamps.rb

@@ -1,6 +0,0 @@
-module NoBrainer::DocumentWithTimestamps
-  extend ActiveSupport::Concern
-
-  include NoBrainer::Document
-  include NoBrainer::Document::Timestamps
-end