pears 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6027c30390f8c8c7eb777118ac67a2c92ab1492c9e56cbf8bfd7f0b3af7dd9b4
-  data.tar.gz: 55a01b652c8f57945d864b9b35b2a0ae974cbf434f26012541eb5a62e8fe4f36
+  metadata.gz: 94c6430efedf1e3534fcd99df29979522f063ec66682217d2f1a6188661be319
+  data.tar.gz: 01f7319c47e4a0fecaa5831c9a53e804112b0b25c42f2a558ef2a2909a1756f6
 SHA512:
-  metadata.gz: 805d0cdae121ba3fc165de1e12177bc63eab1396af53d661652062253b85b40dec8487c7cb49e673784f3cfc4420adc7ef4cd7737f9a10b381655c4ca6e9cacd
-  data.tar.gz: c18a180c02015f9a8816f177fdfca43119552e2e5b584cace0877aceab9108a28a21ceeb1099501060599fdacbb22629ae016d5046c766e3e5b7d34886286176
+  metadata.gz: 5b8d6036fb96e72313fd72317f8ed757b2bf71c2af89f06c999a357582654517c3fe7f2dc3ad7bffa3ccbbafcfa519ae3d5fa0fc98bf4a2dd1b15cc427318ba6
+  data.tar.gz: 98ef7be8b052f2f82a34015d05cee4e537a604d8d9d134d1ff7b671773fa99c06d1361caeb32508aa6efbfdca231b60179c981500f5b688ed272b3f2bc329b08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pears (0.1.0)
+    pears (0.0.5)
       activesupport
       dry-configurable (>= 0.13.0)
       redis
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -25,7 +25,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     rake (13.0.6)
     redis (4.5.1)
     rspec (3.10.0)

data/lib/pears/provider/builder.rb

@@ -1,44 +1,53 @@
 require 'active_support/core_ext/module'
 
 module Pears
-  module Providers
+  module Provider
     class Builder
+      # Evil meta programming.
+      def self.enable_provider(provider, yielder: false)
+        method_name = provider.name.split('::').last.underscore.to_sym
+        if yielder
+          define_method(method_name) do |*args, &block|
+            pr = provider.new(builder: self, &block)
+            push pr
+            pr
+          end
+        else
+          define_method(method_name) do |*args, **opts, &block|
+            pr = provider.new(*args, **opts, &block)
+            push pr
+            pr
+          end
+        end
+      end
+
+      # define Providers
+      enable_provider LocalFile
+      enable_provider RemoteFile
+      enable_provider Subscription, yielder: true
+
       delegate :name, to: :subject
 
       def initialize(subject)
         @subject = subject
       end
 
-      def hash
-        raise 'not yet implemented'
-      end
-
-      def loco
-        raise 'not yet implemented'
-      end
-
-      def env
-        raise 'not yet implemented'
-      end
-
-      def local_file(file_path)
-        register Provider::LocalFile.new(file_path)
-      end
-
-      def remote_file(file_url)
-        register Provider::RemoteFile.new(file_url)
+      def freeze_layers
+        @skip_push = true
+        yield
+        @skip_push = false
       end
 
-      def subscription &block
-        register Provider::Subscription.new(@subject.name, &block)
+      def subject_name
+        @subject.name
       end
 
       private
 
-      def register provider
+      def push provider
         return provider unless @subject.is_a? Subject
 
-        @subject.push_layer provider
+        @subject.push_layer provider unless @skip_push
       end
     end
   end

data/lib/pears/provider/loco.rb

@@ -9,6 +9,7 @@ module Pears
       private
 
       def fetch_from_loco(api_key, url)
+        raise "Not yet implemented"
         # Get config from loco
       end
     end

data/lib/pears/provider/subscription.rb

@@ -1,27 +1,41 @@
 # frozen_string_literal: true
 require 'redis'
 
+
 module Pears
   module Provider
     # Config using redis subscription. This updates automatically upon Redis
     # channel updates.
+    # This class would register as "alternative classes with different interfaces".
+    # I ought to clean this up and maybe make "triggers" a different entity
+    # from a provider available in the builder.
+
     class Subscription < Base
       attr_reader :subscription
-
-      def initialize(channel,
+      def initialize(channel=nil,
           redis_host: Pears.config.redis_host,
+          **opts,
           &fetcher)
+        @builder = opts[:builder] || Builder.new(nil)
         @channel = channel
+
+        # Fetcher is a "Provider" of some sort.
         @fetcher = fetcher
 
+        # Setup redis subscription
         establish_connection(redis_host)
-        subscribe
         reload
+        subscribe
+      end
+
+      def channel
+        @channel ||= @builder.subject_name
       end
 
       def reload
-        @data = @fetcher.call(Pears::Providers::Builder.new(self))
-            .data
+        @builder.freeze_layers do
+          @data = @fetcher.call.data
+        end
       end
 
       # This seems a bit "rough" of an approach. we should check if

data/lib/pears/provider.rb

@@ -9,5 +9,8 @@ require_relative "provider/builder"
 
 module Pears
   module Provider
+    def enable(provider, with_block: false)
+      Builder.enable
+    end
   end
 end

data/lib/pears/subject.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module Pears 
   # A subject is a collection of settings.
   # You could different Pears::Subjects in your application for different parts
@@ -23,6 +25,10 @@ module Pears
       project.has_key? key
     end
 
+    def dig(*args)
+      project.dig(*args)
+    end
+
     def push_layer(layer)
       @layers << layer
     end
@@ -31,7 +37,7 @@ module Pears
     def project
       layers.reverse.reduce(Hash.new) do |hash, layer|
         hash.deep_merge(layer.data)
-      end
+      end.with_indifferent_access
     end
 
     private

data/lib/pears/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pears
-  VERSION = "0.0.1"
+  VERSION = "0.0.5"
 end

data/lib/pears.rb

@@ -14,11 +14,10 @@ module Pears
     @subjects ||= []
   end
 
-
   # This is the main way of locating a subject.
   def self.subject(name)
     Subject.new(name: name).tap do |subject|
-      builder = Providers::Builder.new(subject)
+      builder = Provider::Builder.new(subject)
       yield(builder)
     end
   end

data/pears.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = "pears"
   spec.version       = Pears::VERSION
   spec.authors       = ["Steven Kemp"]
-  spec.email         = ["steven@remarkgroup.Com"]
+  spec.email         = ["steven@remarkgroup.com"]
 
   spec.summary       = "Ingest hot-swappable configuration data"
   spec.homepage      = "https://www.rubygems.com"
@@ -25,10 +25,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency 'dry-configurable', '~> 0.13.0'
-  spec.add_dependency 'activesupport', '~> 6.1.4.1'
-  spec.add_dependency 'redis', '~>4.5.1'
+  spec.add_dependency 'dry-configurable', '>= 0.13.0'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'redis'
 
+  spec.add_development_dependency 'byebug'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,60 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: pears
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Steven Kemp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
-- steven@remarkgroup.Com
+- steven@remarkgroup.com
 executables: []
 extensions: []
 extra_rdoc_files: []