rice_bubble 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ff1a10fe0388c60a178246ee4c45a005292355ec741b9f175b56c8ba393b060
-  data.tar.gz: 35c94ec3a32ea7187b031eaf4341c59ad4a55649510bece671a52b480a10c2c5
+  metadata.gz: 9cbf4c6ade525140da24d50b1f12bf1a0d6bd0d8bd5e5b0b314204e8a086e04f
+  data.tar.gz: 2bb3ea6274dcb3859a7d56129554454dd888a4354f5b9500a1fbde8606e7e122
 SHA512:
-  metadata.gz: 1eb7c799044b2d70f6f13a2066d175b4ff09965b19b11d91c36493509d579e6e9ea6ebbeb4cfe1d897faf5aded93bc74ea5e955db81fc396bda9a292689537c3
-  data.tar.gz: 9bd2f3aa7f5c6c70ebb5c8afc1d2ca2d4ee95e2978c5491c5a6a1e225ce31c4f3ea5e908a933fa48d74e1cea4d437e131f1718c5e0c496df7c7bf0f99196699b
+  metadata.gz: 26a31683aec0406224411ef415cfe70ce1d497223fd9c0e209c8835f1003e2abf33b8cad26a4cd65a521c6dc5726386a0887d6041d4b94065e6204ccb3a21394
+  data.tar.gz: 528efe018c746fcd2b24bb88267b7804bfa0195a6034acf2b5f81405a70857bbd3d2ef02a8c4d46b7567a6e8662e85d52ce4bfdb9630e533d6161431d915efdd

data/.rubocop.yml

@@ -13,7 +13,7 @@ Layout/FirstHashElementIndentation:
 Layout/LineLength:
   Max: 80
   AllowedPatterns:
-    - '^\s*#'
+    - ^\s*[#']
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rice_bubble (0.1.1)
+    rice_bubble (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/rice_bubble/attributes/any.rb

@@ -12,22 +12,17 @@ module RiceBubble
         !which(value).nil?
       end
 
-      def validate!(value, path:, **)
-        member = which(value)
-        return unless member.nil?
-
-        expected = "one of [#{members.map(&:description).join(", ")}]"
-        raise ValidationError,
-              "#{path} expected #{expected} but received #{value.inspect}"
-      end
-
-      def coerce(value)
-        which(value)&.coerce(value) || value
+      def call(value, path: '')
+        super(which(value)&.call(value, path:) || value, path:)
       end
 
       def which(value)
         members.find { |member| member.valid?(value) }
       end
+
+      def description
+        "one of [#{members.map(&:description).join(", ")}]"
+      end
     end
   end
 end

data/lib/rice_bubble/attributes/array.rb

@@ -16,19 +16,11 @@ module RiceBubble
         end
       end
 
-      def validate!(_value, coerced:, path:)
-        coerced.each.with_index do |child, index|
-          members.validate!(
-            child,
-            coerced: members.coerce(child),
-            path: "#{path}[#{index}]"
-          )
+      def call(value, path: '')
+        (value || []).map.with_index do |child, index|
+          members.call(child, path: "#{path}[#{index}]")
         end
       end
-
-      def coerce(value)
-        value.respond_to?(:to_a) ? value.to_a : value
-      end
     end
   end
 end

data/lib/rice_bubble/attributes/base.rb

@@ -11,29 +11,24 @@ module RiceBubble
         elsif object.respond_to?(name)
           object.public_send(name)
         else
-          object[name]
+          object[name] || object[name.to_s]
         end
       end
 
-      def valid?(_value)
-        true
+      def valid?(value)
+        valid_types.any? { |t| value.is_a?(t) }
       end
 
-      def coerce(value)
-        value
-      end
-
-      def validate!(value, coerced:, path:)
-        return if valid?(coerced)
-
-        raise ValidationError,
-              "#{path} expected #{description} but received #{value.inspect}"
+      def valid_types
+        [::Object]
       end
 
       def call(value, path: '')
-        coerced = coerce(value)
-        validate!(value, coerced:, path:)
-        coerced
+        if valid?(value)
+          value
+        else
+          validation_error(value:, path:)
+        end
       end
 
       def optional
@@ -57,6 +52,10 @@ module RiceBubble
           class_or_instance
         end
       end
+
+      def validation_error(value:, path: '')
+        raise ValidationError.new(value:, path:, attribute: self)
+      end
     end
   end
 end

data/lib/rice_bubble/attributes/boolean.rb

@@ -1,10 +1,6 @@
 module RiceBubble
   class Attributes
     class Boolean < Base
-      def validate!(value, path:, **)
-        super(value, coerced: value, path:)
-      end
-
       def valid?(value)
         [true, false].include?(value)
       end

data/lib/rice_bubble/attributes/date.rb

@@ -1,14 +1,12 @@
-require 'date'
-
 module RiceBubble
   class Attributes
     class Date < Base
-      def valid?(value)
-        value.respond_to?(:to_date)
+      def call(value, path: '')
+        super(value.to_date, path:)
       end
 
-      def coerce(value)
-        value.respond_to?(:to_date) ? value.to_date : value
+      def valid_types
+        [::Date, ::Time, ::DateTime]
       end
     end
   end

data/lib/rice_bubble/attributes/datetime.rb

@@ -1,27 +1,20 @@
 module RiceBubble
   class Attributes
     class Datetime < Base
-      def valid?(value)
-        return false unless valid_datetime?(value)
-
-        value.respond_to?(:to_datetime)
+      def call(value, path: '')
+        super(coerce(value), path:)
       end
 
       def coerce(value)
-        return nil unless valid_datetime?(value)
-
-        value.respond_to?(:to_datetime) ? value.to_datetime : value
+        if !value.respond_to?(:to_datetime) || value.is_a?(::Date)
+          value
+        else
+          value.to_datetime
+        end
       end
 
-      private
-
-      def valid_datetime?(value)
-        case value
-        when ::Time then true
-        when ::DateTime then true
-        when ::Date then false
-        else value.respond_to?(:to_datetime)
-        end
+      def valid_types
+        [::Time, ::DateTime]
       end
     end
   end

data/lib/rice_bubble/attributes/integer.rb

@@ -3,16 +3,20 @@ module RiceBubble
     class Integer < Number
       attr_reader :min, :max
 
-      def valid?(value)
-        value.is_a?(::Integer) && super
+      def initialize(min: nil, max: nil, **options, &)
+        super(**options, &)
+        @min = min
+        @max = max
+      end
+
+      def valid_types
+        [::Integer]
       end
 
-      def coerce(value)
-        case value
-        when nil then nil
-        when ::String then value.match?(/\A-?\d+\z/) ? value.to_i : value
-        else value.respond_to?(:to_i) ? value.to_i : value
-        end
+      def valid?(value)
+        super &&
+          (!min || value >= min) &&
+          (!max || value <= max)
       end
     end
   end

data/lib/rice_bubble/attributes/number.rb

@@ -9,8 +9,12 @@ module RiceBubble
         @max = max
       end
 
+      def valid_types
+        [::Numeric]
+      end
+
       def valid?(value)
-        value.is_a?(::Numeric) &&
+        super &&
           !min&.send(:>, value) &&
           !max&.send(:<, value)
       end

data/lib/rice_bubble/attributes/object.rb

@@ -16,17 +16,12 @@ module RiceBubble
         end
       end
 
-      def validate!(value, path:, **)
-        children.each do |name, attr|
-          child = attr.fetch(value, name)
-          coerced = attr.coerce(child)
-          attr.validate!(child, coerced:, path: "#{path}.#{name}")
+      def call(value, path: '')
+        children.to_h do |name, attr|
+          [name,
+           attr.call(value[name] || value[name.to_s], path: "#{path}.#{name}")]
         end
       end
-
-      def coerce(value)
-        children.map { |name, attr| attr.coerce(attr.fetch(value, name)) }
-      end
     end
   end
 end

data/lib/rice_bubble/attributes/optional.rb

@@ -9,17 +9,13 @@ module RiceBubble
       end
 
       def valid?(value)
-        value.nil? || child.valid?(child.coerce(value))
+        value.nil? || child.valid?(value)
       end
 
       def call(value, path: '')
         value && child.call(value, path:)
       end
 
-      def coerce(value)
-        value && child.coerce(value)
-      end
-
       def description
         "#{child.description} (optional)"
       end

data/lib/rice_bubble/attributes/serialized.rb

@@ -5,15 +5,15 @@ module RiceBubble
 
       def initialize(serializer, &)
         super(&)
-        @serializer = serializer.new
+        @serializer = serializer
       end
 
       def valid?(value)
         serializer.valid?(value)
       end
 
-      def validate!(value, path:, **)
-        serializer.validate!(value, path:)
+      def call(value, path: '')
+        serializer.call(value, path:)
       end
     end
   end

data/lib/rice_bubble/attributes/string.rb

@@ -10,19 +10,19 @@ module RiceBubble
         @format = format
       end
 
-      def valid?(value)
-        value.is_a?(::String) &&
-          !min&.send(:>, value.length) &&
-          !max&.send(:<, value.length) &&
-          (!format || format.match?(value))
+      def valid_types
+        [::String, Symbol]
       end
 
-      def call(value, path: '')
-        super(value.to_s, path:)
+      def valid?(value)
+        super &&
+          !min&.send(:>, value.to_s.length) &&
+          !max&.send(:<, value.to_s.length) &&
+          (!format || format.match?(value.to_s))
       end
 
-      def coerce(value)
-        value.respond_to?(:to_s) ? value.to_s : value
+      def call(value, path: '')
+        super.to_s
       end
 
       def description

data/lib/rice_bubble/serializer.rb

@@ -11,7 +11,7 @@ module RiceBubble
         self.class.new(object_to_serialize).call(path:)
       elsif object
         self.class.attributes.map do |name, attr|
-          attr.call(fetch(name), path: path || self.class.name)
+          attr.call(fetch(name), path: "#{path || self.class.name}.#{name}")
         end
       else
         raise ArgumentError, 'no object to serialize'
@@ -32,23 +32,6 @@ module RiceBubble
       end
     end
 
-    def validate!(object, path: '', **)
-      path = self.class.name if path.empty?
-
-      self.class.attributes.each do |name, attr|
-        value = attr.fetch(object, name)
-        attr.validate!(
-          value,
-          coerced: attr.coerce(value),
-          path: "#{path}.#{name}"
-        )
-      end
-    end
-
-    def coerce(object)
-      object
-    end
-
     class << self
       def call(object = nil, ...)
         new(object).call(...)

data/lib/rice_bubble/version.rb

@@ -1,3 +1,3 @@
 module RiceBubble
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/rice_bubble.rb

@@ -18,6 +18,11 @@ require_relative 'rice_bubble/attributes/time'
 require_relative 'rice_bubble/serializer'
 
 module RiceBubble
-  class ValidationError < StandardError; end
-  # Your code goes here...
+  class ValidationError < StandardError
+    attr_reader :value, :path, :attribute
+
+    def initialize(value:, path:, attribute:)
+      super("#{path} expected #{attribute.description} but received #{value.inspect}")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rice_bubble
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Powell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake