lutaml-store 0.2.0 → 0.2.1

data/lib/lutaml/store/adapter/base.rb

@@ -28,6 +28,10 @@ module Lutaml
           raise NotImplementedError
         end
 
+        def each_key(&block)
+          raise NotImplementedError
+        end
+
         def all
           raise NotImplementedError
         end

data/lib/lutaml/store/adapter/memory.rb

@@ -93,6 +93,14 @@ module Lutaml
           end
         end
 
+        def each_key(&block)
+          current_keys = @mutex.synchronize do
+            cleanup_expired if @ttl_enabled
+            @data.keys
+          end
+          current_keys.each(&block)
+        end
+
         def close
           @mutex.synchronize do
             @data.clear

data/lib/lutaml/store/cache_store.rb

@@ -222,15 +222,18 @@ module Lutaml
         end
       end
 
-      def fetch(key, ttl: :default, metadata: {}, &block)
+      def fetch(key, default = nil, ttl: :default, metadata: {})
         value = get(key)
         return value unless value.nil?
 
-        return nil unless block_given?
-
-        value = block.call
-        set(key, value, ttl: ttl, metadata: metadata)
-        value
+        if block_given?
+          value = yield
+          set(key, value, ttl: ttl, metadata: metadata)
+          value
+        elsif !default.nil?
+          set(key, default, ttl: ttl, metadata: metadata)
+          default
+        end
       end
 
       def close

data/lib/lutaml/store/format.rb

@@ -28,6 +28,25 @@ module Lutaml
 
         const_get(entry).new
       end
+
+      def self.for_extension(ext)
+        extension_map[ext] || extension_map[".#{ext.to_s.sub(/\A\./, "")}"]
+      end
+
+      private_class_method def self.extension_map
+        @extension_map ||= begin
+          map = {}
+          FORMATS.each_value do |class_name|
+            fmt = const_get(class_name).new
+            ext = fmt.extension
+            next if map.key?(ext)
+
+            map[ext] = fmt
+            map[".yml"] = fmt if ext == ".yaml"
+          end
+          map.freeze
+        end
+      end
     end
   end
 end

data/lib/lutaml/store/http_cache.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "json"
-
 module Lutaml
   module Store
     class HttpCache
@@ -145,9 +143,7 @@ module Lutaml
           data = @adapter.get(key)
           next unless data
 
-          entry_data = data.is_a?(String) ? JSON.parse(data) : data
-          entry = HttpCacheEntry.from_hash(entry_data)
-          entries << entry
+          entries << HttpCacheEntry.from_json(data)
         rescue StandardError
           # Skip invalid entries
         end
@@ -174,20 +170,14 @@ module Lutaml
         data = @adapter.get(cache_key)
         return nil unless data
 
-        # Handle both serialized and hash data
-        entry_data = data.is_a?(String) ? JSON.parse(data) : data
-        HttpCacheEntry.from_hash(entry_data)
+        HttpCacheEntry.from_json(data)
       rescue StandardError
-        # Log error and continue without cache
         nil
       end
 
       def store_entry(cache_key, entry)
-        # Serialize entry for storage
-        data = entry.to_hash
-        @adapter.set(cache_key, data)
+        @adapter.set(cache_key, entry.to_json)
       rescue StandardError
-        # Log error but don't fail the request
         false
       end
 

data/lib/lutaml/store/model_registration.rb

@@ -4,14 +4,17 @@ module Lutaml
   module Store
     # Represents a single model registration with its metadata
     class ModelRegistration
-      attr_reader :model_class, :key_field, :polymorphic_class_key, :serializer, :dir
+      attr_reader :model_class, :key_field, :polymorphic_class_key, :serializer, :dir,
+                  :composites
 
-      def initialize(model_class, key_field, polymorphic_class_key: nil, serializer: nil, dir: nil)
+      def initialize(model_class, key_field, polymorphic_class_key: nil, serializer: nil,
+                     dir: nil, composites: [])
         @model_class = model_class
         @key_field = key_field.to_sym
         @polymorphic_class_key = polymorphic_class_key&.to_sym
         @serializer = serializer
         @dir = dir
+        @composites = composites.map(&:to_sym)
         validate!
       end
 

data/lib/lutaml/store/model_registry.rb

@@ -81,34 +81,36 @@ module Lutaml
         @registrations.clear
       end
 
-      # Find models that are registered and nested within other models
+      # Find declared composite models nested within the given model
       def find_composite_models(model)
-        composite_models = {}
+        registration = find_registration(model.class)
+        return {} unless registration&.composites&.any?
 
-        model.class.attributes.each_key do |attr_name|
-          attr_value = model.public_send(attr_name)
-          next if attr_value.nil?
-
-          if attr_value.is_a?(Object) && registered?(attr_value.class)
-            add_composite_entry(composite_models, attr_name,
-                                attr_value)
-          end
+        registration.composites.each_with_object({}) do |attr_name, result|
+          collect_composite(model, attr_name, result)
+        end
+      end
 
-          next unless attr_value.is_a?(Array)
+      private
 
-          attr_value.each_with_index do |item, index|
-            next unless item.is_a?(Object) && registered?(item.class)
+      def collect_composite(model, attr_name, result)
+        attr_value = model.public_send(attr_name)
+        return if attr_value.nil?
 
-            add_composite_entry(composite_models, "#{attr_name}.#{index}", item)
-          end
+        if attr_value.is_a?(Array)
+          collect_array_composites(attr_value, attr_name, result)
+        elsif registered?(attr_value.class)
+          add_composite_entry(result, attr_name, attr_value)
         end
-
-        composite_models
-      rescue NoMethodError
-        {}
       end
 
-      private
+      def collect_array_composites(values, attr_name, result)
+        values.each_with_index do |item, index|
+          next unless registered?(item.class)
+
+          add_composite_entry(result, "#{attr_name}.#{index}", item)
+        end
+      end
 
       def add_composite_entry(composite_models, attr_path, model_instance)
         registration = find_registration(model_instance.class)

data/lib/lutaml/store/package_store.rb

@@ -20,15 +20,13 @@ module Lutaml
 
       def self.load(definition, path, transport: :directory, format: nil)
         store = new(definition)
-        transporter = resolve_transport(transport)
-        transporter.read(path, store, format: format)
+        PackageTransport.resolve(transport).read(path, store, format: format)
         store
       end
 
       def save(path, transport: :directory, format: nil, formats: {})
         resolved_formats = resolve_formats(format, formats)
-        transporter = self.class.resolve_transport(transport)
-        transporter.write(path, self, formats: resolved_formats)
+        PackageTransport.resolve(transport).write(path, self, formats: resolved_formats)
       end
 
       # ── Model CRUD ──
@@ -118,22 +116,8 @@ module Lutaml
         }
       end
 
-      # Public access for PackageTransport (avoids instance_variable_get).
-      attr_reader :db
-
       private
 
-      def self.resolve_transport(transport)
-        case transport
-        when :directory, "directory"
-          PackageTransport::DirectoryTransport.new
-        when :zip, "zip"
-          PackageTransport::ZipTransport.new
-        else
-          raise ConfigurationError, "Unknown transport: #{transport}"
-        end
-      end
-
       def resolve_formats(global_format, per_model_formats)
         if global_format
           definition.model_entries

data/lib/lutaml/store/package_transport/base.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Lutaml
+  module Store
+    module PackageTransport
+      class Base
+        def read(path, package_store, format: nil)
+          raise NotImplementedError
+        end
+
+        def write(path, package_store, formats: {})
+          raise NotImplementedError
+        end
+
+        private
+
+        def resolve_format(format_name)
+          Format.resolve(format_name)
+        end
+
+        def effective_format(entry, formats)
+          formats[entry.model] || entry.default_format
+        end
+
+        def format_for_file(filename)
+          Format.for_extension(File.extname(filename)) || Format.resolve(:yaml)
+        end
+
+        def extract_key(model, entry)
+          model.public_send(entry.key).to_s
+        end
+
+        def set_key_from_filename(model, filename, entry)
+          return if model.public_send(entry.key)
+
+          basename = File.basename(filename, ".*")
+          model.public_send(:"#{entry.key}=", basename)
+        end
+
+        def sanitize_filename(key)
+          key.gsub(%r{[/:#?]}, "_")
+        end
+      end
+    end
+  end
+end

data/lib/lutaml/store/package_transport/directory_transport.rb

@@ -0,0 +1,196 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Store
+    module PackageTransport
+      class DirectoryTransport < Base
+        def read(path, package_store, format: nil)
+          definition = package_store.definition
+          global_format = format
+
+          read_metadata(path, package_store)
+
+          definition.model_entries.each do |entry|
+            fmt_name = global_format || entry.default_format
+            read_model_entry(path, entry, package_store, fmt_name)
+          end
+
+          definition.asset_entries.each do |entry|
+            read_asset_entry(path, entry, package_store)
+          end
+        end
+
+        def write(path, package_store, formats: {})
+          definition = package_store.definition
+          FileUtils.mkdir_p(path)
+
+          write_metadata(path, package_store)
+
+          definition.model_entries.each do |entry|
+            fmt_name = effective_format(entry, formats)
+            fmt = resolve_format(fmt_name)
+            write_model_entry(path, entry, package_store, fmt)
+          end
+
+          definition.asset_entries.each do |entry|
+            write_asset_entry(path, entry, package_store)
+          end
+        end
+
+        private
+
+        def read_metadata(path, package_store)
+          definition = package_store.definition
+          return unless definition.metadata_model && definition.metadata_file
+
+          file_path = File.join(path, definition.metadata_file)
+          return unless File.exist?(file_path)
+
+          fmt = format_for_file(definition.metadata_file)
+          raw = File.read(file_path, encoding: "utf-8")
+          metadata = fmt.deserialize(raw, definition.metadata_model)
+          package_store.metadata = metadata
+        end
+
+        def write_metadata(path, package_store)
+          return unless package_store.metadata
+
+          definition = package_store.definition
+          fmt = format_for_file(definition.metadata_file)
+          content = fmt.serialize(package_store.metadata)
+          file_path = File.join(path, definition.metadata_file)
+          FileUtils.mkdir_p(File.dirname(file_path))
+          File.write(file_path, content, encoding: "utf-8")
+        end
+
+        def read_model_entry(base_path, entry, package_store, fmt_name)
+          if entry.file
+            read_single_file_model(base_path, entry, package_store, fmt_name)
+          else
+            read_directory_models(base_path, entry, package_store, fmt_name)
+          end
+        end
+
+        def read_single_file_model(base_path, entry, package_store, fmt_name)
+          file_path = File.join(base_path, entry.file)
+          return unless File.exist?(file_path)
+
+          fmt = resolve_format(fmt_name)
+          raw = File.read(file_path, encoding: "utf-8")
+          model = fmt.deserialize(raw, entry.model)
+          package_store.add_model(model)
+        end
+
+        def read_directory_models(base_path, entry, package_store, fmt_name)
+          dir = entry.dir ? File.join(base_path, entry.dir) : base_path
+          return unless Dir.exist?(dir)
+
+          fmt = resolve_format(fmt_name)
+          glob = File.join(dir, fmt.glob_pattern)
+
+          Dir.glob(glob).sort.each do |file_path|
+            next unless File.file?(file_path)
+
+            raw = File.read(file_path, encoding: "utf-8")
+            next if raw.strip.empty?
+
+            begin
+              case entry.layout
+              when :grouped
+                fmt.deserialize_many(raw, entry.model).each do |m|
+                  set_key_from_filename(m, file_path, entry)
+                  package_store.add_model(m)
+                end
+              else
+                model = fmt.deserialize(raw, entry.model)
+                set_key_from_filename(model, file_path, entry)
+                package_store.add_model(model)
+              end
+            rescue StandardError => e
+              warn "PackageStore: failed to load #{file_path}: #{e.message}"
+            end
+          end
+        end
+
+        def write_model_entry(base_path, entry, package_store, fmt)
+          models = package_store.models_for(entry.model)
+          return if models.empty?
+
+          if entry.file
+            write_single_file_model(base_path, entry, models, fmt)
+          else
+            write_directory_models(base_path, entry, models, fmt)
+          end
+        end
+
+        def write_single_file_model(base_path, entry, models, fmt)
+          content = entry.layout == :grouped ? fmt.serialize_many(models) : fmt.serialize(models.first)
+          file_path = File.join(base_path, entry.file)
+          FileUtils.mkdir_p(File.dirname(file_path))
+          File.write(file_path, content, encoding: "utf-8")
+        end
+
+        def write_directory_models(base_path, entry, models, fmt)
+          dir = entry.dir ? File.join(base_path, entry.dir) : base_path
+          FileUtils.mkdir_p(dir)
+
+          case entry.layout
+          when :grouped
+            models.group_by { |m| extract_key(m, entry) }.each do |key, group|
+              file_path = File.join(dir, "#{sanitize_filename(key)}#{fmt.extension}")
+              File.write(file_path, fmt.serialize_many(group), encoding: "utf-8")
+            end
+          else
+            models.each do |model|
+              key = extract_key(model, entry)
+              file_path = File.join(dir, "#{sanitize_filename(key)}#{fmt.extension}")
+              File.write(file_path, fmt.serialize(model), encoding: "utf-8")
+            end
+          end
+        end
+
+        def read_asset_entry(base_path, entry, package_store)
+          full_path = File.join(base_path, entry.path)
+          case entry.type
+          when :file
+            return unless File.exist?(full_path)
+
+            package_store.add_asset(entry.path, File.binread(full_path))
+          when :directory
+            return unless Dir.exist?(full_path)
+
+            Dir.glob(File.join(full_path, "**", "*")).each do |file|
+              next unless File.file?(file)
+
+              relative = file.sub(%r{\A#{Regexp.escape(base_path)}/}, "")
+              package_store.add_asset(relative, File.binread(file))
+            end
+          end
+        end
+
+        def write_asset_entry(base_path, entry, package_store)
+          case entry.type
+          when :file
+            content = package_store.asset(entry.path)
+            return unless content
+
+            file_path = File.join(base_path, entry.path)
+            FileUtils.mkdir_p(File.dirname(file_path))
+            File.binwrite(file_path, content)
+          when :directory
+            package_store.asset_paths
+                         .select { |p| p.start_with?("#{entry.path}/") }
+                         .each do |asset_path|
+                           content = package_store.asset(asset_path)
+                           next unless content
+
+                           file_path = File.join(base_path, asset_path)
+                           FileUtils.mkdir_p(File.dirname(file_path))
+                           File.binwrite(file_path, content)
+                         end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lutaml/store/package_transport/zip_transport.rb

@@ -0,0 +1,178 @@
+# frozen_string_literal: true
+
+require "zip"
+
+module Lutaml
+  module Store
+    module PackageTransport
+      class ZipTransport < Base
+        def read(path, package_store, format: nil)
+          definition = package_store.definition
+          global_format = format
+
+          Zip::File.open(path) do |zip_file|
+            read_metadata_zip(zip_file, package_store)
+
+            definition.model_entries.each do |entry|
+              fmt_name = global_format || entry.default_format
+              read_model_entry_zip(zip_file, entry, package_store, fmt_name)
+            end
+
+            definition.asset_entries.each do |entry|
+              read_asset_entry_zip(zip_file, entry, package_store)
+            end
+          end
+        end
+
+        def write(path, package_store, formats: {})
+          definition = package_store.definition
+          FileUtils.mkdir_p(File.dirname(path))
+
+          Zip::File.open(path, create: true) do |zip_file|
+            write_metadata_zip(zip_file, package_store)
+
+            definition.model_entries.each do |entry|
+              fmt_name = effective_format(entry, formats)
+              fmt = resolve_format(fmt_name)
+              write_model_entry_zip(zip_file, entry, package_store, fmt)
+            end
+
+            write_assets_zip(zip_file, package_store)
+          end
+        end
+
+        private
+
+        def read_metadata_zip(zip_file, package_store)
+          definition = package_store.definition
+          return unless definition.metadata_model && definition.metadata_file
+
+          entry = zip_file.find_entry(definition.metadata_file)
+          return unless entry
+
+          fmt = format_for_file(definition.metadata_file)
+          raw = entry.get_input_stream.read
+          metadata = fmt.deserialize(raw, definition.metadata_model)
+          package_store.metadata = metadata
+        end
+
+        def write_metadata_zip(zip_file, package_store)
+          return unless package_store.metadata
+
+          definition = package_store.definition
+          fmt = format_for_file(definition.metadata_file)
+          content = fmt.serialize(package_store.metadata)
+          zip_file.get_output_stream(definition.metadata_file) { |f| f.write(content) }
+        end
+
+        def read_model_entry_zip(zip_file, entry, package_store, fmt_name)
+          fmt = resolve_format(fmt_name)
+
+          if entry.file
+            read_single_file_zip(zip_file, entry, package_store, fmt)
+          else
+            read_directory_zip(zip_file, entry, package_store, fmt)
+          end
+        end
+
+        def read_single_file_zip(zip_file, entry, package_store, fmt)
+          zip_entry = zip_file.find_entry(entry.file)
+          return unless zip_entry
+
+          raw = zip_entry.get_input_stream.read
+          model = fmt.deserialize(raw, entry.model)
+          package_store.add_model(model)
+        end
+
+        def read_directory_zip(zip_file, entry, package_store, fmt)
+          prefix = entry.dir ? "#{entry.dir}/" : ""
+
+          zip_file.entries.each do |zip_entry|
+            next unless zip_entry.name.start_with?(prefix)
+            next unless matches_format?(zip_entry.name, fmt)
+            next if zip_entry.name == prefix || zip_entry.name.end_with?("/")
+
+            raw = zip_entry.get_input_stream.read
+            next if raw.strip.empty?
+
+            begin
+              loaded = fmt.deserialize_many(raw, entry.model)
+              loaded = [loaded] unless loaded.is_a?(Array)
+              loaded.each do |m|
+                set_key_from_zip_path(m, zip_entry.name, entry, prefix)
+                package_store.add_model(m)
+              end
+            rescue StandardError => e
+              warn "PackageStore: failed to load #{zip_entry.name}: #{e.message}"
+            end
+          end
+        end
+
+        def write_model_entry_zip(zip_file, entry, package_store, fmt)
+          models = package_store.models_for(entry.model)
+          return if models.empty?
+
+          if entry.file
+            content = entry.layout == :grouped ? fmt.serialize_many(models) : fmt.serialize(models.first)
+            zip_file.get_output_stream(entry.file) { |f| f.write(content) }
+          else
+            write_directory_models_zip(zip_file, entry, models, fmt)
+          end
+        end
+
+        def write_directory_models_zip(zip_file, entry, models, fmt)
+          prefix = entry.dir ? "#{entry.dir}/" : ""
+
+          case entry.layout
+          when :grouped
+            models.group_by { |m| extract_key(m, entry) }.each do |key, group|
+              filename = "#{prefix}#{sanitize_filename(key)}#{fmt.extension}"
+              zip_file.get_output_stream(filename) { |f| f.write(fmt.serialize_many(group)) }
+            end
+          else
+            models.each do |model|
+              key = extract_key(model, entry)
+              filename = "#{prefix}#{sanitize_filename(key)}#{fmt.extension}"
+              zip_file.get_output_stream(filename) { |f| f.write(fmt.serialize(model)) }
+            end
+          end
+        end
+
+        def read_asset_entry_zip(zip_file, entry, package_store)
+          case entry.type
+          when :file
+            zip_entry = zip_file.find_entry(entry.path)
+            package_store.add_asset(entry.path, zip_entry.get_input_stream.read) if zip_entry
+          when :directory
+            prefix = entry.path.end_with?("/") ? entry.path : "#{entry.path}/"
+            zip_file.entries.each do |zip_entry|
+              next unless zip_entry.name.start_with?(prefix)
+              next if zip_entry.name == prefix || zip_entry.name.end_with?("/")
+
+              package_store.add_asset(zip_entry.name, zip_entry.get_input_stream.read)
+            end
+          end
+        end
+
+        def write_assets_zip(zip_file, package_store)
+          package_store.asset_paths.each do |asset_path|
+            content = package_store.asset(asset_path)
+            zip_file.get_output_stream(asset_path) { |f| f.write(content) } if content
+          end
+        end
+
+        def set_key_from_zip_path(model, zip_path, entry, prefix)
+          return if model.public_send(entry.key)
+
+          filename = zip_path.sub(prefix, "")
+          set_key_from_filename(model, filename, entry)
+        end
+
+        def matches_format?(name, fmt)
+          ext = File.extname(name)
+          ext == fmt.extension || (fmt.extension == ".yaml" && ext == ".yml")
+        end
+      end
+    end
+  end
+end