nobrainer 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f5bfdef46fb94e140efe80af84031e02238d07
-  data.tar.gz: aa5965b806a43a8727be98ef2a7a9c370fe94cfc
+  metadata.gz: f9f0fb2d3cb21fba6fad94403706e6f5274f72f4
+  data.tar.gz: 74bfea6252ccc4eee6e67c003ed3facc7bbffe69
 SHA512:
-  metadata.gz: 0285cc6834d21a4e973fe293adf54ada0bcce15424a605719a32db2445a909793ebab766549a9d8b31b42ced44e6d3ef5f1cfecd980b33b4c4c1792af94a74c4
-  data.tar.gz: 3ed81e4508bc4528142b7049db0e1464927f7dfcad9c459853593c70a9ebbed95c47b3bd634d03f0bc2e9ebcc358a2d72cbcd7b7c73b4c46ca37a518a23c7c56
+  metadata.gz: 8da93f62774128bc6bfc485c356fd1e27b68ae0f3c5ccd0e9e81545210856a9282dccf0936369d3b92da90904e598d1c16d264a36b82e050e328ad02bda2758c
+  data.tar.gz: c8f6e9c112d89df7062d2ffde33952e688d6c7c47becde0d3391949abac41851149a3d3625025908f00429565152157366bf90d1147bf4d0e705e68e57b1c31a

data/LICENSE

@@ -0,0 +1,169 @@
+Copyright (c) Nicolas Viennot
+
+NoBrainer is licensed under the terms of the LGPLv3 license.
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/lib/no_brainer/criteria.rb

@@ -1,20 +1,8 @@
 require 'rethinkdb'
 
 class NoBrainer::Criteria
-  # The disctinction between Chainable and Termination is purely cosmetic.
-  module Chainable
-    extend NoBrainer::Autoload
-    extend ActiveSupport::Concern
-    autoload_and_include :Core, :Scope, :Raw, :Where, :OrderBy, :Limit
-  end
-
-  module Termination
-    extend NoBrainer::Autoload
-    extend ActiveSupport::Concern
-    autoload_and_include :Count, :Delete, :Enumerable, :First, :Preload,
-                         :Inc, :Update, :Cache
-  end
-
-  include Chainable
-  include Termination
+  extend NoBrainer::Autoload
+  autoload_and_include :Core, :Scope, :Raw, :AfterFind, :Where, :OrderBy, :Limit,
+                       :Count, :Delete, :Enumerable, :First, :Preload, :Inc,
+                       :Update, :Cache
 end

data/lib/no_brainer/criteria/after_find.rb

@@ -0,0 +1,24 @@
+module NoBrainer::Criteria::AfterFind
+  extend ActiveSupport::Concern
+
+  included { attr_accessor :_after_find }
+
+  def after_find(b=nil, &block)
+    chain { |criteria| criteria._after_find = [b || block] }
+  end
+
+  def merge!(criteria, options={})
+    super
+    if criteria._after_find.present?
+      self._after_find = (self._after_find || []) + criteria._after_find
+    end
+    self
+  end
+
+  def instantiate_doc(attrs)
+    super.tap do |doc|
+      self._after_find.to_a.each { |block| block.call(doc) }
+      doc.run_callbacks(:find) if doc.is_a?(NoBrainer::Document)
+    end
+  end
+end

data/lib/no_brainer/criteria/{termination/cache.rb → cache.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Cache
+module NoBrainer::Criteria::Cache
   extend ActiveSupport::Concern
 
   included { attr_accessor :_with_cache }

data/lib/no_brainer/criteria/{chainable/core.rb → core.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Chainable::Core
+module NoBrainer::Criteria::Core
   extend ActiveSupport::Concern
 
   included { attr_accessor :init_options }

data/lib/no_brainer/criteria/{termination/count.rb → count.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Count
+module NoBrainer::Criteria::Count
   extend ActiveSupport::Concern
 
   def count

data/lib/no_brainer/criteria/{termination/delete.rb → delete.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Delete
+module NoBrainer::Criteria::Delete
   extend ActiveSupport::Concern
 
   def delete_all

data/lib/no_brainer/criteria/{termination/enumerable.rb → enumerable.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Enumerable
+module NoBrainer::Criteria::Enumerable
   extend ActiveSupport::Concern
 
   def each(options={}, &block)

data/lib/no_brainer/criteria/{termination/first.rb → first.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::First
+module NoBrainer::Criteria::First
   extend ActiveSupport::Concern
 
   def first

data/lib/no_brainer/criteria/{termination/inc.rb → inc.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Inc
+module NoBrainer::Criteria::Inc
   extend ActiveSupport::Concern
 
   def inc_all(field, value=1)

data/lib/no_brainer/criteria/{chainable/limit.rb → limit.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Chainable::Limit
+module NoBrainer::Criteria::Limit
   # TODO Test these guys
   extend ActiveSupport::Concern
 

data/lib/no_brainer/criteria/{chainable/order_by.rb → order_by.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Chainable::OrderBy
+module NoBrainer::Criteria::OrderBy
   extend ActiveSupport::Concern
 
   included { attr_accessor :order, :_reverse_order }

data/lib/no_brainer/criteria/{termination/preload.rb → preload.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Preload
+module NoBrainer::Criteria::Preload
   extend ActiveSupport::Concern
 
   included { attr_accessor :_preloads }
@@ -28,10 +28,10 @@ module NoBrainer::Criteria::Termination::Preload
   end
 
   def each(options={}, &block)
-    return super unless should_preloads? && !options[:no_preloadsing] && block
+    return super unless should_preloads? && !options[:no_preloading] && block
 
     docs = []
-    super(options.merge(:no_preloadsing => true)) { |doc| docs << doc }
+    super(options.merge(:no_preloading => true)) { |doc| docs << doc }
     perform_preloads(docs)
     docs.each(&block)
     self

data/lib/no_brainer/criteria/raw.rb

@@ -0,0 +1,25 @@
+module NoBrainer::Criteria::Raw
+  extend ActiveSupport::Concern
+
+  included { attr_accessor :_raw }
+
+  def raw
+    chain { |criteria| criteria._raw = true }
+  end
+
+  def merge!(criteria, options={})
+    super
+    self._raw = criteria._raw unless criteria._raw.nil?
+    self
+  end
+
+  private
+
+  def raw?
+    !!_raw
+  end
+
+  def instantiate_doc(attrs)
+    raw? ? attrs : klass.new_from_db(attrs)
+  end
+end

data/lib/no_brainer/criteria/{chainable/scope.rb → scope.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Chainable::Scope
+module NoBrainer::Criteria::Scope
   extend ActiveSupport::Concern
 
   included { attr_accessor :use_default_scope }

data/lib/no_brainer/criteria/{termination/update.rb → update.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Termination::Update
+module NoBrainer::Criteria::Update
   extend ActiveSupport::Concern
 
   def update_all(attrs={}, &block)

data/lib/no_brainer/criteria/{chainable/where.rb → where.rb}

@@ -1,4 +1,4 @@
-module NoBrainer::Criteria::Chainable::Where
+module NoBrainer::Criteria::Where
   extend ActiveSupport::Concern
 
   included { attr_accessor :where_ast, :with_index_name }
@@ -54,16 +54,16 @@ module NoBrainer::Criteria::Chainable::Where
     end
   end
 
-  class BinaryOperator < Struct.new(:key, :op, :value)
+  class BinaryOperator < Struct.new(:key, :op, :value, :criteria)
     def simplify
       case op
       when :in then
         case value
-        when Range then BinaryOperator.new(key, :between, value)
-        when Array then BinaryOperator.new(key, :in, value.uniq)
+        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)
         else raise ArgumentError.new ":in takes an array/range, not #{value}"
         end
-      else self
+      else BinaryOperator.new(key, op, cast(value), criteria)
       end
     end
 
@@ -74,6 +74,12 @@ module NoBrainer::Criteria::Chainable::Where
       else doc[key].__send__(op, value)
       end
     end
+
+    private
+
+    def cast(value)
+      criteria.klass.cast_value_for(key, value)
+    end
   end
 
   class UnaryOperator < Struct.new(:op, :value)
@@ -117,22 +123,25 @@ module NoBrainer::Criteria::Chainable::Where
     when :and then MultiOperator.new(:and, value.map { |v| parse_clause(v) })
     when :or  then MultiOperator.new(:or,  value.map { |v| parse_clause(v) })
     when :not then UnaryOperator.new(:not, parse_clause(value))
-    when String, Symbol then parse_clause_stub(key.to_sym.eq, value)
+    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
-        case value
-        when Range  then BinaryOperator.new(key.symbol, :between, value)
-        when Regexp then BinaryOperator.new(key.symbol, :match, value.inspect[1..-2])
-        else BinaryOperator.new(key.symbol, key.modifier, value)
-        end
-      else BinaryOperator.new(key.symbol, key.modifier, 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}"
     end
   end
 
+  def parse_clause_stub_eq(key, value)
+    case value
+    when Range  then BinaryOperator.new(key, :between, value, self)
+    when Regexp then BinaryOperator.new(key, :match, value.inspect[1..-2], self)
+    else BinaryOperator.new(key, :eq, value, self)
+    end
+  end
+
   def without_index?
     self.with_index_name == false
   end

data/lib/no_brainer/document.rb

@@ -6,9 +6,9 @@ module NoBrainer::Document
 
   autoload_and_include :Core, :StoreIn, :InjectionLayer, :Attributes, :Validation, :Types,
                        :Persistance, :Callbacks, :Dirty, :Id, :Association, :Serialization,
-                       :Criteria, :Polymorphic, :Index, :Timestamps
+                       :Criteria, :Polymorphic, :Index
 
-  autoload :DynamicAttributes
+  autoload :DynamicAttributes, :Timestamps
 
   singleton_class.delegate :all, :to => Core
 end

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

@@ -19,6 +19,11 @@ class NoBrainer::Document::Association::BelongsTo
     def hook
       super
 
+      # TODO It would be good to set the type we want to work with, but because
+      # the target class is eager loaded, we are not doing it.
+      # This would have the effect of loading all the models because they
+      # 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, options[:validates]) if options[:validates]
 

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

@@ -57,8 +57,8 @@ module NoBrainer::Document::Association::Core
 
   def assert_target_type(value)
     unless value.is_a?(target_klass) || value.nil?
-      msg = "Trying to use a #{value.class} as a #{target_name}"
-      raise NoBrainer::Error::InvalidType.new(msg)
+      options = { :attr_name => target_name, :value => value, :type => target_klass }
+      raise NoBrainer::Error::InvalidType.new(options)
     end
   end
 end

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

@@ -39,7 +39,7 @@ class NoBrainer::Document::Association::HasMany
 
   def target_criteria
     @target_criteria ||= target_klass.where(foreign_key => owner.id)
-                                     ._after_instantiate(set_inverse_proc)
+                                     .after_find(set_inverse_proc)
   end
 
   def read

data/lib/no_brainer/document/attributes.rb

@@ -1,5 +1,5 @@
 module NoBrainer::Document::Attributes
-  VALID_FIELD_OPTIONS = [:index, :default, :type, :validates]
+  VALID_FIELD_OPTIONS = [:index, :default, :type, :type_cast_method, :validates]
   RESERVED_FIELD_NAMES = [:index, :default, :and, :or, :selector, :associations] + NoBrainer::DecoratedSymbol::MODIFIERS.keys
   extend ActiveSupport::Concern
 
@@ -16,7 +16,7 @@ module NoBrainer::Document::Attributes
   end
 
   def attributes
-    @_attributes.dup.freeze
+    Hash[@_attributes.keys.map { |k| [k, read_attribute(k)] }].with_indifferent_access.freeze
   end
 
   def read_attribute(name)
@@ -96,19 +96,6 @@ module NoBrainer::Document::Attributes
       RUBY
     end
 
-    def remove_field(name)
-      name = name.to_sym
-
-      ([self] + descendants).each do |klass|
-        klass.fields.delete(name)
-      end
-
-      inject_in_layer :attributes, <<-RUBY, __FILE__, __LINE__ + 1
-        undef #{name}=
-        undef #{name}
-      RUBY
-    end
-
     def has_field?(name)
       !!fields[name.to_sym]
     end

data/lib/no_brainer/document/callbacks.rb

@@ -4,6 +4,7 @@ module NoBrainer::Document::Callbacks
   included do
     extend ActiveModel::Callbacks
     define_model_callbacks :initialize, :create, :update, :save, :destroy, :terminator => 'false'
+    define_model_callbacks :find, :only => [:after], :terminator => 'false'
   end
 
   def initialize(*args)
@@ -22,6 +23,10 @@ module NoBrainer::Document::Callbacks
     run_callbacks(:update) { super }
   end
 
+  def _update_changed(*args)
+    run_callbacks(:update) { super }
+  end
+
   def save(*args)
     run_callbacks(:save) { super }
   end

data/lib/no_brainer/document/dirty.rb

@@ -17,12 +17,6 @@ module NoBrainer::Document::Dirty
     @old_attributes_values.try(:clear)
   end
 
-  def attributes
-    # If we leak all the attributes (rare), we perform a copy to ensure that we
-    # don't have issues with modified hashes/array. Devs are crazy.
-    super.tap { |attrs| @old_attributes_values = attrs.deep_dup }
-  end
-
   def _assign_attributes(attrs, options={})
     super
     clear_dirtiness if options[:from_db]
@@ -87,17 +81,5 @@ module NoBrainer::Document::Dirty
         end
       end
     end
-
-    def remove_field(name)
-      super
-
-      inject_in_layer :dirty_tracking, <<-RUBY, __FILE__, __LINE__ + 1
-        undef #{name}_changed?
-        undef #{name}_change
-        undef #{name}_was
-        undef #{name}
-        undef #{name}=
-      RUBY
-    end
   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, :default => ->{ NoBrainer::Document::Id.generate }
+    self.field :id, :type => String, :default => ->{ NoBrainer::Document::Id.generate }
   end
 
   def ==(other)

data/lib/no_brainer/document/index.rb

@@ -59,11 +59,6 @@ module NoBrainer::Document::Index
       end
     end
 
-    def remove_field(name)
-      remove_index(name) if fields[name.to_sym][:index]
-      super
-    end
-
     def perform_create_index(index_name, options={})
       index_name = index_name.to_sym
       index_args = self.indexes[index_name]

data/lib/no_brainer/document/persistance.rb

@@ -31,37 +31,50 @@ module NoBrainer::Document::Persistance
   end
 
   def _create(options={})
-    if options[:validate] && !valid?
-      false
-    else
-      keys = self.class.insert_all(attributes)
-      self.id ||= keys.first
-      @new_record = false
-      true
-    end
+    return false if options[:validate] && !valid?
+    keys = self.class.insert_all(@_attributes)
+    self.id ||= keys.first
+    @new_record = false
+    true
   end
 
   def update(options={}, &block)
-    if options[:validate] && !valid?
-      false
-    else
-      selector.update_all(&block)
-      true
-    end
+    return false if options[:validate] && !valid?
+    selector.update_all(&block)
+    true
   end
 
   def replace(options={}, &block)
-    if options[:validate] && !valid?
-      false
+    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.replace_all(&block)
-      true
+      selector.update_all { changed_attrs }
     end
   end
 
+  def _update_changed(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?
+    true
+  end
+
   def save(options={})
     options = options.reverse_merge(:validate => true)
-    new_record? ? _create(options) : replace(options) { attributes }
+    new_record? ? _create(options) : _update_changed(options)
   end
 
   def save!(*args)

data/lib/no_brainer/document/serialization.rb

@@ -3,7 +3,6 @@ module NoBrainer::Document::Serialization
 
   include ActiveModel::Serialization
   include ActiveModel::Serializers::JSON
-  include ActiveModel::Serializers::Xml
 
   included { self.include_root_in_json = false }
 end

data/lib/no_brainer/document/timestamps.rb

@@ -2,20 +2,18 @@ module NoBrainer::Document::Timestamps
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :timestamps_disabled
+    field :created_at, :type => Time
+    field :updated_at, :type => Time
 
-    self.field :created_at, :type => Time
-    self.field :updated_at, :type => Time
-
-    before_create { self.created_at = Time.now unless self.timestamps_disabled }
-    before_save   { self.updated_at = Time.now unless self.timestamps_disabled }
+    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.
   end
 
-  module ClassMethods
-    def disable_timestamps
-      self.timestamps_disabled = true
-      self.remove_field :created_at
-      self.remove_field :updated_at
-    end
+  def _update_changed_attributes(changed_attrs)
+    self.updated_at = Time.now
+    changed_attrs['updated_at'] = @_attributes['updated_at']
+    super
   end
 end

data/lib/no_brainer/document/types.rb

@@ -3,6 +3,7 @@ module NoBrainer::Document::Types
 
   module CastingRules
     extend self
+    InvalidType = NoBrainer::Error::InvalidType
 
     def String(value)
       case value
@@ -64,9 +65,9 @@ module NoBrainer::Document::Types
       proc { raise InvalidType }
     end
 
-    def cast(value, type, cast_method)
+    def cast(value, type, type_cast_method)
       return value if value.nil? || type.nil? || value.is_a?(type)
-      cast_method.call(value)
+      type_cast_method.call(value)
     end
   end
 
@@ -83,39 +84,41 @@ module NoBrainer::Document::Types
     before_validation :add_type_errors
   end
 
-  class InvalidType < RuntimeError
-    attr_accessor :type
-    def initialize(type=nil)
-      @type = type
-    end
-
-    def validation_error_args
-      [:invalid_type, :type => type.to_s.underscore.humanize.downcase]
-    end
-  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 cast_value_for(name, value)
+      name = name.to_sym
+      field_def = fields[name]
+      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
+      raise error
+    end
+
     def field(name, options={})
-      super
-      return unless options.has_key?(:type)
+      return super unless options.has_key?(:type)
+
       name = name.to_sym
       type = options[:type]
-      cast_method = NoBrainer::Document::Types::CastingRules.lookup(type)
+      options[:type_cast_method] = NoBrainer::Document::Types::CastingRules.lookup(type)
+
+      super
 
       inject_in_layer :types do
         define_method("#{name}=") do |value|
           begin
-            value = NoBrainer::Document::Types::CastingRules.cast(value, type, cast_method)
+            value = self.class.cast_value_for(name, value)
             @pending_type_errors.try(:delete, name)
-          rescue NoBrainer::Document::Types::InvalidType => error
-            error.type ||= type
+          rescue NoBrainer::Error::InvalidType => error
             @pending_type_errors ||= {}
             @pending_type_errors[name] = error
           end
@@ -125,13 +128,5 @@ module NoBrainer::Document::Types
         define_method("#{name}?") { !!read_attribute(name) } if type == Boolean
       end
     end
-
-    def remove_field(name)
-      super
-      # TODO remove the name? if we added it. Low priority though.
-      inject_in_layer :types, <<-RUBY, __FILE__, __LINE__ + 1
-        undef #{name}=
-      RUBY
-    end
   end
 end

data/lib/no_brainer/document_with_timestamps.rb

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

data/lib/no_brainer/error.rb

@@ -1,11 +1,28 @@
 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 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 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/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/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

@@ -3,8 +3,8 @@ if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9')
 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 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
@@ -12,7 +12,7 @@ module NoBrainer
   extend NoBrainer::Autoload
 
   # We eager load things that could be loaded for the first time during the web request
-  autoload :Document, :IndexManager, :Loader, :Fork, :DecoratedSymbol
+  autoload :Document, :DocumentWithTimestamps, :IndexManager, :Loader, :Fork, :DecoratedSymbol
   eager_autoload :Config, :Connection, :Error, :QueryRunner, :Criteria, :Util
 
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -65,76 +65,78 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/no_brainer/document/id.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/core.rb
-- lib/no_brainer/document/association/belongs_to.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/polymorphic.rb
 - lib/no_brainer/document/store_in.rb
 - lib/no_brainer/document/injection_layer.rb
-- lib/no_brainer/document/index.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/timestamps.rb
-- lib/no_brainer/document/core.rb
-- lib/no_brainer/document/callbacks.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/attributes.rb
-- lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/persistance.rb
-- lib/no_brainer/document/criteria.rb
+- lib/no_brainer/document/timestamps.rb
+- lib/no_brainer/document/attributes.rb
+- lib/no_brainer/document/id.rb
 - lib/no_brainer/document/types.rb
 - lib/no_brainer/query_runner/connection.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/missing_index.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/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/cache.rb
-- lib/no_brainer/criteria/termination/preload.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/fork.rb
 - lib/no_brainer/connection.rb
 - lib/no_brainer/query_runner.rb
-- lib/no_brainer/error.rb
-- lib/no_brainer/railtie.rb
 - lib/no_brainer/config.rb
 - lib/no_brainer/autoload.rb
-- lib/no_brainer/document.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.rb
+- lib/no_brainer/error.rb
+- lib/no_brainer/railtie.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: []

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