rom-sql 0.5.3 → 0.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3b5357a86ca00174aa17cce24a077a1eb843238
-  data.tar.gz: 4e7165c1dc95b56b1823def507746fefc0c0c74e
+  metadata.gz: f021e93524b9b69f53f28b06b664c5b118ff3756
+  data.tar.gz: 37721788b60206c7db1874ca725197eac7bd11d1
 SHA512:
-  metadata.gz: fe54d5beae0bf5cb3b249ff8a6c17b445b351ebcf61651b02903dda3205d4d1696162be311b82ff68a08b6d9496f735529e7d0807f200a88f3b5445b11787314
-  data.tar.gz: 5458d5da39115d940d9c01989723bbee280ad6f50710c3324e78936c41b91d1c2b2a642e1a5ed58d2bf04320c9b6b1fb1beff26f5795f2806082f0f635dc241b
+  metadata.gz: 1f402a0f8c0e292e759a586fae0e7d3ac00bb53867ca1217a7a8415006be7c47b4118bb65059ae816784fd28048faf2a20fd9aa772240eb4e70d8e7f741a9fae
+  data.tar.gz: ece947688c9b65010aee26585bfbb07650db44414a6b8c1b8fc5b209664761e19c7953b760d374032b4fbe5a24b2cfa7ed6b788d1be4f76976026067d6d74d71

data/.gitignore

@@ -1,3 +1,5 @@
+/vendor/
+/db/
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/Gemfile

@@ -6,6 +6,8 @@ group :test do
   gem 'byebug', platforms: :mri
   gem 'anima'
   gem 'rom', github: 'rom-rb/rom', branch: 'master'
+  gem 'rom-support', github: 'rom-rb/rom-support', branch: 'master'
+  gem 'rom-mapper', github: 'rom-rb/rom-mapper', branch: 'master'
   gem 'virtus'
   gem 'activesupport'
   gem 'rspec', '~> 3.1'

data/lib/rom/sql.rb

@@ -1,57 +1,16 @@
 require "sequel"
 require "rom"
 
-module ROM
-  module SQL
-    NoAssociationError = Class.new(StandardError)
-
-    class Error < StandardError
-      attr_reader :original_exception
-
-      def initialize(original_exception)
-        super(original_exception.message)
-        @original_exception = original_exception
-        set_backtrace(original_exception.backtrace)
-      end
-    end
-
-    DatabaseError = Class.new(Error)
-
-    ConstraintError = Class.new(Error)
-
-    NotNullConstraintError = Class.new(ConstraintError)
-    UniqueConstraintError = Class.new(ConstraintError)
-    ForeignKeyConstraintError = Class.new(ConstraintError)
-    CheckConstraintError = Class.new(ConstraintError)
-
-    ERROR_MAP = {
-      Sequel::DatabaseError => DatabaseError,
-      Sequel::NotNullConstraintViolation => NotNullConstraintError,
-      Sequel::UniqueConstraintViolation => UniqueConstraintError,
-      Sequel::ForeignKeyConstraintViolation => ForeignKeyConstraintError,
-      Sequel::CheckConstraintViolation => CheckConstraintError
-    }.freeze
-  end
-end
-
-require 'rom/sql/plugin/associates'
-require 'rom/sql/plugin/pagination'
-
-ROM.plugins do
-  adapter :sql do
-    register :pagination, ROM::SQL::Plugin::Pagination, type: :relation
-    register :associates, ROM::SQL::Plugin::Associates, type: :command
-  end
-end
-
 require "rom/sql/version"
+require "rom/sql/errors"
+require "rom/sql/plugins"
 require "rom/sql/relation"
 require "rom/sql/gateway"
 require "rom/sql/migration"
 
 if defined?(Rails)
   require "rom/sql/support/active_support_notifications"
-  require 'rom/sql/support/rails_log_subscriber'
+  require "rom/sql/support/rails_log_subscriber"
 end
 
 ROM.register_adapter(:sql, ROM::SQL)

data/lib/rom/sql/error.rb

@@ -0,0 +1,13 @@
+module ROM
+  module SQL
+    class Error < StandardError
+      attr_reader :original_exception
+
+      def initialize(original_exception)
+        super(original_exception.message)
+        @original_exception = original_exception
+        set_backtrace(original_exception.backtrace)
+      end
+    end
+  end
+end

data/lib/rom/sql/errors.rb

@@ -0,0 +1,21 @@
+require "rom/sql/error"
+
+module ROM
+  module SQL
+    NoAssociationError        = Class.new(StandardError)
+    DatabaseError             = Class.new(Error)
+    ConstraintError           = Class.new(Error)
+    NotNullConstraintError    = Class.new(ConstraintError)
+    UniqueConstraintError     = Class.new(ConstraintError)
+    ForeignKeyConstraintError = Class.new(ConstraintError)
+    CheckConstraintError      = Class.new(ConstraintError)
+
+    ERROR_MAP = {
+      Sequel::DatabaseError => DatabaseError,
+      Sequel::NotNullConstraintViolation => NotNullConstraintError,
+      Sequel::UniqueConstraintViolation => UniqueConstraintError,
+      Sequel::ForeignKeyConstraintViolation => ForeignKeyConstraintError,
+      Sequel::CheckConstraintViolation => CheckConstraintError
+    }.freeze
+  end
+end

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

@@ -56,8 +56,6 @@ module ROM
             option :pager, reader: true, default: proc { |relation|
               Pager.new(relation.dataset, per_page: relation.class.per_page)
             }
-
-            exposed_relations.merge([:pager, :page, :per_page])
           end
         end
 

data/lib/rom/sql/plugins.rb

@@ -0,0 +1,9 @@
+require "rom/sql/plugin/associates"
+require "rom/sql/plugin/pagination"
+
+ROM.plugins do
+  adapter :sql do
+    register :pagination, ROM::SQL::Plugin::Pagination, type: :relation
+    register :associates, ROM::SQL::Plugin::Associates, type: :command
+  end
+end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '0.5.3'.freeze
+    VERSION = '0.6.0.beta1'.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.8", ">= 0.8.0"
+  spec.add_runtime_dependency "rom", "~> 0.9.0.beta1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/spec_helper.rb

@@ -21,6 +21,8 @@ begin
 rescue LoadError
 end
 
+ROM.use :auto_registration
+
 LOGGER = Logger.new(File.open('./log/test.log', 'a'))
 DB_URI = 'postgres://localhost/rom'
 
@@ -43,6 +45,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', {})
+    ROM.instance_variable_get('@environment').instance_variable_set('@gateways', {})
   end
 end

data/spec/unit/plugin/pagination_spec.rb

@@ -39,8 +39,8 @@ describe 'Plugin / Pagination' do
     it 'returns paginated relation with provided limit' do
       users = rom.relation(:users).page(2).per_page(5)
 
-      expect(users.relation.dataset.opts[:offset]).to eql(5)
-      expect(users.relation.dataset.opts[:limit]).to eql(5)
+      expect(users.dataset.opts[:offset]).to eql(5)
+      expect(users.dataset.opts[:limit]).to eql(5)
 
       expect(users.pager.current_page).to eql(2)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -50,20 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +113,8 @@ files:
 - lib/rom/sql/commands/transaction.rb
 - lib/rom/sql/commands/update.rb
 - lib/rom/sql/commands_ext/postgres.rb
+- lib/rom/sql/error.rb
+- lib/rom/sql/errors.rb
 - lib/rom/sql/gateway.rb
 - lib/rom/sql/header.rb
 - lib/rom/sql/migration.rb
@@ -126,6 +122,7 @@ files:
 - lib/rom/sql/migration/template.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
@@ -178,9 +175,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