subroutine 0.10.0.beta2 → 0.10.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c3e4d90c09ae08102e8ab71974246b2052203ad830d838328e25345d92593e
-  data.tar.gz: a1f1e10be4abe4940ca34811ce4951d498ece0aa3bb2b199c776e3c13e142653
+  metadata.gz: ad452be684c7aa5f556a1d203c5f6d02a8780600f74276743c164391a91d6fde
+  data.tar.gz: 3f2d5c3303bb579c3741a10e659af80b0adcb7c3a64373dcf6f7f2d82bb37703
 SHA512:
-  metadata.gz: 420d85e72ba91cb3f53025fb43d0dd5276bfbc057f3910acba283d53676667408fc4a52cc5ee5f6d18fc00ffd385ba180bf7b2bf62f608a9a0c37f5541b645cb
-  data.tar.gz: 47556a1a5be391f9f0fabad3f656b7a8f813aca312c2a82f278b8f347dddecb024ec5d0cb82d564e7488445ccbac3b50697be68aa769aaa78392d0af8e5186e6
+  metadata.gz: aa63944122d676ca984525137e05430766b767b20fee7f65c216b45c5ecf523781c9d4e35119d17d7fd99dd58580f43e67405b72a7027886c96166103dac6bc5
+  data.tar.gz: 21c97fa2d75c0fbbd85f691d89e90666cddf490b7dd37fc676a76543bb1b6a5c7654959a6ba2aa19640ccd658ea8f0786c405bafbb2e7f63d0ba7ce64496cd08

data/lib/subroutine/fields/configuration.rb

@@ -37,6 +37,22 @@ module Subroutine
         nil
       end
 
+      def has_default?
+        config.key?(:default)
+      end
+
+      def get_default
+        value = config[:default]
+        if value.respond_to?(:call)
+          value = value.call
+        elsif value.try(:duplicable?) # from active_support
+          # Some classes of default values need to be duplicated, or the instance field value will end up referencing
+          # the class global default value, and potentially modify it.
+          value = value.deep_dup # from active_support
+        end
+        value
+      end
+
       def inheritable_options
         config.slice(*INHERITABLE_OPTIONS)
       end

data/lib/subroutine/fields.rb

@@ -48,6 +48,8 @@ module Subroutine
             end
           EV
         end
+
+        config
       end
       alias input field
 
@@ -108,6 +110,17 @@ module Subroutine
             param_groups[:#{group_name}]
           end
 
+          try(:silence_redefinition_of_method, :#{group_name}_default_params)
+          def #{group_name}_default_params
+            group_field_names = fields_in_group(:#{group_name}).keys
+            all_default_params.slice(*group_field_names)
+          end
+
+          try(:silence_redefinition_of_method, :#{group_name}_params_with_defaults)
+          def #{group_name}_params_with_defaults
+            #{group_name}_default_params.merge(param_groups[:#{group_name}])
+          end
+
           try(:silence_redefinition_of_method, :without_#{group_name}_params)
           def without_#{group_name}_params
             all_params.except(*#{group_name}_params.keys)
@@ -120,7 +133,6 @@ module Subroutine
     def setup_fields(inputs = {})
       @provided_fields = {}.with_indifferent_access
       param_groups[:original] = inputs.with_indifferent_access
-      param_groups[:default] = build_defaults
       mass_assign_initial_params
     end
 
@@ -139,16 +151,29 @@ module Subroutine
     def ungrouped_params
       get_param_group(:ungrouped)
     end
-    alias params ungrouped_params
 
     def all_params
       get_param_group(:all)
     end
+    alias params all_params
 
-    def defaults
+    def all_default_params
       get_param_group(:default)
     end
-    alias default_params defaults
+    alias defaults all_default_params
+
+    def all_params_with_defaults
+      all_default_params.merge(all_params)
+    end
+    alias params_with_defaults all_params_with_defaults
+
+    def ungrouped_defaults
+      default_params.slice(*ungrouped_fields.keys)
+    end
+
+    def ungrouped_params_with_defaults
+      ungrouped_defaults.merge(ungrouped_params)
+    end
 
     def get_field_config(field_name)
       self.class.get_field_config(field_name)
@@ -160,7 +185,7 @@ module Subroutine
     end
 
     def get_field(name)
-      all_params[name]
+      field_provided?(name) ? all_params[name] : all_default_params[name]
     end
 
     def set_field(name, value, track_provided: true)
@@ -181,6 +206,16 @@ module Subroutine
       end
     end
 
+    def fields_in_group(group_name)
+      self.class.fields_in_group(group_name)
+    end
+
+    def ungrouped_fields
+      fields.select { |f| f.groups.empty? }.each_with_object({}) do |f, h|
+        h[f.name] = f
+      end
+    end
+
     protected
 
     def mass_assign_initial_params
@@ -191,33 +226,16 @@ module Subroutine
 
         if original_params.key?(field_name)
           set_field(field_name, original_params[field_name])
-        elsif defaults.key?(field_name)
-          set_field(field_name, defaults[field_name], track_provided: false)
         end
-      end
-    end
 
-    def build_defaults
-      out = {}.with_indifferent_access
+        next unless config.has_default?
 
-      field_configurations.each_pair do |field, config|
-        next unless config.key?(:default)
-
-        deflt = config[:default]
-        if deflt.respond_to?(:call)
-          deflt = deflt.call
-        elsif deflt.try(:duplicable?) # from active_support
-          # Some classes of default values need to be duplicated, or the instance field value will end up referencing
-          # the class global default value, and potentially modify it.
-          deflt = deflt.deep_dup # from active_support
-        end
-
-        out[field.to_s] = attempt_cast(deflt, config) do |e|
+        value = attempt_cast(config.get_default, config) do |e|
           "Error for default `#{field}`: #{e}"
         end
-      end
 
-      out
+        param_groups[:default][field_name] = value
+      end
     end
 
     def attempt_cast(value, config)

data/lib/subroutine/version.rb

@@ -5,7 +5,7 @@ module Subroutine
   MAJOR = 0
   MINOR = 10
   PATCH = 0
-  PRE   = "beta2"
+  PRE   = "beta3"
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
 

data/test/subroutine/base_test.rb

@@ -166,12 +166,16 @@ module Subroutine
       op = ::AdminSignupOp.new(email: "foo")
       assert_equal({
         "email" => "foo",
-        "privileges" => "min",
       }, op.params)
 
       assert_equal({
         "privileges" => "min",
       }, op.defaults)
+
+      assert_equal({
+        "email" => "foo",
+        "privileges" => "min",
+      }, op.params_with_defaults)
     end
 
     def test_it_allows_defaults_to_be_overridden

data/test/subroutine/fields_test.rb

@@ -73,16 +73,17 @@ module Subroutine
       end
     end
 
-    def test_params_include_defaults
+    def test_params_does_not_include_defaults
       instance = Whatever.new(foo: "abc")
       assert_equal({ "foo" => "foo", "bar" => 3, "qux" => "qux" }, instance.defaults)
-      assert_equal({ "foo" => "abc", "qux" => "qux" }, instance.params)
-      assert_equal({ "foo" => "abc", "bar" => 3, "qux" => "qux" }, instance.all_params)
+      assert_equal({ "foo" => "abc" }, instance.params)
+      assert_equal({ "foo" => "abc", "bar" => 3, "qux" => "qux" }, instance.params_with_defaults)
     end
 
-    def test_named_params_include_defaults
+    def test_named_params_do_not_include_defaults_unlesss_asked_for
       instance = Whatever.new(foo: "abc")
-      assert_equal({ "bar" => 3 }, instance.sekret_params)
+      assert_equal({}, instance.sekret_params)
+      assert_equal({ "bar" => 3 }, instance.sekret_params_with_defaults)
     end
 
     def test_fields_can_opt_out_of_mass_assignment
@@ -122,7 +123,8 @@ module Subroutine
     def test_groups_fields_are_accessible
       op = Whatever.new(foo: "bar", protekted_group_input: "pgi", bar: 8)
       assert_equal({ protekted_group_input: "pgi", bar: 8 }.with_indifferent_access, op.sekret_params)
-      assert_equal({ foo: "bar", qux: "qux" }.with_indifferent_access, op.params)
+      assert_equal({ protekted_group_input: "pgi", foo: "bar", bar: 8 }.with_indifferent_access, op.params)
+      assert_equal({ foo: "bar" }.with_indifferent_access, op.ungrouped_params)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta2
+  version: 0.10.0.beta3
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel