dry-initializer-rails 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a894c708b1e5461c0d316687eb482b01797a2e3d
-  data.tar.gz: fa349d24f5fa62e059e099bddf5f45d05f41a3d6
+  metadata.gz: 6c6808d3a56d819ed0d0f450cf8d866e69cdcf0c
+  data.tar.gz: f7f9480365f3b68b1503eafbe8b57ecd6314bc1e
 SHA512:
-  metadata.gz: 0e773812ba782a02ca0cfdb35c1841d9c62942b03b6cd285802c295a47078cd3099614e1ee09061d16ae8f68f94e8aa8e62724ed4620111d71399ba3db71f397
-  data.tar.gz: 6f80e04ad40745801b43063bae14463d5fd509b4d350e1e04d43542ffb0d95088d7d07f04bfbaae5e53b6b60438a6f9945c9d964890cd8753314a328324df25f
+  metadata.gz: 605829836cc66781e67c0c2d2b4c299d5a4885ab9e9c0facb4f3e29d8c6e8a9c49e312ea661bf189f42d6e9374f4777ccb252f3d3ba1f86f5ef21443620428a9
+  data.tar.gz: e3801f23bddecf3dbb6959ddca18f0b4b52f5de3bb7b11867da5976a700872695e1ae842d885ce79f6cd3c1f62c65cf260b5ca58f4d560db433c36d67b206cd7

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.0.0] [2018-02-01]
+
+### Changed
+- take `nil` as is without trying to find a record (nepalez)
+- raise `ActiveRecord::RecordNotFound` in case of absent key (nepalez)
+
 ## [2.0.0] [2018-02-01]
 
 Update dependency to [dry-initializer] v2.4+ (nepalez)
@@ -30,4 +36,5 @@ First public release
 [0.0.2]: https://github.com/nepalez/dry-initializer-rails/compare/v0.0.1...v0.0.2
 [0.0.3]: https://github.com/nepalez/dry-initializer-rails/compare/v0.0.2...v0.0.3
 [1.0.0]: https://github.com/nepalez/dry-initializer-rails/compare/v0.0.3...v1.0.0
-[0.0.3]: https://github.com/nepalez/dry-initializer-rails/compare/v1.0.0...v2.0.0
+[2.0.0]: https://github.com/nepalez/dry-initializer-rails/compare/v1.0.0...v2.0.0
+[3.0.0]: https://github.com/nepalez/dry-initializer-rails/compare/v2.0.0...v3.0.0

data/dry-initializer-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer-rails"
-  gem.version  = "2.0.0"
+  gem.version  = "3.0.0"
   gem.author   = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
   gem.email    = ["andrew.kozin@gmail.com"]
   gem.homepage = "https://github.com/nepalez/dry-initializer-rails"

data/lib/dry/initializer/rails.rb

@@ -7,8 +7,8 @@ rails_dispatcher = lambda do |model: nil, find_by: :id, **options|
 
   model   = model.constantize if model.is_a? String
   coercer = lambda do |value|
-    return value if value.instance_of? model
-    model.find_by(find_by => value)
+    return value if value.nil? || value.instance_of?(model)
+    model.find_by! find_by => value
   end
 
   options.merge(type: coercer)

data/spec/dry/initializer/assignment_by_custom_key_spec.rb

@@ -19,39 +19,14 @@ describe "assignment by custom key" do
       expect(subject.product).to eql item
     end
 
-    it "works when records are absent" do
-      subject = Test::Order.new("Man", product: "Something strange")
+    it "raises when records are absent" do
+      Test::Order.new("Dude", product: "The thing")
 
-      expect(subject.user).to be_nil
-      expect(subject.product).to be_nil
-    end
-  end
-
-  context "with container syntax" do
-    before do
-      class Test::Order
-        include Dry::Initializer.define -> do
-          param  :user,    model: "User", find_by: "name"
-          option :product, model: Item,   find_by: :name
-        end
-      end
-    end
-
-    let!(:user) { User.create name: "Dude" }
-    let!(:item) { Item.create name: "The thing" }
-
-    it "works when records are present" do
-      subject = Test::Order.new("Dude", product: "The thing")
-
-      expect(subject.user).to eql user
-      expect(subject.product).to eql item
-    end
-
-    it "works when records are absent" do
-      subject = Test::Order.new("Man", product: "Something strange")
+      expect { Test::Order.new("Man", product: "The thing") }
+        .to raise_error ActiveRecord::RecordNotFound
 
-      expect(subject.user).to be_nil
-      expect(subject.product).to be_nil
+      expect { Test::Order.new("Dude", product: "Something strange") }
+        .to raise_error ActiveRecord::RecordNotFound
     end
   end
 end

data/spec/dry/initializer/assignment_by_id_spec.rb

@@ -18,10 +18,13 @@ describe "assignment by id" do
     expect(subject.product).to eql item
   end
 
-  it "works when records are absent" do
-    subject = Test::Order.new(0, product: 0)
+  it "raises when records are absent" do
+    Test::Order.new(user.id, product: item.id)
 
-    expect(subject.user).to be_nil
-    expect(subject.product).to be_nil
+    expect { Test::Order.new(0, product: item) }
+      .to raise_error ActiveRecord::RecordNotFound
+
+    expect { Test::Order.new(user, product: 0) }
+      .to raise_error ActiveRecord::RecordNotFound
   end
 end

data/spec/dry/initializer/assignment_by_nil_spec.rb

@@ -0,0 +1,20 @@
+describe "assignment by model" do
+  before do
+    class Test::Order
+      extend Dry::Initializer
+
+      param  :user,    model: "User"
+      option :product, model: Item
+    end
+  end
+
+  let!(:user) { User.create name: "Dude" }
+  let!(:item) { Item.create name: "The thing" }
+
+  it "works" do
+    subject = Test::Order.new(nil, product: nil)
+
+    expect(subject.user).to be_nil
+    expect(subject.product).to be_nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,6 +135,7 @@ files:
 - spec/dry/initializer/assignment_by_custom_key_spec.rb
 - spec/dry/initializer/assignment_by_id_spec.rb
 - spec/dry/initializer/assignment_by_model_spec.rb
+- spec/dry/initializer/assignment_by_nil_spec.rb
 - spec/dry/initializer/base_syntax_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/models/item.rb
@@ -175,6 +176,7 @@ test_files:
 - spec/dry/initializer/assignment_by_custom_key_spec.rb
 - spec/dry/initializer/assignment_by_id_spec.rb
 - spec/dry/initializer/assignment_by_model_spec.rb
+- spec/dry/initializer/assignment_by_nil_spec.rb
 - spec/dry/initializer/base_syntax_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/models/item.rb