nobrainer 0.16.0 → 0.18.1

data/lib/no_brainer/query_runner/reconnect.rb

@@ -2,31 +2,34 @@ class NoBrainer::QueryRunner::Reconnect < NoBrainer::QueryRunner::Middleware
   def call(env)
     @runner.call(env)
   rescue StandardError => e
-    # TODO test that thing
+    context ||= { :retries => NoBrainer::Config.max_retries_on_connection_failure }
     if is_connection_error_exception?(e)
-      retry if reconnect(e)
+      if NoBrainer::Config.max_retries_on_connection_failure == 0
+        NoBrainer.disconnect
+      else
+        # XXX Possibly dangerous, as we could reexecute a non idempotent operation
+        # Check the semantics of the db
+        retry if reconnect(e, context)
+      end
     end
     raise
   end
 
   private
 
-  def reconnect(e)
-    # 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
-        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
+  def reconnect(e, context)
+    begin
+      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
-    false
   end
 
   def is_connection_error_exception?(e)

data/lib/no_brainer/query_runner/run_options.rb

@@ -30,6 +30,9 @@ class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
 
     env[:criteria] = env[:options].delete(:criteria)
 
+    env[:auto_create_tables] = env[:options].delete(:auto_create_tables)
+    env[:auto_create_databases] = env[:options].delete(:auto_create_databases)
+
     @runner.call(env)
   end
 end

data/lib/no_brainer/query_runner/table_on_demand.rb

@@ -2,32 +2,35 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
   def call(env)
     @runner.call(env)
   rescue RuntimeError => e
-    if table_info = table_on_demand_exception?(e)
+    if table_info = handle_table_on_demand_exception?(env, e)
       auto_create_table(env, *table_info)
       retry
     end
     raise
   end
 
-  def table_on_demand_exception?(e)
-    NoBrainer::Config.auto_create_tables && e.message =~ /^Table `(.+)\.(.+)` does not exist\.$/ && [$1, $2]
+  def handle_table_on_demand_exception?(env, e)
+    (NoBrainer::Config.auto_create_tables || env[:auto_create_tables]) &&
+    e.message =~ /^Table `(.+)\.(.+)` does not exist\.$/ && [$1, $2]
   end
 
   private
 
   def auto_create_table(env, database_name, table_name)
-    klass = NoBrainer::Document.all.select { |m| m.table_name == table_name }.first
-    if klass.nil?
+    model = NoBrainer::Document::Index::MetaStore if table_name == 'nobrainer_index_meta'
+    model ||= NoBrainer::Document.all.select { |m| m.table_name == table_name }.first
+
+    if model.nil?
       raise "Auto table creation is not working for `#{database_name}.#{table_name}` -- Can't find the corresponding model."
     end
 
-    if env[:auto_create_table] == [database_name, table_name]
+    if env[:last_auto_create_table] == [database_name, table_name]
       raise "Auto table creation is not working for `#{database_name}.#{table_name}`"
     end
-    env[:auto_create_table] = [database_name, table_name]
+    env[:last_auto_create_table] = [database_name, table_name]
 
     NoBrainer.with_database(database_name) do
-      NoBrainer.table_create(table_name, :primary_key => klass.pk_name)
+      NoBrainer.table_create(table_name, :primary_key => model.pk_name)
     end
   rescue RuntimeError => e
     # We might have raced with another table create

data/lib/no_brainer/railtie/database.rake

@@ -1,27 +1,27 @@
-namespace :db do
+namespace :nobrainer do
   desc 'Drop the database'
   task :drop => :environment do
     NoBrainer.drop!
   end
 
-  desc 'Load seed data from db/seeds.rb'
-  task :seed => :environment do
-    Rails.application.load_seed
+  desc 'Synchronize index definitions'
+  task :sync_indexes => :environment do
+    NoBrainer.sync_indexes(:verbose => true)
   end
 
-  desc 'Create and drop indexes on the database'
-  task :update_indexes => :environment do
-    NoBrainer.update_indexes(:verbose => true)
+  task :sync_indexes_quiet => :environment do
+    NoBrainer.sync_indexes
   end
 
-  task :update_indexes_quiet => :environment do
-    NoBrainer.update_indexes
+  desc 'Load seed data from db/seeds.rb'
+  task :seed => :environment do
+    Rails.application.load_seed
   end
 
-  desc 'Equivalent to db:update_indexes + db:seed'
-  task :setup => [ :update_indexes_quiet, :seed ]
+  desc 'Equivalent to :sync_indexes_quiet + :seed'
+  task :setup => [ :sync_indexes_quiet, :seed ]
 
-  desc 'Equivalent to db:drop + db:setup'
+  desc 'Equivalent to :drop + :setup'
   task :reset => [ :drop, :setup ]
 
   task :create => :environment do

data/lib/no_brainer/railtie.rb

@@ -5,9 +5,9 @@ class NoBrainer::Railtie < Rails::Railtie
   config.eager_load_namespaces << NoBrainer
 
   config.action_dispatch.rescue_responses.merge!(
-    "NoBrainer::Errors::DocumentNotFound" => :not_found,
-    "NoBrainer::Errors::DocumentInvalid"  => :unprocessable_entity,
-    "NoBrainer::Errors::InvalidType"      => :bad_request,
+    "NoBrainer::Error::DocumentNotFound" => :not_found,
+    "NoBrainer::Error::DocumentInvalid"  => :unprocessable_entity,
+    "NoBrainer::Error::InvalidType"      => :bad_request,
   )
 
   rake_tasks do
@@ -27,14 +27,14 @@ class NoBrainer::Railtie < Rails::Railtie
     NoBrainer::Config.configure unless NoBrainer::Config.configured?
 
     if defined?(ActiveRecord) && NoBrainer::Config.warn_on_active_record
-      STDERR.puts "[NoBrainer] WARNING: ActiveRecord is loaded which is probably not what you want."
+      STDERR.puts "[NoBrainer] ActiveRecord is loaded which is probably not what you want."
       STDERR.puts "[NoBrainer] Follow the instructions on http://nobrainer.io/docs/configuration/#removing_activerecord"
       STDERR.puts "[NoBrainer] Configure NoBrainer with 'config.warn_on_active_record = false' to disable with warning."
     end
 
     if defined?(Mongoid)
       STDERR.puts "[NoBrainer] WARNING: Mongoid is loaded, and we conflict on the symbol decorations"
-      STDERR.puts "[NoBrainer] They are used in queries like Model.where(:tags.in => ['fun', 'stuff'])"
+      STDERR.puts "[NoBrainer] They are used in queries such as Model.where(:tags.in => ['fun', 'stuff'])"
       STDERR.puts "[NoBrainer] This is a problem!"
     end
 

data/lib/no_brainer/rql.rb

@@ -2,6 +2,15 @@ module NoBrainer::RQL
   include RethinkDB::Term::TermType
   extend self
 
+  def reset_lambda_var_counter
+    RethinkDB::RQL.class_variable_set(:@@gensym_cnt, 0)
+  end
+
+  def rql_proc_as_json(block)
+    reset_lambda_var_counter
+    RethinkDB::RQL.new.new_func(&block).as_json
+  end
+
   def is_write_query?(rql_query)
     type_of(rql_query) == :write
   end

data/lib/nobrainer.rb

@@ -1,6 +1,9 @@
+require 'set'
 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)
+%w(module/delegation module/attribute_accessors module/introspection
+   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
@@ -10,28 +13,11 @@ 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
-  eager_autoload :Config, :Connection, :Error, :QueryRunner, :Criteria, :RQL
+  eager_autoload :Config, :Connection, :ConnectionManager,  :Error,
+                 :QueryRunner, :Criteria, :RQL
 
   class << self
-    # A connection is tied to a database.
-    def connection
-      @connection ||= begin
-        url = NoBrainer::Config.rethinkdb_url
-        raise "Please specify a database connection to RethinkDB" unless url
-        Connection.new(url)
-      end
-    end
-
-    def disconnect
-      @connection.try(:disconnect, :noreply_wait => true)
-      @connection = nil
-    end
-
-    def disconnect_if_url_changed
-      if @connection && @connection.uri != NoBrainer::Config.rethinkdb_url
-        disconnect
-      end
-    end
+    delegate :connection, :disconnect, :to => 'NoBrainer::ConnectionManager'
 
     delegate :db_create, :db_drop, :db_list,
              :table_create, :table_drop, :table_list,
@@ -39,7 +25,7 @@ module NoBrainer
 
     delegate :configure, :logger,   :to => 'NoBrainer::Config'
     delegate :run,                  :to => 'NoBrainer::QueryRunner'
-    delegate :update_indexes,       :to => 'NoBrainer::IndexManager'
+    delegate :sync_indexes,         :to => 'NoBrainer::Document::Index::Synchronizer'
     delegate :with, :with_database, :to => 'NoBrainer::QueryRunner::RunOptions'
 
     def jruby?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -78,6 +78,7 @@ files:
 - lib/no_brainer/autoload.rb
 - lib/no_brainer/config.rb
 - lib/no_brainer/connection.rb
+- lib/no_brainer/connection_manager.rb
 - lib/no_brainer/criteria.rb
 - lib/no_brainer/criteria/after_find.rb
 - lib/no_brainer/criteria/aggregate.rb
@@ -86,6 +87,7 @@ files:
 - lib/no_brainer/criteria/count.rb
 - lib/no_brainer/criteria/delete.rb
 - lib/no_brainer/criteria/enumerable.rb
+- lib/no_brainer/criteria/extend.rb
 - lib/no_brainer/criteria/first.rb
 - lib/no_brainer/criteria/index.rb
 - lib/no_brainer/criteria/limit.rb
@@ -107,6 +109,7 @@ files:
 - lib/no_brainer/document/association/has_many_through.rb
 - lib/no_brainer/document/association/has_one.rb
 - lib/no_brainer/document/association/has_one_through.rb
+- lib/no_brainer/document/atomic_ops.rb
 - lib/no_brainer/document/attributes.rb
 - lib/no_brainer/document/callbacks.rb
 - lib/no_brainer/document/core.rb
@@ -115,6 +118,9 @@ files:
 - lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/id.rb
 - lib/no_brainer/document/index.rb
+- lib/no_brainer/document/index/index.rb
+- lib/no_brainer/document/index/meta_store.rb
+- lib/no_brainer/document/index/synchronizer.rb
 - lib/no_brainer/document/injection_layer.rb
 - lib/no_brainer/document/lazy_fetch.rb
 - lib/no_brainer/document/missing_attributes.rb
@@ -130,6 +136,7 @@ files:
 - lib/no_brainer/document/types/date.rb
 - lib/no_brainer/document/types/float.rb
 - lib/no_brainer/document/types/integer.rb
+- lib/no_brainer/document/types/set.rb
 - lib/no_brainer/document/types/string.rb
 - lib/no_brainer/document/types/symbol.rb
 - lib/no_brainer/document/types/time.rb
@@ -137,7 +144,6 @@ files:
 - lib/no_brainer/document/validation.rb
 - lib/no_brainer/error.rb
 - lib/no_brainer/fork.rb
-- lib/no_brainer/index_manager.rb
 - lib/no_brainer/loader.rb
 - lib/no_brainer/locale/en.yml
 - lib/no_brainer/query_runner.rb
@@ -177,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ORM for RethinkDB

data/lib/no_brainer/index_manager.rb

@@ -1,9 +0,0 @@
-module NoBrainer::IndexManager
-  def self.update_indexes(options={})
-    NoBrainer::Document.all.each { |model| model.perform_update_indexes(options.merge(:wait => false)) }
-    unless options[:wait] == false
-      NoBrainer::Document.all.each { |model| model.wait_for_index(nil) }
-    end
-    true
-  end
-end