rom-sql 0.6.1 → 0.7.0.beta1

data/spec/unit/migration_tasks_spec.rb

@@ -1,19 +1,20 @@
 require 'spec_helper'
 
 namespace :db do
-  task :setup  do
-    # noop
+  task :setup do
+    #noop
   end
 end
 
 describe 'MigrationTasks' do
+  let(:configuration) { ROM::Configuration.new(:sql, DB_URI) }
+  let!(:container) { ROM.container(configuration) }
+  let(:migrator) { container.gateways[:default].migrator }
+
   before do
-    ROM.setup(:sql, ['postgres://localhost/rom'])
-    ROM.finalize
+    ROM::SQL::RakeSupport.stub(:env) { configuration }
   end
 
-  let(:migrator) { ROM.env.gateways[:default].migrator }
-
   context 'db:reset' do
     it 'calls proper commands' do
       expect(migrator).to receive(:run).with(target: 0)

data/spec/unit/one_to_many_spec.rb

@@ -7,17 +7,21 @@ describe 'Defining one-to-many association' do
     conn[:users].insert id: 2, name: 'Jane'
     conn[:tasks].insert id: 2, user_id: 2, title: 'Task one'
 
-    setup.mappers do
+    configuration.mappers do
       define(:users)
 
       define(:with_tasks, parent: :users) do
         group tasks: [:tasks_id, :title]
       end
     end
+
+    configuration.relation(:tasks) { use :assoc_macros }
   end
 
   it 'extends relation with association methods' do
-    setup.relation(:users) do
+    configuration.relation(:users) do
+      use :assoc_macros
+
       one_to_many :tasks, key: :user_id, on: { title: 'Finish ROM' }
 
       def by_name(name)
@@ -33,14 +37,14 @@ describe 'Defining one-to-many association' do
       end
     end
 
-    users = rom.relations.users
+    users = container.relations.users
 
     expect(users.with_tasks.by_name("Piotr").to_a).to eql(
       [{ id: 1, name: 'Piotr', tasks_id: 1, title: 'Finish ROM' }]
     )
 
-    result = rom.relation(:users).map_with(:with_tasks)
-      .all.with_tasks.by_name("Piotr").to_a
+    result = container.relation(:users).map_with(:with_tasks)
+             .all.with_tasks.by_name("Piotr").to_a
 
     expect(result).to eql(
       [{ id: 1, name: 'Piotr', tasks: [{ tasks_id: 1, title: 'Finish ROM' }] }]
@@ -48,9 +52,11 @@ describe 'Defining one-to-many association' do
   end
 
   it 'allows setting :conditions' do
-    setup.relation(:users) do
+    configuration.relation(:users) do
+      use :assoc_macros
+
       one_to_many :piotrs_tasks, relation: :tasks, key: :user_id,
-        conditions: { name: 'Piotr' }
+                                 conditions: { name: 'Piotr' }
 
       def with_piotrs_tasks
         association_left_join(:piotrs_tasks, select: [:id, :title])
@@ -61,14 +67,14 @@ describe 'Defining one-to-many association' do
       end
     end
 
-    users = rom.relations.users
+    users = container.relations.users
 
     expect(users.with_piotrs_tasks.to_a).to eql(
       [{ id: 1, name: 'Piotr', tasks_id: 1, title: 'Finish ROM' }]
     )
 
-    result = rom.relation(:users).map_with(:with_tasks)
-      .all.with_piotrs_tasks.to_a
+    result = container.relation(:users).map_with(:with_tasks)
+             .all.with_piotrs_tasks.to_a
 
     expect(result).to eql(
       [{ id: 1, name: 'Piotr', tasks: [{ tasks_id: 1, title: 'Finish ROM' }] }]

data/spec/unit/plugin/base_view_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Plugin / Base View' do
+  include_context 'database setup'
+
+  it 'defines base view' do
+    module Test
+      class Users < ROM::Relation[:sql]
+        dataset :users
+        register_as :users
+      end
+    end
+
+    configuration.register_relation(Test::Users)
+
+    expect(container.relation(:users).base.header).to match_array([:id, :name])
+  end
+end

data/spec/unit/plugin/pagination_spec.rb

@@ -8,7 +8,7 @@ describe 'Plugin / Pagination' do
   before do
     9.times { |i| conn[:users].insert(name: "User #{i}") }
 
-    setup.relation(:users) do
+    configuration.relation(:users) do
       use :pagination
 
       per_page 4
@@ -18,13 +18,13 @@ describe 'Plugin / Pagination' do
   describe '#page' do
     it 'allow to call with stringify number' do
       expect {
-        rom.relation(:users).page('5')
+        container.relation(:users).page('5')
       }.to_not raise_error
     end
 
     it 'preserves existing modifiers' do
       expect(
-        rom.relation(:users).send(:where, name: 'User 2').page(1).to_a.size
+        container.relation(:users).send(:where, name: 'User 2').page(1).to_a.size
       ).to be(1)
     end
   end
@@ -32,12 +32,12 @@ describe 'Plugin / Pagination' do
   describe '#per_page' do
     it 'allow to call with stringify number' do
       expect {
-        rom.relation(:users).per_page('5')
+        container.relation(:users).per_page('5')
       }.to_not raise_error
     end
 
     it 'returns paginated relation with provided limit' do
-      users = rom.relation(:users).page(2).per_page(5)
+      users = container.relation(:users).page(2).per_page(5)
 
       expect(users.dataset.opts[:offset]).to eql(5)
       expect(users.dataset.opts[:limit]).to eql(5)
@@ -55,19 +55,19 @@ describe 'Plugin / Pagination' do
 
   describe '#total_pages' do
     it 'returns a single page when elements are a perfect fit' do
-      users = rom.relation(:users).page(1).per_page(3)
+      users = container.relation(:users).page(1).per_page(3)
       expect(users.pager.total_pages).to eql(3)
     end
 
     it 'returns the exact number of pages to accommodate all elements' do
-      users = rom.relation(:users).per_page(9)
+      users = container.relation(:users).per_page(9)
       expect(users.pager.total_pages).to eql(1)
     end
   end
 
   describe '#pager' do
     it 'returns a pager with pagination meta-info' do
-      users = rom.relation(:users).page(1)
+      users = container.relation(:users).page(1)
 
       expect(users.pager.total).to be(9)
       expect(users.pager.total_pages).to be(3)
@@ -76,13 +76,13 @@ describe 'Plugin / Pagination' do
       expect(users.pager.next_page).to be(2)
       expect(users.pager.prev_page).to be(nil)
 
-      users = rom.relation(:users).page(2)
+      users = container.relation(:users).page(2)
 
       expect(users.pager.current_page).to be(2)
       expect(users.pager.next_page).to be(3)
       expect(users.pager.prev_page).to be(1)
 
-      users = rom.relation(:users).page(3)
+      users = container.relation(:users).page(3)
 
       expect(users.pager.next_page).to be(nil)
       expect(users.pager.prev_page).to be(2)

data/spec/unit/relation_spec.rb

@@ -3,15 +3,59 @@ require 'spec_helper'
 describe ROM::Relation do
   include_context 'users and tasks'
 
-  let(:users) { rom.relations.users }
-  let(:tasks) { rom.relations.tasks }
+  let(:users) { container.relations.users }
+  let(:tasks) { container.relations.tasks }
 
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def sorted
         order(:id)
       end
     end
+
+    configuration.relation(:tasks)
+  end
+
+  describe '#dataset' do
+    it 'selects all qualified columns and sorts by pk' do
+      expect(users.dataset).to eql(
+        users.select(*users.columns).order(:users__id).dataset
+      )
+    end
+  end
+
+  describe '#sum' do
+    it 'delegates to dataset and return value' do
+      expect(users.dataset).to receive(:sum).with(:id).and_call_original
+      expect(users.sum(:id)).to eql(1)
+    end
+  end
+
+  describe '#min' do
+    it 'delegates to dataset and return value' do
+      users.insert id: 2, name: 'Oskar'
+
+      expect(users.dataset).to receive(:min).with(:id).and_call_original
+      expect(users.min(:id)).to eql(1)
+    end
+  end
+
+  describe '#max' do
+    it 'delegates to dataset and return value' do
+      users.insert id: 2, name: 'Oskar'
+
+      expect(users.dataset).to receive(:max).with(:id).and_call_original
+      expect(users.max(:id)).to eql(2)
+    end
+  end
+
+  describe '#avg' do
+    it 'delegates to dataset and return value' do
+      users.insert id: 2, name: 'Oskar'
+
+      expect(users.dataset).to receive(:avg).with(:id).and_call_original
+      expect(users.avg(:id)).to eql(1.5)
+    end
   end
 
   describe '#distinct' do
@@ -53,6 +97,12 @@ describe ROM::Relation do
         { name: 'Piotr', title: 'Finish ROM' }
       ])
     end
+
+    it 'raises error when column names are ambiguous' do
+      expect {
+        users.inner_join(:tasks, user_id: :id).to_a
+      }.to raise_error(Sequel::DatabaseError, /column reference "id" is ambiguous/)
+    end
   end
 
   describe '#left_join' do
@@ -131,4 +181,20 @@ describe ROM::Relation do
       expect(tasks.unique?(title: 'Task One')).to be(false)
     end
   end
+
+  describe '#union' do
+    let(:relation1) { users.where(id: 1).select(:id, :name) }
+    let(:relation2) { users.where(id: 2).select(:id, :name) }
+
+    it 'unions two relations and returns a new relation' do
+      conn[:users].insert(id: 2, name: 'Jane')
+
+      result = relation1.union(relation2)
+
+      expect(result.to_a).to match_array([
+        { id: 1, name: 'Piotr' },
+        { id: 2, name: 'Jane' }
+      ])
+    end
+  end
 end

data/spec/unit/schema_spec.rb

@@ -5,8 +5,10 @@ describe 'Inferring schema from database' do
 
   context "when database schema exists" do
     it "infers the schema from the database relations" do
-      expect(rom.relations.users.to_a)
-        .to eql(rom.gateways[:default][:users].to_a)
+      configuration.relation(:users)
+
+      expect(container.relations.users.to_a)
+        .to eql(container.gateways[:default][:users].to_a)
     end
   end
 
@@ -14,7 +16,7 @@ describe 'Inferring schema from database' do
     it "returns an empty schema" do
       drop_tables
 
-      expect { rom.not_here }.to raise_error(NoMethodError)
+      expect { container.not_here }.to raise_error(NoMethodError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -25,45 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.18'
 - !ruby/object:Gem::Dependency
-  name: equalizer
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +99,9 @@ files:
 - README.md
 - Rakefile
 - lib/rom-sql.rb
+- lib/rom/plugins/relation/sql/auto_combine.rb
+- lib/rom/plugins/relation/sql/auto_wrap.rb
+- lib/rom/plugins/relation/sql/base_view.rb
 - lib/rom/sql.rb
 - lib/rom/sql/commands.rb
 - lib/rom/sql/commands/create.rb
@@ -126,14 +117,13 @@ files:
 - lib/rom/sql/migration.rb
 - lib/rom/sql/migration/migrator.rb
 - lib/rom/sql/migration/template.rb
+- lib/rom/sql/plugin/assoc_macros.rb
+- lib/rom/sql/plugin/assoc_macros/class_interface.rb
 - lib/rom/sql/plugin/associates.rb
 - lib/rom/sql/plugin/pagination.rb
 - lib/rom/sql/plugins.rb
 - lib/rom/sql/rake_task.rb
 - lib/rom/sql/relation.rb
-- lib/rom/sql/relation/associations.rb
-- lib/rom/sql/relation/class_methods.rb
-- lib/rom/sql/relation/inspection.rb
 - lib/rom/sql/relation/reading.rb
 - lib/rom/sql/relation/writing.rb
 - lib/rom/sql/spec/support.rb
@@ -148,9 +138,9 @@ files:
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
+- spec/integration/gateway_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/read_spec.rb
-- spec/integration/repository_spec.rb
 - spec/shared/database_setup.rb
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
@@ -165,6 +155,7 @@ files:
 - spec/unit/migration_tasks_spec.rb
 - spec/unit/migrator_spec.rb
 - spec/unit/one_to_many_spec.rb
+- spec/unit/plugin/base_view_spec.rb
 - spec/unit/plugin/pagination_spec.rb
 - spec/unit/relation_spec.rb
 - spec/unit/schema_spec.rb
@@ -183,9 +174,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -198,9 +189,9 @@ test_files:
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
+- spec/integration/gateway_spec.rb
 - spec/integration/migration_spec.rb
 - spec/integration/read_spec.rb
-- spec/integration/repository_spec.rb
 - spec/shared/database_setup.rb
 - spec/shared/users_and_tasks.rb
 - spec/spec_helper.rb
@@ -215,6 +206,8 @@ test_files:
 - spec/unit/migration_tasks_spec.rb
 - spec/unit/migrator_spec.rb
 - spec/unit/one_to_many_spec.rb
+- spec/unit/plugin/base_view_spec.rb
 - spec/unit/plugin/pagination_spec.rb
 - spec/unit/relation_spec.rb
 - spec/unit/schema_spec.rb
+has_rdoc: