ca-data_store-ar 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9000bdba1acc0fce352fa58e7d3cf077f9339b26e6fdce73aeaef9dbdadb8d94
-  data.tar.gz: 4d7cf74286cf189ff73a3d4b0086243099b3e91ace48cd0e16023a1f0fd9d03e
+  metadata.gz: 96b72413fe17fd59be9e12cbbfc78bc60ba6c045d3a64a3e6b49473241299369
+  data.tar.gz: 34162704c41248c6229e0dcf633dd4a9be1d81f3b85c5e877f891e4c0b77f09e
 SHA512:
-  metadata.gz: 0dc057b7b6fa0b4dd873a27d082d515dba440189e60c7777a1c1191f114472f6b04c3d3417ecf73f45bef2904677e76bae6ca9a9072179f99942ffa8b4bd93b3
-  data.tar.gz: 4c6df09287f859ee8cef2977f8b0c6051dc497441ca1a0740211bcd6c1bea869625ae570dc9f5754de0b25fbdbf5297476aab552127059a68335003abe5bfe07
+  metadata.gz: 52eba9ca7040ab4914c428533ae624687b9f8b30242b78e4eea07b761c21e2b275e14a519f747fa40ed95c166a9c984393aa523c5c316180ce01afec1a2cc65f
+  data.tar.gz: 9556b9ca0cc92954118ca79dfb1e19145553789370752cd95507b7d9346ab4dc025517c595176384d4a7a14e723a53c24426a4f5515f016e632001a4b5de37e3

data/.release_history.yml

@@ -2,3 +2,11 @@
 ca-data_store-ar:
 - :version: 0.1.0
   :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,13 +1,14 @@
 PATH
   remote: .
   specs:
-    ca-data_store-ar (0.1.1)
+    ca-data_store-ar (0.1.4)
       activerecord
       activesupport
       ca-data_store
       standalone_migrations
       teLogger
       toolrack
+      tty-prompt
 
 GEM
   remote: https://rubygems.org/
@@ -37,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
@@ -68,7 +69,7 @@ GEM
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     minitest (5.16.3)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     pastel (0.8.0)
       tty-color (~> 0.5)
@@ -90,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)
@@ -127,7 +126,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     wisper (2.0.1)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-linux

data/ca-data_store-ar.gemspec

@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ca-data_store'
 
+  spec.add_dependency 'tty-prompt'
+
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "devops_assist"
 

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

@@ -0,0 +1,87 @@
+
+
+
+module Ca
+  module DataStore
+    module Ar
+
+      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
+          teLogger.debug "Load DCR from : #{path}"
+          res = {}
+          if File.exist?(path)
+            File.open(path, "r") do |f|
+              res = YAML.load(f.read)
+            end
+          end
+          
+          DomainConfigRegistrar.new(res)
+        end
+
+        def self.registrar_storage_path
+          # allow caller to overwrite where to store via the env variable
+          # CADS_AR_DCR_PATH
+          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
+          @storePath
+        end
+
+        def initialize(rec = {  })
+          @reg = rec 
+          if is_empty?(@reg)
+            @reg[:default] = "./config/database.yml"
+          end
+        end
+
+        def register_domain(domain, 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
+
+        def deregister_domain(domain)
+          registrar.delete(domain) if not_empty?(domain)
+        end
+
+        def is_domain_registered?(domain)
+          registrar.keys.include?(domain)
+        end
+
+        def domain_config_path(domain)
+          registrar.fetch(domain) { "./config/database.yml" }
+        end
+
+        def save
+          path = self.class.registrar_storage_path
+          teLogger.debug "Store DCR to : #{path}"
+          File.open(path,"w") do |f|
+            f.write YAML.dump(registrar)
+          end
+        end
+
+        def registrar
+          if @reg.nil?
+            @reg = {}
+          end
+          @reg
+        end
+
+      end # DomainConfigRegistrar
+
+    end
+  end
+end

data/lib/ca/data_store/ar/migration/migration_helper.rb

@@ -9,11 +9,6 @@ module Ca
         include TeLogger::TeLogHelper
         teLogger_tag :ar_mig
 
-        def default_migration_path
-          ActiveRecord::Migrator.migrations_paths.first.freeze
-          #'./db/migrate'.freeze
-        end
-
         def create_db(conf)
           ActiveRecord::Base.establish_connection(conf)
 
@@ -21,19 +16,35 @@ module Ca
         end
 
         def migrate(conf)
+          teLogger.debug "Migrating : #{conf}"
           ActiveRecord::Base.establish_connection(conf)
 
-          migPath = conf[:migration_spec_path] || File.expand_path(default_migration_path)
-          raise MigrateError, "Given migration spec path '#{migPath}' does not exist." if not File.exist?(migPath)
-
-          teLogger.debug "Migration spec path : #{migPath}"
           # for AR <= 4
           #ActiveRecord::Migrator.migrate(migPath)
           # for AR >= 5
-          ActiveRecord::Base.connection.migration_context.migrate
+          ctx = ActiveRecord::Base.connection.migration_context
+          # only keep the one in the config file
+          if not_empty?(conf["migration_path"])
+            ctx.migrations_paths.clear
+            ctx.migrations_paths << conf["migration_path"]
+          end
+
+          teLogger.debug "Migrations Paths : #{ctx.migrations_paths.inspect}"
+          ctx.migrate
+          #ActiveRecord::Base.connection.migration_context.migrate
           dump_schema(conf)
         end
 
+        # rails has done too many customization on top of
+        # ActiverRecord such as supporting engine.
+        # Short cuting that is not a wise choice
+        def migrate_for_rails(conf)
+          # detacting if Rails is present
+          if defined?(Rails::Application)
+
+          end
+        end
+
         def dump_schema(conf)
           ActiveRecord::Base.establish_connection(conf)
           require 'active_record/schema_dumper'
@@ -52,11 +63,11 @@ module Ca
          
           raise MigrateError, "Migration name is required" if is_empty?(name)
 
-          #name = "create_#{name.pluralize}"
-
-          migPath = conf[:migration_spec_path] || File.expand_path(default_migration_path)
+          migPath = conf["migration_path"] || File.expand_path("./db/migrate")
           FileUtils.mkdir_p(migPath) if not File.exist?(migPath)
 
+          teLogger.debug "migPath : #{migPath}"
+
           timestamp = Time.now.strftime("%Y%m%d%H%M%S%6N")
           # rails only take 14 characters as timestamp
           timestamp = timestamp[0...14]

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.1"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/ca/data_store/ar.rb

@@ -20,6 +20,8 @@ require_relative 'ar/migration/migration_helper'
 
 require_relative 'ar/model_base'
 
+require_relative 'ar/domain_config_registrar'
+
 module Ca
   module DataStore
     module Ar
@@ -45,46 +47,76 @@ module Ca
         end
       end
 
-      def Ar.connect_database(confPath = "./config/database.yml")
-        # check if we are in Rails context
-        teLogger.debug "Root : #{root}"
-        if not_empty?(root)
-          railsConf = File.join(root, "config","database.yml")
-          if File.exist?(railsConf)
-            path = File.expand_path(railsConf) 
-          else
-            path = File.expand_path(confPath) 
-          end
-
-        else
-          path = File.expand_path(confPath) 
+      def Ar.register_domain(domain, path,  &block)
+        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
+
+      def Ar.is_domain_registered?(domain)
+        domain_config.is_domain_registered?(domain)
+      end
+
+      def Ar.domain_config_path(domain)
+        domain_config.domain_config_path(domain)
+      end
+
+      def Ar.connectdb(domain = :default, &block)
+        raise Ar::Error, "Domain must be given" if is_empty?(domain)
+
+        dbConfig = domain_config.domain_config_path(domain)
+        dbConfig = File.expand_path(dbConfig) if not_empty?(dbConfig)
 
-        if File.exist?(path)
-          File.open(path,"r") do |f|
+        teLogger.debug "dbConfig at : '#{dbConfig}'"
+
+        if File.exist?(dbConfig)
+          File.open(dbConfig,"r") do |f|
             @conf = YAML.load(f.read)
           end
-          ActiveRecord::Base.establish_connection(@conf["development"])
+
+          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"
+          teLogger.warn "Skipped ActiveRecord connection since config file not available at '#{path}'"
         end
-      end
 
-      def Ar.show_log(out = nil)
-        ActiveRecord::Base.logger = TeLogger::Tlogger.new(out)
       end
 
-      def Ar.migration_path
-        File.join(File.dirname(__FILE__),"..","..","..","db","migrate")
+      def Ar.disconnectdb
+        ActiveRecord::Base.remove_connection
+        #ActiveRecord::Base.connection_pool.active_connection?.try(:disconnect) 
       end
 
-      def Ar.root=(root)
-        @arRoot = root
+      def Ar.show_log(out = nil)
+        ActiveRecord::Base.logger = TeLogger::Tlogger.new(out)
       end
 
-      def Ar.root
-        @arRoot = "." if is_empty?(@arRoot)
-        @arRoot
+      private
+      def Ar.domain_config
+        if @domainConfig.nil?
+          @domainConfig = DomainConfigRegistrar.load_registrar
+        end
+        @domainConfig
       end
 
     end

data/tasks/cads_db_ar.rake

@@ -4,6 +4,8 @@ require_relative '../lib/ca/data_store/ar'
 
 require 'yaml'
 
+require 'tty/prompt'
+
 class MigHelper
   extend Ca::DataStore::Ar::MigrationHelper
 end
@@ -26,22 +28,48 @@ namespace :cads_db_ar do
   desc "Migrate the database"
   task :migrate do
 
-    confPath = './db/config.yml' 
+    target = ""
+    reg = Ca::DataStore::Ar::DomainConfigRegistrar.load_registrar
+    #if reg.length > 1
+      begin
+        
+        tty = TTY::Prompt.new
+        target = tty.select("Target domain : ") do |m|
+          reg.registrar.each do |k,v|
+            m.choice k, v
+          end
+        end
+
+      rescue TTY::Reader::InputInterrupt
+        STDOUT.puts "\nHave a nice day!\n"
+        exit(0)
+      end
+
+    #elsif reg.size == 0
+    #  # default follow rails
+    #  target = "./config/database.yml"
+    #else
+    #  target = reg.values.first
+    #end
+
+    STDOUT.puts "Loading target from : #{target}"
   
-    if not File.exist?(confPath)
+    if not File.exist?(target)
       STDOUT.print "Please provide config file path : " 
-      path = STDIN.gets
-      confPath = File.expand_path(path)
-      raise("Given config file '#{confPath}' does not exist") if not File.exist?(confPath)
+      path = STDIN.gets.strip
+      target = File.expand_path(path)
+      raise("Given config file '#{target}' does not exist") if not File.exist?(target)
     end
 
-    env = ENV['AR-ENV'] || 'development'
-
-    File.open(confPath,"r") do |f|
+    File.open(target,"r") do |f|
       @conf = YAML.load(f.read)
     end
 
-    p @conf
+    env = tty.select("Environment : ") do |m|
+      @conf.keys.each do |k|
+        m.choice k, k
+      end
+    end
 
     MigHelper.migrate(@conf[env])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ca-data_store-ar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teLogger
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -142,11 +156,11 @@ files:
 - exe/ar-migrate
 - lib/ca/data_store/ar.rb
 - lib/ca/data_store/ar/console_helper.rb
+- lib/ca/data_store/ar/domain_config_registrar.rb
 - lib/ca/data_store/ar/migration/migration_helper.rb
 - lib/ca/data_store/ar/model_base.rb
 - lib/ca/data_store/ar/provider.rb
 - lib/ca/data_store/ar/version.rb
-- spec_test.db
 - tasks/cads_db_ar.rake
 homepage: ''
 licenses: []