kangaru 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7c4419e9f9d9661c4d12498fcb5450cde2f209958f0bb7249a39dec4a93b54
-  data.tar.gz: 43b3237bf249c4c4a3ef59eddbd4328a7b03a0084d9c69296557bab93d0b1492
+  metadata.gz: 14de853c7d43559d44b5dab8ca97090305697c8cb14245b9647b1f67d17036a6
+  data.tar.gz: 96572ecb84ae6cc4a74833d0456678bf66b8dcfbe701977ba6c920236cba5c64
 SHA512:
-  metadata.gz: c2c5dff9c5ecd0a4401261203f6c89d5837b7824dae3e88d8dd1ad7683f7ae9b65200892d81f4d20d181acca253c5b4dab9b48c24dae32c069dd3ddcea8fd5d9
-  data.tar.gz: 6b1c7bbef5ef7a08437b5bd33b7fcfa8d2106bd29b52f8df7e56a228caff297fd22df609b96d8a6828390d6bc503bf4105fab52064efb1b4e146866e81a30162
+  metadata.gz: ad440db45f269703c52939c80b0534b527c54e3649e15f2206af920818b2f8b5529c52a9127364a74b7f72d38fe56976ee5a6d8fe610585365a67bcb46b30176
+  data.tar.gz: 67ca725ea8b804a30a0ea4769a0203af75601e546dcfe56dc237f308bda356cc6029e5c01921064044188d955c667e0d74e643f0d52cf309ebecf04403cf157c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kangaru (0.2.0)
+    kangaru (0.2.1)
       colorize (~> 1.1)
       erb (~> 4.0)
       sequel (~> 5.72)

data/lib/kangaru/application.rb

@@ -24,11 +24,8 @@ module Kangaru
       @router ||= Router.new(namespace:)
     end
 
-    # If called with no env, the config will be applied regardless of current
-    # env. If multiple configure calls matching the current env are made, the
-    # most recent calls will overwrite older changes.
-    def configure(env = nil, &block)
-      block.call(config) if current_env?(env)
+    def configure(&block)
+      block.call(config)
     end
 
     def configured?
@@ -62,13 +59,6 @@ module Kangaru
 
     private
 
-    # Returns true if nil as this is represents all envs.
-    def current_env?(env)
-      return true if env.nil?
-
-      Kangaru.env?(env)
-    end
-
     def autoloader
       @autoloader ||= Zeitwerk::Loader.new.tap do |loader|
         loader.inflector = Zeitwerk::GemInflector.new(paths.source.to_s)

data/lib/kangaru/initialiser.rb

@@ -6,7 +6,7 @@ module Kangaru
       Kangaru.application = Application.new(source:, namespace:)
       Kangaru.eager_load(Initialisers)
 
-      namespace.extend InjectedMethods
+      namespace.extend Interface
     end
   end
 end

data/lib/kangaru/{injected_methods.rb → interface.rb}

@@ -1,5 +1,5 @@
 module Kangaru
-  module InjectedMethods
+  module Interface
     def run!(*argv)
       Kangaru.application!.run!(*argv)
     end
@@ -8,11 +8,15 @@ module Kangaru
       Kangaru.application!.config
     end
 
-    def configure(env = nil, &)
-      Kangaru.application!.configure(env, &)
+    def configure(env: nil, &)
+      return unless env_applies?(env)
+
+      Kangaru.application!.configure(&)
     end
 
-    def import_config_from!(path)
+    def config_path(path, env: nil)
+      return unless env_applies?(env)
+
       Kangaru.application!.config_path = path
     end
 
@@ -23,5 +27,13 @@ module Kangaru
     def database
       Kangaru.application!.database
     end
+
+    private
+
+    def env_applies?(env)
+      return true if env.nil?
+
+      Kangaru.env?(env)
+    end
   end
 end

data/lib/kangaru/version.rb

@@ -1,3 +1,3 @@
 module Kangaru
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/sig/kangaru/application.rbs

@@ -16,7 +16,7 @@ module Kangaru
 
     def initialize: (source: String, namespace: Module) -> void
 
-    def configure: (?Symbol?) { (Config) -> void } -> void
+    def configure: { (Config) -> void } -> void
 
     def configured?: -> bool
 
@@ -34,8 +34,6 @@ module Kangaru
 
     @configured: bool
 
-    def current_env?: (Symbol?) -> bool
-
     attr_reader autoloader: Zeitwerk::Loader
 
     def validate_config!: -> void

data/sig/kangaru/initialiser.rbs

@@ -1,9 +1,5 @@
 module Kangaru
   module Initialiser
-    module InjectedMethods
-      include Kangaru::_ApplicationMethods
-    end
-
     def self.extended: (Module) -> void
   end
 end

data/sig/kangaru/interface.rbs

@@ -0,0 +1,21 @@
+module Kangaru
+  module Interface
+    type env = Symbol?
+
+    def run!: (*String) -> void
+
+    def config: -> Config
+
+    def configure: (?env: env) { (Config) -> void } -> void
+
+    def apply_config!: -> void
+
+    def config_path: (String, ?env: env) -> void
+
+    def database: -> Database?
+
+    private
+
+    def env_applies?: (Symbol?) -> bool
+  end
+end

data/sig/kangaru.rbs

@@ -21,9 +21,4 @@ module Kangaru
 
     def test?: -> bool
   end
-
-  # Included in target applications that extend Kangaru::Initialiser.
-  interface _ApplicationMethods
-    include InjectedMethods::_InjectedMethods
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kangaru
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Welham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-12 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -127,7 +127,7 @@ files:
 - lib/kangaru/initialisers/rspec.rb
 - lib/kangaru/initialisers/rspec/kangaru_helper.rb
 - lib/kangaru/initialisers/rspec/request_helper.rb
-- lib/kangaru/injected_methods.rb
+- lib/kangaru/interface.rb
 - lib/kangaru/model.rb
 - lib/kangaru/patches/constantise.rb
 - lib/kangaru/patches/inflections.rb
@@ -174,7 +174,7 @@ files:
 - sig/kangaru/inflectors/tokeniser.rbs
 - sig/kangaru/initialiser.rbs
 - sig/kangaru/initialisers/rspec.rbs
-- sig/kangaru/injected_methods.rbs
+- sig/kangaru/interface.rbs
 - sig/kangaru/model.rbs
 - sig/kangaru/patches/constantise.rbs
 - sig/kangaru/patches/inflections.rbs

data/sig/kangaru/injected_methods.rbs

@@ -1,19 +0,0 @@
-module Kangaru
-  module InjectedMethods
-    interface _InjectedMethods
-      def run!: (*String) -> void
-
-      def config: -> Config
-
-      def configure: (?Symbol?) { (Config) -> void } -> void
-
-      def apply_config!: -> void
-
-      def import_config_from!: (String) -> void
-
-      def database: -> Database?
-    end
-
-    include _InjectedMethods
-  end
-end