itg 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c60773e9c8ca502b677976a3dcc42507f2a380c656aaa428234926cade8089c3
-  data.tar.gz: f7b47a3d333b4213c025184f735d2c4db202c2b12baaf23d582b902180cdad64
+  metadata.gz: fe781750f5aa0333312d6a9fd50522d349b25d4c33459c82e9db8417c60e2ab1
+  data.tar.gz: 112e6866a3e64dfa33ecc755d69c40d44c4f460e8b91a8bbf0a3a19e14daacf7
 SHA512:
-  metadata.gz: 3747664586c161f37074adba3f32a6b4f2309c2eb2b26e06f9209926d06b98f107b351a81e09c465a4b041b3d29331ecad623354187f92b4d94ecd036a0599a4
-  data.tar.gz: 7d63370e7fc1f8169cfe8baa69263aefde490f21ee3737f5506da5520873d15ae3c9624b974142bc0255b7f66e5555678356c0aa6483d011c8f4da47e1fb0455
+  metadata.gz: 569b0ef8c9e406792bbe4491bf841ce1558d26b6cfa206395b4d62368170a2741048f527cde8406666f973cbf2ad9b262fbd4e4cee3d54f53d3a2f0d00c1746e
+  data.tar.gz: 20df9342f243bb409fd467c97ef55a781abc3e1198142739488603c1625a81a485603da738131b684ea8c4bb388a49caa88665e72829b731763f79389cd7b4cb

data/README.md

@@ -1,4 +1,22 @@
-# Itg
+# Itg gem
+
+### Context
+
+The `Context` describes the isolated storage for the users data
+
+Every time a user can see and manage only the data of a single `context` in which he has access
+
+User has a list of contexts (memberships) where has access.
+Each `context membership` has: `context`, `user`, `access` (`ro`, `rw`, `admin`)
+
+
+
+
+
+
+
+
+
 
 TODO: Delete this and the text below, and describe your gem
 

data/lib/itg/controllers/itg_controller_set_current_request_details.rb

@@ -0,0 +1,18 @@
+module Itg
+  module ControllerSetCurrentRequestDetails
+    extend ActiveSupport::Concern
+
+    included do
+      before_action do
+        Current.request_id = request.uuid
+        Current.user_agent = request.user_agent
+        Current.ip_address = request.ip
+        Current.host = request.host
+      end
+    end
+
+    class_methods do
+
+    end
+  end
+end

data/lib/itg/controllers/itg_entities_controller_base.rb

@@ -20,11 +20,11 @@ module Itg
         # @g_model_class = Entity
         @g_model_class = self.class.model_class
         @g_search_field = 'kind'
-        @g_permited_params = {kind: nil, tags: nil, context: nil, attrs: {}}
+        @g_permitted_params = {kind: nil, tags: nil, context: nil, attrs: {}}
       end
 
       def set_model_instance
-        puts '******** entities_controller#set_model_instance......'
+        # puts '******** entities_controller#set_model_instance......'
         ITG_LOGGER.info '*** [Entities.set_model_instance] ...'
         @model_instance = @g_model_class.find(params[:id])
       end

data/lib/itg/controllers/itg_generic_controller_base.rb

@@ -7,21 +7,22 @@ module Itg
     included do
       include Itg::Response
 
-      before_action :g_model_class, :g_parent_model_class, :g_search_field, :g_permited_params
+      before_action :g_model_class, :g_parent_model_class, :g_search_field, :g_permitted_params
       # before_action :set_model_instance, only: [:show, :update, :destroy]
       before_action :require_permission
       before_action :switch_database
       after_action :reset_database
 
       def curr_user_db
-        @current_bearer ? @current_bearer.db : 'mainaaa'
+        # @current_bearer ? @current_bearer.db : 'mainaaa'
+        # 'test'
       end
 
       def index
-        puts "[GenericController.index] current_bearer: #{@current_bearer}, current_api_key: #{@current_api_key}"
-        puts "[GenericController.index] current_bearer.db: #{@current_bearer.db}, current_bearer.kind: #{@current_bearer.kind}"
-        puts "[GenericController.index] curr_user_db: #{curr_user_db}, params[:filter]: #{params[:filter]}"
-        pp "*** Api::V1::Cultivation::Chamber.count: #{Api::V1::Cultivation::Chamber.count}"
+        # puts "[GenericController.index] current_bearer: #{@current_bearer}, current_api_key: #{@current_api_key}"
+        # puts "[GenericController.index] current_bearer.db: #{@current_bearer.db}, current_bearer.kind: #{@current_bearer.kind}"
+        # puts "[GenericController.index] curr_user_db: #{curr_user_db}, params[:filter]: #{params[:filter]}"
+        # pp "*** Api::V1::Cultivation::Chamber.count: #{Api::V1::Cultivation::Chamber.count}"
         ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.index] params: #{params}\n    params[:filter]: #{params[:filter]}\n    db: #{@g_model_class.database_name}\n=========================="
         collection = get_collection
         # data = if (filter = params[:filter])
@@ -33,13 +34,13 @@ module Itg
         #          collection.all
         #        end
         data = if (filter = params[:filter])
-                 puts '----- with filter'
+                 # puts '----- with filter'
                  collection.where(@g_search_field => /.*#{filter}.*/i)
                else
-                 puts '----- all'
+                 # puts '----- all'
                  # pp collection.with(curr_user_db).all.count
-                 pp collection.all.count
-                 pp "*** Api::V1::Cultivation::Chamber.count: #{Api::V1::Cultivation::Chamber.count}"
+                 # pp collection.all.count
+                 # pp "*** Api::V1::Cultivation::Chamber.count: #{Api::V1::Cultivation::Chamber.count}"
                  collection.all
                  # Api::V1::Link.with(database: curr_user_db) { |klass| klass.all.to_a }
                  # collection.with(database: curr_user_db) { |klass| klass.all.to_a }
@@ -48,7 +49,7 @@ module Itg
                  #   klass.all
                  # end
                end
-        puts ">>>> collection '#{collection}' data (#{data.count}): #{data}"
+        # puts ">>>> collection '#{collection}' data (#{data.count}): #{data}"
         if (view_name = params[:view])
           data = data.respond_to?(view_name) ? data.send(view_name) : "View '#{view_name}' does not exist for collection '#{collection}'"
         end
@@ -62,21 +63,21 @@ module Itg
         # data = params[:filter] ? collection.where(@g_search_field => /.*#{params[:filter]}.*/i) : collection.all
         # ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.index] data to return (#{data.count}):\n#{JSON.pretty_generate data}\n============================"
         # render json: params[:filter] ? @g_model_class.where(@g_search_field => /.*#{params[:filter]}.*/i) : @g_model_class.all
-        puts '>>>>>>> [GenericController.index] ....'
-        puts ">>>>>>> [GenericController.index] data (#{data.count if data})"
-        pp data
-        pp data
+        # puts '>>>>>>> [GenericController.index] ....'
+        # puts ">>>>>>> [GenericController.index] data (#{data.count if data})"
+        # pp data
+        # pp data
         render json: data
       end
 
       def show
-        puts '>>>>>>> [GenericController.show] ...'
+        # puts '>>>>>>> [GenericController.show] ...'
         ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.show] params: #{params}\n    params[:id]: #{params[:id]}\n    db: #{@g_model_class.database_name}\n========================="
         collection = get_collection
         data = collection.find(params[:id])
-        ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.show] data to return:\n#{JSON.pretty_generate data}\n============================"
-        puts ">>>>>>> [GenericController.show] collection: #{collection}"
-        pp data
+        ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.show] data to return:\n#{JSON.pretty_generate data.to_s}\n============================"
+        # puts ">>>>>>> [GenericController.show] collection: #{collection}"
+        # pp data
         if data
           render json: data
         else
@@ -85,7 +86,7 @@ module Itg
       end
 
       def create
-        puts '>>>>>>> [GenericController.create] ...'
+        # puts '>>>>>>> [GenericController.create] ...'
         ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.create] params:\n#{JSON.pretty_generate params}\n    db: #{@g_model_class.database_name}\n============================"
         # g_check_variables
         # # ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.create] model_instance_params:\n#{JSON.pretty_generate model_instance_params}\n============================"
@@ -128,7 +129,7 @@ module Itg
       end
 
       def update
-        puts '>>>>>>> [GenericController.update] ...'
+        # puts '>>>>>>> [GenericController.update] ...'
         ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.update] params:\n#{JSON.pretty_generate params}\n    db: #{@g_model_class.database_name}\n============================"
         g_check_variables
         # @model_instance.update(model_instance_params)
@@ -155,7 +156,7 @@ module Itg
 
       def destroy
         g_check_variables
-        puts "*** [GenericController/#{@g_model_class}.destroy] params:\n#{JSON.pretty_generate params}\n    db: #{@g_model_class.database_name}\n============================"
+        # puts "*** [GenericController/#{@g_model_class}.destroy] params:\n#{JSON.pretty_generate params}\n    db: #{@g_model_class.database_name}\n============================"
         ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.destroy] params:\n#{JSON.pretty_generate params}\n    db: #{@g_model_class.database_name}\n============================"
         if @model_instance
           @model_instance.destroy
@@ -168,7 +169,7 @@ module Itg
       private
 
       def switch_database
-        puts ">>> [GenericController.switch_database] curr_user_db: #{curr_user_db}"
+        # puts ">>> [GenericController.switch_database] curr_user_db: #{curr_user_db}"
         # if params.has_key? 'test'
         #   # db_name = "md-test"
         #   db_name = 'itg_api_test'
@@ -187,7 +188,7 @@ module Itg
         ITG_LOGGER.info '*** [GenericController.g_check_variables] ...'
         raise '[GenericController] @g_model_class is nil!' unless @g_model_class
         raise "[GenericController/#{@g_model_class}] @g_search_field is nil!" unless @g_search_field
-        raise "[GenericController/#{@g_model_class}] @g_permited_params is nil!" unless @g_permited_params
+        raise "[GenericController/#{@g_model_class}] @g_permitted_params is nil!" unless @g_permitted_params
       end
 
       def g_model_class
@@ -205,9 +206,9 @@ module Itg
         @g_search_field ||= nil
       end
 
-      def g_permited_params
-        ITG_LOGGER.info '*** [GenericController.g_permited_params] ...'
-        @g_permited_params ||= nil
+      def g_permitted_params
+        ITG_LOGGER.info '*** [GenericController.g_permitted_params] ...'
+        @g_permitted_params ||= nil
       end
 
       def g_only_show
@@ -223,24 +224,24 @@ module Itg
       # end
 
       def model_instance_params(create = false)
-        puts '>>>>>>> [GenericController.model_instance_params] ...'
+        # puts '>>>>>>> [GenericController.model_instance_params] ...'
         ITG_LOGGER.info '*** [GenericController.model_instance_params] ...'
         ITG_LOGGER.info ">>>>> params: #{params}"
         ITG_LOGGER.info ">>>>> @g_model_class: #{@g_model_class}"
         # params_model_sym = @g_model_class.name.parameterize.underscore.to_sym
         params_model_sym = @g_model_class.name.underscore.gsub('/', '_').to_sym
         ITG_LOGGER.info ">>>>> params_model_sym: #{params_model_sym}"
-        ITG_LOGGER.info ">>>>> @g_permited_params: #{@g_permited_params}"
-        # ITG_LOGGER.info "*** [GenericController.model_instance_params] g_permited_params:\n#{@g_permited_params}"
-        # ret = params.require(@g_model_class.name.underscore.to_sym).permit(*@g_permited_params)
+        ITG_LOGGER.info ">>>>> @g_permitted_params: #{@g_permitted_params}"
+        # ITG_LOGGER.info "*** [GenericController.model_instance_params] g_permitted_params:\n#{@g_permitted_params}"
+        # ret = params.require(@g_model_class.name.underscore.to_sym).permit(*@g_permitted_params)
 
-        case @g_permited_params
+        case @g_permitted_params
         when Array
-          ret = params.require(params_model_sym).permit(*@g_permited_params)
+          ret = params.require(params_model_sym).permit(*@g_permitted_params)
         when Hash
-          ret = params.require(params_model_sym).permit(*@g_permited_params, **@g_permited_params)
+          ret = params.require(params_model_sym).permit(*@g_permitted_params, **@g_permitted_params)
         else
-          raise "[GenericController.model_instance_params] unhandled @g_permited_params: #{@g_permited_params.inspect}"
+          raise "[GenericController.model_instance_params] unhandled @g_permitted_params: #{@g_permitted_params.inspect}"
         end
 
         ITG_LOGGER.info "*** [GenericController.model_instance_params] return:\n#{ret}"
@@ -261,12 +262,12 @@ module Itg
       end
 
       def get_collection
-        puts "*** [GenericController/#{@g_model_class}.get_collection] params: #{params}"
+        # puts "*** [GenericController/#{@g_model_class}.get_collection] params: #{params}"
         ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.get_collection] params: #{params}"
         g_check_variables
         if @g_parent_model_class
           ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.index] With parent: #{@g_parent_model_class}"
-          puts "*** [GenericController/#{@g_model_class}.index] With parent: #{@g_parent_model_class}"
+          # puts "*** [GenericController/#{@g_model_class}.index] With parent: #{@g_parent_model_class}"
           collection_name = @g_model_class.to_s.parameterize.pluralize
           parent_field_id = @g_parent_model_class.to_s.parameterize + '_id'
           parent_id = params[parent_field_id.to_sym]
@@ -282,7 +283,7 @@ module Itg
           end
         else
           ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.index] NO parent...."
-          puts "*** [GenericController/#{@g_model_class}.index] NO parent...."
+          # puts "*** [GenericController/#{@g_model_class}.index] NO parent...."
           collection = @g_model_class
           # data = params[:filter] ? @g_model_class.where(@g_search_field => /.*#{params[:filter]}.*/i) : @g_model_class.all
         end
@@ -291,12 +292,12 @@ module Itg
 
       def require_permission
         if @g_model_class.attribute_names.include?('owner_id')
-          puts "******** generic_controller#require_permission @model_instance.owner: #{@model_instance&.owner}, @model_instance: #{@model_instance}"
+          # puts "******** generic_controller#require_permission @model_instance.owner: #{@model_instance&.owner}, @model_instance: #{@model_instance}"
           if @model_instance && @model_instance.owner_id != @current_bearer.id
             json_response('Not allowed!', :forbidden)
           end
         else
-          puts "******** generic_controller#require_permission @current_bearer: #{@current_bearer.inspect}, @model_instance: #{@model_instance.inspect}"
+          # puts "******** generic_controller#require_permission @current_bearer: #{@current_bearer.inspect}, @model_instance: #{@model_instance.inspect}"
           unless @current_bearer.kind == 'one'
             json_response('Not allowed!', :forbidden)
           end

data/lib/itg/itg_api_key_authenticatable.rb

@@ -15,11 +15,13 @@ module Itg
     # code when API key authentication fails
     def authenticate_with_api_key!
       @current_bearer = authenticate_or_request_with_http_token(&method(:authenticator))
+      Current.user = @current_bearer
     end
 
     # Use this for optional API key authentication
     def authenticate_with_api_key
       @current_bearer = authenticate_with_http_token(&method(:authenticator))
+      Current.user = @current_bearer
     end
 
     private

data/lib/itg/itg_current_base.rb

@@ -0,0 +1,27 @@
+module Itg
+  module CurrentBase
+    extend ActiveSupport::Concern
+
+    included do
+      attribute :user
+      attribute :context
+      attribute :config
+      attribute :request_id, :user_agent, :ip_address, :host
+
+      def to_s
+        ret_hash = {}
+        ret_hash[:user] = user.username if user
+        ret_hash[:request_id] = request_id if request_id
+        ret_hash[:user_agent] = user_agent if user_agent
+        ret_hash[:host] = host if host
+        ret_hash[:ip_address] = ip_address if ip_address
+        if ret_hash.empty?
+          "Current singleton is empty"
+        else
+          # ret_hash.to_a.join(', ')
+          "Current is #{ret_hash.inspect}"
+        end
+      end
+    end
+  end
+end

data/lib/itg/itg_printable.rb

@@ -8,7 +8,8 @@ module Itg
     included do
       def itg_print(header: nil, prefix: '', allow_nested: true)
         puts header if header
-        puts "#{prefix}print item....."
+        # puts "#{prefix}print item....."
+        puts "#{prefix}#{self.to_s}"
       end
     end
 

data/lib/itg/itg_sec.rb

@@ -19,12 +19,12 @@ module Itg
 
     included do
       begin
-        puts ">>>>>> itg_sec - include it....."
+        # puts ">>>>>> itg_sec - include it....."
         unless Rails.env.test?
           store_in database: DB_NAME, client: CLIENT_NAME
-          puts "[itg_sec] set db details: #{DB_NAME}, #{CLIENT_NAME}"
+          # puts "[itg_sec] set db details: #{DB_NAME}, #{CLIENT_NAME}"
         end
-        self.itg_print_db_info
+        # self.itg_print_db_info
       rescue NameError => e
         # Ignored - Used only because the gem does not have the Rails initialized!
         raise if e.message != "uninitialized constant Itg::Sec::Rails"

data/lib/itg/models/itg_context_model_base.rb

@@ -11,10 +11,20 @@ module Itg
       field :code, type: String
       field :name, type: String
       field :descr, type: String
-      field :db, type: String
+      field :db_name, type: String
+      field :db_client, type: String, default: "default"
 
       validates_presence_of(:code, :name)
       validates_uniqueness_of :code
+
+      def to_s
+        [code, name, descr]
+      end
+
+      # def itg_print(header: nil, prefix: '', allow_nested: true)
+      #   puts header if header
+      #   puts "#{prefix}#{[attrs['name'] || attrs['descr'] || attrs['code']]}"
+      # end
     end
   end
 end

data/lib/itg/models/itg_entity_model_base.rb

@@ -19,8 +19,10 @@ module Itg
 
       validates_presence_of :kind
       validates_presence_of :attrs
+      validates_presence_of :context
 
-      belongs_to :owner, class_name: 'User'
+      # belongs_to :owner, class_name: 'User'
+      belongs_to :owner, class_name: User
 
       def to_s
         attrs['name'] || attrs['descr'] || attrs['code']

data/lib/itg/models/itg_user_model_base.rb

@@ -44,9 +44,9 @@ module Itg
 
       field :email, type: String
       # field :password_digest, type: String
-      field :db, type: String
+      # field :db, type: String
       field :kind, type: String, default: 'user'
-      field :contexts, type: Object, default: {}
+      # field :contexts, type: Object, default: {}
 
       index({ email: 1 }, { unique: true, name: 'email_index' })
 
@@ -67,19 +67,20 @@ module Itg
         super
       end
 
-      def add_context(context, role: :user)
-        if context.persisted?
-          unless contexts.keys.include?(context.code.to_sym)
-            contexts[context.code.to_sym] = {role: role.to_sym}
-            contexts[context.code.to_sym][:name] = context[:name] if context[:name]
-            contexts[context.code.to_sym][:descr] = context[:descr] if context[:descr]
-            contexts[context.code.to_sym][:db] = context[:db] if context[:db]
-          end
-        end
-      end
+      # def add_context(context, role: :user)
+      #   if context.persisted?
+      #     unless contexts.keys.include?(context.code.to_sym)
+      #       contexts[context.code.to_sym] = {role: role.to_sym}
+      #       contexts[context.code.to_sym][:name] = context[:name] if context[:name]
+      #       contexts[context.code.to_sym][:descr] = context[:descr] if context[:descr]
+      #       contexts[context.code.to_sym][:db] = context[:db] if context[:db]
+      #     end
+      #   end
+      # end
 
       def to_s
-        attributes.symbolize_keys.slice(:_id, :email, :db, :role).to_s
+        # attributes.symbolize_keys.slice(:_id, :email, :db, :role).to_s
+        attributes.symbolize_keys.slice(:_id, :email, :role).to_s
       end
 
       def itg_print(header: nil, prefix: '', allow_nested: true)

data/lib/itg/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Itg
-  VERSION = "0.1.9"
-  DATE = "18/2/2024"
+  VERSION = "0.1.10"
+  DATE = "21/3/2024"
 
   def self.version_info
     "Itg gem v.#{VERSION} #{DATE}"

data/lib/itg.rb

@@ -10,9 +10,11 @@ require_relative "itg/itg_mongo_base"
 require_relative "itg/itg_printable"
 require_relative "itg/itg_api_key_authenticatable"
 require_relative "itg/itg_response"
+require_relative "itg/itg_current_base"
 require_relative "itg/controllers/itg_generic_controller_base"
 require_relative "itg/controllers/itg_api_keys_controller_base"
 require_relative "itg/controllers/itg_entities_controller_base"
+require_relative "itg/controllers/itg_controller_set_current_request_details"
 require_relative "itg/itg_sec"
 
 module Itg

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itg
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - aAon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-18 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -30,9 +30,11 @@ files:
 - itg.gemspec
 - lib/itg.rb
 - lib/itg/controllers/itg_api_keys_controller_base.rb
+- lib/itg/controllers/itg_controller_set_current_request_details.rb
 - lib/itg/controllers/itg_entities_controller_base.rb
 - lib/itg/controllers/itg_generic_controller_base.rb
 - lib/itg/itg_api_key_authenticatable.rb
+- lib/itg/itg_current_base.rb
 - lib/itg/itg_mongo_base.rb
 - lib/itg/itg_printable.rb
 - lib/itg/itg_response.rb