typed_operation 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c80a027434c29b23257b43e03eeb8acb61a3ac300a59e0c04068ffada1dd4aa6
-  data.tar.gz: 6b78a70b2a46710746129f8dac3a403bdc692c761c93f3ec111bf09efec8a70e
+  metadata.gz: a5af7163e167fa37ba366469393a59d8ea25d4eede88472a7c739bee91e987d7
+  data.tar.gz: fb1de81a7eb3ce710c36355474c7f3b01e970c4696a82ede8fd680273cae1cb2
 SHA512:
-  metadata.gz: 35baa03191cfa29e1786de975d7f8d2baf62040859922544f0d79109a8f088996521e85e3dce0c66bde1f7dd5bb2b62a5332cb7841a63a1ebe4b369d48005bb6
-  data.tar.gz: ebf8aea46fb0d3dcd72aa846b772f228aca21be2e04695989266218e9303e9b7760770d67f53f57ca231b41b7f502ad5145bf621a0648c6706b6e741a8e6c80e
+  metadata.gz: fd8a364079683dbe13c02c6090a707499db4f847bf86c395baa80ffed3e7bc997b11ae545c2a7f20d9b2c46e66f9e4b3b5496776524fe70b276eef46eff33f88
+  data.tar.gz: 7a7cf690621318b56b44cfe8cf4d4231694d65befd2ee62dd1cfb53d283be653b41011de4ad77f9f46636eb0b4146093f37162f4059aa74afc8190f9a789b68e

data/lib/generators/templates/operation.rb

@@ -4,8 +4,8 @@
 module <%= namespace_name %>
   class <%= name %> < ::ApplicationOperation
     # Replace with implementation...
-    param :my_param, String, convert: true
-    param :an_optional_param, Integer, allow_nil: true
+    param :required_param, String
+    param :an_optional_param, Integer, convert: true, allow_nil: true
 
     def prepare
       # Prepare...
@@ -20,8 +20,8 @@ end
 <% else %>
 class <%= name %> < ::ApplicationOperation
   # Replace with implementation...
-  param :my_param, String, convert: true
-  param :an_optional_param, Integer, allow_nil: true
+  param :required_param, String
+  param :an_optional_param, Integer, convert: true, allow_nil: true
 
   def prepare
     # Prepare...

data/lib/generators/templates/operation_test.rb

@@ -1,45 +1,47 @@
 # frozen_string_literal: true
 
+require "test_helper"
+
 <% if namespace_name.present? %>
 module <%= namespace_name %>
   class <%= name %>Test < ActiveSupport::TestCase
     def setup
-      @operation = <%= name %>.new(my_param: "test")
+      @operation = <%= name %>.new(required_param: "test")
     end
 
-    test 'should raise ParameterError if my_param is nil' do
+    test "should raise ParameterError if required param is nil" do
       assert_raises(ParameterError) do
-        <%= name %>.new(my_param: nil)
+        <%= name %>.new(required_param: nil)
       end
     end
 
-    test 'should convert my_param if it is not a string' do
-      assert_equal <%= name %>.new(my_param: 123).my_param, "123"
+    test "should convert optional_param if it is not a string" do
+      assert_equal <%= name %>.new(required_param: "foo", optional_param: 123).converts_param, "123"
     end
 
-    test 'call returns after operation' do
+    test "call returns after operation" do
       result = @operation.call
       assert_equal result, "Hello World!"
     end
   end
 end
 <% else %>
-  class <%= name %>Test < ActiveSupport::TestCase
-    def setup
-      @operation = <%= name %>.new(my_param: "test")
-    end
+class <%= name %>Test < ActiveSupport::TestCase
+  def setup
+    @operation = <%= name %>.new(required_param: "test")
+  end
 
-    test 'should raise ParameterError if my_param is nil' do
-      assert_raises(ParameterError) do
-        <%= name %>.new(my_param: nil)
-      end
+  test "should raise ParameterError if required param is nil" do
+    assert_raises(ParameterError) do
+      <%= name %>.new(required_param: nil)
     end
+  end
 
-    test 'should convert my_param if it is not a string' do
-      assert_equal <%= name %>.new(my_param: 123).my_param, "123"
+  test "should convert optional_param if it is not a string" do
+    assert_equal <%= name %>.new(required_param: "foo", optional_param: 123).converts_param, "123"
   end
 
-  test 'call returns after operation' do
+  test "call returns after operation" do
     result = @operation.call
     assert_equal result, "Hello World!"
   end

data/lib/typed_operation/base.rb

@@ -42,7 +42,7 @@ module TypedOperation
     end
 
     def call
-      raise NotImplementedError, "You must implement #call"
+      raise InvalidOperationError, "You must implement #call"
     end
 
     def to_proc

data/lib/typed_operation/partially_applied.rb

@@ -10,7 +10,10 @@ module TypedOperation
     def curry(**params)
       all_args = @applied_args.merge(params)
       # check if required attrs are in @applied_args
-      required_keys = @operation.attribute_names.select { |name| @operation.attribute_metadata(name)[:required] != false }
+      required_keys = @operation.attribute_names.select do |name|
+        meta = @operation.attribute_metadata(name)
+        meta[:required] != false && !meta[:typed_attribute_options].key?(:default)
+      end
       missing_keys = required_keys - all_args.keys
 
       if missing_keys.size > 0
@@ -26,7 +29,7 @@ module TypedOperation
     def call(...)
       prepared = curry(...)
       return prepared.operation.call if prepared.is_a?(Prepared)
-      raise "Cannot call PartiallyApplied operation #{@operation.name} (key: #{@operation.operation_key}), are you expecting it to be Prepared?"
+      raise TypedOperation::MissingParameterError, "Cannot call PartiallyApplied operation #{@operation.name} (key: #{@operation.operation_key}), are you expecting it to be Prepared?"
     end
   end
 end

data/lib/typed_operation/version.rb

@@ -1,3 +1,3 @@
 module TypedOperation
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/typed_operation.rb

@@ -5,5 +5,7 @@ require "typed_operation/partially_applied"
 require "typed_operation/prepared"
 
 module TypedOperation
-  class ParameterError < StandardError; end
+  class InvalidOperationError < StandardError; end
+  class MissingParameterError < ArgumentError; end
+  class ParameterError < TypeError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typed_operation
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Stephen Ierodiaconou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails