nobrainer 0.18.0 → 0.19.0

data/lib/no_brainer/document/atomic_ops.rb

@@ -2,54 +2,53 @@ module NoBrainer::Document::AtomicOps
   extend ActiveSupport::Concern
 
   class PendingAtomic
-    def self._new(instance, field, value, is_user_value, options={})
-      model = case value
-              when Array then PendingAtomicArray
-              when Set   then PendingAtomicSet
-              else self
-              end
-      model.new(instance, field, value, is_user_value, options)
+    def self._new(instance, field, value, is_user_value)
+      case value
+      when Array then PendingAtomicArray
+      when Set   then PendingAtomicSet
+      else self
+      end.new(instance, field, value, is_user_value)
     end
 
-    def initialize(instance, field, value, is_user_value, options={})
+    def initialize(instance, field, value, is_user_value)
       @instance = instance
       @field = field.to_s
       @value = value
       @is_user_value = is_user_value
-      @options = options.dup
       @ops = []
     end
 
-    def write_access?
-      !!@options[:write_access]
-    end
-
-    def ensure_writeable!
-      unless write_access?
-        @options[:write_access] = true
-        @instance.write_attribute(@field, self)
-      end
+    def initialize_copy(other)
+      super
+      @ops = @ops.dup
     end
 
     def to_s
-      "<#{@field} with pending atomic operations>"
+      "<`#{@field}' with #{@ops.size} pending atomic operations>"
     end
-    alias inspect to_s
+    alias_method :inspect, :to_s
 
-    def method_missing(method_name, *a, &b)
-      @ops << [method_name, a, b]
+    def method_missing(method, *a, &b)
+      @ops << [method, a, b]
       self
     end
 
     def compile_rql_value(rql_doc)
       field = @instance.class.lookup_field_alias(@field)
       value = @is_user_value ? RethinkDB::RQL.new.expr(@value) : rql_doc[field]
-      @ops.each { |method_name, a, b| value = value.__send__(method_name, *a, &b) }
-      value
+      @ops.reduce(value) { |v, (method, a, b)| v.__send__(method, *a, &b) }
+    end
+  end
+
+  class PendingAtomicContainer < PendingAtomic
+    def modify_source!
+      unless @instance._is_attribute_touched?(@field)
+        @instance.write_attribute(@field, self)
+      end
     end
   end
 
-  class PendingAtomicArray < PendingAtomic
+  class PendingAtomicArray < PendingAtomicContainer
     def -(value)
       @ops << [:difference, [value.to_a]]
       self
@@ -80,12 +79,12 @@ module NoBrainer::Document::AtomicOps
 
     def <<(value)
       @ops << [:append, [value]]
-      ensure_writeable!
+      modify_source!
       self
     end
   end
 
-  class PendingAtomicSet < PendingAtomicArray
+  class PendingAtomicSet < PendingAtomicContainer
     def -(value)
       @ops << [:set_difference, [value.to_a]]
       self
@@ -98,7 +97,7 @@ module NoBrainer::Document::AtomicOps
 
     def <<(value)
       @ops << [:set_union, [[value]]]
-      ensure_writeable!
+      modify_source!
       self
     end
   end
@@ -145,9 +144,9 @@ module NoBrainer::Document::AtomicOps
     value = super
 
     case [in_atomic?, value.is_a?(PendingAtomic)]
-    when [true, true]   then value
     when [true, false]  then PendingAtomic._new(self, name, value, _is_attribute_touched?(name))
     when [false, true]  then raise NoBrainer::Error::CannotReadAtomic.new(self, name, value)
+    when [true, true]   then value.is_a?(PendingAtomicContainer) ? value : value.dup
     when [false, false] then value
     end
   end
@@ -156,9 +155,9 @@ module NoBrainer::Document::AtomicOps
     ensure_exclusive_atomic!
 
     case [in_atomic?, value.is_a?(PendingAtomic)]
-    when [true, true]   then super
     when [true, false]  then raise NoBrainer::Error::AtomicBlock.new('Avoid the use of atomic blocks for non atomic operations')
     when [false, true]  then raise NoBrainer::Error::AtomicBlock.new('Use atomic blocks for atomic operations')
+    when [true, true]   then super.tap { _touch_attribute(name) }
     when [false, false] then super.tap { _touch_attribute(name) }
     end
   end

data/lib/no_brainer/document/attributes.rb

@@ -1,14 +1,11 @@
 module NoBrainer::Document::Attributes
-  VALID_FIELD_OPTIONS = [:index, :default, :type, :real_type,
-                         :validates, :required, :unique, :uniq, :format, :in,
-                         :readonly, :primary_key, :as, :lazy_fetch]
+  VALID_FIELD_OPTIONS = [:index, :default, :type, :readonly, :primary_key, :lazy_fetch, :store_as,
+                         :validates, :required, :unique, :uniq, :format, :in]
   RESERVED_FIELD_NAMES = [:index, :default, :and, :or, :selector, :associations, :pk_value] \
-                          + NoBrainer::DecoratedSymbol::MODIFIERS.keys
+                          + NoBrainer::Criteria::Where::OPERATORS
   extend ActiveSupport::Concern
 
   included do
-    # Not using class_attribute because we want to
-    # use our custom logic
     singleton_class.send(:attr_accessor, :fields)
     self.fields = {}
   end
@@ -46,20 +43,19 @@ module NoBrainer::Document::Attributes
 
   def assign_defaults(options)
     self.class.fields.each do |name, field_options|
-      if field_options.has_key?(:default) &&
-         !@_attributes.has_key?(name)
-
-         if opt = options[:missing_attributes]
-           if (opt[:pluck] && !opt[:pluck][name]) ||
-              (opt[:without] && opt[:without][name])
-             next
-           end
-         end
-
-        default_value = field_options[:default]
-        default_value = default_value.call if default_value.is_a?(Proc)
-        self.write_attribute(name, default_value)
+      next unless field_options.has_key?(:default) &&
+                  !@_attributes.has_key?(name)
+
+      if opt = options[:missing_attributes]
+        if (opt[:pluck] && !opt[:pluck][name]) ||
+           (opt[:without] && opt[:without][name])
+          next
+        end
       end
+
+      default_value = field_options[:default]
+      default_value = default_value.call if default_value.is_a?(Proc)
+      self.write_attribute(name, default_value)
     end
   end
 

data/lib/no_brainer/document/callbacks.rb

@@ -9,7 +9,7 @@ module NoBrainer::Document::Callbacks
   end
 
   def initialize(*args, &block)
-    run_callbacks(:initialize) { _initialize(*args); true }
+    run_callbacks(:initialize) { _initialize(*args, &block); true }
   end
 
   def _create(*args, &block)

data/lib/no_brainer/document/id.rb

@@ -51,14 +51,13 @@ module NoBrainer::Document::Id
     # 3 bytes inc
     oid += [get_inc].pack("N")[1, 3]
 
-    oid.unpack("C12").map {|e| v=e.to_s(16); v.size == 1 ? "0#{v}" : v }.join
+    oid.unpack("C12").map { |e| v = e.to_s(16); v.size == 1 ? "0#{v}" : v }.join
   end
 
   module ClassMethods
     def define_default_pk
       class_variable_set(:@@pk_name, nil)
-      field NoBrainer::Document::Id::DEFAULT_PK_NAME, :primary_key => :default,
-        :type => String, :default => ->{ NoBrainer::Document::Id.generate }
+      field NoBrainer::Document::Id::DEFAULT_PK_NAME, :primary_key => :default
     end
 
     def define_pk(attr)
@@ -81,6 +80,11 @@ module NoBrainer::Document::Id
       if options[:primary_key]
         options = options.merge(:readonly => true) if options[:readonly].nil?
         options = options.merge(:index => true)
+
+        if options[:type].in?([String, nil]) && options[:default].nil?
+          options[:type] = String
+          options[:default] = ->{ NoBrainer::Document::Id.generate }
+        end
       end
       super
     end

data/lib/no_brainer/document/index.rb

@@ -1,5 +1,5 @@
 module NoBrainer::Document::Index
-  VALID_INDEX_OPTIONS = [:external, :geo, :multi, :as]
+  VALID_INDEX_OPTIONS = [:external, :geo, :multi, :store_as]
   extend ActiveSupport::Concern
   extend NoBrainer::Autoload
 
@@ -14,6 +14,12 @@ module NoBrainer::Document::Index
     def index(name, *args)
       name = name.to_sym
       options = args.extract_options!
+
+      if options[:as]
+        STDERR.puts "[NoBrainer] `:as' is deprecated and will be removed. Please use `:store_as' instead (from the #{self} model)"
+        options[:store_as] = options.delete(:as)
+      end
+
       options.assert_valid_keys(*VALID_INDEX_OPTIONS)
 
       raise "Too many arguments: #{args}" if args.size > 1
@@ -33,12 +39,16 @@ module NoBrainer::Document::Index
         raise "Cannot reuse field name #{name}"
       end
 
-      as = options.delete(:as)
-      as ||= fields[name][:as] if has_field?(name)
-      as ||= name
-      as = as.to_sym
+      if kind == :compound && what.size < 2
+        raise "Compound indexes only make sense with 2 or more fields"
+      end
+
+      store_as = options.delete(:store_as)
+      store_as ||= fields[name][:store_as] if has_field?(name)
+      store_as ||= name
+      store_as = store_as.to_sym
 
-      indexes[name] = NoBrainer::Document::Index::Index.new(self.root_class, name, as,
+      indexes[name] = NoBrainer::Document::Index::Index.new(self.root_class, name, store_as,
         kind, what, options[:external], options[:geo], options[:multi], nil)
     end
 
@@ -57,12 +67,12 @@ module NoBrainer::Document::Index
 
       super
 
-      as = {:as => options[:as]}
+      store_as = {:store_as => options[:store_as]}
       case options[:index]
       when nil    then
-      when Hash   then index(attr, as.merge(options[:index]))
-      when Symbol then index(attr, as.merge(options[:index] => true))
-      when true   then index(attr, as)
+      when Hash   then index(attr, store_as.merge(options[:index]))
+      when Symbol then index(attr, store_as.merge(options[:index] => true))
+      when true   then index(attr, store_as)
       when false  then remove_index(attr)
       end
     end

data/lib/no_brainer/document/persistance.rb

@@ -45,16 +45,16 @@ module NoBrainer::Document::Persistance
 
   def reload(options={})
     [:without, :pluck].each do |type|
-      if v = options.delete(type)
-        v = Hash[v.flatten.map { |k| [k, true] }] if v.is_a?(Array)
-        v = {v => true} if !v.is_a?(Hash)
-        v = v.select { |k,_v| _v }
-        v = v.with_indifferent_access
-        next unless v.present?
-
-        options[:missing_attributes] ||= {}
-        options[:missing_attributes][type] = v
-      end
+      next unless v = options.delete(type)
+
+      v = Hash[v.flatten.map { |k| [k, true] }] if v.is_a?(Array)
+      v = {v => true} unless v.is_a?(Hash)
+      v = v.select { |k,_v| _v }
+      v = v.with_indifferent_access
+      next unless v.present?
+
+      options[:missing_attributes] ||= {}
+      options[:missing_attributes][type] = v
     end
     _reload(options)
   end
@@ -144,6 +144,7 @@ module NoBrainer::Document::Persistance
     def create(attrs={}, options={})
       new(attrs, options).tap { |doc| doc.save(options) }
     end
+    alias_method :create!, :create
 
     def insert_all(*args)
       docs = args.shift

data/lib/no_brainer/document/timestamps.rb

@@ -7,12 +7,14 @@ module NoBrainer::Document::Timestamps
   end
 
   def _create(options={})
-    self.created_at = self.updated_at = Time.now
+    now = Time.now
+    self.created_at = now unless created_at_changed?
+    self.updated_at = now unless updated_at_changed?
     super
   end
 
   def _update(attrs)
-    self.updated_at = Time.now
+    self.updated_at = Time.now unless updated_at_changed?
     super(attrs.merge('updated_at' => @_attributes['updated_at']))
   end
 end

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

@@ -20,4 +20,3 @@ class NoBrainer::Binary
   end
   extend NoBrainerExtentions
 end
-

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

@@ -23,4 +23,3 @@ class NoBrainer::Boolean
   end
   extend NoBrainerExtentions
 end
-

data/lib/no_brainer/document/types.rb

@@ -88,15 +88,6 @@ module NoBrainer::Document::Types
         remove_method("#{attr}?") if method_defined?("#{attr}?")
       end
     end
-
-    def field(attr, options={})
-      options[:real_type] = options[:type]
-      if options[:type] == Array || options[:type] == Hash
-        # XXX For the moment, NoBrainer does not support these complex types
-        options.delete(:type)
-      end
-      super
-    end
   end
 
   require File.join(File.dirname(__FILE__), 'types', 'binary')

data/lib/no_brainer/document/uniqueness.rb

@@ -58,7 +58,6 @@ module NoBrainer::Document::Uniqueness
       subclass.unique_validators = self.unique_validators.dup
       super
     end
-
   end
 
   class UniquenessValidator < ActiveModel::EachValidator

data/lib/no_brainer/document/validation.rb

@@ -23,11 +23,11 @@ module NoBrainer::Document::Validation
   module ClassMethods
     def _field(attr, options={})
       super
-      validates(attr, { :format => { :with => options[:format] } }) if options.has_key?(:format)
-      validates(attr, { :presence => options[:required] }) if options.has_key?(:required)
-      validates(attr, { :uniqueness => options[:unique] }) if options.has_key?(:unique)
-      validates(attr, { :uniqueness => options[:uniq] }) if options.has_key?(:uniq)
-      validates(attr, { :inclusion => {:in => options[:in]} }) if options.has_key?(:in)
+      validates(attr, :format => { :with => options[:format] }) if options.has_key?(:format)
+      validates(attr, :presence => options[:required]) if options.has_key?(:required)
+      validates(attr, :uniqueness => options[:unique]) if options.has_key?(:unique)
+      validates(attr, :uniqueness => options[:uniq]) if options.has_key?(:uniq)
+      validates(attr, :inclusion => {:in => options[:in]}) if options.has_key?(:in)
       validates(attr, options[:validates]) if options[:validates]
     end
   end

data/lib/no_brainer/error.rb

@@ -9,6 +9,7 @@ module NoBrainer::Error
   class AssociationNotPersisted < RuntimeError; end
   class ReadonlyField           < RuntimeError; end
   class MissingAttribute        < RuntimeError; end
+  class UnknownAttribute        < RuntimeError; end
   class AtomicBlock             < RuntimeError; end
 
   class CannotReadAtomic < RuntimeError

data/lib/no_brainer/query_runner/connection_lock.rb

@@ -3,7 +3,7 @@ class NoBrainer::QueryRunner::ConnectionLock < NoBrainer::QueryRunner::Middlewar
 
   def call(env)
     if NoBrainer::Config.per_thread_connection
-      @runner.call(env) 
+      @runner.call(env)
     else
       @@lock.synchronize { @runner.call(env) }
     end

data/lib/no_brainer/query_runner/reconnect.rb

@@ -18,18 +18,16 @@ class NoBrainer::QueryRunner::Reconnect < NoBrainer::QueryRunner::Middleware
   private
 
   def reconnect(e, context)
-    begin
-      return false if context[:retries].zero?
-      context[:retries] -= 1
+    return false if context[:retries].zero?
+    context[:retries] -= 1
 
-      warn_reconnect(e)
-      sleep 1
-      NoBrainer.connection.reconnect(:noreply_wait => false)
-      return true
-    rescue StandardError => e
-      retry if is_connection_error_exception?(e)
-      raise
-    end
+    warn_reconnect(e)
+    sleep 1
+    NoBrainer.connection.reconnect(:noreply_wait => false)
+    true
+  rescue StandardError => e
+    retry if is_connection_error_exception?(e)
+    raise
   end
 
   def is_connection_error_exception?(e)

data/lib/no_brainer/query_runner/table_on_demand.rb

@@ -30,7 +30,7 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
     env[:last_auto_create_table] = [database_name, table_name]
 
     NoBrainer.with_database(database_name) do
-      NoBrainer.table_create(table_name, :primary_key => model.pk_name)
+      NoBrainer.table_create(table_name, :primary_key => model.lookup_field_alias(model.pk_name))
     end
   rescue RuntimeError => e
     # We might have raced with another table create

data/lib/no_brainer/railtie/database.rake

@@ -19,10 +19,10 @@ namespace :nobrainer do
   end
 
   desc 'Equivalent to :sync_indexes_quiet + :seed'
-  task :setup => [ :sync_indexes_quiet, :seed ]
+  task :setup => [:sync_indexes_quiet, :seed]
 
   desc 'Equivalent to :drop + :setup'
-  task :reset => [ :drop, :setup ]
+  task :reset => [:drop, :setup]
 
   task :create => :environment do
     # noop

data/lib/no_brainer/rql.rb

@@ -19,7 +19,7 @@ module NoBrainer::RQL
     case rql_query.body.first
     when UPDATE, DELETE, REPLACE, INSERT
       :write
-    when DB_CREATE,DB_DROP, DB_LIST, TABLE_CREATE, TABLE_DROP, TABLE_LIST, SYNC,
+    when DB_CREATE, DB_DROP, DB_LIST, TABLE_CREATE, TABLE_DROP, TABLE_LIST, SYNC,
          INDEX_CREATE, INDEX_DROP, INDEX_LIST, INDEX_STATUS, INDEX_WAIT
       :management
     else

data/lib/nobrainer.rb

@@ -12,7 +12,7 @@ module NoBrainer
 
   # We eager load things that could be loaded when handling the first web request.
   # Code that is loaded through the DSL of NoBrainer should not be eager loaded.
-  autoload :Document, :IndexManager, :Loader, :Fork, :DecoratedSymbol
+  autoload :Document, :IndexManager, :Loader, :Fork
   eager_autoload :Config, :Connection, :ConnectionManager,  :Error,
                  :QueryRunner, :Criteria, :RQL
 
@@ -31,13 +31,8 @@ module NoBrainer
     def jruby?
       RUBY_PLATFORM == 'java'
     end
-
-    def user_caller
-      caller.reject { |s| s =~ /\/no_brainer\// }.first
-    end
   end
 
-  DecoratedSymbol.hook
   Fork.hook unless jruby?
 end
 

data/lib/rails/generators/nobrainer.rb

@@ -12,7 +12,7 @@ module NoBrainer::Generators
     end
 
     def self.namespace
-      super.gsub(/no_brainer/,'nobrainer')
+      super.gsub(/no_brainer/, 'nobrainer')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0.0
+        version: 1.15.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0.0
+        version: 1.15.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: symbol_decoration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: ORM for RethinkDB
 email:
 - nicolas@viennot.biz
@@ -98,7 +112,6 @@ files:
 - 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/aliases.rb
 - lib/no_brainer/document/association.rb

data/lib/no_brainer/decorated_symbol.rb

@@ -1,17 +0,0 @@
-class NoBrainer::DecoratedSymbol < Struct.new(:symbol, :modifier, :args)
-  MODIFIERS = { :in => :in, :nin => :nin,
-                :eq => :eq, :ne => :ne, :not => :ne,
-                :gt => :gt, :ge => :ge, :gte => :ge,
-                :lt => :lt, :le => :le, :lte => :le,
-                :defined => :defined }
-
-  def self.hook
-    Symbol.class_eval do
-      MODIFIERS.each do |modifier_name, modifier|
-        define_method modifier_name do |*args|
-          NoBrainer::DecoratedSymbol.new(self, modifier, args)
-        end
-      end
-    end
-  end
-end