yarrow 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0d0048f5ad41b5bd0d8c0cb49059728e2920217876618294cc08997e450914
-  data.tar.gz: e12fc19f4d9e973e522ae20e995bddf81c1e21861cfa26136cc3f03acf7f20b0
+  metadata.gz: 2a2ebdee5113cc218a9744d5da88b01cb0e7604b4ecfe0d133f776d48d2b4b97
+  data.tar.gz: 967ba36fec57253eea8069f903828b8529f43802578c8be009413e4a5373e1f1
 SHA512:
-  metadata.gz: 81d64f248a17176116104d16f3d1e1a718aa5aa68eced9cc5eefa5ae8fb2d050bf43532c378a131010eab80125cb63360704790d62687287669f1a8c96bf91e3
-  data.tar.gz: 1f3e90865e4a947a1615eb0ea190a35f7cf4b8d3b51de6a1e1d9b78391f7e47d7a480153aacdef51028debca6d6eeb58222017c480cb1c66b143e361fa762bb6
+  metadata.gz: 982f7c783ed933419504e6722e9ffbacaf513468a16cdb07ca4ec7ffc859d5eaed1470948d8c1ca7ce5aa00f5e0fc05b9c29a38f0f0e2972aa6d2f348aec2c7b
+  data.tar.gz: 4debe486afb56d7f664a0dd730db05429b2d7256a5f2789f1987339b394f404ac0f59f67d9e2f25126ad946675a46b7f910a91881d447afed148cb56eb4b5317

data/.github/workflows/ruby.yml

@@ -10,10 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: [2.7, 3.1, 3.2]
+        ruby: [3.1, 3.2, "3.3.0-preview1"]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/lib/yarrow/config.rb

@@ -53,13 +53,13 @@ module Yarrow
     #   Yarrow::Schema::Types::Map.of(Symbol)
     # )
 
-    class Content < Yarrow::Schema::Entity[:__config_content]
+    class Content < Yarrow::Schema::Entity
       attribute :module, :string
       #attribute :source_map, :__config_source_map
       attribute :source_map, :hash
     end
 
-    class Output < Yarrow::Schema::Entity[:__config_output]
+    class Output < Yarrow::Schema::Entity
       attribute :generator, :string
       attribute :template_dir, :path
       #attribute :scripts, :array
@@ -71,8 +71,8 @@ module Yarrow
       attribute :output_dir, :path
       attribute :meta, :any
       attribute :server, :any
-      attribute :content, :__config_content
-      attribute :output, :__config_output
+      attribute :content, :yarrow_config_content
+      attribute :output, :yarrow_config_output
     end
     #
     # `content_dir` and `output_dir` are placeholders and should be overriden

data/lib/yarrow/schema/entity.rb

@@ -20,11 +20,16 @@ module Yarrow
         end
 
         def inherited(class_name)
+          class_type = Yarrow::Schema::Types::Instance.of(class_name).accept(Hash)
+          
           if @label
-            class_type = Yarrow::Schema::Types::Instance.of(class_name)
-            Yarrow::Schema::Definitions.register(@label, class_type)
+            label = @label
             @label = nil
+          else
+            label = Yarrow::Symbols.from_const(class_name)
           end
+
+          Yarrow::Schema::Definitions.register(label, class_type)
         end
       end
 
@@ -32,14 +37,7 @@ module Yarrow
         converted = dictionary.cast(config)
 
         converted.each_pair do |key, value|
-          # raise "#{key} not a declared attribute" unless dictionary.key?(key)
-          #
-          # defined_type = dictionary[key]
-          #
-          # unless value.is_a?(defined_type)
-          #   raise "#{key} accepts #{defined_type} but #{value.class} given"
-          # end
-
+          # TODO: should we represent this as an attribute set rather than instance vars?
           instance_variable_set("@#{key}", value)
         end
       end

data/lib/yarrow/schema/value.rb

@@ -1,15 +1,20 @@
 module Yarrow
   module Schema
-    # class Structure < Struct
-    #   def self.inherited(subclass)
-    #     unless subclass.name
-    #       puts "CLASS"
-    #       p caller_locations[3]
-    #     else
-    #       p subclass.name.downcase.to_sym
-    #     end
-    #   end
-    # end
+    class ValueType < Struct
+      def self.register(label)
+        class_type = Yarrow::Schema::Types::Instance.of(self).accept(Hash)
+        Yarrow::Schema::Definitions.register(label, class_type)
+        self
+      end
+
+      # Automatically register when struct is defined as a class extension
+      # rather than anonymous struct class.
+      def self.inherited(subclass)
+        if subclass.name
+          self.register(subclass.name.downcase.to_sym)
+        end
+      end
+    end
 
     # Value object (with comparison by value equality). This just chucks back a
     # Ruby struct but wraps the constructor with method advice that handles
@@ -33,12 +38,16 @@ module Yarrow
 
         validator = Dictionary.new(fields_spec)
 
-        struct = Struct.new(*slots_spec, keyword_init: true, &block)
+        struct = ValueType.new(*slots_spec, keyword_init: true, &block)
 
         struct.define_method :initialize do |*args, **kwargs|
           attr_values = if args.any?
             raise ArgumentError.new("cannot mix slots and kwargs") if kwargs.any?
-            Hash[slots.zip(args)]
+            if args.first.instance_of?(Hash) and args.count == 1
+              args.first
+            else
+              Hash[slots.zip(args)]
+            end
           else
             kwargs
           end

data/lib/yarrow/symbols.rb

@@ -19,6 +19,20 @@ module Yarrow
       Object.const_get(Strings::Case.pascalcase(atom.to_s).to_sym)
     end
 
+    # Converts a string name of class const to a symbol atom
+    #
+    # @param [Class, String, #to_s] const_obj
+    # @return [Symbol]
+    def self.from_const(const_obj)
+      const_lookup = if const_obj.respond_to?(:name)
+        const_obj.name
+      else
+        const_obj.to_s
+      end
+
+      Strings::Case.underscore(const_lookup).to_sym
+    end
+
     # @param [Symbol, String] atom
     # @return [Symbol]
     def self.to_singular(atom)

data/lib/yarrow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Yarrow
   APP_NAME = "Yarrow"
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable