params_ready 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe16e13531ab2ae207b8656a5daf5e71ad4db06adf638936e5a4f80803dc0a8
-  data.tar.gz: 0357fb20e9c206e68a257936760d8d20c1c9fdf863c61f50d730d29340362742
+  metadata.gz: b4eb98d2bab40c49a0b89e33a7a61bfd54f4c4f5ca23c2df52cbab5093b9c3e8
+  data.tar.gz: 3a492ccded066984574cce7a75cbc5b408edf0e7f2c5be4cb3db695120e9d2ff
 SHA512:
-  metadata.gz: bd90dfe134db52a495589a8a56245be744e20239285afef6a04dc38f47337ecdadcbf02a758391e936d48654da3ffd9b72a938654aec05a3b9cc19390240bdf5
-  data.tar.gz: 2389b613a4fe45e2fb32cc2469da23b761e670e6af9d5305758caa52254a66545237606046955d8ec848f4a58aea2e27c8b878f281fbecbd9e0064edc899d9d7
+  metadata.gz: 481b9530a79d65dd79b0ea290fc80fb258bfbe01305a0dd99b57436957dcad2be4323be9c11fad02ea45dad107714bda1d6957d291b7d54e375b1e6fa2f245cc
+  data.tar.gz: 1e96846e0e4c89dcc4f698387be8e8276cf3a8da70eb9623a66bc93843fdc575bdcd73a128dcb3f8261bf49676f1f1dc00c346a5a8976f7fb70598734d7a120e

data/lib/params_ready.rb

@@ -28,7 +28,7 @@ require_relative 'params_ready/query/variable_operator_predicate'
 
 
 module ParamsReady
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.7'.freeze
 
   def self.gem_version
     ::Gem::Version.new(VERSION)

data/lib/params_ready/builder.rb

@@ -94,6 +94,10 @@ module ParamsReady
         @definition.set_no_output Helpers::Rule(rule) || true
       end
 
+      def no_input(*arr, rule: nil)
+        @definition.set_no_input *arr, rule: rule
+      end
+
       def local(*arr, rule: nil)
         @definition.set_local *arr, rule: rule
       end

data/lib/params_ready/format.rb

@@ -100,8 +100,10 @@ module ParamsReady
     @names = {
       backend: Format.new(marshal: :none, omit: [], naming_scheme: :standard, remap: false, local: true, name: :backend),
       frontend: Format.new(marshal: :all, omit: OMIT_ALL, naming_scheme: :alternative, remap: false, local: false, name: :frontend),
-      attributes: Format.new(marshal: :none, omit: %i(undefined), naming_scheme: :standard, remap: false, local: true, name: :attributes),
-      json: Format.new(marshal: { except: [:array, :tuple, :boolean, :number] }, omit: [], naming_scheme: :alternative, remap: true, local: false, name: :json)
+      create: Format.new(marshal: :none, omit: [], naming_scheme: :standard, remap: false, local: true, name: :create),
+      update: Format.new(marshal: :none, omit: %i(undefined), naming_scheme: :standard, remap: false, local: true, name: :update),
+      json: Format.new(marshal: { except: [:array, :tuple, :boolean, :number] }, omit: [], naming_scheme: :alternative, remap: true, local: false, name: :json),
+      inspect: Format.new(marshal: :none, omit: [], naming_scheme: :standard, remap: false, local: false, name: :inspect)
     }.freeze
 
     def self.define(name, format)

data/lib/params_ready/output_parameters.rb

@@ -104,8 +104,8 @@ module ParamsReady
       @parameter.for_frontend(restriction: restriction, data: data)
     end
 
-    def for_model(restriction: @intent.restriction)
-      @parameter.for_model(restriction: restriction)
+    def for_model(format = :update, restriction: @intent.restriction)
+      @parameter.for_model(format, restriction: restriction)
     end
 
     def format(format = @intent)

data/lib/params_ready/parameter/abstract_hash_parameter.rb

@@ -69,7 +69,7 @@ module ParamsReady
         for_output(format, restriction: restriction, data: data)
       end
 
-      def for_model(format = :attributes, restriction: nil)
+      def for_model(format = :update, restriction: nil)
         for_output(format, restriction: restriction)
       end
 

data/lib/params_ready/parameter/definition.rb

@@ -96,7 +96,7 @@ module ParamsReady
         preprocessor: nil,
         populator: nil,
         postprocessor: nil,
-        local: false,
+        no_input: nil,
         no_output: nil,
         **opts
       )
@@ -106,7 +106,7 @@ module ParamsReady
         @preprocessor = preprocessor
         @postprocessor = postprocessor
         @populator = populator
-        @local = local
+        @no_input = no_input
         @no_output = no_output
 
         set_default(default) unless default == Extensions::Undefined
@@ -126,6 +126,7 @@ module ParamsReady
       end
 
       late_init :populator, getter: true, once: true, obligatory: false
+      late_init :no_input, getter: false, once: false
       late_init :no_output, getter: false, once: false
       late_init :memoize, getter: true, obligatory: false
 
@@ -173,53 +174,45 @@ module ParamsReady
         validator
       end
 
-      def set_local(*arr, rule: nil)
-        if rule.nil?
-          @local = true
-        else
-          @local = Helpers::Rule(rule)
-        end
+      def set_no_input(*arr, rule: nil)
+        @no_input = Helpers::Rule(rule) || true
+        raise ParamsReadyError, "Default not expected: #{arr}" if rule == false
+
         set_default *arr unless arr.empty?
       end
 
-      def local?(format)
-        case @local
-        when nil, false
-          false
-        when true
-          !format.local?
-        when Helpers::Rule
-          @local.include? format.name
-        else
-          raise ParamsReadyError, "Unexpected rule: #{@local}"
-        end
+      def set_local(*arr, rule: nil)
+        rule = Helpers::Rule(rule)
+        set_no_input(*arr, rule: rule)
+        set_no_output(rule || true)
+      end
+
+      def no_input?(format)
+        restricted_for_format?(@no_input, format)
       end
 
       def no_output?(format)
-        case @no_output
+        restricted_for_format?(@no_output, format)
+      end
+
+      def restricted_for_format?(rule, format)
+        case rule
         when nil, false
-          return local?(format)
+          false
         when true
-          return !format.local?
+          !format.local?
         when Helpers::Rule
-          @no_output.include? format.name
+          rule.include?(format.name)
         else
-          raise ParamsReadyError, "Unexpected option: '#{@no_output}'"
+          raise ParamsReadyError, "Unexpected rule: #{rule}"
         end
       end
 
-      late_init :optional, boolean: true, getter: false, once: false do |value|
-        next value if value == false
-        raise ParamsReadyError, "Optional parameter can't have default" if default_defined?
-
-        value
-      end
+      late_init :optional, boolean: true, getter: false, once: false
 
       late_init :default, once: false, definite: false do |value|
         next value if value == Extensions::Undefined
 
-        raise ParamsReadyError, "Optional parameter can't have default" if optional?
-
         canonical = canonical_default(value)
         next canonical if canonical.nil?
 
@@ -235,16 +228,16 @@ module ParamsReady
 
 
       def finish
-        if @populator && !@local
-          raise ParamsReadyError, "Populator set for non-local parameter '#{name}'"
+        if @populator && !@no_input
+          raise ParamsReadyError, "Populator set for input parameter '#{name}'"
         end
 
-        if @preprocessor && @local
-          raise ParamsReadyError, "Preprocessor set for local parameter '#{name}'"
+        if @preprocessor && @no_input == true
+          raise ParamsReadyError, "Preprocessor set for no-input parameter '#{name}'"
         end
 
-        if @postprocessor && @local
-          raise ParamsReadyError, "Postprocessor set for local parameter '#{name}'"
+        if @postprocessor && @no_input == true
+          raise ParamsReadyError, "Postprocessor set for no-input parameter '#{name}'"
         end
 
         super

data/lib/params_ready/parameter/parameter.rb

@@ -8,8 +8,12 @@ module ParamsReady
   module Parameter
     module FromHash
       def set_from_hash(hash, context: nil, validator: Result.new(name))
-        _, input = find_in_hash hash, context
-        set_from_input(input, context, validator)
+        if no_input?(context)
+          populate(context, validator)
+        else
+          _, input = find_in_hash hash, context
+          set_from_input(input, context, validator)
+        end
       end
     end
 
@@ -184,7 +188,9 @@ module ParamsReady
       end
 
       def inspect
-        "#{self.class.name.split("::").last} #{self.name}: { #{inspect_content} }"
+        preserve = Format.instance(:inspect).preserve?(self)
+        content = preserve ? inspect_content : '[FILTERED]'
+        "#{self.class.name.split("::").last} #{self.name}: { #{content} }"
       end
 
       def dup
@@ -205,7 +211,7 @@ module ParamsReady
 
     class Parameter < AbstractParameter
       def_delegators :@definition,
-                     :default, :optional?, :default_defined?, :constraints, :no_output?, :local?
+                     :default, :optional?, :default_defined?, :constraints, :no_output?, :no_input?
 
       def initialize(definition)
         @value = Extensions::Undefined
@@ -248,6 +254,7 @@ module ParamsReady
 
       def is_definite?
         return true if @value != Extensions::Undefined && !@value.nil?
+        return false if optional? && @value.nil?
 
         definite_default?
       end
@@ -267,7 +274,13 @@ module ParamsReady
       end
 
       def is_undefined?
-        @value == Extensions::Undefined && !default_defined?
+        @value == Extensions::Undefined && allows_undefined?
+      end
+
+      def allows_undefined?
+        return true if optional?
+
+        !default_defined?
       end
 
       def eligible_for_output?(intent)
@@ -278,14 +291,6 @@ module ParamsReady
         format.hash_key(self)
       end
 
-      def set_from_hash(hash, context: nil, validator: Result.new(name))
-        if local?(context)
-          populate(context, validator)
-        else
-          super
-        end
-      end
-
       def set_from_input(input, context, validator)
         preprocessed = definition.preprocess(input, context, validator)
         set_value preprocessed, context, validator
@@ -389,17 +394,17 @@ module ParamsReady
 
       def handle_indefinite_input(input, validator)
         value_missing validator
-        if optional?
+        if default_defined?
           # if value_missing doesn't crash,
           # and the parameter is optional
           # it's safe to set to nil or Extensions::Undefined
-          @value = input
-        elsif default_defined?
+          @value = Extensions::Undefined
+        elsif optional?
           # Clear possible previous state,
           # will be set to default on read
-          @value = Extensions::Undefined
+          @value = input
         else
-          raise ParamsReadyError, "Unexpected state in #handle_indefinite_input" if validator.ok?
+          raise ParamsReadyError, "Unexpected state for '#{name}' in #handle_indefinite_input" if validator.ok?
         end
       end
 

data/lib/params_ready/query/variable_operator_predicate.rb

@@ -33,8 +33,8 @@ module ParamsReady
 
       def inspect_content
         op, val = if is_definite?
-          op = @data[:operator].unwrap_or(nil)&.name || '?'
-          val = @data[:value].unwrap_or('?')
+          @data[:operator].unwrap_or(nil)&.name || '?'
+          @data[:value].unwrap_or('?')
         else
           %w[? ?]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: params_ready
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Tomas Milsimer