nobrainer 0.13.1 → 0.15.0

data/lib/no_brainer/query_runner/table_on_demand.rb

@@ -3,8 +3,8 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
     @runner.call(env)
   rescue RuntimeError => e
     if NoBrainer::Config.auto_create_tables &&
-       e.message =~ /^Table `(.+)` does not exist\.$/
-      auto_create_table(env, $1)
+       e.message =~ /^Table `(.+)\.(.+)` does not exist\.$/
+      auto_create_table(env, $1, $2)
       retry
     end
     raise
@@ -12,33 +12,22 @@ class NoBrainer::QueryRunner::TableOnDemand < NoBrainer::QueryRunner::Middleware
 
   private
 
-  def auto_create_table(env, table_name)
-    if env[:auto_create_table] == table_name
-      raise "Auto table creation is not working with #{table_name}"
+  def auto_create_table(env, database_name, table_name)
+    klass = NoBrainer::Document.all.select { |m| m.table_name == table_name }.first
+    if klass.nil?
+      raise "Auto table creation is not working for `#{database_name}.#{table_name}` -- Can't find the corresponding model."
     end
-    env[:auto_create_table] = table_name
 
-    # FIXME This stinks.
-    database_names = find_db_names(env[:query])
-    case database_names.size
-    when 0 then NoBrainer.table_create(table_name)
-    when 1 then NoBrainer.with_database(database_names.first) { NoBrainer.table_create(table_name) }
-    else raise "Ambiguous database name for creation on demand: #{database_names}"
+    if env[: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]
+
+    NoBrainer.with_database(database_name) do
+      NoBrainer.table_create(table_name, :primary_key => klass.pk_name)
     end
   rescue RuntimeError => e
     # We might have raced with another table create
-    raise unless e.message =~ /Table `#{table_name}` already exists/
-  end
-
-  def find_db_names(terms)
-    terms = terms.body.args if terms.is_a?(RethinkDB::RQL)
-    terms.map do |term|
-      next unless term.is_a?(Term)
-      if term.type == Term::TermType::DB
-        term.args.first.datum.r_str
-      else
-        find_db_names(term.args)
-      end
-    end.flatten.uniq
+    raise unless e.message =~ /Table `#{database_name}\.#{table_name}` already exists/
   end
 end

data/lib/no_brainer/query_runner/write_error.rb

@@ -1,13 +1,10 @@
 class NoBrainer::QueryRunner::WriteError < NoBrainer::QueryRunner::Middleware
   def call(env)
-    write_query = NoBrainer::Util.is_write_query?(env[:query])
+    write_query = NoBrainer::RQL.is_write_query?(env[:query])
     @runner.call(env).tap do |result|
-      # TODO Fix rethinkdb driver: Their classes Term, Query, Response are
-      # not scoped to the RethinkDB module! (that would prevent a user from
-      # creating a Response model for example).
-
-      if write_query && (result['errors'].to_i != 0 || result['skipped'].to_i != 0)
-        raise_write_error(env, result['first_error'])
+      if write_query && (result['errors'].to_i != 0)
+        error_msg = result['first_error']
+        raise_write_error(env, error_msg)
       end
     end
   rescue RethinkDB::RqlRuntimeError => e
@@ -23,6 +20,6 @@ class NoBrainer::QueryRunner::WriteError < NoBrainer::QueryRunner::Middleware
   def raise_write_error(env, error_msg)
     error_msg ||= "Unknown error"
     error_msg += "\nQuery was: #{env[:query].inspect[0..1000]}"
-    raise NoBrainer::Error::DocumentNotSaved, error_msg
+    raise NoBrainer::Error::DocumentNotPersisted, error_msg
   end
 end

data/lib/no_brainer/rql.rb

@@ -0,0 +1,25 @@
+module NoBrainer::RQL
+  include RethinkDB::Term::TermType
+  extend self
+
+  def is_write_query?(rql_query)
+    type_of(rql_query) == :write
+  end
+
+  def type_of(rql_query)
+    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,
+         INDEX_CREATE, INDEX_DROP, INDEX_LIST, INDEX_STATUS, INDEX_WAIT
+      :management
+    else
+      # XXX Not sure if that's correct, but we'll be happy for logging colors.
+      :read
+    end
+  end
+
+  def is_table?(rql)
+    rql.body.first == TABLE
+  end
+end

data/lib/nobrainer.rb

@@ -7,19 +7,18 @@ module NoBrainer
   require 'no_brainer/autoload'
   extend NoBrainer::Autoload
 
-  # We eager load things that could be loaded for the first time during the web request
+  # 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, :Util
+  eager_autoload :Config, :Connection, :Error, :QueryRunner, :Criteria, :RQL
 
   class << self
-    # Note: we always access the connection explicitly, so that in the future,
-    # we can refactor to return a connection depending on the context.
-    # Note that a connection is tied to a database in NoBrainer.
+    # 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).tap { |c| c.connect }
+        Connection.new(url)
       end
     end
 
@@ -46,6 +45,10 @@ module NoBrainer
     def jruby?
       RUBY_PLATFORM == 'java'
     end
+
+    def user_caller
+      caller.reject { |s| s =~ /\/no_brainer\// }.first
+    end
   end
 
   DecoratedSymbol.hook

data/lib/rails/generators/nobrainer/model/model_generator.rb

@@ -2,7 +2,8 @@ require "rails/generators/nobrainer"
 
 module NoBrainer::Generators
   class ModelGenerator < Base
-    argument :attributes, :type => :array, default: [], banner: "field ... field"
+    argument(:attributes, :type => :array, default: [],
+             banner: "field[:type][:index] ... field[:type][:index]")
 
     check_class_collision
 

data/lib/rails/generators/nobrainer/model/templates/model.rb.tt

@@ -2,12 +2,17 @@
 class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent] %>
 <% unless options[:parent] -%>
   include NoBrainer::Document
+  include NoBrainer::Document::Timestamps
+
 <% end -%>
 <% attributes.reject(&:reference?).each do |attribute| -%>
-  field :<%= attribute.name %>
+  field :<%= attribute.name -%>
+<%= puts attribute; ", :type => #{attribute.type.to_s.classify}" if attribute.type != :object -%>
+<%= ", :index => true" if attribute.has_index? %>
 <% end -%>
 <% attributes.select(&:reference?).each do |attribute| -%>
-  belongs_to :<%= attribute.name %>
+  belongs_to :<%= attribute.name -%>
+<%= ", :index => true" if attribute.has_index? %>
 <% end -%>
 end
 <% end -%>

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0.1
+        version: 1.13.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0.1
+        version: 1.13.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,13 @@ files:
 - lib/no_brainer/document/store_in.rb
 - lib/no_brainer/document/timestamps.rb
 - lib/no_brainer/document/types.rb
+- 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/integer.rb
+- lib/no_brainer/document/types/string.rb
+- lib/no_brainer/document/types/symbol.rb
+- lib/no_brainer/document/types/time.rb
 - lib/no_brainer/document/uniqueness.rb
 - lib/no_brainer/document/validation.rb
 - lib/no_brainer/error.rb
@@ -137,7 +144,7 @@ files:
 - lib/no_brainer/query_runner/write_error.rb
 - lib/no_brainer/railtie.rb
 - lib/no_brainer/railtie/database.rake
-- lib/no_brainer/util.rb
+- lib/no_brainer/rql.rb
 - lib/nobrainer.rb
 - lib/rails/generators/nobrainer.rb
 - lib/rails/generators/nobrainer/model/model_generator.rb

data/lib/no_brainer/util.rb

@@ -1,23 +0,0 @@
-module NoBrainer::Util
-  def self.is_write_query?(rql_query)
-    rql_type(rql_query) == :write
-  end
-
-  def self.rql_type(rql_query)
-    case rql_query.body.type
-    when Term::TermType::UPDATE,  Term::TermType::DELETE,
-         Term::TermType::REPLACE, Term::TermType::INSERT
-      :write
-    when Term::TermType::DB_CREATE,    Term::TermType::DB_DROP,
-         Term::TermType::DB_LIST,      Term::TermType::TABLE_CREATE,
-         Term::TermType::TABLE_DROP,   Term::TermType::TABLE_LIST,
-         Term::TermType::SYNC,         Term::TermType::INDEX_CREATE,
-         Term::TermType::INDEX_DROP,   Term::TermType::INDEX_LIST,
-         Term::TermType::INDEX_STATUS, Term::TermType::INDEX_WAIT
-      :management
-    else
-      # XXX Not sure if that's correct, but we'll be happy for logging colors.
-      :read
-    end
-  end
-end