rom-repository 0.3.1 → 1.0.0.beta1

data/spec/unit/repository/inspect_spec.rb

@@ -0,0 +1,18 @@
+RSpec.describe ROM::Repository, '#inspect' do
+  subject(:repo) do
+    Class.new(ROM::Repository) do
+      relations :users
+
+      def self.to_s
+        'UserRepo'
+      end
+    end.new(rom)
+  end
+
+  include_context 'database'
+  include_context 'relations'
+
+  specify do
+    expect(repo.inspect).to eql('#<UserRepo relations=[:users]>')
+  end
+end

data/spec/unit/repository/session_spec.rb

@@ -0,0 +1,251 @@
+RSpec.describe ROM::Repository, '#session' do
+  subject(:repo) do
+    Class.new(ROM::Repository) { relations :users, :posts, :labels }.new(rom)
+  end
+
+  include_context 'database'
+  include_context 'relations'
+
+  describe 'with :create command' do
+    let(:user_changeset) do
+      repo.changeset(:users, name: 'Jane')
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |s|
+        s.add(user_changeset)
+      end
+
+      user = repo.users.where(name: 'Jane').one
+      expect(user.to_h).to eql(id: 1, name: 'Jane')
+    end
+  end
+
+  describe 'with :update command' do
+    let(:user_changeset) do
+      repo.changeset(:users, user.id, user.to_h.merge(name: 'Jane Doe'))
+    end
+
+    let(:user) do
+      repo.users.where(name: 'Jane').one
+    end
+
+    before do
+      repo.command(:create, repo.users).call(name: 'John')
+      repo.command(:create, repo.users).call(name: 'Jane')
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |s|
+        s.add(user_changeset)
+      end
+
+      updated_user = repo.users.fetch(user.id)
+
+      expect(updated_user).to eql(id: 2, name: 'Jane Doe')
+    end
+  end
+
+  describe 'with :delete command' do
+    let(:user) do
+      repo.users.where(name: 'Jane').one
+    end
+
+    before do
+      repo.command(:create, repo.users).call(name: 'John')
+      repo.command(:create, repo.users).call(name: 'Jane')
+    end
+
+    let(:user_changeset) do
+      repo.changeset(delete: repo.users.by_pk(user.id))
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |t|
+        t.add(user_changeset)
+      end
+
+      expect(repo.users.by_pk(user.id).one).to be(nil)
+      expect(repo.users.count).to be(1)
+    end
+  end
+
+  describe 'with :custom command', :postgres do
+    before do
+      configuration.commands(:users) do
+        define(:create) do
+          register_as :custom
+        end
+      end
+    end
+
+    let(:user_changeset) do
+      repo.changeset(:users, name: 'John').with(command_type: :custom)
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |t|
+        t.add(user_changeset)
+      end
+
+      user = repo.users.first
+
+      expect(user.id).to_not be(nil)
+      expect(user.name).to eql('John')
+      expect(repo.users.count).to be(1)
+    end
+  end
+
+  describe 'creating a user with its posts' do
+    let(:posts_changeset) do
+      repo.changeset(:posts, [{ title: 'Post 1' }, { title: 'Post 2' }])
+    end
+
+    let(:user_changeset) do
+      repo.changeset(:users, name: 'Jane')
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |s|
+        s.add(user_changeset.associate(posts_changeset, :author))
+      end
+
+      user = repo.users.combine(:posts).one
+
+      expect(user.name).to eql('Jane')
+      expect(user.posts.size).to be(2)
+      expect(user.posts[0].title).to eql('Post 1')
+      expect(user.posts[1].title).to eql('Post 2')
+    end
+  end
+
+  describe 'creating a user with its posts and their labels' do
+    let(:posts_data) do
+      { title: 'Post 1' }
+    end
+
+    let(:posts_changeset) do
+      repo.
+        changeset(:posts, posts_data).
+        associate(labels_changeset, :posts)
+    end
+
+    let(:labels_changeset) do
+      repo.changeset(:labels, [{ name: 'red' }, { name: 'green' }])
+    end
+
+    let(:user_changeset) do
+      repo.
+        changeset(:users, name: 'Jane').
+        associate(posts_changeset, :author)
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |t|
+        t.add(user_changeset)
+      end
+
+      user = repo.users.combine(posts: [:labels]).one
+
+      expect(user.name).to eql('Jane')
+      expect(user.posts.size).to be(1)
+      expect(user.posts[0].title).to eql('Post 1')
+      expect(user.posts[0].labels.size).to be(2)
+      expect(user.posts[0].labels[0].name).to eql('red')
+      expect(user.posts[0].labels[1].name).to eql('green')
+    end
+
+    context 'with invalid data' do
+      let(:posts_data) do
+        [{ title: nil }]
+      end
+
+      it 'rolls back the transaction' do
+        expect {
+          repo.session do |t|
+            t.add(user_changeset)
+          end
+        }.to raise_error(ROM::SQL::ConstraintError)
+
+        expect(repo.users.count).to be(0)
+        expect(repo.posts.count).to be(0)
+        expect(repo.labels.count).to be(0)
+      end
+    end
+  end
+
+  describe 'creating new posts for existing user' do
+    let(:posts_changeset) do
+      repo.
+        changeset(:posts, [{ title: 'Post 1' }, { title: 'Post 2' }]).
+        associate(user, :author)
+    end
+
+    let(:user) do
+      repo.command(:create, repo.users).call(name: 'Jane')
+    end
+
+    it 'saves data in a transaction' do
+      repo.session do |s|
+        s.add(posts_changeset)
+      end
+
+      user = repo.users.combine(:posts).one
+
+      expect(user.posts.size).to be(2)
+      expect(user.posts[0].title).to eql('Post 1')
+      expect(user.posts[1].title).to eql('Post 2')
+    end
+  end
+
+  describe 'nesting sessions' do
+    let(:user_changeset) do
+      repo.changeset(:users, name: 'Jane')
+    end
+
+    let(:posts_changeset) do
+      repo.changeset(:posts, post_data)
+    end
+
+    let(:user) do
+      repo.users.where(name: 'Jane').one
+    end
+
+    context 'when data is valid' do
+      let(:post_data) do
+        [{ title: 'Post 1' }, { title: 'Post 2' }]
+      end
+
+      it 'saves data in transactions' do
+        repo.send(:transaction) do |t|
+          repo.session { |s| s.add(user_changeset) }
+          repo.session { |s| s.add(posts_changeset.associate(user, :author)) }
+        end
+
+        user = repo.users.combine(:posts).one
+
+        expect(user.posts.size).to be(2)
+        expect(user.posts[0].title).to eql('Post 1')
+        expect(user.posts[1].title).to eql('Post 2')
+      end
+    end
+
+    context 'when data is not valid' do
+      let(:post_data) do
+        [{ title: 'Post 1' }, { title: nil }]
+      end
+
+      it 'rolls back transaction' do
+        expect {
+          repo.send(:transaction) do |t|
+            repo.session { |s| s.add(user_changeset) }
+            repo.session { |s| s.add(posts_changeset.associate(user, :author)) }
+          end
+        }.to raise_error(ROM::SQL::ConstraintError, /title/)
+
+        expect(repo.users.count).to be(0)
+        expect(repo.posts.count).to be(0)
+      end
+    end
+  end
+end

data/spec/unit/session_spec.rb

@@ -0,0 +1,54 @@
+RSpec.describe ROM::Session do
+  subject(:session) do
+    ROM::Session.new(repo)
+  end
+
+  let(:repo) { instance_double(ROM::Repository) }
+  let(:create_changeset) { instance_double(ROM::Changeset::Create, relation: relation) }
+  let(:delete_changeset) { instance_double(ROM::Changeset::Delete, relation: relation) }
+  let(:relation) { double.as_null_object }
+  let(:create_command) { spy(:create_command) }
+  let(:delete_command) { spy(:delete_command) }
+
+  describe '#pending?' do
+    it 'returns true before commit' do
+      expect(session).to be_pending
+    end
+
+    it 'returns false after commit' do
+      expect(session.commit!).to_not be_pending
+    end
+  end
+
+  describe '#commit!' do
+    it 'executes ops and restores pristine state' do
+      expect(create_changeset).to receive(:command).and_return(create_command)
+
+      session.add(create_changeset).commit!
+      session.commit!
+
+      expect(session).to be_success
+
+      expect(create_command).to have_received(:call)
+    end
+
+    it 'executes ops and restores pristine state when exception was raised' do
+      expect(create_changeset).to receive(:command).and_return(create_command)
+      expect(delete_changeset).to receive(:command).and_return(delete_command)
+
+      expect(delete_command).to receive(:call).and_raise(StandardError, 'oops')
+
+      expect {
+        session.add(delete_changeset)
+        session.add(create_changeset)
+        session.commit!
+      }.to raise_error(StandardError, 'oops')
+
+      expect(session).to be_failure
+
+      session.commit!
+
+      expect(create_command).not_to have_received(:call)
+    end
+  end
+end

data/spec/unit/struct_builder_spec.rb

@@ -1,7 +1,22 @@
 RSpec.describe 'struct builder', '#call' do
   subject(:builder) { ROM::Repository::StructBuilder.new }
 
-  let(:input) { [:users, [:header, [[:attribute, :id], [:attribute, :name]]]] }
+  def attr_double(name, type, **opts)
+    double(
+      name: name,
+      aliased?: false,
+      wrapped?: false,
+      foreign_key?: false,
+      type: ROM::Types.const_get(type),
+      **opts
+    )
+  end
+
+  let(:input) do
+    [:users, [:header, [
+                [:attribute, attr_double(:id, :Int)],
+                [:attribute, attr_double(:name, :String)]]]]
+  end
 
   before { builder[*input] }
 
@@ -25,4 +40,33 @@ RSpec.describe 'struct builder', '#call' do
   it 'stores struct in the cache' do
     expect(builder.class.cache[input.hash]).to be(builder[*input])
   end
+
+  context 'with reserved keywords as attribute names' do
+    let(:input) do
+      [:users, [:header, [
+                  [:attribute, attr_double(:id, :Int)],
+                  [:attribute, attr_double(:name, :String)],
+                  [:attribute, attr_double(:alias, :String)],
+                  [:attribute, attr_double(:until, :Time)]]]]
+    end
+
+    it 'allows to build a struct class without complaining' do
+      struct = builder.class.cache[input.hash]
+
+      user = struct.new(id: 1, name: 'Jane', alias: 'JD', until: Time.new(2030))
+
+      expect(user.id).to be(1)
+      expect(user.name).to eql('Jane')
+      expect(user.alias).to eql('JD')
+      expect(user.until).to eql(Time.new(2030))
+    end
+  end
+
+  it 'raise a friendly error on missing keys' do
+    struct = builder.class.cache[input.hash]
+
+    expect { struct.new(id: 1) }.to raise_error(
+      Dry::Struct::Error, /:name is missing/
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -16,42 +16,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0.beta
 - !ruby/object:Gem::Dependency
-  name: rom-support
+  name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.5.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.5.0.beta
 - !ruby/object:Gem::Dependency
-  name: rom-mapper
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +119,7 @@ files:
 - lib/rom/repository.rb
 - lib/rom/repository/changeset.rb
 - lib/rom/repository/changeset/create.rb
+- lib/rom/repository/changeset/delete.rb
 - lib/rom/repository/changeset/pipe.rb
 - lib/rom/repository/changeset/update.rb
 - lib/rom/repository/class_interface.rb
@@ -110,7 +131,7 @@ files:
 - lib/rom/repository/relation_proxy/combine.rb
 - lib/rom/repository/relation_proxy/wrap.rb
 - lib/rom/repository/root.rb
-- lib/rom/repository/struct_attributes.rb
+- lib/rom/repository/session.rb
 - lib/rom/repository/struct_builder.rb
 - lib/rom/repository/version.rb
 - lib/rom/struct.rb
@@ -122,6 +143,7 @@ files:
 - spec/integration/multi_adapter_spec.rb
 - spec/integration/repository_spec.rb
 - spec/integration/root_repository_spec.rb
+- spec/integration/typed_structs_spec.rb
 - spec/shared/database.rb
 - spec/shared/mappers.rb
 - spec/shared/models.rb
@@ -132,13 +154,15 @@ files:
 - spec/shared/structs.rb
 - spec/spec_helper.rb
 - spec/support/mapper_registry.rb
+- spec/support/mutant.rb
+- spec/unit/changeset/map_spec.rb
 - spec/unit/changeset_spec.rb
-- spec/unit/header_builder_spec.rb
-- spec/unit/plugins/view_spec.rb
 - spec/unit/relation_proxy_spec.rb
-- spec/unit/sql/relation_spec.rb
+- spec/unit/repository/changeset_spec.rb
+- spec/unit/repository/inspect_spec.rb
+- spec/unit/repository/session_spec.rb
+- spec/unit/session_spec.rb
 - spec/unit/struct_builder_spec.rb
-- spec/unit/struct_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -154,9 +178,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.5.1