pathway 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9376646cdfe67c835f62fdffd9bca5406d5b4e
-  data.tar.gz: 71435c8a4bd5f27b105f16b6f877c544d45d9a95
+  metadata.gz: 6e5314504a8dfd84cb2f31dd46586839df19b603
+  data.tar.gz: c92541f944631c3b10fe3c91adaf7e31dc58a4ed
 SHA512:
-  metadata.gz: beb3a173fef44d01612064b9b9ad16d29e801e01d7c683f3a3a2e7e64460b0341654997aac13aeee8d0bd7e262f39cd9d01869b88ef13b60a8a9f833b84a8f1f
-  data.tar.gz: c0847f6a843ccb62f5bf5d83406b88fa78549cdb9d4b2bd5277ef59eda7df781adb67d5bdf239bd32a696a65e218ae5382bb1f5f3a161ebb1a05157897485f0b
+  metadata.gz: eca5cc01b6a9c6705f7518add28afb922bd275f5821adcff37c9fde237fba4d29be1474ad2258e5a5849b3936e610b60ef200a5a539c32f65638861267e1d2b1
+  data.tar.gz: 2cd6000ff33eeb6e36a3b0fe22689d64dba3c4f91cc6916d55194e15ea1c084d8418ba38f742082d0fb47f18caf55c17d823bd2db2eae0d4c7da16ec8cfe978c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.6.1] - 2018-03-16
+### Changed
+- Update default error message for `:fetch_model` step, at `sequel_models` plugin, to indicate the model's name
+- Add `:error_message` option for `sequel_models` plugin initializer to set the default error message
+- Add `:error_message` option for `:fetch_model` step to override the default error message
+
 ## [0.6.0] - 2018-03-01
 ### Changed
 - Replace unmaintained `inflecto` gem with `dry-inflector`

data/README.md

@@ -495,7 +495,7 @@ class UpdateNugget < Pathway::Operation
   process do
     step :validate
     step :fetch_model
-    step :fetch_model, from: User, with: :user_id, search_by: :pk, to: :user # Even the default class can also be overrided with 'from:'
+    step :fetch_model, from: User, using: :user_id, search_by: :pk, to: :user # Even the default class can also be overrided with 'from:'
     step :update_nugget
   end
 
@@ -503,7 +503,7 @@ class UpdateNugget < Pathway::Operation
 end
 ```
 
-As a side note, and as you can see at the 3rd step, `:fetch_model` allows you to override the search column (`search_by:`), the input parameter to extract from `input` (`with:`), the attribute to store the result (`to:`) and even the default search class (`from:`). If the current defaults doesn't fit your needs and you'll have these options available. When, for instance, if you need some extra object to execute your operation.
+As a side note, and as shown on the 3rd step, `:fetch_model` allows you to override the search column (`search_by:`), the input parameter to extract from `input` (`using:`), the attribute to store the result (`to:`) and even the default search class (`from:`). If the current defaults doesn't fit your needs and you'll have these options available. This is commonly usefuly when you need some extra object, besides the main one, to execute your operation.
 
 ##### `transaction` and `after_commit`
 

data/lib/pathway/plugins/sequel_models.rb

@@ -22,12 +22,13 @@ module Pathway
       end
 
       module ClassMethods
-        attr_accessor :model_class, :search_field
+        attr_accessor :model_class, :search_field, :model_not_found
 
-        def model(model_class, search_by: model_class.primary_key, set_result_key: true)
-          self.model_class  = model_class
-          self.search_field = search_by
-          self.result_key   = Inflector.underscore(Inflector.demodulize(model_class.name)).to_sym if set_result_key
+        def model(model_class, search_by: model_class.primary_key, set_result_key: true, error_message: nil)
+          self.model_class      = model_class
+          self.search_field     = search_by
+          self.result_key       = Inflector.underscore(Inflector.demodulize(model_class.name)).to_sym if set_result_key
+          self.model_not_found  = error_message || Inflector.humanize(Inflector.underscore(Inflector.demodulize(model_class.name))) + ' not found'
         end
 
         def inherited(subclass)
@@ -39,21 +40,27 @@ module Pathway
 
       module InstanceMethods
         extend Forwardable
-        delegate %i[model_class search_field] => 'self.class'
+        delegate %i[model_class search_field model_not_found] => 'self.class'
         delegate :db => :model_class
 
-        def fetch_model(state, from: model_class, search_by: search_field, using: search_by, to: result_key, overwrite: false)
+        def fetch_model(state, from: model_class, search_by: search_field, using: search_by, to: result_key, overwrite: false, error_message: nil)
+          error_message ||= if from != model_class
+                              Inflector.humanize(Inflector.underscore(Inflector.demodulize(from.name))) + ' not found'
+                            else
+                              model_not_found
+                            end
+
           if state[to].nil? || overwrite
-            wrap_if_present(state[:input][using])
-              .then { |key| find_model_with(key, from, search_by) }
+            wrap_if_present(state[:input][using], message: error_message)
+              .then { |key| find_model_with(key, from, search_by, error_message) }
               .then { |model| state.update(to => model) }
           else
             state
           end
         end
 
-        def find_model_with(key, dataset = model_class, column = search_field)
-          wrap_if_present(dataset.first(column => key))
+        def find_model_with(key, dataset = model_class, column = search_field, error_message = nil)
+          wrap_if_present(dataset.first(column => key), message: error_message)
         end
       end
 

data/lib/pathway/version.rb

@@ -1,3 +1,3 @@
 module Pathway
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathway
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Pablo Herrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector