shale 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527c634afc670223747f11c77d1fd5e1470c26faec18594c1c31594503883799
-  data.tar.gz: ee6e31c70608520549b9bf90c00e98fd43821797b8b31a7493d0538ce40767a8
+  metadata.gz: f737403457864d1e61e3a75015369cc826b7e3f758aae950d2a8aec16d316942
+  data.tar.gz: 2921f2984702ab7272b7aeca49521fb1c5103747ab32fdf2c25c54e6cf0a8e70
 SHA512:
-  metadata.gz: bf35ec1503adfe41ab81d6ad27515158980937bcbce04f8ca8014343b8fae0404433c8a667a2d30492c4aa359bd2e1cf6e836e900ce57574a811ac88da28ac93
-  data.tar.gz: ea9e5799d4c93611ae0d1c390e835248f460e565aa68f6556c06ff0ef9057c0f42a68da02b6005d809594945548ec7dc659db775a135dc58c7f5920b18ec8eaf
+  metadata.gz: 52189f5729daad8d9b6d237c08f3d924017161028c08fafbae943ac9e736d1a1239729fe8cb4142899accd3d71f0142858b7fcb835bcecb8b36c2e7083a0c30f
+  data.tar.gz: 7c00edbbff3daff21b2f87c2a24b8d3cfe1e8f449dfe7523206c7f51c81597ab240390254b06f24264dab0cf9628843c6e7b855d6458362496f98c87ae97a538

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.2.2] - 2025-03-13
+
+### Added
+- [kjeldahl] Adds BigDecimal mapper
+
+### Fixed
+- [ollietulloch] Allow `Shale::Mapper` attributes to define a `schema`
+
 ## [1.2.1] - 2025-01-09
 
 ### Fixed

data/lib/shale/schema/compiler/decimal.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Shale
+  module Schema
+    module Compiler
+      # Class that maps Schema type to Shale Decimal type
+      #
+      # @api private
+      class Decimal
+        # Return name of the Shale type
+        #
+        # @return [String]
+        #
+        # @api private
+        def name
+          'Shale::Type::Decimal'
+        end
+      end
+    end
+  end
+end

data/lib/shale/schema/json_generator/ref.rb

@@ -9,8 +9,8 @@ module Shale
       #
       # @api private
       class Ref < Base
-        def initialize(name, type)
-          super(name)
+        def initialize(name, type, schema: nil)
+          super(name, schema: schema)
           @type = type.gsub('::', '_')
         end
 

data/lib/shale/schema/json_generator.rb

@@ -87,7 +87,7 @@ module Shale
             next unless attribute
 
             if mapper_type?(attribute.type)
-              json_type = Ref.new(mapping.name, attribute.type.model.name)
+              json_type = Ref.new(mapping.name, attribute.type.model.name, schema: mapping.schema)
             else
               json_klass = self.class.get_json_type(attribute.type)
 

data/lib/shale/schema/xml_compiler.rb

@@ -6,6 +6,7 @@ require_relative '../../shale'
 require_relative '../error'
 require_relative 'compiler/boolean'
 require_relative 'compiler/date'
+require_relative 'compiler/decimal'
 require_relative 'compiler/float'
 require_relative 'compiler/integer'
 require_relative 'compiler/string'
@@ -103,11 +104,16 @@ module Shale
       # XML Schema "float" types
       # @api private
       XS_TYPE_FLOAT = [
-        "#{XS_NAMESPACE_URI}:decimal",
         "#{XS_NAMESPACE_URI}:float",
         "#{XS_NAMESPACE_URI}:double",
       ].freeze
 
+      # XML Schema "decimal" types
+      # @api private
+      XS_TYPE_DECIMAL = [
+        "#{XS_NAMESPACE_URI}:decimal",
+      ].freeze
+
       # XML Schema "integer" types
       # @api private
       XS_TYPE_INTEGER = [
@@ -612,6 +618,8 @@ module Shale
           Compiler::Time.new
         elsif XS_TYPE_STRING.include?(type)
           Compiler::String.new
+        elsif XS_TYPE_DECIMAL.include?(type)
+          Compiler::Decimal.new
         elsif XS_TYPE_FLOAT.include?(type)
           Compiler::Float.new
         elsif XS_TYPE_INTEGER.include?(type)

data/lib/shale/schema/xml_generator.rb

@@ -52,6 +52,7 @@ module Shale
       register_xml_type(Shale::Type::Boolean, 'boolean')
       register_xml_type(Shale::Type::Date, 'date')
       register_xml_type(Shale::Type::Float, 'decimal')
+      register_xml_type(Shale::Type::Decimal, 'decimal')
       register_xml_type(Shale::Type::Integer, 'integer')
       register_xml_type(Shale::Type::Time, 'dateTime')
       register_xml_type(Shale::Type::Value, 'anyType')

data/lib/shale/type/decimal.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'value'
+
+module Shale
+  module Type
+    # Cast value to BigDecimal
+    #
+    # @api public
+    class Decimal < Value
+      class << self
+        # @param [String, Float, Integer, nil] value Value to cast
+        #
+        # @return [BigDecimal, nil]
+        #
+        # @api private
+        def cast(value)
+          return if value.nil?
+
+          case value
+          when ::BigDecimal then value
+          when ::Float then BigDecimal(value, value.to_s.length)
+          else BigDecimal(value)
+          end
+        end
+
+        def as_json(value, **)
+          value.to_f
+        end
+
+        def as_yaml(value, **)
+          value.to_f
+        end
+
+        def as_csv(value, **)
+          value.to_f
+        end
+
+        def as_toml(value, **)
+          value.to_f
+        end
+
+        def as_xml_value(value, **)
+          value.to_s('F')
+        end
+      end
+    end
+
+    register(:decimal, Decimal)
+  end
+end

data/lib/shale/version.rb

@@ -2,5 +2,5 @@
 
 module Shale
   # @api private
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/lib/shale.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'yaml'
+require 'bigdecimal'
 
 require_relative 'shale/mapper'
 require_relative 'shale/adapter/json'
 require_relative 'shale/type'
 require_relative 'shale/type/boolean'
 require_relative 'shale/type/date'
+require_relative 'shale/type/decimal'
 require_relative 'shale/type/float'
 require_relative 'shale/type/integer'
 require_relative 'shale/type/string'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shale
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Kamil Giszczak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -72,6 +72,7 @@ files:
 - lib/shale/schema/compiler/boolean.rb
 - lib/shale/schema/compiler/complex.rb
 - lib/shale/schema/compiler/date.rb
+- lib/shale/schema/compiler/decimal.rb
 - lib/shale/schema/compiler/float.rb
 - lib/shale/schema/compiler/integer.rb
 - lib/shale/schema/compiler/property.rb
@@ -109,6 +110,7 @@ files:
 - lib/shale/type/boolean.rb
 - lib/shale/type/complex.rb
 - lib/shale/type/date.rb
+- lib/shale/type/decimal.rb
 - lib/shale/type/float.rb
 - lib/shale/type/integer.rb
 - lib/shale/type/string.rb