nobrainer 0.10.0 → 0.13.0

data/lib/no_brainer/document/types.rb

@@ -1,14 +1,9 @@
 module NoBrainer::Document::Types
   extend ActiveSupport::Concern
 
-  included do
-    # We namespace our fake Boolean class to avoid polluting the global namespace
-    class_exec { class Boolean; def initialize; raise; end; end }
-    before_validation :add_type_errors
-  end
-
   module CastingRules
     extend self
+    InvalidType = NoBrainer::Error::InvalidType
 
     def String(value)
       case value
@@ -63,67 +58,77 @@ module NoBrainer::Document::Types
       else raise InvalidType
       end
     end
-  end
-
-  def self.cast(value, type, cast_method)
-    return value if value.nil? || type.nil? || value.is_a?(type)
-    cast_method.call(value)
-  end
 
-  def self.lookup_cast_method(type)
-    type = type.to_s
-    type = 'Boolean' if type == 'NoBrainer::Document::Types::Boolean'
-    CastingRules.method(type)
-  rescue NameError
-    proc { raise InvalidType }
-  end
+    def lookup(type)
+      CastingRules.method(type.to_s)
+    rescue NameError
+      proc { raise InvalidType }
+    end
 
-  class InvalidType < RuntimeError
-    attr_accessor :type
-    def initialize(type=nil)
-      @type = type
+    def cast(value, type, type_cast_method)
+      return value if value.nil? || type.nil? || value.is_a?(type)
+      type_cast_method.call(value)
     end
+  end
 
-    def validation_error_args
-      [:invalid_type, :type => type.to_s.underscore.humanize.downcase]
+  included do
+    # We namespace our fake Boolean class to avoid polluting the global namespace
+    class_exec do
+      class Boolean
+        def initialize; raise; end
+        def self.inspect; 'Boolean'; end
+        def self.to_s; inspect; end
+        def self.name; inspect; end
+      end
     end
+    before_validation :add_type_errors
   end
 
   def add_type_errors
     return unless @pending_type_errors
     @pending_type_errors.each do |name, error|
-      errors.add(name, *error.validation_error_args)
+      errors.add(name, :invalid_type, :type => error.human_type_name)
     end
   end
 
   module ClassMethods
-    def field(name, options={})
+    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 = attr
+      raise error
+    end
+
+    def _field(attr, options={})
       super
-      return unless options.has_key?(:type)
-      name = name.to_sym
-      type = options[:type]
-      cast_method = NoBrainer::Document::Types.lookup_cast_method(type)
 
       inject_in_layer :types do
-        define_method("#{name}=") do |value|
+        define_method("#{attr}=") do |value|
           begin
-            value = NoBrainer::Document::Types.cast(value, type, cast_method)
-            @pending_type_errors.try(:delete, name)
-          rescue NoBrainer::Document::Types::InvalidType => error
-            error.type ||= type
+            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("#{attr}?") { !!read_attribute(attr) } if options[:type] == Boolean
       end
     end
 
-    def remove_field(name)
+    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
-      inject_in_layer :types, <<-RUBY, __FILE__, __LINE__ + 1
-        undef #{name}=
-      RUBY
     end
   end
 end

data/lib/no_brainer/document/validation.rb

@@ -8,6 +8,12 @@ module NoBrainer::Document::Validation
   end
 
   module ClassMethods
+    def _field(attr, options={})
+      super
+      validates(attr, { :presence => true }) if options[:required]
+      validates(attr, options[:validates]) if options[:validates]
+    end
+
     def validates_uniqueness_of(*attr_names)
       validates_with UniquenessValidator, _merge_attributes(attr_names)
     end

data/lib/no_brainer/document.rb

@@ -4,11 +4,11 @@ module NoBrainer::Document
   extend ActiveSupport::Concern
   extend NoBrainer::Autoload
 
-  autoload_and_include :Core, :StoreIn, :InjectionLayer, :Attributes, :Validation, :Types,
-                       :Persistance, :Dirty, :Id, :Association, :Serialization, :Criteria,
-                       :Polymorphic, :Index, :Timestamps
+  autoload_and_include :Core, :StoreIn, :InjectionLayer, :Attributes, :Readonly, :Validation, :Types,
+                       :Persistance, :Callbacks, :Dirty, :Id, :Association, :Serialization,
+                       :Criteria, :Polymorphic, :Index
 
-  autoload :DynamicAttributes
+  autoload :DynamicAttributes, :Timestamps
 
   singleton_class.delegate :all, :to => Core
 end

data/lib/no_brainer/error.rb

@@ -1,11 +1,39 @@
 module NoBrainer::Error
-  class Connection          < StandardError; end
-  class DocumentNotFound    < StandardError; end
-  class DocumentInvalid     < StandardError; end
-  class DocumentNotSaved    < StandardError; end
-  class ChildrenExist       < StandardError; end
-  class CannotUseIndex      < StandardError; end
-  class MissingIndex        < StandardError; end
-  class InvalidType         < StandardError; end
-  class AssociationNotSaved < StandardError; end
+  class Connection          < RuntimeError; end
+  class DocumentNotFound    < 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
+    def initialize(options={})
+      @attr_name = options[:attr_name]
+      @value     = options[:value]
+      @type      = options[:type]
+    end
+
+    def human_type_name
+      type.to_s.underscore.humanize.downcase
+    end
+
+    def message
+      "#{attr_name} should be used with a #{human_type_name}. Got `#{value}`"
+    end
+  end
 end

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/missing_index.rb

@@ -3,7 +3,7 @@ class NoBrainer::QueryRunner::MissingIndex < NoBrainer::QueryRunner::Middleware
     @runner.call(env)
   rescue RethinkDB::RqlRuntimeError => e
     if e.message =~ /^Index `(.+)` was not found\.$/
-      raise NoBrainer::Error::MissingIndex.new("Please run \"rake db:update_indexes\" to create index `#{$1}`\n" +
+      raise NoBrainer::Error::MissingIndex.new("Please run \"rake db:update_indexes\" to create the index `#{$1}`\n" +
                                                "--> Read http://nobrainer.io/docs/indexes for more information.")
     end
     raise

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/no_brainer/railtie.rb

@@ -7,12 +7,22 @@ class NoBrainer::Railtie < Rails::Railtie
   config.action_dispatch.rescue_responses.merge!(
     "NoBrainer::Errors::DocumentNotFound" => :not_found,
     "NoBrainer::Errors::DocumentInvalid"  => :unprocessable_entity,
+    "NoBrainer::Errors::InvalidType"      => :bad_request,
   )
 
   rake_tasks do
     load "no_brainer/railtie/database.rake"
   end
 
+  console do
+    # Send console messages to standard error like ActiveRecord.
+    # Not the cleanest behavior, but if ActiveRecord does it, why not.
+    unless defined?(ActiveRecord)
+      console = ActiveSupport::Logger.new(STDERR)
+      Rails.logger.extend ActiveSupport::Logger.broadcast(console)
+    end
+  end
+
   config.after_initialize do
     NoBrainer::Config.configure unless NoBrainer::Config.configured?
 

data/lib/nobrainer.rb

@@ -1,10 +1,6 @@
-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/duplicable object/try hash/keys hash/reverse_merge array/extract_options)
+%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)
     .each { |dep| require "active_support/core_ext/#{dep}" }
 
 module NoBrainer
@@ -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.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 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: '5'
+        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
@@ -65,75 +73,77 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/no_brainer/document/id.rb
-- lib/no_brainer/document/association/belongs_to.rb
-- lib/no_brainer/document/association/has_many.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/dynamic_attributes.rb
-- lib/no_brainer/document/criteria.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/injection_layer.rb
-- lib/no_brainer/document/index.rb
 - lib/no_brainer/document/serialization.rb
 - lib/no_brainer/document/association.rb
-- lib/no_brainer/document/validation.rb
+- lib/no_brainer/document/callbacks.rb
+- lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/timestamps.rb
 - lib/no_brainer/document/dirty.rb
-- lib/no_brainer/document/persistance.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/logger.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/run_options.rb
+- lib/no_brainer/query_runner/connection.rb
 - lib/no_brainer/railtie/database.rake
-- lib/no_brainer/criteria/chainable/limit.rb
-- lib/no_brainer/criteria/chainable/order_by.rb
-- lib/no_brainer/criteria/chainable/scope.rb
-- lib/no_brainer/criteria/chainable/raw.rb
-- lib/no_brainer/criteria/chainable/core.rb
-- lib/no_brainer/criteria/chainable/where.rb
-- lib/no_brainer/criteria/termination/inc.rb
-- lib/no_brainer/criteria/termination/count.rb
-- lib/no_brainer/criteria/termination/first.rb
-- lib/no_brainer/criteria/termination/enumerable.rb
-- lib/no_brainer/criteria/termination/update.rb
-- lib/no_brainer/criteria/termination/delete.rb
-- lib/no_brainer/criteria/termination/eager_loading.rb
-- lib/no_brainer/criteria/termination/cache.rb
-- lib/no_brainer/decorated_symbol.rb
 - lib/no_brainer/index_manager.rb
 - lib/no_brainer/loader.rb
 - lib/no_brainer/locale/en.yml
-- lib/no_brainer/util.rb
 - lib/no_brainer/fork.rb
-- lib/no_brainer/criteria.rb
 - lib/no_brainer/connection.rb
 - lib/no_brainer/query_runner.rb
-- lib/no_brainer/error.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/autoload.rb
 - lib/no_brainer/document.rb
+- lib/no_brainer/criteria.rb
+- lib/no_brainer/error.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
 - lib/nobrainer.rb
 - README.md
-- LICENSE.md
-homepage: http://github.com/nviennot/nobrainer
+- LICENSE
+homepage: http://nobrainer.io
 licenses:
-- MIT
+- LGPLv3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -143,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/LICENSE.md

@@ -1,7 +0,0 @@
-Copyright (C) 2012 Nicolas Viennot
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/no_brainer/criteria/chainable/raw.rb

@@ -1,33 +0,0 @@
-module NoBrainer::Criteria::Chainable::Raw
-  extend ActiveSupport::Concern
-
-  included { attr_accessor :_raw, :__after_instantiate }
-
-  def raw
-    chain { |criteria| criteria._raw = true }
-  end
-
-  def _after_instantiate(block)
-    # Just some helper for the has_many association to set the inverses on the
-    # related belongs_to. A bit hackish.
-    chain { |criteria| criteria.__after_instantiate = block }
-  end
-
-  def merge!(criteria, options={})
-    super
-    self._raw = criteria._raw unless criteria._raw.nil?
-    self.__after_instantiate ||= criteria.__after_instantiate
-    self
-  end
-
-  private
-
-  def raw?
-    !!_raw
-  end
-
-  def instantiate_doc(attrs)
-    (raw? ? attrs : klass.new_from_db(attrs))
-      .tap { |doc| __after_instantiate.call(doc) if __after_instantiate }
-  end
-end

data/lib/no_brainer/criteria/termination/eager_loading.rb

@@ -1,50 +0,0 @@
-module NoBrainer::Criteria::Termination::EagerLoading
-  extend ActiveSupport::Concern
-
-  included { attr_accessor :_includes }
-
-  def initialize(options={})
-    super
-    self._includes = []
-  end
-
-  def includes(*values)
-    chain(:keep_cache => true) { |criteria| criteria._includes = values }
-  end
-
-  def merge!(criteria, options={})
-    super
-    self._includes = self._includes + criteria._includes
-
-    # XXX Not pretty hack
-    if criteria._includes.present? && cached?
-      perform_eager_loading(@cache)
-    end
-  end
-
-  def each(options={}, &block)
-    return super unless should_eager_load? && !options[:no_eager_loading] && block
-
-    docs = []
-    super(options.merge(:no_eager_loading => true)) { |doc| docs << doc }
-    perform_eager_loading(docs)
-    docs.each(&block)
-    self
-  end
-
-  private
-
-  def should_eager_load?
-    self._includes.present? && !raw?
-  end
-
-  def get_one(criteria)
-    super.tap { |doc| perform_eager_loading([doc]) }
-  end
-
-  def perform_eager_loading(docs)
-    if should_eager_load? && docs.present?
-      NoBrainer::Document::Association::EagerLoader.new.eager_load(docs, self._includes)
-    end
-  end
-end

data/lib/no_brainer/criteria/termination/inc.rb

@@ -1,14 +0,0 @@
-module NoBrainer::Criteria::Termination::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/criteria/termination/update.rb

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