json_model_rb 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8629addf96efee3c996feeeff0f3b1806ceb78bbc3ecffd6470ea1f96db1da5
-  data.tar.gz: 9821968d8a12620d7b4f53c5884cbe6214998e3af9b6785719f8390a3148725f
+  metadata.gz: 5fd21067ed2a5b88fe10eb6238524fdeac5234bb54dbbb8325f57bd12a5201d1
+  data.tar.gz: 3e388b7b7e26367fc55a95573f5f119d6109826f81c560e12445ad0c5f3f5efe
 SHA512:
-  metadata.gz: ae72851a9d485cc0cbd7df518d48a40ff03a115025a4e3a04177fb6207783c2df3377c7778b1131cee053fc13711e60b9dafe220b831303f06d19eec56ef3eb6
-  data.tar.gz: e51539c6a3beb3319949bb0e052e5817304772c012d742f96b744289c2cb33afd8d9864b4593e3a0ea9013ee9039a5183e4ce1351fa670534dae1e1b45b10ab4
+  metadata.gz: 5c74c663193b74704f7165e312b226261b4b5ed44d469770ad6e0853c104917b21397f6ebd56c6aa18f6d17499dd431949605b6068cd853b8c7ce53bda156dcf
+  data.tar.gz: 2022ec4abc4ba514b6b106d51ead65307046283e5baf9406453f83ecbce75c393f985edee6c9469480dab320e9a3a57580da98f6ea00eda82a9d4f5216958233

data/lib/json_model/schema_meta.rb

@@ -16,7 +16,7 @@ module JsonModel
       # @param [Class] subclass
       def self.inherited(subclass)
         super
-        subclass.schema_id(JsonModel.config.schema_id_naming_strategy.call(self))
+        subclass.schema_id(JsonModel.config.schema_id_naming_strategy.call(subclass))
         subclass.additional_properties(false)
         subclass.meta_attributes[:$ref] = schema_id
       end

data/lib/json_model/type_spec/array.rb

@@ -46,9 +46,13 @@ module JsonModel
       end
 
       # @param [::Object] json
-      # @return [::Object]
+      # @return [::Object, nil]
       def cast(json)
-        json.map { |item| @type.cast(item) }
+        if json.is_a?(Enumerable)
+          json.map { |item| @type.cast(item) }
+        else
+          raise(Errors::TypeError, "Expected an array, got #{json.class} (#{json.inspect})")
+        end
       end
 
       private

data/lib/json_model/type_spec/composition/all_of.rb

@@ -11,7 +11,7 @@ module JsonModel
         end
 
         # @param [::Object] json
-        # @return [::Object]
+        # @return [::Object, nil]
         def cast(json)
           if json.nil?
             return nil

data/lib/json_model/type_spec/composition/any_of.rb

@@ -11,7 +11,7 @@ module JsonModel
         end
 
         # @param [::Object] json
-        # @return [::Object]
+        # @return [::Object, nil]
         def cast(json)
           if json.nil?
             return nil

data/lib/json_model/type_spec/composition/one_of.rb

@@ -11,7 +11,7 @@ module JsonModel
         end
 
         # @param [::Object] json
-        # @return [::Object]
+        # @return [::Object, nil]
         def cast(json)
           if json.nil?
             return nil

data/lib/json_model/type_spec/composition.rb

@@ -25,7 +25,7 @@ module JsonModel
       end
 
       # @param [::Object] json
-      # @return [::Object]
+      # @return [::Object, nil]
       def cast(json)
         raise(NotImplementedError)
       end

data/lib/json_model/type_spec/const.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module JsonModel
+  class TypeSpec
+    class Const < TypeSpec
+      # @param [String] value
+      def initialize(value)
+        super()
+        @value = value
+
+        if value.blank?
+          raise(ArgumentError, 'Const type spec requires a non-empty value')
+        end
+      end
+
+      # @param [Hash] _options
+      # @return [Hash]
+      def as_schema(**_options)
+        {
+          const: @value,
+        }.compact
+      end
+
+      # @param [Symbol] name
+      # @param [ActiveModel::Validations] klass
+      def register_validations(name, klass)
+        super
+
+        klass.validates(name, inclusion: { in: @value })
+      end
+    end
+  end
+end

data/lib/json_model/type_spec/object.rb

@@ -21,7 +21,7 @@ module JsonModel
       end
 
       # @param [::Object] json
-      # @return [::Object]
+      # @return [::Object, nil]
       def cast(json)
         @type.new(**json)
       end

data/lib/json_model/type_spec/primitive/string.rb

@@ -76,7 +76,6 @@ module JsonModel
           relative_json_pointer: ->(v) { v.match?(%r{\A(?:0|[1-9][0-9]*)(?:#|(?:/(?:[^~]|~[01])*))*\z}) },
         }.freeze
 
-
         # @param [Integer, nil] min_length
         # @param [Integer, nil] max_length
         # @param [Regexp, nil] pattern

data/lib/json_model/type_spec/primitive.rb

@@ -18,14 +18,14 @@ module JsonModel
       end
 
       # @param [::Object] json
-      # @return [::Object]
+      # @return [::Object, nil]
       def cast(json)
         if json.nil?
           nil
         elsif @types.any? { |type| json.is_a?(type) }
           json
         else
-          raise(Errors::TypeError, "Expected #{@type}, got #{json.class} (#{json.inspect})")
+          raise(Errors::TypeError, "Expected one of #{@type.join('/')}, got #{json.class} (#{json.inspect})")
         end
       end
     end

data/lib/json_model/type_spec.rb

@@ -2,6 +2,7 @@
 
 require_relative('type_spec/array')
 require_relative('type_spec/composition')
+require_relative('type_spec/const')
 require_relative('type_spec/enum')
 require_relative('type_spec/object')
 require_relative('type_spec/primitive')
@@ -24,7 +25,7 @@ module JsonModel
     end
 
     # @param [::Object] json
-    # @return [::Object]
+    # @return [::Object, nil]
     def cast(json)
       json
     end

data/lib/json_model/types/const.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module T
+  class Const
+    # @param [String] value
+    def initialize(value)
+      @value = value
+    end
+
+    # @return [JsonModel::TypeSpec::Const]
+    def to_type_spec(**options)
+      JsonModel::TypeSpec::Const.new(*@value, **options)
+    end
+
+    class << self
+      # @param [Array] args
+      # @return [Const]
+      def [](*args)
+        Const.new(*args)
+      end
+    end
+  end
+end

data/lib/json_model/types.rb

@@ -5,4 +5,5 @@ require_relative('types/any_of')
 require_relative('types/boolean')
 require_relative('types/one_of')
 require_relative('types/array')
+require_relative('types/const')
 require_relative('types/enum')

data/lib/json_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonModel
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

data/spec/type_spec/const_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require('spec_helper')
+
+RSpec.describe(JsonModel::TypeSpec::Const) do
+  describe('#as_schema') do
+    it('returns a const schema') do
+      expect(described_class.new('a').as_schema)
+        .to(
+          eq(
+            {
+              const: 'a'
+            },
+          ),
+        )
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul Gillesberger
@@ -121,6 +121,7 @@ files:
 - lib/json_model/type_spec/composition/all_of.rb
 - lib/json_model/type_spec/composition/any_of.rb
 - lib/json_model/type_spec/composition/one_of.rb
+- lib/json_model/type_spec/const.rb
 - lib/json_model/type_spec/enum.rb
 - lib/json_model/type_spec/object.rb
 - lib/json_model/type_spec/primitive.rb
@@ -135,6 +136,7 @@ files:
 - lib/json_model/types/any_of.rb
 - lib/json_model/types/array.rb
 - lib/json_model/types/boolean.rb
+- lib/json_model/types/const.rb
 - lib/json_model/types/enum.rb
 - lib/json_model/types/one_of.rb
 - lib/json_model/version.rb
@@ -152,6 +154,7 @@ files:
 - spec/type_spec/composition/any_of_spec.rb
 - spec/type_spec/composition/one_of_spec.rb
 - spec/type_spec/composition_spec.rb
+- spec/type_spec/const_spec.rb
 - spec/type_spec/enum_spec.rb
 - spec/type_spec/primitive/boolean_spec.rb
 - spec/type_spec/primitive/integer_spec.rb