dry-initializer-rails 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c6808d3a56d819ed0d0f450cf8d866e69cdcf0c
-  data.tar.gz: f7f9480365f3b68b1503eafbe8b57ecd6314bc1e
+  metadata.gz: be08cdd7d51330fca13c8f87074fb211b8461710
+  data.tar.gz: 357ac57f1fd962cb2140ac642da75f24c809e66b
 SHA512:
-  metadata.gz: 605829836cc66781e67c0c2d2b4c299d5a4885ab9e9c0facb4f3e29d8c6e8a9c49e312ea661bf189f42d6e9374f4777ccb252f3d3ba1f86f5ef21443620428a9
-  data.tar.gz: e3801f23bddecf3dbb6959ddca18f0b4b52f5de3bb7b11867da5976a700872695e1ae842d885ce79f6cd3c1f62c65cf260b5ca58f4d560db433c36d67b206cd7
+  metadata.gz: 480baa49814dc169dace0b975857b3faa8078c970dc22faf35f1489b1de1ce9165fe35ac73517118c23451e52520c566e55c40881284bef08cb13215289452e2
+  data.tar.gz: ff9e9fcac48cda861a02755d8e50ccc78575642b92065e50d6523b7b306b28c427f2547d928830ed1c2eac70ca0823f31de3ac9ce46ae4c3c9ac4c11667c4339

data/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.1.0] [2018-02-12]
+- support `ActiveRecord::Relation` in models (nepalez)
+
+  ```ruby
+  param :user, model: User.where(active: true)
+  ```
+
 ## [3.0.0] [2018-02-01]
 
 ### Changed
@@ -38,3 +45,4 @@ First public release
 [1.0.0]: https://github.com/nepalez/dry-initializer-rails/compare/v0.0.3...v1.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
+[3.1.0]: https://github.com/nepalez/dry-initializer-rails/compare/v3.0.0...v3.1.0

data/README.md

@@ -52,11 +52,12 @@ class CreateOrder
   extend Dry::Initializer
 
   # Params and options
-  param  :customer, model: 'Customer' # use either a name
-  option :product,  model: Product    # or a class
+  param  :customer, model: 'Customer'                 # use either a name
+  option :product,  model: Product                    # or a class
+  option :coupon,   model: Coupon.where(active: true) # or relation
 
   def call
-    Order.create customer: customer, product: product
+    Order.create customer: customer, product: product, coupon: coupon
   end
 end
 ```
@@ -64,29 +65,30 @@ end
 Now you can assign values as pre-initialized model instances:
 
 ```ruby
-customer = Customer.find(1)
-product  = Product.find(2)
-
-order = CreateOrder.new(customer, product: product).call
-order.customer # => <Customer @id=1 ...>
-order.product  # => <Product @id=2 ...>
+customer = Customer.create(id: 1)
+product  = Product.create(id: 2)
+coupon   = Coupon.create(id: 3, active: true)
+
+order = CreateOrder.new(customer, product: product, coupon: coupon).call
+order.customer # => #<Customer @id=1 ...>
+order.product  # => #<Product @id=2 ...>
+order.coupon   # => #<Coupon @id=3 ...>
 ```
 
 ...or their ids:
 
 ```ruby
-order = CreateOrder.new(1, product: 2).call
-order.customer # => <Customer @id=1 ...>
-order.product  # => <Product @id=2 ...>
+order = CreateOrder.new(1, product: 2, coupon: 3).call
+order.customer # => #<Customer @id=1 ...>
+order.product  # => #<Product @id=2 ...>
+order.coupon   # => #<Coupon @id=3 ...>
 ```
 
-The instance is envoked using method `find_by(id: ...)`.
-With wrong ids `nil` values are assigned to a corresponding params and options:
+The instance is envoked using method `find_by!(id: ...)`.
 
 ```ruby
-order = CreateOrder.new(0, product: 0).call
-order.customer # => nil
-order.product  # => nil
+order = CreateOrder.new(1, product: 2, coupon: 4).call
+# raises #<ActiveRecord::RecordNotFound>
 ```
 
 You can specify custom `key` for searching model instance:

data/dry-initializer-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer-rails"
-  gem.version  = "3.0.0"
+  gem.version  = "3.1.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

@@ -5,9 +5,11 @@ require "rails"
 rails_dispatcher = lambda do |model: nil, find_by: :id, **options|
   return options unless model
 
-  model   = model.constantize if model.is_a? String
+  model = eval(model) if model.is_a? String
+  klass = model.is_a?(ActiveRecord::Relation) ? model.klass : model
+
   coercer = lambda do |value|
-    return value if value.nil? || value.instance_of?(model)
+    return value if value.nil? || value.is_a?(klass)
     model.find_by! find_by => value
   end
 

data/spec/dry/initializer/modelling_relation_spec.rb

@@ -0,0 +1,26 @@
+describe "modelling relation" do
+  before do
+    class Test::Order
+      extend Dry::Initializer
+
+      param  :user,    model: "User.where(name: 'Dude')"
+      option :product, model: Item.where(name: "The thing")
+    end
+  end
+
+  let!(:user)  { User.create id: 9, name: "Dude" }
+  let!(:item)  { Item.create id: 1, name: "The thing" }
+  let!(:other) { Item.create id: 2, name: "Another thing" }
+
+  it "uses relation" do
+    subject = Test::Order.new(9, product: 1)
+
+    expect(subject.user).to    eq user
+    expect(subject.product).to eq item
+  end
+
+  it "raises when record not found for the relation" do
+    expect { Test::Order.new(9, product: 2) }
+      .to raise_error(ActiveRecord::RecordNotFound)
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,6 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160509134900) do
+
   create_table "items", force: :cascade do |t|
     t.string "name"
     t.index ["name"], name: "index_items_on_name"
@@ -20,4 +21,5 @@ ActiveRecord::Schema.define(version: 20160509134900) do
     t.string "name"
     t.index ["name"], name: "index_users_on_name"
   end
+
 end

metadata

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