subroutine 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2703769996395de8478c8c16b7eb8f2826c903b3
-  data.tar.gz: 42bf18f9555f5977ffcb93508468d399fe62d993
+  metadata.gz: 6ab6d4e06e0400af01060d41f08ba6b61695c24a
+  data.tar.gz: c6542be4a9832df325fe8f33ad33f297dfd8912c
 SHA512:
-  metadata.gz: d7be70968a4c5a9bbc85feabdcef6a1ded8fd04b797acd62266bdab558a51d64cafb93229d220222e5515978c187f328c24f337c0572c135b5b6f6f20e7e9c16
-  data.tar.gz: 6c04f8721942a5ff271d06065a4b9ebce38f830b5727d0c3b31d7734da379ba613ecab9ee6a319794442fa641ed5c5d7383cb7a07ba5b6814c5c54e5a26f06be
+  metadata.gz: 6331a42ddc585caf91166eb7871e96637712ff09ece5794735c525c044650cf87fb337aa36edb6bb31f084a21d6655df4198932d79b0d5f64b25c5138b34ac28
+  data.tar.gz: 6d68a2bccecfef89ea3a42689cc565a28b15a4584da2436182fa4ca8cbc25c4e4658e99022b10190622fc57387bfdbd54f028f590a66771a53d9b527f4829d76

data/lib/subroutine/association.rb

@@ -92,6 +92,10 @@ module Subroutine
             params['#{foreign_key_method}'] = r.nil? ? nil : r.id
             r
           end
+
+          def #{as}_field_provided?
+            field_provided?('#{foreign_key_method}')#{poly ? "&& field_provided?('#{foreign_type_method}')" : ""}
+          end
         EV
 
         alias_method :"#{as}_without_association", :"#{as}"

data/lib/subroutine/fields.rb

@@ -103,6 +103,8 @@ module Subroutine
 
     # check if a specific field was provided
     def field_provided?(key)
+      return send(:"#{key}_field_provided?") if respond_to?(:"#{key}_field_provided?", true)
+
       @params.key?(key)
     end
 
@@ -113,7 +115,11 @@ module Subroutine
       _fields.each_pair do |field, config|
         next unless inputs.key?(field)
 
-        out[field] = ::Subroutine::TypeCaster.cast(inputs[field], config)
+        begin
+          out[field] = ::Subroutine::TypeCaster.cast(inputs[field], config)
+        rescue ::Subroutine::TypeCaster::TypeCastError => e
+          raise ::Subroutine::TypeCaster::TypeCastError, "Error for field `#{field}`: #{e}"
+        end
       end
 
       out

data/lib/subroutine/type_caster.rb

@@ -10,6 +10,15 @@ require 'active_support/core_ext/array/wrap'
 
 module Subroutine
   module TypeCaster
+
+    class TypeCastError < StandardError
+
+      def initialize(message)
+        super(message)
+      end
+
+    end
+
     def self.casters
       @casters ||= {}
     end
@@ -28,6 +37,9 @@ module Subroutine
       return value unless caster
 
       caster.call(value, options)
+
+    rescue StandardError => e
+      raise ::Subroutine::TypeCaster::TypeCastError, e.to_s, e.backtrace
     end
   end
 end

data/lib/subroutine/version.rb

@@ -2,8 +2,8 @@
 
 module Subroutine
   MAJOR = 0
-  MINOR = 8
-  PATCH = 1
+  MINOR = 9
+  PATCH = 0
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/subroutine/association_test.rb

@@ -102,5 +102,45 @@ module Subroutine
       assert_equal 'AdminUser', op.admin_type
       assert_equal doug.id, op.admin_id
     end
+
+    def test_it_provides_answers_to_field_provided
+      ::User.expects(:all).never
+
+      op = SimpleAssociationOp.new user: doug
+      assert_equal true, op.field_provided?(:user)
+      assert_equal true, op.field_provided?(:user_id)
+      assert_equal false, op.field_provided?(:user_type)
+
+      op = SimpleAssociationOp.new user_id: doug.id
+      assert_equal true, op.field_provided?(:user)
+      assert_equal true, op.field_provided?(:user_id)
+      assert_equal false, op.field_provided?(:user_type)
+
+      op = SimpleAssociationOp.new
+      assert_equal false, op.field_provided?(:user)
+      assert_equal false, op.field_provided?(:user_id)
+      assert_equal false, op.field_provided?(:user_type)
+
+      op = PolymorphicAssociationOp.new admin: doug
+      assert_equal true, op.field_provided?(:admin)
+      assert_equal true, op.field_provided?(:admin_id)
+      assert_equal true, op.field_provided?(:admin_type)
+
+      op = PolymorphicAssociationOp.new admin_type: doug.class.name, admin_id: doug.id
+      assert_equal true, op.field_provided?(:admin)
+      assert_equal true, op.field_provided?(:admin_id)
+      assert_equal true, op.field_provided?(:admin_type)
+
+      op = PolymorphicAssociationOp.new admin_id: doug.id
+      assert_equal false, op.field_provided?(:admin)
+      assert_equal true, op.field_provided?(:admin_id)
+      assert_equal false, op.field_provided?(:admin_type)
+
+      op = PolymorphicAssociationOp.new
+      assert_equal false, op.field_provided?(:admin)
+      assert_equal false, op.field_provided?(:admin_id)
+      assert_equal false, op.field_provided?(:admin_type)
+
+    end
   end
 end

data/test/subroutine/fields_test.rb

@@ -12,6 +12,7 @@ module Subroutine
 
       string :foo, default: "foo"
       integer :bar, default: -> { 3 }
+      date :baz
 
       def initialize(options = {})
         setup_fields(options)
@@ -20,9 +21,10 @@ module Subroutine
     end
 
     def test_fields_are_configured
-      assert_equal 2, Whatever._fields.size
+      assert_equal 3, Whatever._fields.size
       assert_equal :string, Whatever._fields[:foo][:type]
       assert_equal :integer, Whatever._fields[:bar][:type]
+      assert_equal :date, Whatever._fields[:baz][:type]
     end
 
     def test_field_defaults_are_handled
@@ -43,6 +45,25 @@ module Subroutine
       assert_equal false, instance.field_provided?(:bar)
     end
 
+    def test_field_provided
+
+      instance = Whatever.new(foo: "abc")
+      assert_equal true, instance.field_provided?(:foo)
+      assert_equal false, instance.field_provided?(:bar)
+
+      instance = DefaultsOp.new
+      assert_equal false, instance.field_provided?(:foo)
+
+      instance = DefaultsOp.new(foo: 'foo')
+      assert_equal true, instance.field_provided?(:foo)
+    end
+
+    def test_invalid_typecast
+      assert_raises "Error for field `baz`: invalid date" do
+        Whatever.new(baz: "2015-13-01")
+      end
+    end
+
     def test_params
       instance = Whatever.new(foo: "abc")
       assert_equal({ "foo" => "abc" }, instance.params)

data/test/subroutine/type_caster_test.rb

@@ -252,18 +252,14 @@ module Subroutine
       op.file_input.unlink
     end
 
-    def test_field_provided
-      op = ::SignupOp.new
-      assert_equal false, op.send(:field_provided?, :email)
-
-      op = ::SignupOp.new(email: 'foo')
-      assert_equal true, op.send(:field_provided?, :email)
-
-      op = ::DefaultsOp.new
-      assert_equal false, op.send(:field_provided?, :foo)
-
-      op = ::DefaultsOp.new(foo: 'foo')
-      assert_equal true, op.send(:field_provided?, :foo)
+    def test_when_a_type_cast_fails_a_type_cast_error_is_raised
+      assert_raises Subroutine::TypeCaster::TypeCastError do
+        op.date_input = "2015-13-01"
+      end
+
+      assert_raises "invalid date" do
+        op.date_input = "2015-13-01"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel