nobrainer 0.20.0 → 0.21.0

data/lib/no_brainer/locale/en.yml

@@ -3,3 +3,4 @@ en:
     messages:
       taken: "is already taken"
       invalid_type: "should be a %{type}"
+      undefined: "must be defined"

data/lib/no_brainer/lock.rb

@@ -0,0 +1,114 @@
+require 'digest/sha1'
+
+class NoBrainer::Lock
+  include NoBrainer::Document
+
+  store_in :table => 'nobrainer_locks'
+
+  # Since PKs are limited to 127 characters, we can't use the user's key as a PK
+  # as it could be arbitrarily long.
+  field :key_hash,   :type => String, :primary_key => true, :default => ->{ Digest::SHA1.base64digest(key) }
+  field :key,        :type => String
+  field :token,      :type => String
+  field :expires_at, :type => Time
+
+  # We always use a new token, even when reading from the DB, because that's
+  # what represent our instance.
+  after_initialize { self.token = NoBrainer::Document::PrimaryKey::Generator.generate }
+
+  scope :expired, where(:expires_at.lt(RethinkDB::RQL.new.now))
+
+  def initialize(key, options={})
+    return super if options[:from_db]
+
+    key = case key
+      when Symbol then key.to_s
+      when String then key
+      else raise ArgumentError
+    end
+
+    super(options.merge(:key => key))
+  end
+
+  def lock(options={}, &block)
+    if block
+      lock(options)
+      return block.call.tap { unlock }
+    end
+
+    options.assert_valid_keys(:expire, :timeout)
+    timeout = NoBrainer::Config.lock_options.merge(options)[:timeout]
+    sleep_amount = 0.1
+
+    start_at = Time.now
+    while Time.now - start_at < timeout
+      return if try_lock(options.select { |k,_| k == :expire })
+      sleep(sleep_amount)
+      sleep_amount = [1, sleep_amount * 2].min
+    end
+
+    raise NoBrainer::Error::LockUnavailable.new("Lock on `#{key}' unavailable")
+  end
+
+  def try_lock(options={})
+    options.assert_valid_keys(:expire)
+    raise "Lock instance `#{key}' already locked" if @locked
+
+    set_expiration(options)
+
+    result = NoBrainer.run do |r|
+      selector.replace do |doc|
+        r.branch(doc.eq(nil).or(doc[:expires_at] < r.now),
+                 self.attributes, doc)
+      end
+    end
+
+    return @locked = (result['inserted'] + result['replaced']) == 1
+  end
+
+  def unlock
+    raise "Lock instance `#{key}' not locked" unless @locked
+
+    result = NoBrainer.run do |r|
+      selector.replace do |doc|
+        r.branch(doc[:token].eq(self.token),
+                 nil, doc)
+      end
+    end
+
+    @locked = false
+    raise NoBrainer::Error::LostLock.new("Lost lock on `#{key}'") unless result['deleted'] == 1
+  end
+
+  def refresh(options={})
+    options.assert_valid_keys(:expire)
+    raise "Lock instance `#{key}' not locked" unless @locked
+
+    set_expiration(options)
+
+    result = NoBrainer.run do |r|
+      selector.update do |doc|
+        r.branch(doc[:token].eq(self.token),
+                 { :expires_at => self.expires_at }, nil)
+      end
+    end
+
+    # Note: If we are too quick, expires_at may not change, and the returned
+    # 'replaced' won't be 1. We'll generate a spurious error. This is very
+    # unlikely to happen and should not harmful.
+    unless result['replaced'] == 1
+      @locked = false
+      raise NoBrainer::Error::LostLock.new("Lost lock on `#{key}'")
+    end
+  end
+
+  private
+
+  def set_expiration(options)
+    expire = NoBrainer::Config.lock_options.merge(options)[:expire]
+    self.expires_at = RethinkDB::RQL.new.now + expire
+  end
+
+  def save?; raise; end
+  def delete; raise; end
+end

data/lib/no_brainer/query_runner/database_on_demand.rb

@@ -10,7 +10,6 @@ class NoBrainer::QueryRunner::DatabaseOnDemand < NoBrainer::QueryRunner::Middlew
   end
 
   def handle_database_on_demand_exception?(env, e)
-    (NoBrainer::Config.auto_create_databases || env[:auto_create_databases]) &&
     e.message =~ /^Database `(.+)` does not exist\.$/ && $1
   end
 

data/lib/no_brainer/query_runner/missing_index.rb

@@ -11,7 +11,7 @@ class NoBrainer::QueryRunner::MissingIndex < NoBrainer::QueryRunner::Middleware
       index = model.indexes.values.select { |i| i.aliased_name == index_name.to_sym }.first if model
       index_name = index.name if index
 
-      if model.try(:pk_name).try(:to_s) == index_name
+      if model.try(:pk_name).try(:to_s) == index_name.to_s
         err_msg  = "Please update the primary key `#{index_name}` in the table `#{database_name}.#{table_name}`."
       else
         err_msg  = "Please run `NoBrainer.sync_indexes' or `rake nobrainer:sync_indexes' to create the index `#{index_name}`"

data/lib/no_brainer/query_runner/run_options.rb

@@ -30,9 +30,6 @@ 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

@@ -10,15 +10,14 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
   end
 
   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)
-    model = NoBrainer::Document::Index::MetaStore if table_name == 'nobrainer_index_meta'
-    model ||= NoBrainer::Document.all.select { |m| m.table_name == table_name }.first
+    model ||= NoBrainer::Document::Core._all.select { |m| m.table_name == table_name }.first
+    model ||= NoBrainer::Document::Core._all_nobrainer.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."

data/lib/no_brainer/rql.rb

@@ -27,8 +27,4 @@ module NoBrainer::RQL
       :read
     end
   end
-
-  def is_table?(rql)
-    rql.body.first == TABLE
-  end
 end

data/lib/nobrainer.rb

@@ -13,7 +13,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, :Geo
+  autoload :Document, :IndexManager, :Loader, :Fork, :Geo, :Lock
   eager_autoload :Config, :Connection, :ConnectionManager,  :Error,
                  :QueryRunner, :Criteria, :RQL
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -100,6 +100,7 @@ files:
 - lib/no_brainer/criteria/core.rb
 - lib/no_brainer/criteria/count.rb
 - lib/no_brainer/criteria/delete.rb
+- lib/no_brainer/criteria/eager_load.rb
 - lib/no_brainer/criteria/enumerable.rb
 - lib/no_brainer/criteria/extend.rb
 - lib/no_brainer/criteria/first.rb
@@ -107,7 +108,6 @@ files:
 - lib/no_brainer/criteria/limit.rb
 - lib/no_brainer/criteria/order_by.rb
 - lib/no_brainer/criteria/pluck.rb
-- lib/no_brainer/criteria/preload.rb
 - lib/no_brainer/criteria/raw.rb
 - lib/no_brainer/criteria/scope.rb
 - lib/no_brainer/criteria/update.rb
@@ -149,13 +149,16 @@ files:
 - lib/no_brainer/document/types/boolean.rb
 - lib/no_brainer/document/types/date.rb
 - lib/no_brainer/document/types/float.rb
+- lib/no_brainer/document/types/geo.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/text.rb
 - lib/no_brainer/document/types/time.rb
-- lib/no_brainer/document/uniqueness.rb
 - lib/no_brainer/document/validation.rb
+- lib/no_brainer/document/validation/not_null.rb
+- lib/no_brainer/document/validation/uniqueness.rb
 - lib/no_brainer/error.rb
 - lib/no_brainer/fork.rb
 - lib/no_brainer/geo.rb
@@ -166,6 +169,7 @@ files:
 - lib/no_brainer/geo/polygon.rb
 - lib/no_brainer/loader.rb
 - lib/no_brainer/locale/en.yml
+- lib/no_brainer/lock.rb
 - lib/no_brainer/query_runner.rb
 - lib/no_brainer/query_runner/connection_lock.rb
 - lib/no_brainer/query_runner/database_on_demand.rb

data/lib/no_brainer/criteria/preload.rb

@@ -1,44 +0,0 @@
-module NoBrainer::Criteria::Preload
-  extend ActiveSupport::Concern
-
-  included { criteria_option :preload, :merge_with => :append_array }
-
-  def preload(*values)
-    chain({:preload => values}, :copy_cache_from => self)
-  end
-
-  def merge!(criteria, options={})
-    super.tap do
-      # XXX Not pretty hack
-      if criteria.options[:preload].present? && criteria.cached?
-        perform_preloads(@cache)
-      end
-    end
-  end
-
-  def each(options={}, &block)
-    return super unless should_preloads? && !options[:no_preloading] && block
-
-    docs = []
-    super(options.merge(:no_preloading => true)) { |doc| docs << doc }
-    perform_preloads(docs)
-    docs.each(&block)
-    self
-  end
-
-  private
-
-  def should_preloads?
-    @options[:preload].present? && !raw?
-  end
-
-  def get_one(criteria)
-    super.tap { |doc| perform_preloads([doc]) }
-  end
-
-  def perform_preloads(docs)
-    if should_preloads? && docs.present?
-      NoBrainer::Document::Association::EagerLoader.new.eager_load(docs, @options[:preload])
-    end
-  end
-end