ca-data_store-ar 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5415c75a20de2e01bf9430ca552bda0d47b88b6ae7710cb8eafe297ab3f4502
-  data.tar.gz: 675667a02f7c0e56a44da4ba5b4475c20cf918cbb51dfa9f2b5621c1d1b5bbc2
+  metadata.gz: 96b72413fe17fd59be9e12cbbfc78bc60ba6c045d3a64a3e6b49473241299369
+  data.tar.gz: 34162704c41248c6229e0dcf633dd4a9be1d81f3b85c5e877f891e4c0b77f09e
 SHA512:
-  metadata.gz: 6c570a7ef638ad54d7a861318702f23f60d5d2feaa940f9a95fcc77f3809e037e518605a7c9e8bd03e14adc077e0512d5f2529375c7a8d89171871a8f5d3c3ef
-  data.tar.gz: ca92d6164331ffed80afe3358f2d49e338690094e920a2a9bce0f47795c312db64d1bb9c40b18a154986c03652f0cf5f3126527cb298ea69193f59b4538561dc
+  metadata.gz: 52eba9ca7040ab4914c428533ae624687b9f8b30242b78e4eea07b761c21e2b275e14a519f747fa40ed95c166a9c984393aa523c5c316180ce01afec1a2cc65f
+  data.tar.gz: 9556b9ca0cc92954118ca79dfb1e19145553789370752cd95507b7d9346ab4dc025517c595176384d4a7a14e723a53c24426a4f5515f016e632001a4b5de37e3

data/.release_history.yml

@@ -4,3 +4,9 @@ ca-data_store-ar:
   :timestamp: 1664513882.3107193
 - :version: 0.1.1
   :timestamp: 1664551040.4916718
+- :version: 0.1.2
+  :timestamp: 1668260793.5370069
+- :version: 0.1.3
+  :timestamp: 1668267700.4040802
+- :version: 0.1.4
+  :timestamp: 1668428550.0305433

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ca-data_store-ar (0.1.2)
+    ca-data_store-ar (0.1.4)
       activerecord
       activesupport
       ca-data_store
@@ -38,12 +38,12 @@ GEM
       tzinfo (~> 2.0)
     base58 (0.2.3)
     builder (3.2.4)
-    ca-data_store (0.1.0)
+    ca-data_store (0.1.1)
       teLogger
       toolrack
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    devops_assist (0.3.0)
+    devops_assist (0.3.1)
       git_cli
       git_cli_prompt
       gvcs
@@ -91,30 +91,28 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    sqlite3 (1.4.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    sqlite3 (1.5.3-x86_64-linux)
     standalone_migrations (7.1.0)
       activerecord (>= 4.2.7, < 7.1.0, != 5.2.3.rc1, != 5.2.3)
       railties (>= 4.2.7, < 7.1.0, != 5.2.3.rc1, != 5.2.3)
       rake (>= 10.0)
     teLogger (0.2.0)
     thor (1.2.1)
-    tlogger (0.26.3)
-    toolrack (0.18.6)
+    toolrack (0.19.1)
       base58
-      tlogger
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)

data/lib/ca/data_store/ar/domain_config_registrar.rb

@@ -8,11 +8,16 @@ module Ca
       class DomainConfigRegistrar
         include TR::CondUtils
 
+        include TeLogger::TeLogHelper
+        teLogger_tag :DomConfReg
+
         CONFIG_FILE_NAME = "cads_ar_domain_config.yml"
+        CONFIG_FOLDER = ".cads_ar"
+        ENV_KEY = "CADS_AR_DCR_PATH".freeze
 
         def self.load_registrar
           path = registrar_storage_path
-          logger.debug "Load DCR from : #{path}"
+          teLogger.debug "Load DCR from : #{path}"
           res = {}
           if File.exist?(path)
             File.open(path, "r") do |f|
@@ -26,21 +31,12 @@ module Ca
         def self.registrar_storage_path
           # allow caller to overwrite where to store via the env variable
           # CADS_AR_DCR_PATH
-          val = ENV[env_key] || File.join(Dir.home,".cads_ar")
-          FileUtils.mkdir_p(val) if not File.exist?(val)
-          File.join(val, CONFIG_FILE_NAME)
-        end
-
-        def self.logger
-          if @logger.nil?
-            @logger = TeLogger::Tlogger.new
-            @logger.tag = :DCR
+          if @storePath.nil?
+            val = ENV.fetch(ENV_KEY) { File.join(Dir.home, CONFIG_FOLDER) }
+            FileUtils.mkdir_p(val) if not File.exist?(val)
+            @storePath = File.join(val, CONFIG_FILE_NAME)
           end
-          @logger
-        end
-
-        def self.env_key
-          "CADS_AR_DCR_PATH".freeze
+          @storePath
         end
 
         def initialize(rec = {  })
@@ -51,11 +47,14 @@ module Ca
         end
 
         def register_domain(domain, path_to_config)
-          raise Error, "Domain cannot be empty" if is_empty?(domain)
-          raise Error, "Path-to-config cannot be empty" if is_empty?(path_to_config)
+          if not_empty?(domain) and not_empty?(path_to_config)
+            # path-to-config is expected to be the typical database.yml
+            registrar[domain] = path_to_config
+          end
+        end
 
-          # path-to-config is expected to be the typical database.yml
-          registrar[domain] = path_to_config
+        def deregister_domain(domain)
+          registrar.delete(domain) if not_empty?(domain)
         end
 
         def is_domain_registered?(domain)
@@ -63,17 +62,12 @@ module Ca
         end
 
         def domain_config_path(domain)
-          v = registrar[domain] 
-          if is_empty?(v)
-            "./config/database.yml"
-          else
-            v
-          end
+          registrar.fetch(domain) { "./config/database.yml" }
         end
 
         def save
           path = self.class.registrar_storage_path
-          logger.debug "Store DCR to : #{path}"
+          teLogger.debug "Store DCR to : #{path}"
           File.open(path,"w") do |f|
             f.write YAML.dump(registrar)
           end
@@ -86,10 +80,6 @@ module Ca
           @reg
         end
 
-        def logger
-          self.class.logger
-        end
-
       end # DomainConfigRegistrar
 
     end

data/lib/ca/data_store/ar/model_base.rb

@@ -10,7 +10,13 @@ module Ca
       # which in Ruby is totally up to developer
       #
       class Model < ActiveRecord::Base
-        primary_abstract_class
+        #p defined?(Rails)
+        # remark this will tame rails in production mode
+        # BUT error when accessing model derive from here
+        # Leaving it here is ok in dev mode
+        #if not defined?(Rails)
+          primary_abstract_class
+        #end
       end
 
     end

data/lib/ca/data_store/ar/version.rb

@@ -3,7 +3,7 @@
 module Ca
   module DataStore
     module Ar
-      VERSION = "0.1.2"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/ca/data_store/ar.rb

@@ -48,7 +48,14 @@ module Ca
       end
 
       def Ar.register_domain(domain, path,  &block)
-        domain_config.register_domain(domain, path) 
+        if not is_domain_registered?(domain)
+          domain_config.register_domain(domain, path) 
+          domain_config.save
+        end
+      end
+
+      def Ar.update_registered_domain(domain, path, &block)
+        domain_config.register_domain(domain, path)
         domain_config.save
       end
 
@@ -72,14 +79,22 @@ module Ca
           File.open(dbConfig,"r") do |f|
             @conf = YAML.load(f.read)
           end
-          
-          if block
-            env = block.call(:env)
-          end
-          env = "development" if is_empty?(env)
 
-          teLogger.debug "db env : #{env} / #{@conf[env.to_s]}"
-          ActiveRecord::Base.establish_connection(@conf[env.to_s])
+          if @conf.is_a?(Hash)
+            
+            if block
+              env = block.call(:env)
+            end
+            env = "development" if is_empty?(env)
+
+            # this assumed the content of the config file is like Rails style
+            teLogger.debug "db env : #{env} / #{@conf[env.to_s]}"
+            ActiveRecord::Base.establish_connection(@conf[env.to_s])
+
+          else
+            teLogger.debug "Config: #{@conf}"
+            ActiveRecord::Base.establish_connection(@conf)
+          end
 
         else
           teLogger.warn "Skipped ActiveRecord connection since config file not available at '#{path}'"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ca-data_store-ar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teLogger