rom-repository 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c74e20a5f12fce2888ae33bfeba0f4ff2baa9546
-  data.tar.gz: 816d5902836dfe8ab67f785c448c7e1b33b42853
+  metadata.gz: 3d274cac190d09e34254d67581d2cd8647e30301
+  data.tar.gz: 39db9816c2762e1c47422df900b85d4d82b91556
 SHA512:
-  metadata.gz: 9b8dac9fd33b64b269353b52dc6d01a5f2d65a6f97376d2df322ea9bb64fa1a31850100b2080e8b69b89c15a84227cb6e6f02913fcfda673554f1cbb2f0f8539
-  data.tar.gz: a8355e2936bf75d78ce989337815b0a5446aa532e2fa5e93e359cc87bb920db82afecd3f6a899306d3994e0aab75956a17adda086bb8909075849911eea11da5
+  metadata.gz: 55676bbb6a54903a047c3218334038039e8a26d3239ddec34011cef262450f6ed56a63bc0074c1094ebc5d547a845f8ffa20c0ad8ec9b4d5feed2c1eabcb7e09
+  data.tar.gz: 9e04a30eecd17b3741f22c3efac94f7a643d73b68dd781bf15e80f37a00be65eb2c5cdb13214ad0b3016e0fe877df7478c6a1c958dd08af654d345ca27880e4e

data/.travis.yml

@@ -8,13 +8,16 @@ before_script:
   - rvm get master
 script: "bundle exec rake ci"
 after_success:
-  - '[ "${TRAVIS_JOB_NUMBER#*.}" = "1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
+  - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 rvm:
-  - 2.4.0
-  - 2.3
-  - 2.2
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - rbx-3
-  - jruby-9.1.6.0
+  - jruby-9.1.8.0
+matrix:
+  allow_failures:
+    - rvm: rbx-3
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.3.2 2017-05-02
+
+### Fixed
+
+* Fix building changesets with relation using `Root#changeset` (flash-gordon)
+* Fix wrap when aliased relation is used (solnic)
+* Fix accessing `data` in map block in changesets (flash-gordon+solnic)
+
+### Changed
+
+* Calculate diff only with respect to keys present on the original tuple (yuszuv+solnic)
+
 # v1.3.1 2017-03-25
 
 ### Fixed

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

@@ -7,6 +7,10 @@ module ROM
     # @api public
     class Create < Stateful
       command_type :create
+
+      def command
+        super.new(relation)
+      end
     end
   end
 end

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

@@ -18,7 +18,7 @@ module ROM
       # @!attribute [r] pipe
       #   @return [Changeset::Pipe] data transformation pipe
       #   @api private
-      option :pipe, accept: [Proc, Pipe], default: -> { self.class.default_pipe(self) }
+      option :pipe, reader: false, optional: true
 
       # Define a changeset mapping
       #
@@ -56,7 +56,7 @@ module ROM
       #
       # @api public
       def self.map(&block)
-        if block.arity.zero?
+        if block.parameters.empty?
           pipes << Class.new(Pipe, &block).new
         else
           pipes << Pipe.new(block)
@@ -212,6 +212,15 @@ module ROM
         %(#<#{self.class} relation=#{relation.name.inspect} data=#{__data__}>)
       end
 
+      # Data transformation pipe
+      #
+      # @return [Changeset::Pipe]
+      #
+      # @api private
+      def pipe
+        @pipe ||= self.class.default_pipe(self)
+      end
+
       private
 
       # @api private

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

@@ -77,8 +77,11 @@ module ROM
       def diff
         @diff ||=
           begin
-            new_tuple = __data__.to_a
-            ori_tuple = original.to_a
+            data_tuple = __data__.to_a
+            data_keys = __data__.keys & original.keys
+
+            new_tuple = data_tuple.to_a.select { |(k, _)| data_keys.include?(k) }
+            ori_tuple = original.to_a.select { |(k, _)| data_keys.include?(k) }
 
             Hash[new_tuple - (new_tuple & ori_tuple)]
           end

data/lib/rom/repository/relation_proxy/wrap.rb

@@ -69,7 +69,7 @@ module ROM
         def wraps_from_names(names)
           names.map { |name|
             assoc = associations[name]
-            registry[assoc.target].wrapped(name, assoc.combine_keys(__registry__), true)
+            registry[assoc.target.relation].wrapped(name, assoc.combine_keys(__registry__), true)
           }
         end
       end

data/lib/rom/repository/root.rb

@@ -150,7 +150,7 @@ module ROM
           super
         elsif args.first.is_a?(Class)
           klass, *rest = args
-          super(klass[self.class.root], *rest)
+          super(klass[klass.relation || self.class.root], *rest)
         else
           super(root.name, *args)
         end

data/lib/rom/repository/version.rb

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

data/spec/integration/changeset_spec.rb

@@ -2,6 +2,22 @@ RSpec.describe 'Using changesets' do
   include_context 'database'
   include_context 'relations'
 
+  before do
+    module Test
+      class User < Dry::Struct
+        attribute :id, Dry::Types['strict.int']
+        attribute :name, Dry::Types['strict.string']
+      end
+    end
+
+    configuration.mappers do
+      define(:users) do
+        model Test::User
+        register_as :user
+      end
+    end
+  end
+
   describe 'Create' do
     subject(:repo) do
       Class.new(ROM::Repository[:users]) {
@@ -10,6 +26,18 @@ RSpec.describe 'Using changesets' do
       }.new(rom)
     end
 
+    let(:create_changeset) do
+      Class.new(ROM::Changeset::Create)
+    end
+
+    let(:add_book_changeset) do
+      Class.new(ROM::Changeset::Create[:books])
+    end
+
+    let(:update_changeset) do
+      Class.new(ROM::Changeset::Update)
+    end
+
     it 'can be passed to a command' do
       changeset = repo.changeset(name: "Jane Doe")
       command = repo.command(:create, repo.users)
@@ -70,6 +98,28 @@ RSpec.describe 'Using changesets' do
       expect(result.created_at).to be_instance_of(Time)
       expect(result.updated_at).to be_instance_of(Time)
     end
+
+    it 'preserves relation mappers with create' do
+      changeset = repo.
+                    changeset(create_changeset).
+                    new(repo.users.relation.as(:user)).
+                    data(name: 'Joe Dane')
+
+      expect(changeset.commit).to eql(Test::User.new(id: 1, name: 'Joe Dane'))
+    end
+
+    it 'creates changesets for non-root relations' do
+      repo.create(name: 'John Doe')
+      changeset = repo.changeset(add_book_changeset).data(title: 'The War of the Worlds')
+
+      expect(changeset.commit).
+        to include(
+             id: 1,
+             title: 'The War of the Worlds',
+             created_at: nil,
+             updated_at: nil
+           )
+    end
   end
 
   describe 'Update' do

data/spec/integration/multi_adapter_spec.rb

@@ -1,8 +1,11 @@
+# coding: utf-8
 RSpec.describe 'Repository with multi-adapters configuration' do
-  let!(:configuration) {
+  let(:configuration) {
     ROM::Configuration.new(default: [:sql, DB_URI], memory: [:memory])
   }
 
+  let(:sql_conn) { configuration.gateways[:default].connection }
+
   let(:rom) { ROM.container(configuration) }
 
   let(:users) { rom.relation(:sql_users) }
@@ -11,6 +14,14 @@ RSpec.describe 'Repository with multi-adapters configuration' do
   let(:repo) { Test::Repository.new(rom) }
 
   before do
+    [:tags, :tasks, :posts, :books, :users, :posts_labels, :labels,
+     :reactions, :messages].each { |table| sql_conn.drop_table?(table) }
+
+    sql_conn.create_table :users do
+      primary_key :id
+      column :name, String
+    end
+
     module Test
       class Users < ROM::Relation[:sql]
         gateway :default
@@ -34,7 +45,7 @@ RSpec.describe 'Repository with multi-adapters configuration' do
         end
 
         def for_users(users)
-          restrict(user_id: users.map { |u| u[:id] })
+          restrict(user_id: users.pluck(:id))
         end
       end
 

data/spec/integration/repository_spec.rb

@@ -71,6 +71,17 @@ RSpec.describe 'ROM repository' do
     expect(repo.tag_with_wrapped_task.first).to eql(tag_with_task)
   end
 
+  it 'loads wraps using aliased relation' do
+    author = repo.users.where(name: 'Jane').one
+
+    repo.command(:create, repo.books).(title: 'Hello World', author_id: author.id)
+
+    book = repo.books.wrap(:author).to_a.first
+
+    expect(book.author.id).to eql(author.id)
+    expect(book.author.name).to eql(author.name)
+  end
+
   it 'loads multiple wraps' do
     post_label = repo.posts_labels.wrap(:post).wrap(:label).to_a.first
 

data/spec/shared/database.rb

@@ -14,21 +14,22 @@ RSpec.shared_context 'database' do
   include_context 'database setup'
 
   before do
-    [:tags, :tasks, :posts, :users, :posts_labels, :labels, :books,
+    [:tags, :tasks, :posts, :books, :users, :posts_labels, :labels,
      :reactions, :messages].each { |table| conn.drop_table?(table) }
 
+    conn.create_table :users do
+      primary_key :id
+      column :name, String
+    end
+
     conn.create_table :books do
       primary_key :id
+      foreign_key :author_id, :users, on_delete: :cascade
       column :title, String
       column :created_at, Time
       column :updated_at, Time
     end
 
-    conn.create_table :users do
-      primary_key :id
-      column :name, String
-    end
-
     conn.create_table :tasks do
       primary_key :id
       foreign_key :user_id, :users, null: false, on_delete: :cascade

data/spec/shared/relations.rb

@@ -9,9 +9,14 @@ RSpec.shared_context 'relations' do
     configuration.relation(:books) do
       schema(:books) do
         attribute :id, ROM::SQL::Types::Serial
+        attribute :author_id, ROM::SQL::Types.ForeignKey(:users)
         attribute :title, ROM::SQL::Types::String
         attribute :created_at, ROM::SQL::Types::Time
         attribute :updated_at, ROM::SQL::Types::Time
+
+        associations do
+          belongs_to :users, as: :author, relation: :authors, foreign_key: :author_id
+        end
       end
     end
 
@@ -21,6 +26,7 @@ RSpec.shared_context 'relations' do
           has_many :posts
           has_many :posts, as: :aliased_posts
           has_many :labels, through: :posts
+          has_many :books, foreign_key: :author_id
         end
       end
 
@@ -37,6 +43,10 @@ RSpec.shared_context 'relations' do
       end
     end
 
+    configuration.relation(:authors) do
+      schema(:users, infer: true)
+    end
+
     configuration.relation(:tasks) do
       schema(infer: true) do
         associations do

data/spec/shared/repo.rb

@@ -6,7 +6,7 @@ RSpec.shared_context('repo') do
 
   let(:repo_class) do
     Class.new(ROM::Repository[:users]) do
-      relations :tasks, :tags, :posts, :labels, :posts_labels
+      relations :tasks, :tags, :posts, :labels, :posts_labels, :books, :authors
 
       def find_users(criteria)
         users.find(criteria)

data/spec/spec_helper.rb

@@ -1,13 +1,17 @@
-# encoding: utf-8
-
 # this is needed for guard to work, not sure why :(
 require "bundler"
 Bundler.setup
 
-if ENV['COVERAGE'] == 'true' && RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.4.0' && ENV['CI'] == 'true'
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec/'
+if RUBY_ENGINE == 'ruby' && ENV['COVERAGE'] == 'true'
+  require 'yaml'
+  rubies = YAML.load(File.read(File.join(__dir__, '..', '.travis.yml')))['rvm']
+  latest_mri = rubies.select { |v| v =~ /\A\d+\.\d+.\d+\z/ }.max
+
+  if RUBY_VERSION == latest_mri
+    require 'simplecov'
+    SimpleCov.start do
+      add_filter '/spec/'
+    end
   end
 end
 
@@ -61,7 +65,7 @@ Warning.extend(SileneceWarnings) if warning_api_available
 
 RSpec.configure do |config|
   config.disable_monkey_patching!
-  config.warnings = true
+  config.warnings = warning_api_available
 
   config.after do
     Test.remove_constants

data/spec/unit/changeset/map_spec.rb

@@ -42,6 +42,29 @@ RSpec.describe ROM::Changeset, '.map' do
     end
   end
 
+  context 'accessing data in a map block' do
+    subject(:changeset) do
+      Class.new(ROM::Changeset::Create[:users]) do
+        map do |tuple|
+          extend_data(tuple)
+        end
+
+        private
+
+        def extend_data(tuple)
+          tuple.merge(email: "#{self[:name].downcase}@test.com")
+        end
+      end.new(relation).data(user_data)
+    end
+
+    let(:relation) { double(:relation) }
+    let(:user_data) { { name: 'Jane' } }
+
+    it 'extends data in a map block' do
+      expect(changeset.to_h).to eql(name: 'Jane', email: 'jane@test.com')
+    end
+  end
+
   context 'multi mapping with custom blocks' do
     subject(:changeset) do
       Class.new(ROM::Changeset::Create[:users]) do
@@ -53,6 +76,10 @@ RSpec.describe ROM::Changeset, '.map' do
           tuple.merge(two: next_value)
         end
 
+        map do |three: next_value, **other|
+          { three: three, **other }
+        end
+
         def initialize(*args)
           super
           @counter = 0
@@ -72,7 +99,7 @@ RSpec.describe ROM::Changeset, '.map' do
     let(:user_data) { { name: 'Jane' } }
 
     it 'applies mappings in order of definition' do
-      expect(changeset.to_h).to eql(name: 'Jane', one: 1, two: 2)
+      expect(changeset.to_h).to eql(name: 'Jane', one: 1, two: 2, three: 3)
     end
 
     it 'inherits pipes' do

data/spec/unit/changeset_spec.rb

@@ -32,13 +32,21 @@ RSpec.describe ROM::Changeset do
 
       expect(changeset.diff).to eql(name: "Jane Doe")
     end
+
+    it 'does not consider keys that are not present on the original tuple' do
+      expect(relation).to receive(:one).and_return(jane)
+
+      changeset = ROM::Changeset::Update.new(relation).data(foo: 'bar')
+
+      expect(changeset.diff).to eql({})
+    end
   end
 
   describe '#diff?' do
     it 'returns true when data differs from the original tuple' do
       expect(relation).to receive(:one).and_return(jane)
 
-      changeset = ROM::Changeset::Update.new(relation, __data__: { name: "Jane Doe" })
+      changeset = ROM::Changeset::Update.new(relation).data(name: "Jane Doe")
 
       expect(changeset).to be_diff
     end
@@ -46,7 +54,15 @@ RSpec.describe ROM::Changeset do
     it 'returns false when data are equal to the original tuple' do
       expect(relation).to receive(:one).and_return(jane)
 
-      changeset = ROM::Changeset::Update.new(relation, __data__: { name: "Jane" })
+      changeset = ROM::Changeset::Update.new(relation).data(name: 'Jane')
+
+      expect(changeset).to_not be_diff
+    end
+
+    it 'returns false when data contains keys that are not available on the original tuple' do
+      expect(relation).to receive(:one).and_return(jane)
+
+      changeset = ROM::Changeset::Update.new(relation).data(foo: 'bar')
 
       expect(changeset).to_not be_diff
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-repository
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Repository abstraction for rom-rb