itg 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe781750f5aa0333312d6a9fd50522d349b25d4c33459c82e9db8417c60e2ab1
-  data.tar.gz: 112e6866a3e64dfa33ecc755d69c40d44c4f460e8b91a8bbf0a3a19e14daacf7
+  metadata.gz: 607160ca0fae7c6056512f97f5a4dce7beae782fcbbbe6d38783683de313e126
+  data.tar.gz: 1694396346780d64ac6fe97596117724d6afbe594864056598ba318ca7119dc3
 SHA512:
-  metadata.gz: 569b0ef8c9e406792bbe4491bf841ce1558d26b6cfa206395b4d62368170a2741048f527cde8406666f973cbf2ad9b262fbd4e4cee3d54f53d3a2f0d00c1746e
-  data.tar.gz: 20df9342f243bb409fd467c97ef55a781abc3e1198142739488603c1625a81a485603da738131b684ea8c4bb388a49caa88665e72829b731763f79389cd7b4cb
+  metadata.gz: 3e3874652a6edfec7c463eeca191a7dbe85997e4902650183877e0585e215bf0cca6470d496fa46084452fae0c1807e6ee0bdda7d4529353bd331c09afb5f853
+  data.tar.gz: 705b2f75c7659d02cbfb28c97e87d1e3f8ca1bb05b855c74e1fba71b8cf442f4cdcb49b2085c73520c2d4ad1590f1f9165fc529a4f412100ec4bdbb26fcd2f3c

data/lib/itg/controllers/itg_controller_set_current_request_details.rb

@@ -8,6 +8,9 @@ module Itg
         Current.user_agent = request.user_agent
         Current.ip_address = request.ip
         Current.host = request.host
+        Current.context = @context
+        puts ">>>> ControllerSetCurrentRequestDetails.before_action - params: #{params}"
+        puts ">>>> ControllerSetCurrentRequestDetails.before_action - Current: #{Current}"
       end
     end
 

data/lib/itg/controllers/itg_entities_controller_base.rb

@@ -20,7 +20,8 @@ module Itg
         # @g_model_class = Entity
         @g_model_class = self.class.model_class
         @g_search_field = 'kind'
-        @g_permitted_params = {kind: nil, tags: nil, context: nil, attrs: {}}
+        # @g_permitted_params = {kind: nil, tags: nil, context: nil, attrs: {}}
+        @g_permitted_params = {kind: nil, tags: nil, attrs: {}}
       end
 
       def set_model_instance

data/lib/itg/controllers/itg_generic_controller_base.rb

@@ -95,8 +95,10 @@ module Itg
 
         # @model_instance = collection.create!(model_instance_params(true))
         # @model_instance = collection.create(model_instance_params(true))
+        puts ">>>>>> Entity.create - Current: #{Current.user.email}, #{Current.context}\n#{Current}"
         @model_instance = collection.new(model_instance_params(true))
         @model_instance.owner = @current_bearer if @model_instance.respond_to?(:owner)
+        @model_instance.context = Current.context if @model_instance.respond_to?(:context)
         # puts ">>>> @model_instance: #{@model_instance}"
         # json_response(@model_instance, :created)
         # puts ">>>>>>> create...."
@@ -185,34 +187,34 @@ module Itg
       end
 
       def g_check_variables
-        ITG_LOGGER.info '*** [GenericController.g_check_variables] ...'
-        raise '[GenericController] @g_model_class is nil!' unless @g_model_class
+        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_permitted_params is nil!" unless @g_permitted_params
       end
 
       def g_model_class
-        ITG_LOGGER.info '*** [GenericController.g_model_class] ...'
+        ITG_LOGGER.info "*** [GenericController.g_model_class] ..."
         @g_model_class ||= nil
       end
 
       def g_parent_model_class
-        ITG_LOGGER.info '*** [GenericController.g_parent_model_class] ...'
+        ITG_LOGGER.info "*** [GenericController.g_parent_model_class] ..."
         @g_parent_model_class ||= nil
       end
 
       def g_search_field
-        ITG_LOGGER.info '*** [GenericController.g_search_field] ...'
+        ITG_LOGGER.info "*** [GenericController.g_search_field] ..."
         @g_search_field ||= nil
       end
 
       def g_permitted_params
-        ITG_LOGGER.info '*** [GenericController.g_permitted_params] ...'
+        ITG_LOGGER.info "*** [GenericController.g_permitted_params] ..."
         @g_permitted_params ||= nil
       end
 
       def g_only_show
-        ITG_LOGGER.info '*** [GenericController.g_only_show] ...'
+        ITG_LOGGER.info "*** [GenericController.g_only_show] ..."
         @g_only_show ||= false
       end
 
@@ -225,11 +227,11 @@ module Itg
 
       def model_instance_params(create = false)
         # puts '>>>>>>> [GenericController.model_instance_params] ...'
-        ITG_LOGGER.info '*** [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
+        params_model_sym = @g_model_class.name.underscore.gsub("/", "_").to_sym
         ITG_LOGGER.info ">>>>> params_model_sym: #{params_model_sym}"
         ITG_LOGGER.info ">>>>> @g_permitted_params: #{@g_permitted_params}"
         # ITG_LOGGER.info "*** [GenericController.model_instance_params] g_permitted_params:\n#{@g_permitted_params}"
@@ -254,9 +256,16 @@ module Itg
             # ITG_LOGGER.info "*** [GenericController.model_instance_params] field: #{field.inspect}"
             # ITG_LOGGER.info "*** [GenericController.model_instance_params] field.options: #{field.options.inspect}"
             # ITG_LOGGER.info "*** [GenericController.model_instance_params] field.options[:type]: #{field.options[:type].inspect}, field.default_val: #{field.default_val.inspect}"
-            ret.delete(k) if v == '' and !field.default_val.nil?
+            ret.delete(k) if v == "" and !field.default_val.nil?
           end
           ITG_LOGGER.info "*** [GenericController.model_instance_params] (create) changed return:\n#{ret}"
+
+          # puts ">>>> ret: #{ret}"
+          # if ret.include?('context')
+          # if c = ret['context']
+          #   ret.delete('context')
+          #   ITG_LOGGER.info "*** [GenericController.model_instance_params] (create) changed return (context):\n#{ret}"
+          # end
         end
         ret
       end
@@ -269,7 +278,7 @@ module Itg
           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}"
           collection_name = @g_model_class.to_s.parameterize.pluralize
-          parent_field_id = @g_parent_model_class.to_s.parameterize + '_id'
+          parent_field_id = @g_parent_model_class.to_s.parameterize + "_id"
           parent_id = params[parent_field_id.to_sym]
           raise "[GenericController/#{@g_model_class}.index] Parent id is empty!" if parent_id.nil? || parent_id.empty?
           ITG_LOGGER.info "*** [GenericController/#{@g_model_class}.index] collection_name: #{collection_name}, parent_field_id: #{parent_field_id}, parent_id: #{parent_id}"
@@ -291,15 +300,15 @@ module Itg
       end
 
       def require_permission
-        if @g_model_class.attribute_names.include?('owner_id')
+        if @g_model_class.attribute_names.include?("owner_id")
           # 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)
+            json_response("Not allowed!", :forbidden)
           end
         else
           # 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)
+          unless @current_bearer.kind == "one"
+            json_response("Not allowed!", :forbidden)
           end
         end
       end

data/lib/itg/itg_api_key_authenticatable.rb

@@ -16,6 +16,8 @@ module Itg
     def authenticate_with_api_key!
       @current_bearer = authenticate_or_request_with_http_token(&method(:authenticator))
       Current.user = @current_bearer
+      puts ">>>> authenticate_with_api_key! - params: #{params}"
+      # Current.context =
     end
 
     # Use this for optional API key authentication

data/lib/itg/itg_current_base.rb

@@ -8,9 +8,13 @@ module Itg
       attribute :config
       attribute :request_id, :user_agent, :ip_address, :host
 
+    end
+
+    class_methods do
       def to_s
         ret_hash = {}
-        ret_hash[:user] = user.username if user
+        ret_hash[:user] = user.email if user
+        ret_hash[:context] = context if context
         ret_hash[:request_id] = request_id if request_id
         ret_hash[:user_agent] = user_agent if user_agent
         ret_hash[:host] = host if host

data/lib/itg/models/itg_entity_model_base.rb

@@ -22,7 +22,7 @@ module Itg
       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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itg
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - aAon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email: