rom-sql 0.4.0.beta1 → 0.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43358c16de1cbf1030d10052160c9a5a7e922216
-  data.tar.gz: 0c9950d51f83c690436f1ba9504435c2bad53d2c
+  metadata.gz: c31ac7fa972f7d1fbc7c713386d27022cc23f40d
+  data.tar.gz: 01c29d65d87c5938bd54348c012cd081bf4931b2
 SHA512:
-  metadata.gz: 916eb01f87b7825519ec9d917ee1904e04fa75537e5e2e35ba470cdc6239f4a0f2037393b64cec97e77fd9f1ea322939cf919e00618a6fff628297bfd1d9ab34
-  data.tar.gz: d2a3fe1e9077a547b44938c3600d5586548a7a283fa4d46de8c2d73d8b51394f56e8691b88d6197a38de9662c2c3ec697d24ed5415ee48df522010877da70728
+  metadata.gz: b80a36a94602f5b5aa5c1ca11ac1b17d7d22d1cb342a682afa6487210ea8d39124062254c7867115bf9d25ccd31c29a795e71b6689529e0a37b404b14a71fc6e
+  data.tar.gz: bc46004965aa3c9c8a36d60cd56b23c86c8635efef47e7236905d00ada4647982a90de9693a6c8ca954f1c4de781730efaa9e0829d3ab0605e9ba57cf1681e34

data/CHANGELOG.md

@@ -3,6 +3,8 @@
 ### Added
 
 * `ROM::SQL::Relation` which explictly defines an interface on top of Sequel (solnic + mcls)
+* Postgres-specific Create and Update commands that support RETURNING (gotar + solnic)
+* `Update#change` interface for skipping execution when there's no diff (solnic)
 * Experimental migration API using sequel/migrations (gotar)
 * Pagination plugin (solnic)
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rom', '~> 0.6.0', github: 'rom-rb/rom', branch: 'master'
+  gem 'rom', '~> 0.6.0.beta', github: 'rom-rb/rom', branch: 'master'
   gem 'virtus'
   gem 'activesupport'
   gem 'rspec', '~> 3.1'

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

@@ -4,17 +4,16 @@ module ROM
       module Pagination
         class Pager
           include Options
-          include Equalizer.new(:current_page, :per_page)
+          include Equalizer.new(:dataset, :options)
 
           option :current_page, reader: true, default: 1
           option :per_page, reader: true
 
           attr_reader :dataset
-          attr_reader :current_page
 
           def initialize(dataset, options = {})
-            @dataset = dataset
             super
+            @dataset = dataset
           end
 
           def next_page
@@ -35,10 +34,13 @@ module ROM
             (total / per_page) + 1
           end
 
-          def at(num, per_page = options[:per_page])
+          def at(dataset, current_page, per_page = self.per_page)
+            current_page = current_page.to_i
+            per_page = per_page.to_i
+
             self.class.new(
-              dataset.offset((num-1)*per_page).limit(per_page),
-              options.merge(current_page: num, per_page: per_page)
+              dataset.offset((current_page-1)*per_page).limit(per_page),
+              current_page: current_page, per_page: per_page
             )
           end
 
@@ -70,8 +72,7 @@ module ROM
         #
         # @api public
         def page(num)
-          num = num.to_i
-          next_pager = pager.at(num)
+          next_pager = pager.at(dataset, num)
           __new__(next_pager.dataset, pager: next_pager)
         end
 
@@ -82,11 +83,9 @@ module ROM
         #
         # @api public
         def per_page(num)
-          num = num.to_i
-          next_pager = pager.at(pager.current_page, num)
+          next_pager = pager.at(dataset, pager.current_page, num)
           __new__(next_pager.dataset, pager: next_pager)
         end
-
       end
     end
   end

data/lib/rom/sql/relation.rb

@@ -125,6 +125,18 @@ module ROM
         __new__(dataset.__send__(__method__, *args, &block))
       end
 
+      # Returns a copy of the relation with a SQL DISTINCT clause.
+      #
+      # @example
+      #   users.distinct(:country)
+      #
+      # @return [Relation]
+      #
+      # @api public
+      def distinct(*args, &block)
+        __new__(dataset.__send__(__method__, *args, &block))
+      end
+
       # Restrict a relation to match criteria
       #
       # @example
@@ -137,6 +149,18 @@ module ROM
         __new__(dataset.__send__(__method__, *args, &block))
       end
 
+      # Restrict a relation to not match criteria
+      #
+      # @example
+      #   users.exclude(name: 'Jane')
+      #
+      # @return [Relation]
+      #
+      # @api public
+      def exclude(*args, &block)
+        __new__(dataset.__send__(__method__, *args, &block))
+      end
+
       # Set order for the relation
       #
       # @example

data/lib/rom/sql/relation/class_methods.rb

@@ -22,7 +22,8 @@ module ROM
         end
 
         def many_to_one(name, options = {})
-          new_options = options.merge(relation: Inflector.pluralize(name).to_sym)
+          relation_name = Inflector.pluralize(name).to_sym
+          new_options = options.merge(relation: relation_name)
           associations << [__method__, name, new_options]
         end
 

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = "0.4.0.beta1".freeze
+    VERSION = "0.4.0.beta2".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.6.0.beta1"
+  spec.add_runtime_dependency "rom", "~> 0.6.0.beta3"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/shared/database_setup.rb

@@ -37,4 +37,9 @@ shared_context 'database setup' do
       Integer :task_id
     end
   end
+
+  after do
+    rom.repositories[:default].disconnect
+    conn.disconnect
+  end
 end

data/spec/unit/plugin/pagination_spec.rb

@@ -21,6 +21,12 @@ describe 'Plugin / Pagination' do
         rom.relation(:users).page('5')
       }.to_not raise_error
     end
+
+    it 'preserves existing modifiers' do
+      expect(
+        rom.relation(:users) { |r| r.where(name: 'User 2') }.page(1).to_a.size
+      ).to be(1)
+    end
   end
 
   describe '#per_page' do

data/spec/unit/relation_spec.rb

@@ -14,6 +14,21 @@ describe ROM::Relation do
     end
   end
 
+  describe '#distinct' do
+    it 'delegates to dataset and returns a new relation' do
+      expect(users.dataset).to receive(:distinct).with(:name).and_call_original
+      expect(users.distinct(:name)).to_not eq(users)
+    end
+  end
+
+  describe '#exclude' do
+    it 'delegates to dataset and returns a new relation' do
+      expect(users.dataset)
+        .to receive(:exclude).with(name: 'Piotr').and_call_original
+      expect(users.exclude(name: 'Piotr')).to_not eq(users)
+    end
+  end
+
   describe '#map' do
     it 'yields tuples' do
       result = []

data/spec/unit/repository_spec.rb

@@ -24,6 +24,8 @@ describe ROM::SQL::Repository do
   end
 
   describe '#disconnect' do
+    let(:repository) { ROM::SQL::Repository.new(uri) }
+
     it 'disconnects via sequel connection' do
       # FIXME: no idea how to test it in a different way
       expect(repository.connection).to receive(:disconnect)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.0.beta2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta1
+        version: 0.6.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta1
+        version: 0.6.0.beta3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement