rom-sql 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d07fe9555b80ab518029eb126f90e93e8b4c3d
-  data.tar.gz: 9beb66309d64a2aa65f7c4ab47d57cc274b53085
+  metadata.gz: 2e002fcfac65061b46118390214d8731033307b4
+  data.tar.gz: a13fd979244aee8b7a2c46ef4b522333534ecbd9
 SHA512:
-  metadata.gz: 3d72099961426bc8cd2a60faa7001f0a7b65a353bd5a93e4e12c9a233002c340f7c928ce21df42c14a9e59fdd06a14740f5f477c88a065ad3cd929c6f6a86c73
-  data.tar.gz: 562af5a84d07462549511657df45cdbc18e4e9904d3a7cd3742c9d1ad846f2e3c6c136873a54da7661940dc6c41feb3e7490da6e03243595e12c01b6ad34de84
+  metadata.gz: 27e70cf80b500a17af3d29ec60d10c9066caed57256a39f9f7acdc6955999b68d38b18e0356d2ac0518340280651ef5d08d15fd973753050cd66086e0bed2726
+  data.tar.gz: 8b37d7213ff4a0330a3331969886d670a8a09d46dd0cea8145bd45a1959259d44b3fe4dfac5544df6cda76eb0718d6b3406b67d0b7953c90c04c1346ee80bd88

data/.travis.yml

@@ -15,6 +15,7 @@ rvm:
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.3.2 2015-01-01
+
+### Fixed
+
+* Checking tuple count in commands (solnic)
+
+[Compare v0.3.1...v0.3.2](https://github.com/rom-rb/rom-sql/compare/v0.3.1...v0.3.2)
+
 ## v0.3.1 2014-12-31
 
 ### Added

data/lib/rom/sql/commands.rb

@@ -6,7 +6,18 @@ module ROM
         Sequel::NotNullConstraintViolation
       ].freeze
 
+      module TupleCount
+        # TODO: we need an interface for "target_count" here
+        def assert_tuple_count
+          if result == :one && target.count > 1
+            raise TupleCountMismatchError, "#{inspect} expects one tuple"
+          end
+        end
+      end
+
       class Create < ROM::Commands::Create
+        include TupleCount
+
         def execute(tuples)
           pks = Array([tuples]).flatten.map do |tuple|
             attributes = input[tuple]
@@ -21,6 +32,8 @@ module ROM
       end
 
       class Update < ROM::Commands::Update
+        include TupleCount
+
         def execute(tuple)
           attributes = input[tuple]
           validator.call(attributes)
@@ -33,6 +46,8 @@ module ROM
       end
 
       class Delete < ROM::Commands::Delete
+        include TupleCount
+
         def execute
           deleted = target.to_a
           target.delete

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end

data/spec/integration/commands/delete_spec.rb

@@ -13,22 +13,24 @@ describe 'Commands / Delete' do
     end
 
     setup.commands(:users) do
-      define(:delete)
+      define(:delete) do
+        result :one
+      end
     end
 
     rom.relations.users.insert(id: 2, name: 'Jane')
   end
 
-  it 'deletes all tuples' do
+  it 'raises error when tuple count does not match expectation' do
     result = users.try { delete }
 
-    expect(result.value.to_a)
-      .to match_array([{ id: 1, name: 'Piotr' }, { id: 2, name: 'Jane' }])
+    expect(result.value).to be(nil)
+    expect(result.error).to be_instance_of(ROM::TupleCountMismatchError)
   end
 
   it 'deletes all tuples in a restricted relation' do
     result = users.try { delete(:by_name, 'Jane') }
 
-    expect(result.value).to match_array([{ id: 2, name: 'Jane' }])
+    expect(result.value).to eql({ id: 2, name: 'Jane' })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel