rom-sql 0.6.1 → 0.7.0.beta1

data/spec/integration/commands/delete_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe 'Commands / Delete' do
   include_context 'users and tasks'
 
-  subject(:users) { rom.commands.users }
+  subject(:users) { container.commands.users }
 
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_name(name)
         where(name: name)
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete) do
         result :one
       end
     end
 
-    rom.relations.users.insert(id: 2, name: 'Jane')
+    container.relations.users.insert(id: 2, name: 'Jane')
   end
 
   context '#transaction' do
@@ -27,7 +27,7 @@ describe 'Commands / Delete' do
         users.delete.transaction do
           users.delete.by_name('Jane').call
         end
-      }.to change { rom.relations.users.count }.by(-1)
+      }.to change { container.relations.users.count }.by(-1)
     end
 
     it 'delete nothing if error was raised' do
@@ -36,7 +36,7 @@ describe 'Commands / Delete' do
           users.delete.by_name('Jane').call
           raise ROM::SQL::Rollback
         end
-      }.to_not change { rom.relations.users.count }
+      }.to_not change { container.relations.users.count }
     end
   end
 

data/spec/integration/commands/update_spec.rb

@@ -4,14 +4,14 @@ require 'anima'
 describe 'Commands / Update' do
   include_context 'database setup'
 
-  subject(:users) { rom.command(:users) }
+  subject(:users) { container.command(:users) }
 
-  let(:relation) { rom.relations.users }
+  let(:relation) { container.relations.users }
   let(:piotr) { relation.by_name('Piotr').one }
   let(:peter) { { name: 'Peter' } }
 
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_id(id)
         where(id: id).limit(1)
       end
@@ -21,13 +21,13 @@ describe 'Commands / Update' do
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:update)
     end
 
     User = Class.new { include Anima.new(:id, :name) }
 
-    setup.mappers do
+    configuration.mappers do
       register :users, entity: -> tuples { tuples.map { |tuple| User.new(tuple) } }
     end
 

data/spec/integration/{repository_spec.rb → gateway_spec.rb}

@@ -5,12 +5,10 @@ describe ROM::SQL::Gateway do
     let(:conn) { Sequel.connect(DB_URI) }
 
     context 'creating migrations inline' do
-      subject(:gateway) { ROM.env.gateways[:default] }
+      subject(:gateway) { container.gateways[:default] }
 
-      before do
-        ROM.setup(:sql, conn)
-        ROM.finalize
-      end
+      let(:configuration) { ROM::Configuration.new(:sql, conn) }
+      let!(:container) { ROM.container(configuration) }
 
       after do
         [:rabbits, :carrots].each do |name|
@@ -19,7 +17,7 @@ describe ROM::SQL::Gateway do
       end
 
       it 'allows creating and running migrations' do
-        migration = ROM::SQL.migration do
+        migration = gateway.migration do
           up do
             create_table(:rabbits) do
               primary_key :id
@@ -43,19 +41,27 @@ describe ROM::SQL::Gateway do
     end
 
     context 'running migrations from a file system' do
+      include_context 'database setup'
+
       let(:migration_dir) do
         Pathname(__FILE__).dirname.join('../fixtures/migrations').realpath
       end
 
       let(:migrator) { ROM::SQL::Migration::Migrator.new(conn, path: migration_dir) }
+      let(:configuration) { ROM::Configuration.new(:sql, [conn, migrator: migrator]) }
+      let!(:container) { ROM.container(configuration) }
+
+      it 'returns true for pending migrations' do
+        expect(container.gateways[:default].pending_migrations?).to be_truthy
+      end
 
-      before do
-        ROM.setup(:sql, [conn, migrator: migrator])
-        ROM.finalize
+      it 'returns false for non pending migrations' do
+        container.gateways[:default].run_migrations
+        expect(container.gateways[:default].pending_migrations?).to be_falsy
       end
 
       it 'runs migrations from a specified directory' do
-        ROM.env.gateways[:default].run_migrations
+        container.gateways[:default].run_migrations
       end
     end
   end
@@ -64,24 +70,31 @@ describe ROM::SQL::Gateway do
     include_context 'database setup'
 
     it 'skips settings up associations when tables are missing' do
-      ROM.setup(:sql, uri)
+      configuration = ROM::Configuration.new(:sql, uri) do |config|
+        config.use(:macros)
 
-      ROM.relation(:foos) do
-        one_to_many :bars, key: :foo_id
+        config.relation(:foos) do
+          use :assoc_macros
+          primary_key :id
+          one_to_many :bars, key: :foo_id
+        end
       end
-
-      expect { ROM.finalize }.not_to raise_error
+      expect { ROM.container(configuration) }.not_to raise_error
     end
 
     it 'skips finalization a relation when table is missing' do
-      ROM.setup(:sql, uri)
-
-      class Foos < ROM::Relation[:sql]
-        dataset :foos
-        one_to_many :bars, key: :foo_id
+      configuration = ROM::Configuration.new(:sql, uri) do |config|
+        config.use(:macros)
+
+        class Foos < ROM::Relation[:sql]
+          dataset :foos
+          use :assoc_macros
+          primary_key :id
+          one_to_many :bars, key: :foo_id
+        end
       end
 
-      expect { ROM.finalize }.not_to raise_error
+      expect { ROM.container(configuration) }.not_to raise_error
       expect { Foos.model.dataset }.to raise_error(Sequel::Error, /no dataset/i)
     end
   end

data/spec/integration/migration_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe ROM::SQL, '.migration' do
   let(:connection) { ROM::SQL.gateway.connection }
+  let(:configuration) { ROM::Configuration.new(:sql, DB_URI) }
 
   before do
-    ROM.setup(:sql, DB_URI)
+    configuration
     connection.drop_table?(:dragons)
   end
 
-  it 'creates a migration for a specific gateway' do
-
+  xit 'creates a migration for a specific gateway' do
     migration = ROM::SQL.migration do
       change do
         create_table :dragons do

data/spec/integration/read_spec.rb

@@ -34,12 +34,16 @@ describe 'Reading relations' do
       end
     end
 
-    setup.relation(:goals) do
+    configuration.relation(:goals) do
+      use :assoc_macros
+
       register_as :goals
       dataset :tasks
     end
 
-    setup.relation(:users) do
+    configuration.relation(:users) do
+      use :assoc_macros
+
       one_to_many :goals, key: :user_id
 
       def by_name(name)
@@ -55,7 +59,9 @@ describe 'Reading relations' do
       end
     end
 
-    setup.relation(:user_goal_counts) do
+    configuration.relation(:user_goal_counts) do
+      use :assoc_macros
+
       dataset :users
       register_as :user_goal_counts
       one_to_many :goals, key: :user_id
@@ -71,7 +77,7 @@ describe 'Reading relations' do
       end
     end
 
-    setup.mappers do
+    configuration.mappers do
       define(:users) do
         model User
 
@@ -90,7 +96,7 @@ describe 'Reading relations' do
   end
 
   it 'loads domain objects' do
-    user = rom.relation(:users).as(:users).with_goals.by_name('Piotr').to_a.first
+    user = container.relation(:users).as(:users).with_goals.by_name('Piotr').to_a.first
 
     expect(user).to eql(
       User.new(
@@ -99,9 +105,9 @@ describe 'Reading relations' do
   end
 
   it 'works with grouping and aggregates' do
-    rom.relations[:goals].insert(id: 2, user_id: 1, title: 'Get Milk')
+    container.relations[:goals].insert(id: 2, user_id: 1, title: 'Get Milk')
 
-    users_with_goal_count = rom.relation(:user_goal_counts).as(:user_goal_counts).all
+    users_with_goal_count = container.relation(:user_goal_counts).as(:user_goal_counts).all
 
     expect(users_with_goal_count.to_a).to eq([
       UserGoalCount.new(id: 1, name: "Piotr", goal_count: 2)

data/spec/shared/database_setup.rb

@@ -1,10 +1,8 @@
 shared_context 'database setup' do
-  subject(:rom) { setup.finalize }
-
   let(:uri) { DB_URI }
   let(:conn) { Sequel.connect(uri) }
-
-  let(:setup) { ROM.setup(:sql, conn) }
+  let(:configuration) { ROM::Configuration.new(:sql, conn).use(:macros) }
+  let(:container) { ROM.container(configuration) }
 
   def drop_tables
     [:tasks, :users, :tags, :task_tags, :rabbits, :carrots, :schema_migrations].each do |name|
@@ -36,7 +34,7 @@ shared_context 'database setup' do
     end
 
     conn.create_table :task_tags do
-      primary_key :tag_id, :task_id
+      primary_key [:tag_id, :task_id]
       Integer :tag_id
       Integer :task_id
     end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'bundler'
 Bundler.setup
 
 if RUBY_ENGINE == 'rbx'
-  require "codeclimate-test-reporter"
+  require 'codeclimate-test-reporter'
   CodeClimate::TestReporter.start
 end
 
@@ -18,13 +18,11 @@ require 'active_support/inflector'
 require 'logger'
 begin
   require 'byebug'
-rescue LoadError
+rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
-ROM.use :auto_registration
-
 LOGGER = Logger.new(File.open('./log/test.log', 'a'))
-DB_URI = 'postgres://localhost/rom'
+DB_URI = 'postgres://localhost/rom_sql'
 
 root = Pathname(__FILE__).dirname
 TMP_PATH = root.join('../tmp')
@@ -45,6 +43,5 @@ RSpec.configure do |config|
   config.after do
     added_constants = Object.constants - @constants
     added_constants.each { |name| Object.send(:remove_const, name) }
-    ROM.instance_variable_get('@environment').instance_variable_set('@gateways', {})
   end
 end

data/spec/support/active_support_notifications_spec.rb

@@ -7,7 +7,7 @@ describe 'ActiveSupport::Notifications support' do
   include_context 'database setup'
 
   it 'works' do
-    rom.gateways[:default].use_logger(LOGGER)
+    container.gateways[:default].use_logger(LOGGER)
 
     sql = nil
 

data/spec/support/rails_log_subscriber_spec.rb

@@ -18,7 +18,7 @@ describe 'Rails log subscriber' do
 
   before do
     set_logger(logger)
-    rom.gateways[:default].use_logger(logger)
+    container.gateways[:default].use_logger(logger)
   end
 
   it 'works' do

data/spec/unit/association_errors_spec.rb

@@ -5,16 +5,17 @@ describe 'Association errors' do
 
   describe 'accessing an undefined association' do
     specify do
-      setup.relation(:users) do
+      configuration.relation(:users) do
+        use :assoc_macros
+
         def with_undefined
           association_join(:undefined)
         end
       end
 
       expect {
-        rom.relations.users.with_undefined
+        container.relations.users.with_undefined
       }.to raise_error ROM::SQL::NoAssociationError, 'Association :undefined has not been defined for relation :users'
     end
   end
 end
-

data/spec/unit/combined_associations_spec.rb

@@ -8,11 +8,13 @@ describe 'Defining multiple associations' do
   end
 
   it 'extends relation with association methods' do
-    setup.relation(:users)
+    configuration.relation(:users) { use :assoc_macros }
 
-    setup.relation(:tags)
+    configuration.relation(:tags) { use :assoc_macros }
+
+    configuration.relation(:tasks) do
+      use :assoc_macros
 
-    setup.relation(:tasks) do
       many_to_one :users, key: :user_id
 
       many_to_many :tags,
@@ -49,7 +51,7 @@ describe 'Defining multiple associations' do
       end
     end
 
-    tasks = rom.relations.tasks
+    tasks = container.relations.tasks
 
     expect(tasks.with_user_and_tags.to_a).to eql([
       { id: 1, title: 'Finish ROM', name: 'Piotr', tags_name: 'important' },
@@ -67,7 +69,7 @@ describe 'Defining multiple associations' do
 
     expect(tasks.all.with_user.to_a).to eql([
       { id: 1, title: 'Finish ROM', name: 'Piotr' },
-      { id: 2, title: 'Go to sleep', name: 'Piotr'  }
+      { id: 2, title: 'Go to sleep', name: 'Piotr' }
     ])
 
     expect(tasks.by_title('Go to sleep').to_a).to eql(

data/spec/unit/gateway_spec.rb

@@ -5,12 +5,12 @@ require 'rom/lint/spec'
 describe ROM::SQL::Gateway do
   include_context 'users and tasks'
 
-  let(:gateway) { rom.gateways[:default] }
+  let(:gateway) { container.gateways[:default] }
 
   it_behaves_like 'a rom gateway' do
     let(:identifier) { :sql }
     let(:gateway) { ROM::SQL::Gateway }
-    let(:uri) { 'postgres://localhost/rom' }
+    let(:uri) { DB_URI }
   end
 
   describe '#dataset?' do

data/spec/unit/logger_spec.rb

@@ -4,7 +4,7 @@ describe 'Logger' do
   include_context 'database setup'
 
   it 'sets up a logger for sequel' do
-    gateway = rom.gateways[:default]
+    gateway = container.gateways[:default]
 
     gateway.use_logger(LOGGER)
 

data/spec/unit/many_to_many_spec.rb

@@ -8,7 +8,12 @@ describe 'Defining many-to-one association' do
   end
 
   it 'extends relation with association methods' do
-    setup.relation(:tasks) do
+    configuration.relation(:tags) { use :assoc_macros }
+    configuration.relation(:task_tags) { use :assoc_macros }
+
+    configuration.relation(:tasks) do
+      use :assoc_macros
+
       many_to_many :tags,
         join_table: :task_tags,
         left_key: :task_id,
@@ -33,9 +38,7 @@ describe 'Defining many-to-one association' do
       end
     end
 
-    setup.relation(:tags)
-
-    tasks = rom.relations.tasks
+    tasks = container.relations.tasks
 
     expect(tasks.all.with_tags.to_a).to eql([
       { id: 1, title: 'Finish ROM', name: 'important' },

data/spec/unit/many_to_one_spec.rb

@@ -6,10 +6,14 @@ describe 'Defining many-to-one association' do
   before do
     conn[:users].insert id: 2, name: 'Jane'
     conn[:tasks].insert id: 2, user_id: 2, title: 'Task one'
+
+    configuration.relation(:users) { use :assoc_macros }
   end
 
   it 'extends relation with association methods' do
-    setup.relation(:tasks) do
+    configuration.relation(:tasks) do
+      use :assoc_macros
+
       many_to_one :users, key: :user_id, on: { name: 'Piotr' }
 
       def all
@@ -21,7 +25,7 @@ describe 'Defining many-to-one association' do
       end
     end
 
-    setup.mappers do
+    configuration.mappers do
       define(:tasks)
 
       define(:with_user, parent: :tasks) do
@@ -31,21 +35,21 @@ describe 'Defining many-to-one association' do
       end
     end
 
-    setup.relation(:users)
-
-    tasks = rom.relations.tasks
+    tasks = container.relations.tasks
 
     expect(tasks.all.with_user.to_a).to eql(
       [{ id: 1, name: 'Piotr', title: 'Finish ROM' }]
     )
 
-    expect(rom.relation(:tasks).map_with(:with_user).all.with_user.to_a).to eql(
+    expect(container.relation(:tasks).map_with(:with_user).all.with_user.to_a).to eql(
       [{ id: 1, title: 'Finish ROM', user: { name: 'Piotr' } }]
     )
   end
 
   it "joins on specified key" do
-    setup.relation(:task_tags) do
+    configuration.relation(:task_tags) do
+      use :assoc_macros
+
       many_to_one :tags, key: :tag_id
 
       def with_tags
@@ -53,7 +57,9 @@ describe 'Defining many-to-one association' do
       end
     end
 
-    expect(rom.relation(:task_tags).with_tags.to_a).to eq(
+    configuration.relation(:tags) { use :assoc_macros }
+
+    expect(container.relation(:task_tags).with_tags.to_a).to eq(
       [{ tag_id: 1, task_id: 1, id: 1, name: "important" }]
     )
   end