rom-repository 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c707538203786422c6f8a84fb4c0cc9eeb09c042
-  data.tar.gz: c926f00d3af0cced7bf8c49cd631d0d6d8d49325
+  metadata.gz: e6b048642fe2a94616f34fd16f97f14c66ef9d09
+  data.tar.gz: f5d68af52ed2f23e95f0b374c6dd8ec6c0fba51a
 SHA512:
-  metadata.gz: e2cd0fbb32bc8ad51c6d7c4242c74bd9ac6117630c0f3cfb7e14a08f90cb04225e82d52308d0699fe9d59e4d1c601514864c2a1f3165bd67027abfa813823710
-  data.tar.gz: c75b062e768280c3d6a347c4608c74e372d243add19d425b1b0a98d49964c869a8b611e1e8d89f373dd698d56cb3cab1020f6f12da06d34d66e7a90f2d8144a4
+  metadata.gz: 54fdd9a7b04880a7e3d3b9cdcaaf4794921bbfc9fe1fe95a6807b18e9c5d025cc295c86f8f4afb7f43a25939ef04bb665dfeeef84c768eb6b2d4037619b826d5
+  data.tar.gz: d4d7fe97225798174a5d7feee644f76188f321066501d2c8b4683dcc15d37b8fad1c1aa6fd0dd186962a3094a4ee9d486c29788d0047ffe830b8b7cc1e6dc2e1

data/.travis.yml

@@ -13,7 +13,7 @@ rvm:
   - 2.3
   - 2.2
   - rbx-3
-  - jruby
+  - jruby-9.1.6.0
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-# v1.0.0 to-be-released
+# v1.0.1 2017-01-31
+
+### Fixed
+
+* `Changeset::Update` creates a command with restricted relation (solnic)
+* `Changeset#result` will always return `:many` for arrays and `:one` for other objects (even a custom object is used) (solnic)
+
+[Compare v1.0.1...v1.0.1](https://github.com/rom-rb/rom-repository/compare/v1.0.0...v1.0.1)
+
+# v1.0.0 2017-01-30
 
 ### Added
 

data/lib/rom/repository/changeset.rb

@@ -121,7 +121,7 @@ module ROM
     #
     # @api private
     def command
-      command_compiler.(command_type, relation_identifier, DEFAULT_COMMAND_OPTS).new(relation)
+      command_compiler.(command_type, relation_identifier, DEFAULT_COMMAND_OPTS)
     end
 
     private

data/lib/rom/repository/changeset/delete.rb

@@ -1,3 +1,5 @@
+require 'rom/repository/changeset/restricted'
+
 module ROM
   class Changeset
     # Changeset specialization for delete commands
@@ -7,6 +9,8 @@ module ROM
     #
     # @api public
     class Delete < Changeset
+      include Restricted
+
       command_type :delete
     end
   end

data/lib/rom/repository/changeset/restricted.rb

@@ -0,0 +1,14 @@
+module ROM
+  class Changeset
+    module Restricted
+      # Return a command restricted by the changeset's relation
+      #
+      # @see Changeset#command
+      #
+      # @api private
+      def command
+        super.new(relation)
+      end
+    end
+  end
+end

data/lib/rom/repository/changeset/stateful.rb

@@ -197,7 +197,7 @@ module ROM
       #
       # @api private
       def result
-        __data__.is_a?(Hash) ? :one : :many
+        __data__.is_a?(Array) ? :many : :one
       end
 
       # @api public

data/lib/rom/repository/changeset/update.rb

@@ -1,3 +1,5 @@
+require 'rom/repository/changeset/restricted'
+
 module ROM
   class Changeset
     # Changeset specialization for update commands
@@ -13,6 +15,8 @@ module ROM
     #
     # @api public
     class Update < Stateful
+      include Restricted
+
       command_type :update
 
       # Commit update changeset if there's a diff

data/lib/rom/repository/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Repository
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/spec/unit/changeset_spec.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 RSpec.describe ROM::Changeset do
   let(:jane) { { id: 2, name: "Jane" } }
   let(:relation) { double(ROM::Relation, name: :users) }
@@ -120,6 +122,24 @@ RSpec.describe ROM::Changeset do
     end
   end
 
+  describe 'quacks like a custom object' do
+    subject(:changeset) { ROM::Changeset::Create.new(relation, __data__: data) }
+
+    let(:data) { OpenStruct.new(name: 'Jane') }
+
+    it 'delegates to its data hash' do
+      expect(changeset[:name]).to eql('Jane')
+    end
+
+    it 'raises NoMethodError when an unknown message was sent' do
+      expect { changeset.not_here }.to raise_error(NoMethodError, /not_here/)
+    end
+
+    it 'has correct result type' do
+      expect(changeset.result).to be(:one)
+    end
+  end
+
   describe '#inspect' do
     context 'with a stateful changeset' do
       subject(:changeset) { ROM::Changeset::Create.new(relation).data(name: 'Jane') }

data/spec/unit/repository/changeset_spec.rb

@@ -54,10 +54,14 @@ RSpec.describe ROM::Repository, '#changeset' do
     end
 
     shared_context 'a valid update changeset' do
-      let(:user) do
+      let!(:jane) do
         repo.command(:create, repo.users).call(name: 'Jane')
       end
 
+      let!(:joe) do
+        repo.command(:create, repo.users).call(name: 'Joe')
+      end
+
       it 'has data' do
         expect(changeset.to_h).to eql(name: 'Jane Doe')
       end
@@ -67,17 +71,18 @@ RSpec.describe ROM::Repository, '#changeset' do
       end
 
       it 'has relation' do
-        expect(changeset.relation.one).to eql(repo.users.by_pk(user[:id]).one)
+        expect(changeset.relation.one).to eql(repo.users.by_pk(jane[:id]).one)
       end
 
-      it 'can return be commited' do
+      it 'can be commited' do
         expect(changeset.commit).to eql(id: 1, name: 'Jane Doe')
+        expect(repo.users.by_pk(joe[:id]).one).to eql(joe)
       end
     end
 
     context 'using PK to restrict a relation' do
       let(:changeset) do
-        repo.changeset(:users, user[:id], data)
+        repo.changeset(:users, jane[:id], data)
       end
 
       include_context 'a valid update changeset'
@@ -85,7 +90,7 @@ RSpec.describe ROM::Repository, '#changeset' do
 
     context 'using custom relation' do
       let(:changeset) do
-        repo.changeset(update: repo.users.by_pk(user[:id])).data(data)
+        repo.changeset(update: repo.users.by_pk(jane[:id])).data(data)
       end
 
       include_context 'a valid update changeset'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -123,6 +123,7 @@ files:
 - lib/rom/repository/changeset/create.rb
 - lib/rom/repository/changeset/delete.rb
 - lib/rom/repository/changeset/pipe.rb
+- lib/rom/repository/changeset/restricted.rb
 - lib/rom/repository/changeset/stateful.rb
 - lib/rom/repository/changeset/update.rb
 - lib/rom/repository/class_interface.rb