nobrainer 0.8.0 → 0.9.0

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

@@ -0,0 +1,31 @@
+class NoBrainer::Document::Association::HasManyThrough
+  include NoBrainer::Document::Association::Core
+
+  class Metadata
+    VALID_OPTIONS = [:through]
+    include NoBrainer::Document::Association::Core::Metadata
+
+    def through_association_name
+      options[:through].to_sym
+    end
+
+    def through_association
+      owner_klass.association_metadata[through_association_name] or
+        raise "#{through_association_name} association not found"
+    end
+
+    def eager_load(docs, criteria=nil)
+      NoBrainer::Document::Association::EagerLoader.new
+        .eager_load_association(through_association.eager_load(docs), target_name, criteria)
+    end
+  end
+
+  def read
+    # TODO implement joins
+    @targets ||= metadata.eager_load([owner]).freeze
+  end
+
+  def write(new_children)
+    raise "You can't assign #{target_name}"
+  end
+end

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

@@ -0,0 +1,13 @@
+class NoBrainer::Document::Association::HasOne < NoBrainer::Document::Association::HasMany
+  class Metadata < NoBrainer::Document::Association::HasMany::Metadata
+    def target_klass
+      (options[:class_name] || target_name.to_s.camelize).constantize
+    end
+  end
+
+  def read
+    targets = target_criteria.to_a # to load the cache
+    NoBrainer.logger.warn "#{owner} has more than one #{target_name}" if targets.size > 1
+    targets.first
+  end
+end

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

@@ -0,0 +1,10 @@
+class NoBrainer::Document::Association::HasOneThrough < NoBrainer::Document::Association::HasManyThrough
+  class Metadata < NoBrainer::Document::Association::HasManyThrough::Metadata
+  end
+
+  def read
+    targets = super
+    NoBrainer.logger.warn "#{owner} has more than one #{target_name}" if targets.size > 1
+    targets.first
+  end
+end

data/lib/no_brainer/document/attributes.rb

@@ -1,11 +1,12 @@
 module NoBrainer::Document::Attributes
   VALID_FIELD_OPTIONS = [:index, :default]
+  RESERVED_FIELD_NAMES = [:index, :default, :and, :or, :selector, :associations] + NoBrainer::DecoratedSymbol::MODIFIERS.keys
   extend ActiveSupport::Concern
 
   included do
     # Not using class_attribute because we want to
     # use our custom logic
-    class << self; attr_accessor :fields; end
+    singleton_class.send(:attr_accessor, :fields)
     self.fields = {}
   end
 
@@ -82,8 +83,8 @@ module NoBrainer::Document::Attributes
     def field(name, options={})
       name = name.to_sym
 
-      options.assert_valid_keys(*NoBrainer::Document::Attributes::VALID_FIELD_OPTIONS)
-      if name.in? NoBrainer::Criteria::Chainable::Where::RESERVED_FIELDS
+      options.assert_valid_keys(*VALID_FIELD_OPTIONS)
+      if name.in?(RESERVED_FIELD_NAMES)
         raise "Cannot use a reserved field name: #{name}"
       end
 

data/lib/no_brainer/document/core.rb

@@ -1,7 +1,7 @@
 module NoBrainer::Document::Core
   extend ActiveSupport::Concern
 
-  class << self; attr_accessor :all; end
+  singleton_class.send(:attr_accessor, :all)
   self.all = []
 
   # TODO This assume the primary key is id.

data/lib/no_brainer/document/criteria.rb

@@ -5,9 +5,7 @@ module NoBrainer::Document::Criteria
     self.class.selector_for(id)
   end
 
-  included do
-    class_attribute :default_scope_proc
-  end
+  included { cattr_accessor :default_scope_proc, :instance_accessor => false }
 
   module ClassMethods
     delegate :to_rql,                        # Core
@@ -39,6 +37,7 @@ module NoBrainer::Document::Criteria
 
     def default_scope(criteria=nil, &block)
       criteria ||= block
+      raise "store_in() must be called on the parent class" unless is_root_class?
       self.default_scope_proc = criteria.is_a?(Proc) ? criteria : proc { criteria }
     end
 

data/lib/no_brainer/document/index.rb

@@ -3,7 +3,7 @@ module NoBrainer::Document::Index
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :indexes
+    cattr_accessor :indexes, :instance_accessor => false
     self.indexes = {}
     self.index :id
   end
@@ -12,7 +12,7 @@ module NoBrainer::Document::Index
     def index(name, *args)
       name = name.to_sym
       options = args.extract_options!
-      options.assert_valid_keys(*NoBrainer::Document::Index::VALID_INDEX_OPTIONS)
+      options.assert_valid_keys(*VALID_INDEX_OPTIONS)
 
       raise "Too many arguments: #{args}" if args.size > 1
 
@@ -24,7 +24,7 @@ module NoBrainer::Document::Index
       end
 
       # FIXME Primary key may not always be :id
-      if name.in?(NoBrainer::Criteria::Chainable::Where::RESERVED_FIELDS)
+      if name.in?(NoBrainer::Document::Attributes::RESERVED_FIELD_NAMES)
         raise "Cannot use a reserved field name: #{name}"
       end
       if has_field?(name) && kind != :single

data/lib/no_brainer/document/polymorphic.rb

@@ -3,7 +3,7 @@ module NoBrainer::Document::Polymorphic
   include ActiveSupport::DescendantsTracker
 
   included do
-    class_attribute :root_class
+    cattr_accessor :root_class
     self.root_class = self
   end
 

data/lib/no_brainer/document/serialization.rb

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

data/lib/no_brainer/document/store_in.rb

@@ -1,14 +1,16 @@
+require 'rethinkdb'
+
 module NoBrainer::Document::StoreIn
   extend ActiveSupport::Concern
 
   included do
-    class_attribute :store_in_options
+    cattr_accessor :store_in_options, :instance_accessor => false
     self.store_in_options = {}
   end
 
   module ClassMethods
     def store_in(options)
-      raise "store_in() must be called on the parent class" unless root_class?
+      raise "store_in() must be called on the parent class" unless is_root_class?
       self.store_in_options.merge!(options)
     end
 
@@ -20,7 +22,7 @@ module NoBrainer::Document::StoreIn
     def table_name
       table = store_in_options[:table]
       table_name = table.is_a?(Proc) ? table.call : table
-      table_name || root_class.name.underscore.gsub('/', '__').pluralize
+      table_name || root_class.name.tableize.gsub('/', '__')
     end
 
     def rql_table

data/lib/no_brainer/error.rb

@@ -5,6 +5,7 @@ module NoBrainer::Error
   class DocumentNotSaved    < StandardError; end
   class ChildrenExist       < StandardError; end
   class CannotUseIndex      < StandardError; end
+  class MissingIndex        < StandardError; end
   class InvalidType         < StandardError; end
   class AssociationNotSaved < StandardError; end
 end

data/lib/no_brainer/query_runner.rb

@@ -11,7 +11,7 @@ module NoBrainer::QueryRunner
   end
 
   autoload :Driver, :DatabaseOnDemand, :TableOnDemand, :WriteError,
-           :Connection, :Selection, :RunOptions, :Logger
+           :Connection, :Selection, :RunOptions, :Logger, :MissingIndex
 
   class << self
     attr_accessor :stack
@@ -29,6 +29,7 @@ module NoBrainer::QueryRunner
     use RunOptions
     use Connection
     use WriteError
+    use MissingIndex
     use DatabaseOnDemand
     use TableOnDemand
     use Logger

data/lib/no_brainer/query_runner/driver.rb

@@ -1,8 +1,5 @@
 class NoBrainer::QueryRunner::Driver < NoBrainer::QueryRunner::Middleware
   def call(env)
-    env[:query].run(NoBrainer.connection, env[:options])
-  rescue NoMethodError => e
-    raise "NoBrainer is not connected to a RethinkDB instance" unless NoBrainer.connection
-    raise e
+    env[:query].run(NoBrainer.connection.raw, env[:options])
   end
 end

data/lib/no_brainer/query_runner/missing_index.rb

@@ -0,0 +1,11 @@
+class NoBrainer::QueryRunner::MissingIndex < NoBrainer::QueryRunner::Middleware
+  def call(env)
+    @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" +
+                                               "--> Read http://nobrainer.io/docs/indexes for more information.")
+    end
+    raise
+  end
+end

data/lib/no_brainer/query_runner/run_options.rb

@@ -1,12 +1,11 @@
 class NoBrainer::QueryRunner::RunOptions < NoBrainer::QueryRunner::Middleware
   # XXX NoBrainer::Database#drop() uses Thread.current[:nobrainer_options]
-  # We should fix that hack.
 
   def self.with_database(db_name, &block)
-    with_options(:db => db_name, &block)
+    with(:db => db_name, &block)
   end
 
-  def self.with_options(options={}, &block)
+  def self.with(options={}, &block)
     old_options = Thread.current[:nobrainer_options]
     Thread.current[:nobrainer_options] = (old_options || {}).merge(options.symbolize_keys)
     block.call if block

data/lib/no_brainer/railtie.rb

@@ -5,7 +5,6 @@ class NoBrainer::Railtie < Rails::Railtie
   config.action_dispatch.rescue_responses.merge!(
     "NoBrainer::Errors::DocumentNotFound" => :not_found,
     "NoBrainer::Errors::DocumentInvalid"  => :unprocessable_entity,
-    "NoBrainer::Errors::DocumentNotSaved" => :unprocessable_entity,
   )
 
   rake_tasks do

data/lib/no_brainer/version.rb

@@ -1,3 +1,3 @@
 module NoBrainer
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/nobrainer.rb

@@ -34,13 +34,13 @@ module NoBrainer
       end
     end
 
-    # No not use modules to extend, it's nice to see the NoBrainer module API here.
-    delegate :db_create, :db_drop, :db_list, :database, :to => :connection
-    delegate :table_create, :table_drop, :table_list,
-             :drop!, :purge!, :to => :database
+    # Not using modules to extend, it's nicer to see the NoBrainer module API here.
+    delegate :db_create, :db_drop, :db_list,
+             :table_create, :table_drop, :table_list,
+             :drop!, :purge!, :to => :connection
     delegate :run, :to => 'NoBrainer::QueryRunner'
     delegate :update_indexes, :to => 'NoBrainer::IndexManager'
-    delegate :with_options, :with_database, :to => 'NoBrainer::QueryRunner::RunOptions'
+    delegate :with, :with_database, :to => 'NoBrainer::QueryRunner::RunOptions'
     delegate :configure, :logger, :to => 'NoBrainer::Config'
 
     def jruby?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Nicolas Viennot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
@@ -65,61 +65,65 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/no_brainer/document/polymorphic.rb
 - lib/no_brainer/document/id.rb
 - lib/no_brainer/document/injection_layer.rb
-- lib/no_brainer/document/store_in.rb
 - lib/no_brainer/document/timestamps.rb
-- lib/no_brainer/document/association.rb
+- lib/no_brainer/document/association/belongs_to.rb
 - lib/no_brainer/document/association/core.rb
+- lib/no_brainer/document/association/eager_loader.rb
+- lib/no_brainer/document/association/has_many_through.rb
 - lib/no_brainer/document/association/has_many.rb
-- lib/no_brainer/document/association/belongs_to.rb
-- lib/no_brainer/document/core.rb
-- lib/no_brainer/document/criteria.rb
+- lib/no_brainer/document/association/has_one.rb
+- lib/no_brainer/document/association/has_one_through.rb
 - lib/no_brainer/document/dirty.rb
 - lib/no_brainer/document/dynamic_attributes.rb
 - lib/no_brainer/document/persistance.rb
-- lib/no_brainer/document/serialization.rb
 - lib/no_brainer/document/validation.rb
-- lib/no_brainer/document/attributes.rb
+- lib/no_brainer/document/serialization.rb
+- lib/no_brainer/document/criteria.rb
 - lib/no_brainer/document/index.rb
+- lib/no_brainer/document/polymorphic.rb
+- lib/no_brainer/document/store_in.rb
+- lib/no_brainer/document/attributes.rb
+- lib/no_brainer/document/core.rb
+- lib/no_brainer/document/association.rb
 - lib/no_brainer/query_runner/connection.rb
-- lib/no_brainer/query_runner/driver.rb
 - lib/no_brainer/query_runner/database_on_demand.rb
 - lib/no_brainer/query_runner/logger.rb
-- lib/no_brainer/query_runner/run_options.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/railtie/database.rake
-- lib/no_brainer/criteria/chainable/raw.rb
-- lib/no_brainer/criteria/chainable/core.rb
 - 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/cache.rb
 - lib/no_brainer/criteria/termination/delete.rb
 - lib/no_brainer/criteria/termination/eager_loading.rb
-- lib/no_brainer/autoload.rb
-- lib/no_brainer/railtie.rb
-- lib/no_brainer/criteria.rb
-- lib/no_brainer/database.rb
+- lib/no_brainer/criteria/termination/cache.rb
 - lib/no_brainer/decorated_symbol.rb
-- lib/no_brainer/document.rb
-- lib/no_brainer/error.rb
 - lib/no_brainer/index_manager.rb
 - lib/no_brainer/loader.rb
 - lib/no_brainer/locale/en.yml
-- lib/no_brainer/query_runner.rb
 - lib/no_brainer/util.rb
-- lib/no_brainer/config.rb
-- lib/no_brainer/connection.rb
 - lib/no_brainer/fork.rb
+- lib/no_brainer/criteria.rb
+- lib/no_brainer/connection.rb
+- lib/no_brainer/query_runner.rb
+- lib/no_brainer/error.rb
+- lib/no_brainer/document.rb
+- lib/no_brainer/config.rb
+- lib/no_brainer/railtie.rb
+- lib/no_brainer/autoload.rb
 - lib/no_brainer/version.rb
 - lib/nobrainer.rb
 - README.md

data/lib/no_brainer/database.rb

@@ -1,41 +0,0 @@
-class NoBrainer::Database
-  attr_accessor :connection
-
-  # FIXME This class is a bit weird as we don't use it to represent the current
-  # database.
-
-  delegate :database_name, :to => :connection
-
-  def initialize(connection)
-    self.connection = connection
-  end
-
-  def raw
-    @raw ||= RethinkDB::RQL.new.db(database_name)
-  end
-
-  def drop!
-    # FIXME Sad hack.
-    db = (Thread.current[:nobrainer_options] || {})[:db] || database_name
-    connection.db_drop(db)['dropped'] == 1
-  end
-
-  # Note that truncating each table (purge) is much faster than dropping the
-  # database (drop)
-  def purge!(options={})
-    table_list.each do |table_name|
-      NoBrainer.run { |r| r.table(table_name).delete }
-    end
-    true
-  rescue RuntimeError => e
-    raise e unless e.message =~ /No entry with that name/
-  end
-
-  [:table_create, :table_drop, :table_list].each do |cmd|
-    class_eval <<-RUBY, __FILE__, __LINE__ + 1
-      def #{cmd}(*args)
-        NoBrainer.run { |r| r.#{cmd}(*args) }
-      end
-    RUBY
-  end
-end