Enhanced version of adapter

.rubocop.yml

@@ -1,7 +1,7 @@
 # Generated by `rubocop --auto-gen-config`
 inherit_from: .rubocop_todo.yml
 
-# It’s quite readable when we know what we are doing
+# It's quite readable when we know what we are doing
 Lint/AssignmentInCondition:
   Enabled: false
 
@@ -10,7 +10,7 @@ Lint/HandleExceptions:
   Exclude:
     - Rakefile
 
-# The enforced style doesn’t match Vim’s defaults
+# The enforced style doesn't match Vim's defaults
 Style/AlignParameters:
   Enabled: false
 
@@ -42,7 +42,7 @@ Style/MultilineBlockChain:
 Style/RegexpLiteral:
   MaxSlashes: 0
 
-# Don’t introduce semantic fail/raise distinction
+# Don't introduce semantic fail/raise distinction
 Style/SignalException:
   EnforcedStyle: only_raise
 

lib/rom/rethinkdb/commands/create.rb

@@ -8,21 +8,26 @@ class Create < ROM::Commands::Create
         adapter :rethinkdb
 
         def execute(tuples)
-          insert_tuples =  [tuples].flatten.map do |tuple|
+          insert_tuples = [tuples].flatten.map do |tuple|
             attributes = input[tuple]
             validator.call(attributes)
             attributes.to_h
           end
 
-          insert(insert_tuples)
+          pks = insert(insert_tuples)
+          get_by_pks(pks)
         end
 
         def insert(tuples)
-          pks = dataset.scope.insert(tuples)
-                .run(dataset.connection)["generated_keys"]
+          dataset.scope.insert(tuples)
+            .run(dataset.connection)
+            .fetch('generated_keys')
+        end
 
-          dataset.filter { |user| relation.rql.expr(pks).contains(user["id"]) }
-            .to_a
+        def get_by_pks(pks)
+          dataset.filter do |user|
+            relation.rql.expr(pks).contains(user['id'])
+          end.to_a
         end
 
         def dataset

lib/rom/rethinkdb/dataset.rb

@@ -13,22 +13,26 @@ def initialize(scope, rql, connection)
       end
 
       def to_a
-        scope.run(connection)
+        wrap_array(scope.run(connection))
       end
 
       def each(&block)
         to_a.each(&block)
       end
 
-      def count
-        scope.count.run(connection)
+      def method_missing(command, *args, &block)
+        self.class.new(scope.public_send(command, *args, &block),
+          rql, connection)
       end
 
-      [:filter, :pluck, :order_by].each do |method_name|
-        define_method(method_name) do |*args, &block|
-          self.class.new(scope.send(method_name, *args, &block), rql,
-          connection)
-        end
+      private
+
+      def wrap_array(object)
+        return [object] if object.is_a?(Hash)
+        return object if object.is_a?(Array)
+        return [] if object.nil?
+
+        object.to_a
       end
     end
   end

lib/rom/rethinkdb/gateway.rb

@@ -31,7 +31,6 @@ def initialize(options)
       #
       # @api public
       def dataset(name)
-        rql.db(options[:db]).table(name.to_s).run(connection)
         datasets[name] = Dataset.new(rql.table(name.to_s), rql, connection)
       end
 
@@ -52,10 +51,7 @@ def [](name)
       #
       # @api public
       def dataset?(name)
-        rql.db(options[:db]).table(name.to_s).run(connection)
-        true
-      rescue ::RethinkDB::RqlRuntimeError
-        false
+        rql.db(options[:db]).table_list.run(connection).include?(name.to_s)
       end
 
       # Disconnect from database

lib/rom/rethinkdb/relation.rb

@@ -15,19 +15,11 @@ def rql
       end
 
       def count
-        dataset.count
+        dataset.to_a.count
       end
 
-      def filter(*args, &block)
-        __new__(dataset.__send__(__method__, *args, &block))
-      end
-
-      def pluck(*args, &block)
-        __new__(dataset.__send__(__method__, *args, &block))
-      end
-
-      def order_by(*args, &block)
-        __new__(dataset.__send__(__method__, *args, &block))
+      def method_missing(command, *args, &block)
+        __new__(dataset.public_send(command, *args, &block))
       end
     end
   end

spec/integration/commands/create_spec.rb

@@ -10,7 +10,7 @@
   subject(:users) { rom.commands.users }
 
   before do
-    create_table('test_db', 'users')
+    clean_table('test_db', 'users')
 
     setup.relation(:users)
 
@@ -41,7 +41,7 @@ class User
   end
 
   after do
-    drop_table('test_db', 'users')
+    clean_table('test_db', 'users')
   end
 
   it 'returns a single tuple when result is set to :one' do

spec/integration/commands/delete_spec.rb

@@ -10,7 +10,7 @@
   let(:gateway) { rom.gateways[:default] }
 
   before do
-    create_table('test_db', 'users')
+    clean_table('test_db', 'users')
 
     setup.relation(:users) do
       def by_id(id)
@@ -34,7 +34,7 @@ def by_id(id)
   end
 
   after do
-    drop_table('test_db', 'users')
+    clean_table('test_db', 'users')
   end
 
   it 'deletes all tuples in a restricted relation' do

spec/integration/commands/update_spec.rb

@@ -11,7 +11,7 @@
   let(:gateway) { rom.gateways[:default] }
 
   before do
-    create_table('test_db', 'users')
+    clean_table('test_db', 'users')
 
     setup.relation(:users) do
       def by_id(id)
@@ -48,7 +48,7 @@ class User
   end
 
   after do
-    drop_table('test_db', 'users')
+    clean_table('test_db', 'users')
   end
 
   it 'updates everything when there is no original tuple' do

spec/integration/repository_spec.rb

@@ -1,18 +1,19 @@
 require 'spec_helper'
-
 require 'virtus'
 
 describe 'RethinkDB gateway' do
-  include PrepareDB
-
   let(:gateway) { rom.gateways[:default] }
   let(:setup) { ROM.setup(:rethinkdb, db_options.merge(db: 'test_db')) }
   subject(:rom) { setup.finalize }
 
   before do
-    create_table('test_db', 'users')
+    clean_table('test_db', 'users')
 
     setup.relation(:users) do
+      def by_id(id)
+        get(id)
+      end
+
       def with_name(name)
         filter(name: name)
       end
@@ -32,6 +33,10 @@ def by_name
       def names_on_street(street)
         filter(street: street).order_by('name').pluck(:name)
       end
+
+      def undefined
+        undfn(with: 'args')
+      end
     end
 
     class User
@@ -63,10 +68,23 @@ class User
   end
 
   after do
-    drop_table('test_db', 'users')
+    clean_table('test_db', 'users')
   end
 
   describe 'env#relation' do
+    it 'raise error on undefined method' do
+      expect {
+        rom.relation(:users).undefined.to_a
+      }.to raise_error(NoMethodError)
+    end
+
+    it 'return data by primary key' do
+      pk = rom.relation(:users).to_a.map { |o| o.fetch('id') }.first
+      user = rom.relation(:users).as(:entity).by_id(pk).one
+
+      expect(user.id).to eq(pk)
+    end
+
     it 'returns mapped object' do
       jane = rom.relation(:users).as(:entity).with_name('Jane').to_a.first
 

spec/spec_helper.rb

@@ -13,13 +13,14 @@
 require_relative 'support/prepare_db'
 
 RSpec.configure do |config|
-  config.include PrepareDB
+  include PrepareDB
 
-  config.before(:all) do
+  config.before(:suite) do
     create_database('test_db')
+    create_table('test_db', 'users')
   end
 
-  config.after(:all) do
+  config.after(:suite) do
     drop_database('test_db')
   end
 end

spec/support/prepare_db.rb

@@ -1,33 +1,26 @@
 module PrepareDB
   def create_database(database)
-    drop_database(database)
-
     rql.db_create(database).run(connection)
   end
 
   def drop_database(database)
-    database_exist?(database) && rql.db_drop(database).run(connection)
-  end
-
-  def database_exist?(database)
-    database_list.include?(database.to_s)
-  end
-
-  def database_list
-    rql.db_list.run(connection)
+    rql.db_drop(database).run(connection)
   end
 
   def create_table(database, table)
-    drop_table(database, table)
-    rql.db(database).table_create(table).run(connection)
-  end
-
-  def drop_table(database, table)
     if table_exist?(database, table)
-      rql.db(database).table_drop(table).run(connection)
+      clean_table(database, table)
+    else
+      rql.db(database).table_create(table).run(connection)
     end
   end
 
+  def clean_table(database, table)
+    rql.db(database).table(table).delete.run(connection)
+  rescue RethinkDB::RqlOpFailedError
+    nil
+  end
+
   def table_exist?(database, table)
     table_list(database).include?(table.to_s)
   end