fino 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41afe38eceb38b92f9305cbb4da0f2ab9d0ed503b6e918d09506eff570d0d998
-  data.tar.gz: c5358f8b1a40dda75057a40369f624179c6bbe93a55190843d1c9ebd7055a31d
+  metadata.gz: a2820a64cf64defc88202ae9e9ee7140efe02246c812e33cfe6ce07877f68b9e
+  data.tar.gz: 6b2b9c1cf4ae0ac28ad60912e0a5026cf01901b3a6006c03ecf1f5550e3f0c80
 SHA512:
-  metadata.gz: b82b39b8c82c79cf715f8d1dbe97de58d78584bcd14a2cc7c745c1855a36cd6c16364fb367448bec57743334ba9444103812ab767618213b8693da1b15fc959c
-  data.tar.gz: dad45241623885aeb26fd15c7122908c9e2893e73cb07bc66e9482c35bf5cbe1d66645dc5be8bb10e69e61163bac5c9fc255375267d5e1b616b8fbe4dbb8203e
+  metadata.gz: 76444316536ac50999142e41abba7dbc4939832a138fb6ad3bf06bf7fb1700b3007f842b874b513789dbeec101ab3c7110818e6f862bd58bd83be06e2cca9251
+  data.tar.gz: 3120460c8c7ee45f2be9f38e00dd12150a81e93d36b8bd7a932c16f73b2061e0d0c7c431d50431244cb2e66b9ee4faa11799d96b120716a1a29f0e5b4b68e8b3

data/README.md

@@ -56,7 +56,7 @@ Fino.value(:temperature, at: :openai) #=> 0.7
 
 Fino.values(:model, :temperature, at: :openai) #=> ["gpt-4", 0.7]
 
-Fino.set("gpt-5", :model, at: :openai)
+Fino.set(model: "gpt-5", at: :openai)
 Fino.value(:model, at: :openai) #=> "gpt-5"
 ```
 

data/lib/fino/definition/section.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Fino::Definition::Section
+  attr_reader :name, :options
+
+  def initialize(name:, **options)
+    @name = name
+    @options = options
+  end
+
+  def label
+    options.fetch(:label, name.to_s.capitalize)
+  end
+end

data/lib/fino/definition/setting.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class Fino::Definition::Setting
+  attr_reader :setting_name, :section_definition, :type, :options
+
+  def initialize(type:, setting_name:, section_definition: nil, **options)
+    @setting_name = setting_name
+    @section_definition = section_definition
+    @type = type
+    @options = options
+  end
+
+  def type_class # rubocop:disable Metrics/MethodLength
+    @type_class ||=
+      case type
+      when :string
+        Fino::Settings::String
+      when :integer
+        Fino::Settings::Integer
+      when :float
+        Fino::Settings::Float
+      when :boolean
+        Fino::Settings::Boolean
+      else
+        raise "Unknown type #{type}"
+      end
+  end
+
+  def default
+    return @default if defined?(@default)
+
+    @default = options[:default]
+  end
+
+  def description
+    options[:description]
+  end
+
+  def path
+    @path ||= [setting_name, section_definition&.name].compact
+  end
+
+  def key
+    @key ||= path.reverse.join("/")
+  end
+end

data/lib/fino/library.rb

@@ -19,22 +19,42 @@ class Fino::Library
     pipeline.read(build_setting_definition(setting_name, at: at))
   end
 
-  def settings(*setting_names, at: nil)
-    setting_definitions = setting_names.map { |name| build_setting_definition(name, at: at) }
+  def settings(*setting_names, at: Fino::EMPTINESS)
+    setting_definitions =
+      if setting_names.empty? && at.equal?(Fino::EMPTINESS)
+        configuration.registry.setting_definitions
+      elsif at.equal?(Fino::EMPTINESS)
+        setting_names.map { |name| build_setting_definition(name) }
+      elsif setting_names.empty?
+        configuration.registry.setting_definitions(at: at)
+      else
+        setting_names.map { |name| build_setting_definition(name, at: at) }
+      end
+
     pipeline.read_multi(setting_definitions)
   end
 
-  def all
-    pipeline.read_multi(configuration.registry.setting_definitions)
+  def set(**setting_names_to_values)
+    at = setting_names_to_values.delete(:at)
+
+    setting_names_to_values.each do |setting_name, value|
+      setting_definition = build_setting_definition(setting_name, at: at)
+
+      pipeline.write(
+        setting_definition,
+        setting_definition.type_class.deserialize(value)
+      )
+    end
   end
 
-  def set(value, setting_name, at: nil)
-    setting_definition = build_setting_definition(setting_name, at: at)
+  def slice(**mapping)
+    setting_definitions = mapping.each_with_object([]) do |(section_name, setting_names), memo|
+      Array(setting_names).each do |setting_name|
+        memo << build_setting_definition(setting_name, at: section_name)
+      end
+    end
 
-    pipeline.write(
-      setting_definition,
-      setting_definition.type_class.deserialize(value)
-    )
+    pipeline.read_multi(setting_definitions)
   end
 
   private
@@ -42,7 +62,7 @@ class Fino::Library
   attr_reader :configuration
 
   def build_setting_definition(setting_name, at: nil)
-    configuration.registry.fetch(setting_name, at)
+    configuration.registry.setting_definition(setting_name.to_s, at&.to_s)
   end
 
   def pipeline

data/lib/fino/pipeline.rb

@@ -12,7 +12,7 @@ class Fino::Pipeline
   end
 
   def use(pipe_class, *args, **kwargs, &block)
-    pipes.unshift ->(pipe) { pipe_class.new(pipe, *args, **kwargs, &block) }
+    pipes << ->(pipe) { pipe_class.new(pipe, *args, **kwargs, &block) }
     @pipeline = nil
   end
 

data/lib/fino/registry.rb

@@ -3,17 +3,17 @@
 class Fino::Registry
   class DSL
     class SectionDSL
-      def initialize(section_name, _options, registry)
-        @section_name = section_name
+      def initialize(section_definition, registry)
+        @section_definition = section_definition
         @registry = registry
       end
 
       def setting(setting_name, type, **)
         @registry.register(
-          Fino::SettingDefinition.new(
+          Fino::Definition::Setting.new(
             type: type,
             setting_name: setting_name,
-            section_name: @section_name,
+            section_definition: @section_definition,
             **
           )
         )
@@ -26,7 +26,7 @@ class Fino::Registry
 
     def setting(setting_name, type, **)
       @registry.register(
-        Fino::SettingDefinition.new(
+        Fino::Definition::Setting.new(
           type: type,
           setting_name: setting_name,
           **
@@ -35,7 +35,14 @@ class Fino::Registry
     end
 
     def section(section_name, options = {}, &)
-      SectionDSL.new(section_name, options, @registry).instance_eval(&)
+      section_definition = Fino::Definition::Section.new(
+        name: section_name,
+        **options
+      )
+
+      @registry.register_section(section_definition)
+
+      SectionDSL.new(section_definition, @registry).instance_eval(&)
     end
   end
 
@@ -43,22 +50,45 @@ class Fino::Registry
 
   using Fino::Ext::Hash
 
-  attr_reader :setting_definitions_by_path, :setting_definitions
+  attr_reader :setting_definitions, :section_definitions
 
   def initialize
-    @setting_definitions_by_path = {}
     @setting_definitions = []
+    @setting_definitions_by_path = {}
+
+    @section_definitions = []
+    @section_definitions_by_name = {}
   end
 
-  def fetch(*path)
-    @setting_definitions_by_path.dig(*path.reverse).tap do |definition|
+  def setting_definition(*path)
+    @setting_definitions_by_path.dig(*path.compact.reverse).tap do |definition|
       raise UnknownSetting, "Unknown setting: #{path.compact.join('.')}" unless definition
     end
   end
 
+  def setting_definitions(at: Fino::EMPTINESS)
+    case at
+    when Fino::EMPTINESS
+      @setting_definitions
+    when nil
+      @setting_definitions.select { |d| d.section_definition.nil? }
+    else
+      @setting_definitions_by_path[at&.to_s]&.values || []
+    end
+  end
+
+  def section_definition(section_name)
+    @section_definitions_by_name[section_name.to_s]
+  end
+
   def register(setting_definition)
     @setting_definitions << setting_definition
 
-    @setting_definitions_by_path.deep_set(setting_definition, *setting_definition.path)
+    @setting_definitions_by_path.deep_set(setting_definition, *setting_definition.path.map(&:to_s))
+  end
+
+  def register_section(section_definition)
+    @section_definitions << section_definition
+    @section_definitions_by_name.deep_set(section_definition, section_definition.name.to_s)
   end
 end

data/lib/fino/setting.rb

@@ -40,17 +40,34 @@ module Fino::Setting
     definition.key
   end
 
+  def type
+    definition.type
+  end
+
+  def type_class
+    definition.type_class
+  end
+
+  def section_definition
+    definition.section_definition
+  end
+
   def section_name
-    definition.section_name
+    definition.section_definition&.name
   end
 
   def default
     definition.default
   end
 
+  def description
+    definition.description
+  end
+
   def inspect
     attributes = [
       "key=#{key.inspect}",
+      "type=#{type_class.inspect}",
       "value=#{value.inspect}",
       "default=#{default.inspect}"
     ]

data/lib/fino/settings/boolean.rb

@@ -9,7 +9,10 @@ class Fino::Settings::Boolean
     end
 
     def deserialize(raw_value)
-      raw_value == "1"
+      case raw_value
+      when "1", 1, true, "true", "t", "yes", "y" then true
+      else false
+      end
     end
   end
 end

data/lib/fino/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Fino
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
   REQUIRED_RUBY_VERSION = ">= 3.0.0"
 end

data/lib/fino.rb

@@ -24,7 +24,7 @@ module Fino
                    :values,
                    :setting,
                    :settings,
-                   :all,
+                   :slice,
                    :set
 
     module_function

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fino
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Egor Iskrenkov
@@ -35,6 +35,8 @@ files:
 - lib/fino/cache.rb
 - lib/fino/cache/memory.rb
 - lib/fino/configuration.rb
+- lib/fino/definition/section.rb
+- lib/fino/definition/setting.rb
 - lib/fino/error.rb
 - lib/fino/expirator.rb
 - lib/fino/ext/hash.rb
@@ -46,7 +48,6 @@ files:
 - lib/fino/pipeline.rb
 - lib/fino/registry.rb
 - lib/fino/setting.rb
-- lib/fino/setting_definition.rb
 - lib/fino/settings/boolean.rb
 - lib/fino/settings/float.rb
 - lib/fino/settings/integer.rb

data/lib/fino/setting_definition.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class Fino::SettingDefinition
-  attr_reader :setting_name, :section_name, :type, :options
-
-  def initialize(type:, setting_name:, section_name: nil, **options)
-    @setting_name = setting_name
-    @section_name = section_name
-    @type = type
-    @options = options
-  end
-
-  def type_class
-    case type
-    when :string
-      Fino::Settings::String
-    when :integer
-      Fino::Settings::Integer
-    when :float
-      Fino::Settings::Float
-    when :boolean
-      Fino::Settings::Boolean
-    else
-      raise "Unknown type #{type}"
-    end
-  end
-
-  def default
-    options[:default]
-  end
-
-  def path
-    @path ||= [setting_name, section_name].compact
-  end
-
-  def key
-    @key ||= path.reverse.join("/")
-  end
-end