rom-sql 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7899f84b60af6ef8f8e80c230905abde0ca7be65
-  data.tar.gz: 34e2218734e91c6dfff3f83bf90db56e90b64be8
+  metadata.gz: 0b429ab1e11613744f6b0626ea822abe070424c0
+  data.tar.gz: 86220401f55baec6bc56a40545379971f74ed17e
 SHA512:
-  metadata.gz: 69fb7e9221a9fd8255fec6e41f2bf3f266b8e4d5c52c102381226c0ce09c7b3bdbb1c64e6c69f0755ee97e549eb3fe258fbfc888e574f4a6130f201fd45c9838
-  data.tar.gz: b6275286b6649dd026b5b9c248027579da3d5b4b3de1ea123a3a252a07df42e599265d97536ac84282fb97007fe4b0d356455b2ed201df31986daea382bb76f0
+  metadata.gz: f0169d4b08b6e037dbb7c18b76e41e14a6cff5f2d1edb0bdaba4705c216a6f52e57b04de4bb3ef14b5e329ba45e55205be7afe18c85f3179f345612158cbbc0d
+  data.tar.gz: beceab2da1ed5cea31bf03224cf30752a6b1c2a922e88f6a5f61875c03bf4239b1626d8b5d9d51930244492957362f2efab80f87773e2e1118b50d354e36c8db

data/CHANGELOG.md

@@ -1,8 +1,21 @@
-## v0.5.1 to-be-released
+## v0.5.2 2015-06-22
+
+### Added
+
+* `Relation#invert` operation (nepalez)
+
+### Changed
+
+* Migration tasks no longer require entire ROM env (solnic)
+* `Repository` => `Gateway` rename for ROM 0.8.0 compatibility (solnic)
+
+[Compare v0.5.1...v0.5.2](https://github.com/rom-rb/rom-sql/compare/v0.5.1...v0.5.2)
+
+## v0.5.1 2015-05-25
 
 ### Changed
 
-* relations won't be finalized when table(s) is/are missing (solnic)
+* Relations won't be finalized when table(s) is/are missing (solnic)
 
 ### Fixed
 

data/lib/rom/sql.rb

@@ -46,7 +46,7 @@ end
 
 require "rom/sql/version"
 require "rom/sql/relation"
-require "rom/sql/repository"
+require "rom/sql/gateway"
 require "rom/sql/migration"
 
 if defined?(Rails)

data/lib/rom/sql/commands/delete.rb

@@ -20,8 +20,8 @@ module ROM
         #
         # @api public
         def execute
-          deleted = target.to_a
-          target.delete
+          deleted = relation.to_a
+          relation.delete
           deleted
         end
       end

data/lib/rom/sql/commands/update.rb

@@ -55,7 +55,7 @@ module ROM
         #
         # @api public
         def change(original)
-          self.class.new(relation, options.merge(original: original.to_h))
+          self.class.build(relation, options.merge(original: original.to_h))
         end
 
         private

data/lib/rom/sql/{repository.rb → gateway.rb}

@@ -1,21 +1,21 @@
 require 'logger'
 
-require 'rom/repository'
+require 'rom/gateway'
 require 'rom/sql/migration'
 require 'rom/sql/commands'
 
 module ROM
   module SQL
-    # SQL repository
+    # SQL gateway
     #
     # @example
     #   db = Sequel.connect(:sqlite)
-    #   repository = ROM::SQL::Repository.new(db)
+    #   gateway = ROM::SQL::Gateway.new(db)
     #
-    #   users = repository.dataset(:users)
+    #   users = gateway.dataset(:users)
     #
     # @api public
-    class Repository < ROM::Repository
+    class Gateway < ROM::Gateway
       include Options
       include Migration
 
@@ -40,7 +40,7 @@ module ROM
         scheme.to_s.include?('sqlite')
       end
 
-      # SQL repository interface
+      # SQL gateway interface
       #
       # @overload connect(uri, options)
       #   Connects to database via uri passing options
@@ -54,11 +54,11 @@ module ROM
       #   @param [Sequel::Database] connection a connection instance
       #
       # @example
-      #   repository = ROM::SQL::Repository.new('postgres://localhost/rom')
+      #   gateway = ROM::SQL::Gateway.new('postgres://localhost/rom')
       #
       #   # or reuse connection
       #   DB = Sequel.connect('postgres://localhost/rom')
-      #   repository = ROM::SQL::Repository.new(DB)
+      #   gateway = ROM::SQL::Gateway.new(DB)
       #
       # @api public
       def initialize(uri, options = {})

data/lib/rom/sql/migration.rb

@@ -2,7 +2,7 @@ require 'rom/sql/migration/migrator'
 
 module ROM
   module SQL
-    # Create a database migration for a specific repository
+    # Create a database migration for a specific gateway
     #
     # @example
     #   ROM.setup(
@@ -21,14 +21,26 @@ module ROM
     #     end
     #   end
     #
-    #   # for a non-default repository
+    #   # for a non-default gateway
     #   ROM::SQL.migration(:other) do
     #     # ...
     #   end
     #
     # @api public
-    def self.migration(repository = :default, &block)
-      ROM.env.repositories[repository].migration(&block)
+    def self.migration(gateway = :default, &block)
+      gateways = ROM.boot ? ROM.boot.gateways : ROM.env.gateways
+      gateways[gateway].migration(&block)
+    end
+
+    # Return first sql gateway for migrations
+    #
+    # This is used by migration tasks, they only support a single sql gateway
+    #
+    # @api private
+    def self.gateway
+      ROM.gateways
+        .keys
+        .detect { |gateway| gateway.instance_of?(Gateway) }
     end
 
     module Migration
@@ -37,8 +49,8 @@ module ROM
       def self.included(klass)
         super
         klass.class_eval do
-          option :migrator, reader: true, default: proc { |repository|
-            Migrator.new(repository.connection)
+          option :migrator, reader: true, default: proc { |gateway|
+            Migrator.new(gateway.connection)
           }
         end
       end
@@ -50,12 +62,12 @@ module ROM
         migrator.migration(&block)
       end
 
-      # Run migrations for a given repository
+      # Run migrations for a given gateway
       #
       # @example
       #   ROM.setup(:sql, ['sqlite::memory'])
       #   ROM.finalize
-      #   ROM.env.repositories[:default].run_migrations
+      #   ROM.env.gateways[:default].run_migrations
       #
       #
       # @param [Hash] options The options used by Sequel migrator
@@ -65,7 +77,7 @@ module ROM
         migrator.run(options)
       end
 
-      # TODO: this should be removed in favor of migration API in Repository
+      # TODO: this should be removed in favor of migration API in Gateway
       class << self
         attr_writer :path
         attr_accessor :connection
@@ -75,7 +87,7 @@ module ROM
         end
 
         def run(options = {})
-          warn "ROM::SQL::Migration.run is deprecated please ROM::SQL::Repository#run_migrations (#{caller[0]})"
+          warn "ROM::SQL::Migration.run is deprecated please ROM::SQL::Gateway#run_migrations (#{caller[0]})"
           ::Sequel::Migrator.run(connection, path, options)
         end
 

data/lib/rom/sql/plugin/associates.rb

@@ -46,7 +46,7 @@ module ROM
           # @example
           #   class CreateTask < ROM::Commands::Create[:sql]
           #     relation :tasks
-          #     associates :user, [:user_id, :id]
+          #     associates :user, key: [:user_id, :id]
           #   end
           #
           #   create_user = rom.command(:user).create.with(name: 'Jane')

data/lib/rom/sql/relation.rb

@@ -199,6 +199,21 @@ module ROM
         __new__(dataset.__send__(__method__, *args, &block))
       end
 
+      # Inverts a request
+      #
+      # @example
+      #   users.exclude(name: 'Jane').invert
+      #
+      #   # this is the same as:
+      #   users.where(name: 'Jane')
+      #
+      # @return [Relation]
+      #
+      # @api public
+      def invert(*args, &block)
+        __new__(dataset.__send__(__method__, *args, &block))
+      end
+
       # Set order for the relation
       #
       # @example

data/lib/rom/sql/tasks/migration_tasks.rake

@@ -4,37 +4,37 @@ require "fileutils"
 namespace :db do
   desc "Perform migration reset (full erase and migration up)"
   task reset: :setup do
-    repository = ROM.env.repositories[:default]
-    repository.run_migrations(target: 0)
-    repository.run_migrations
+    gateway = ROM::SQL.gateway
+    gateway.run_migrations(target: 0)
+    gateway.run_migrations
     puts "<= db:reset executed"
   end
 
   desc "Migrate the database (options [version_number])]"
   task :migrate, [:version] => :setup do |_, args|
-    repository = ROM.env.repositories[:default]
+    gateway = ROM::SQL.gateway
     version = args[:version]
 
     if version.nil?
-      repository.run_migrations
+      gateway.run_migrations
       puts "<= db:migrate executed"
     else
-      repository.run_migrations(target: version.to_i)
+      gateway.run_migrations(target: version.to_i)
       puts "<= db:migrate version=[#{version}] executed"
     end
   end
 
   desc "Perform migration down (erase all data)"
   task clean: :setup do
-    repository = ROM.env.repositories[:default]
+    gateway = ROM::SQL.gateway
 
-    repository.run_migrations(target: 0)
+    gateway.run_migrations(target: 0)
     puts "<= db:clean executed"
   end
 
   desc "Create a migration (parameters: NAME, VERSION)"
   task :create_migration, [:name, :version] => :setup do |_, args|
-    repository = ROM.env.repositories[:default]
+    gateway = ROM::SQL.gateway
     name, version = args[:name], args[:version]
 
     if name.nil?
@@ -43,7 +43,7 @@ namespace :db do
       exit
     end
 
-    path = repository.migrator.create_file(*[name, version].compact)
+    path = gateway.migrator.create_file(*[name, version].compact)
 
     puts "<= migration file created #{path}"
   end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.5.2'.freeze
   end
 end

data/rom-sql.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "sequel", "~> 4.18"
   spec.add_runtime_dependency "equalizer", "~> 0.0", ">= 0.0.9"
-  spec.add_runtime_dependency "rom", "~> 0.7", ">= 0.7.0"
+  spec.add_runtime_dependency "rom", "~> 0.8", ">= 0.8.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/fixtures/migrations/20150403090603_create_carrots.rb

@@ -1,4 +1,4 @@
-ROM.env.repositories[:default].migration do
+ROM.env.gateways[:default].migration do
   change do
     create_table :carrots do
       primary_key :id

data/spec/integration/commands/update_spec.rb

@@ -72,13 +72,12 @@ describe 'Commands / Update' do
   end
 
   it 'does not update when attributes did not change' do
-    piotr_rel = double('piotr_rel').as_null_object
+    result = users.try do
+      command = users.update.by_id(piotr[:id]).change(piotr)
 
-    expect(relation).to receive(:by_id).with(piotr[:id]).and_return(piotr_rel)
-    expect(piotr_rel).not_to receive(:update)
+      expect(command.relation).not_to receive(:update)
 
-    result = users.try do
-      users.update.by_id(piotr[:id]).change(piotr).call(name: piotr[:name])
+      command.call(name: piotr[:name])
     end
 
     expect(result.value.to_a).to be_empty

data/spec/integration/migration_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ROM::SQL, '.migration' do
+  let(:connection) { ROM::SQL.gateway.connection }
+
+  before do
+    ROM.setup(:sql, DB_URI)
+    connection.drop_table?(:dragons)
+  end
+
+  it 'creates a migration for a specific gateway' do
+
+    migration = ROM::SQL.migration do
+      change do
+        create_table :dragons do
+          primary_key :id
+          column :name, String
+        end
+      end
+    end
+
+    migration.apply(connection, :up)
+
+    expect(connection.table_exists?(:dragons)).to be(true)
+  end
+end

data/spec/integration/repository_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe ROM::SQL::Repository do
+describe ROM::SQL::Gateway do
   describe 'migration' do
     let(:conn) { Sequel.connect(DB_URI) }
 
     context 'creating migrations inline' do
-      subject(:repository) { ROM.env.repositories[:default] }
+      subject(:gateway) { ROM.env.gateways[:default] }
 
       before do
         ROM.setup(:sql, conn)
@@ -14,7 +14,7 @@ describe ROM::SQL::Repository do
 
       after do
         [:rabbits, :carrots].each do |name|
-          repository.connection.drop_table?(name)
+          gateway.connection.drop_table?(name)
         end
       end
 
@@ -32,13 +32,13 @@ describe ROM::SQL::Repository do
           end
         end
 
-        migration.apply(repository.connection, :up)
+        migration.apply(gateway.connection, :up)
 
-        expect(repository.connection[:rabbits]).to be_a(Sequel::Dataset)
+        expect(gateway.connection[:rabbits]).to be_a(Sequel::Dataset)
 
-        migration.apply(repository.connection, :down)
+        migration.apply(gateway.connection, :down)
 
-        expect(repository.connection.tables).to_not include(:rabbits)
+        expect(gateway.connection.tables).to_not include(:rabbits)
       end
     end
 
@@ -55,7 +55,7 @@ describe ROM::SQL::Repository do
       end
 
       it 'runs migrations from a specified directory' do
-        ROM.env.repositories[:default].run_migrations
+        ROM.env.gateways[:default].run_migrations
       end
     end
   end

data/spec/spec_helper.rb

@@ -43,5 +43,6 @@ RSpec.configure do |config|
   config.after do
     added_constants = Object.constants - @constants
     added_constants.each { |name| Object.send(:remove_const, name) }
+    ROM.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.repositories[:default].use_logger(LOGGER)
+    rom.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.repositories[:default].use_logger(logger)
+    rom.gateways[:default].use_logger(logger)
   end
 
   it 'works' do

data/spec/unit/logger_spec.rb

@@ -4,11 +4,11 @@ describe 'Logger' do
   include_context 'database setup'
 
   it 'sets up a logger for sequel' do
-    repository = rom.repositories[:default]
+    gateway = rom.gateways[:default]
 
-    repository.use_logger(LOGGER)
+    gateway.use_logger(LOGGER)
 
-    expect(repository.logger).to be(LOGGER)
+    expect(gateway.logger).to be(LOGGER)
     expect(conn.loggers).to include(LOGGER)
   end
 end

data/spec/unit/migration_tasks_spec.rb

@@ -12,7 +12,7 @@ describe 'MigrationTasks' do
     ROM.finalize
   end
 
-  let(:migrator) { ROM.env.repositories[:default].migrator }
+  let(:migrator) { ROM.env.gateways[:default].migrator }
 
   context 'db:reset' do
     it 'calls proper commands' do

data/spec/unit/relation_spec.rb

@@ -29,6 +29,13 @@ describe ROM::Relation do
     end
   end
 
+  describe '#invert' do
+    it 'delegates to dataset and returns a new relation' do
+      expect(users.dataset).to receive(:invert).and_call_original
+      expect(users.invert).to_not eq(users)
+    end
+  end
+
   describe '#map' do
     it 'yields tuples' do
       result = []

data/spec/unit/repository_spec.rb

@@ -2,24 +2,24 @@ require 'spec_helper'
 
 require 'rom/lint/spec'
 
-describe ROM::SQL::Repository do
+describe ROM::SQL::Gateway do
   include_context 'users and tasks'
 
-  let(:repository) { rom.repositories[:default] }
+  let(:gateway) { rom.gateways[:default] }
 
-  it_behaves_like 'a rom repository' do
+  it_behaves_like 'a rom gateway' do
     let(:identifier) { :sql }
-    let(:repository) { ROM::SQL::Repository }
+    let(:gateway) { ROM::SQL::Gateway }
     let(:uri) { 'postgres://localhost/rom' }
   end
 
   describe '#dataset?' do
     it 'returns true if a table exists' do
-      expect(repository.dataset?(:users)).to be(true)
+      expect(gateway.dataset?(:users)).to be(true)
     end
 
     it 'returns false if a table does not exist' do
-      expect(repository.dataset?(:not_here)).to be(false)
+      expect(gateway.dataset?(:not_here)).to be(false)
     end
   end
 
@@ -31,20 +31,20 @@ describe ROM::SQL::Repository do
         .with(DB_URI, host: '127.0.0.1')
         .and_return(conn)
 
-      repository = ROM::SQL::Repository.new(DB_URI, migrator: migrator, host: '127.0.0.1')
+      gateway = ROM::SQL::Gateway.new(DB_URI, migrator: migrator, host: '127.0.0.1')
 
-      expect(repository.options).to eql(migrator: migrator)
+      expect(gateway.options).to eql(migrator: migrator)
     end
   end
 
   describe '#disconnect' do
-    let(:repository) { ROM::SQL::Repository.new(uri) }
+    let(:gateway) { ROM::SQL::Gateway.new(uri) }
 
     it 'disconnects via sequel connection' do
       # FIXME: no idea how to test it in a different way
       # FIXME: we are leaking connection here
-      expect(repository.connection).to receive(:disconnect)
-      repository.disconnect
+      expect(gateway.connection).to receive(:disconnect)
+      gateway.disconnect
     end
   end
 end

data/spec/unit/schema_spec.rb

@@ -6,7 +6,7 @@ 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.repositories[:default][:users].to_a)
+        .to eql(rom.gateways[:default][:users].to_a)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - lib/rom/sql/commands/transaction.rb
 - lib/rom/sql/commands/update.rb
 - lib/rom/sql/commands_ext/postgres.rb
+- lib/rom/sql/gateway.rb
 - lib/rom/sql/header.rb
 - lib/rom/sql/migration.rb
 - lib/rom/sql/migration/migrator.rb
@@ -130,7 +131,6 @@ files:
 - lib/rom/sql/relation/associations.rb
 - lib/rom/sql/relation/class_methods.rb
 - lib/rom/sql/relation/inspection.rb
-- lib/rom/sql/repository.rb
 - lib/rom/sql/spec/support.rb
 - lib/rom/sql/support/active_support_notifications.rb
 - lib/rom/sql/support/rails_log_subscriber.rb
@@ -143,6 +143,7 @@ files:
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
+- spec/integration/migration_spec.rb
 - spec/integration/read_spec.rb
 - spec/integration/repository_spec.rb
 - spec/shared/database_setup.rb
@@ -192,6 +193,7 @@ test_files:
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/update_spec.rb
+- spec/integration/migration_spec.rb
 - spec/integration/read_spec.rb
 - spec/integration/repository_spec.rb
 - spec/shared/database_setup.rb