activematrix 0.0.2 → 0.0.4

data/lib/active_matrix/room.rb

@@ -5,7 +5,7 @@ module ActiveMatrix
   class Room
     extend ActiveMatrix::Extensions
     include ActiveMatrix::Logging
-    include ActiveMatrix::Util::Cacheable
+    include ActiveMatrix::Cacheable
 
     # @!attribute [rw] event_history_limit
     #   @return [Fixnum] the limit of events to keep in the event log
@@ -179,8 +179,6 @@ module ActiveMatrix
       # Return cached instance if available
       return @cached_joined_members if @cached_joined_members
 
-      return fetch_joined_members unless cache_available?
-
       # Cache the raw data that can be used to reconstruct User objects
       members_data = cache.fetch(cache_key(:joined_members), expires_in: 1.hour) do
         # Convert API response to cacheable format
@@ -226,7 +224,7 @@ module ActiveMatrix
       # Return cached instance if available and no params
       return @cached_all_members if @cached_all_members && params.empty?
 
-      return fetch_all_members(**params) if !params.empty? || client.cache == :none || !cache_available?
+      return fetch_all_members(**params) if !params.empty? || client.cache == :none
 
       # Cache the raw member state keys, not User objects
       members_data = cache.fetch(cache_key(:all_members), expires_in: 1.hour) do
@@ -269,7 +267,7 @@ module ActiveMatrix
       rooms = client.direct_rooms
       dirty = false
       list_for_room = (rooms[id.to_s] ||= [])
-      if direct && !list_for_room.include?(id.to_s)
+      if direct && list_for_room.exclude?(id.to_s)
         list_for_room << id.to_s
         dirty = true
       elsif !direct && list_for_room.include?(id.to_s)
@@ -330,9 +328,9 @@ module ActiveMatrix
     end
 
     def room_state
-      return ActiveMatrix::Util::StateEventCache.new self if client.cache == :none
+      return ActiveMatrix::StateEventCache.new self if client.cache == :none
 
-      @room_state ||= ActiveMatrix::Util::StateEventCache.new self
+      @room_state ||= ActiveMatrix::StateEventCache.new self
     end
 
     # Gets a state object in the room
@@ -365,7 +363,7 @@ module ActiveMatrix
     # @param canonical_only [Boolean] Should the list of aliases only contain the canonical ones
     # @return [Array[String]] The assigned room aliases
     def aliases(canonical_only: true)
-      return fetch_aliases(canonical_only: canonical_only) if !canonical_only || client.cache == :none || !cache_available?
+      return fetch_aliases(canonical_only: canonical_only) if !canonical_only || client.cache == :none
 
       cache.fetch(cache_key(:aliases), expires_in: 1.hour) do
         fetch_aliases(canonical_only: true)
@@ -506,10 +504,8 @@ module ActiveMatrix
     # @param content [Hash] The custom content of the message
     # @param msgtype [String] The type of the message, should be one of the known types (m.text, m.notice, m.emote, etc)
     def send_custom_message(body, content = {}, msgtype: nil)
-      content.merge!(
-        body: body,
-        msgtype: msgtype || 'm.text'
-      )
+      content[:body] = body
+      content[:msgtype] = msgtype || 'm.text'
 
       client.api.send_message_event(id, 'm.room.message', content)
     end
@@ -622,9 +618,9 @@ module ActiveMatrix
     end
 
     def account_data
-      return ActiveMatrix::Util::AccountDataCache.new client, room: self if client.cache == :none
+      return ActiveMatrix::AccountDataCache.new client, room: self if client.cache == :none
 
-      @account_data ||= ActiveMatrix::Util::AccountDataCache.new client, room: self
+      @account_data ||= ActiveMatrix::AccountDataCache.new client, room: self
     end
 
     # Retrieves a custom entry from the room-specific account data
@@ -790,7 +786,7 @@ module ActiveMatrix
     def add_alias(room_alias)
       client.api.set_room_alias(id, room_alias)
       # Clear the cache to force refresh
-      cache.delete(cache_key(:aliases)) if cache_available?
+      cache.delete(cache_key(:aliases))
       true
     end
 
@@ -801,7 +797,7 @@ module ActiveMatrix
     #       alias list updates.
     def reload_aliases!
       room_state.expire('m.room.canonical_alias')
-      cache.delete(cache_key(:aliases)) if cache_available?
+      cache.delete(cache_key(:aliases))
     end
     alias refresh_aliases! reload_aliases!
 
@@ -981,7 +977,7 @@ module ActiveMatrix
     # @param params [Hash] other power-level params to change
     # @return [Boolean] if the change was successful
     def modify_required_power_levels(events = nil, params = {})
-      return false if events.nil? && (params.nil? || params.empty?)
+      return false if events.nil? && params.blank?
 
       room_state.expire 'm.room.power_levels'
 
@@ -1005,10 +1001,6 @@ module ActiveMatrix
       "activematrix:room:#{id}:#{method_name}"
     end
 
-    def cache_available?
-      defined?(::Rails) && ::Rails.respond_to?(:cache) && ::Rails.cache
-    end
-
     def cache
       ::Rails.cache
     end
@@ -1021,7 +1013,7 @@ module ActiveMatrix
       @pre_populated_members << member unless @pre_populated_members.include?(member)
 
       # Clear the cache to force a refresh on next access
-      cache.delete(cache_key(:joined_members)) if cache_available?
+      cache.delete(cache_key(:joined_members))
     end
 
     def handle_room_member(event)
@@ -1038,15 +1030,15 @@ module ActiveMatrix
       @cached_all_members = nil
 
       # Clear the cache when membership changes
-      cache.delete(cache_key(:joined_members)) if cache_available?
-      cache.delete(cache_key(:all_members)) if cache_available?
+      cache.delete(cache_key(:joined_members))
+      cache.delete(cache_key(:all_members))
     end
 
     def handle_room_canonical_alias(event)
       room_state.write('m.room.canonical_alias', event[:content])
 
       # Clear the aliases cache
-      cache.delete(cache_key(:aliases)) if cache_available?
+      cache.delete(cache_key(:aliases))
     end
 
     def room_handlers?

data/lib/active_matrix/rooms/space.rb

@@ -46,7 +46,7 @@ module ActiveMatrix::Rooms
 
         room = self if entry == id
         room ||= rooms.find { |r| r.id == entry }
-        puts "Unable to find room for entry #{entry}" unless room
+        Rails.logger.debug { "Unable to find room for entry #{entry}" } unless room
         # next if room.nil?
 
         ret = {

data/lib/active_matrix/{util/state_event_cache.rb → state_event_cache.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ActiveMatrix::Util
+module ActiveMatrix
   class StateEventCache
     extend ActiveMatrix::Extensions
     include Enumerable
@@ -18,13 +18,11 @@ module ActiveMatrix::Util
       @cache_time = cache_time
     end
 
-    def client
-      @room.client
-    end
+    delegate :client, to: :@room
 
     def reload!
       # Clear all cache entries for this room's state
-      cache.delete_matched("activematrix:room:#{room.id}:state:*") if cache_available?
+      cache.delete_matched("activematrix:room:#{room.id}:state:*")
     end
 
     def keys
@@ -42,11 +40,11 @@ module ActiveMatrix::Util
     end
 
     def key?(type, key = nil)
-      cache_available? && cache.exist?(cache_key(type, key))
+      cache.exist?(cache_key(type, key))
     end
 
     def expire(type, key = nil)
-      cache.delete(cache_key(type, key)) if cache_available?
+      cache.delete(cache_key(type, key))
     end
 
     def each(live: false)
@@ -57,12 +55,12 @@ module ActiveMatrix::Util
     def delete(type, key = nil)
       type = type.to_s unless type.is_a? String
       client.api.set_room_state(room.id, type, {}, **{ state_key: key }.compact)
-      cache.delete(cache_key(type, key)) if cache_available?
+      cache.delete(cache_key(type, key))
     end
 
     def [](type, key = nil)
       type = type.to_s unless type.is_a? String
-      return fetch_state(type, key) if !cache_available? || client.cache == :none
+      return fetch_state(type, key) if client.cache == :none
 
       begin
         cached_value = cache.fetch(cache_key(type, key), expires_in: @cache_time) do
@@ -109,8 +107,6 @@ module ActiveMatrix::Util
       type = type.to_s unless type.is_a? String
       client.api.set_room_state(room.id, type, value, **{ state_key: key }.compact)
 
-      return unless cache_available?
-
       # Convert to plain hash for caching to avoid serialization issues with Mocha
       cacheable_value = if value.is_a?(Hash)
                           clean_hash = {}
@@ -131,7 +127,6 @@ module ActiveMatrix::Util
     # Alias for writing without API call
     def write(type, value, key = nil)
       type = type.to_s unless type.is_a? String
-      return unless cache_available?
 
       # Convert to plain hash for caching to avoid serialization issues
       cacheable_value = if value.is_a?(Hash)
@@ -156,10 +151,6 @@ module ActiveMatrix::Util
       "activematrix:room:#{room.id}:state:#{type}#{"|#{key}" if key}"
     end
 
-    def cache_available?
-      defined?(::Rails) && ::Rails.respond_to?(:cache) && ::Rails.cache
-    end
-
     def cache
       ::Rails.cache
     end

data/lib/active_matrix/{util/uri.rb → uri_module.rb}

@@ -2,27 +2,19 @@
 
 require 'uri'
 
-module URI
-  # A mxc:// Matrix content URL
-  class MXC < Generic
-    def full_path
-      select(:host, :port, :path, :query, :fragment)
-        .compact
-        .join
+module ActiveMatrix
+  module Uri
+    # A mxc:// Matrix content URL
+    class MXC < ::URI::Generic
+      def full_path
+        select(:host, :port, :path, :query, :fragment)
+          .compact
+          .join
+      end
     end
-  end
-
-  # TODO: Use +register_scheme+ on Ruby >=3.1 and fall back to old behavior
-  # for older Rubies. May be removed at EOL of Ruby 3.0.
-  if respond_to? :register_scheme
-    register_scheme 'MXC', MXC
-  else
-    @@schemes['MXC'] = MXC
-  end
 
-  unless scheme_list.key? 'MATRIX'
     # A matrix: URI according to MSC2312
-    class MATRIX < Generic
+    class MATRIX < ::URI::Generic
       attr_reader :authority, :action, :mxid, :mxid2, :via
 
       def initialize(*)
@@ -62,7 +54,7 @@ module URI
                 end
 
         component = components.shift
-        raise InvalidComponentError, "component can't be empty" if component.nil? || component.empty?
+        raise InvalidComponentError, "component can't be empty" if component.blank?
 
         @mxid = ActiveMatrix::MXID.new("#{sigil}#{component}")
 
@@ -74,7 +66,7 @@ module URI
                      raise InvalidComponentError, 'invalid component in path'
                    end
           component = components.shift
-          raise InvalidComponentError, "component can't be empty" if component.nil? || component.empty?
+          raise InvalidComponentError, "component can't be empty" if component.blank?
 
           @mxid2 = ActiveMatrix::MXID.new("#{sigil2}#{component}")
         end
@@ -90,12 +82,12 @@ module URI
       end
     end
 
-    # TODO: Use +register_scheme+ on Ruby >=3.1 and fall back to old behavior
-    # for older Rubies. May be removed at EOL of Ruby 3.0.
-    if respond_to? :register_scheme
-      register_scheme 'MATRIX', MATRIX
-    else
-      @@schemes['MATRIX'] = MATRIX
-    end
+    # Register URI schemes using modern Ruby
+    ::URI.register_scheme 'MXC', MXC
+    ::URI.register_scheme 'MATRIX', MATRIX unless ::URI.scheme_list.key?('MATRIX')
+
+    # Make them available in URI namespace for backward compatibility
+    ::URI.const_set(:MXC, MXC) unless ::URI.const_defined?(:MXC)
+    ::URI.const_set(:MATRIX, MATRIX) unless ::URI.const_defined?(:MATRIX)
   end
 end

data/lib/active_matrix/user.rb

@@ -4,7 +4,7 @@ module ActiveMatrix
   # A class for tracking information about a user on Matrix
   class User
     extend ActiveMatrix::Extensions
-    include ActiveMatrix::Util::Cacheable
+    include ActiveMatrix::Cacheable
 
     attr_reader :id, :client
     alias user_id :id
@@ -140,7 +140,7 @@ module ActiveMatrix
       since = raw_presence[:last_active_ago]
       return unless since
 
-      Time.now - (since / 1000)
+      Time.zone.now - (since / 1000)
     end
 
     # Gets a direct message room with the user if one exists

data/lib/active_matrix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveMatrix
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

data/lib/active_matrix.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
+# Version is required for gem specification
 require_relative 'active_matrix/version'
-require_relative 'active_matrix/logging'
-require_relative 'active_matrix/util/extensions'
-require_relative 'active_matrix/util/uri'
-require_relative 'active_matrix/util/events'
-require_relative 'active_matrix/errors'
 
 require 'json'
 require 'zeitwerk'
 require 'active_support'
 require 'active_support/core_ext/integer/time'
 require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/zones'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
 
@@ -53,16 +50,43 @@ module ActiveMatrix
     end
   end
 
+  # Logger methods
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= if defined?(::Rails) && ::Rails.respond_to?(:logger)
+                    ::Rails.logger
+                  else
+                    require 'logger'
+                    ::Logger.new($stdout)
+                  end
+    end
+
+    def debug!
+      logger.level = if defined?(::Rails)
+                       :debug
+                     else
+                       ::Logger::DEBUG
+                     end
+    end
+
+    def global_logger?
+      instance_variable_defined?(:@logger)
+    end
+  end
+
   # Set up Zeitwerk loader
   Loader = Zeitwerk::Loader.for_gem
 
-  # Ignore directories that shouldn't be autoloaded
+  # Ignore directories and files that shouldn't be autoloaded
   Loader.ignore("#{__dir__}/generators")
+  Loader.ignore("#{__dir__}/activematrix.rb")
 
   # Configure inflections for special cases
   Loader.inflector.inflect(
     'mxid' => 'MXID',
-    'uri' => 'URI',
+    'uri_module' => 'Uri',
     'as' => 'AS',
     'cs' => 'CS',
     'is' => 'IS',
@@ -73,8 +97,10 @@ module ActiveMatrix
   # Setup Zeitwerk autoloading
   Loader.setup
 
-  # Eager load all classes if in Rails eager loading mode
-  Loader.eager_load if defined?(Rails) && Rails.respond_to?(:application) && Rails.application&.config&.eager_load
+  # Load core classes that are used in metaprogramming
+  require_relative 'active_matrix/errors'
+  require_relative 'active_matrix/events'
+  require_relative 'active_matrix/uri_module'
 
   # Load Railtie for Rails integration
   require 'active_matrix/railtie' if defined?(Rails::Railtie)

data/lib/activematrix.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'active_matrix'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activematrix
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -236,17 +278,20 @@ files:
 - LICENSE.txt
 - README.md
 - lib/active_matrix.rb
+- lib/active_matrix/account_data_cache.rb
 - lib/active_matrix/agent_manager.rb
 - lib/active_matrix/agent_registry.rb
 - lib/active_matrix/api.rb
 - lib/active_matrix/bot.rb
 - lib/active_matrix/bot/base.rb
-- lib/active_matrix/bot/main.rb
 - lib/active_matrix/bot/multi_instance_base.rb
+- lib/active_matrix/cacheable.rb
 - lib/active_matrix/client.rb
 - lib/active_matrix/client_pool.rb
 - lib/active_matrix/errors.rb
 - lib/active_matrix/event_router.rb
+- lib/active_matrix/events.rb
+- lib/active_matrix/extensions.rb
 - lib/active_matrix/logging.rb
 - lib/active_matrix/memory.rb
 - lib/active_matrix/memory/agent_memory.rb
@@ -263,14 +308,11 @@ files:
 - lib/active_matrix/response.rb
 - lib/active_matrix/room.rb
 - lib/active_matrix/rooms/space.rb
+- lib/active_matrix/state_event_cache.rb
+- lib/active_matrix/uri_module.rb
 - lib/active_matrix/user.rb
-- lib/active_matrix/util/account_data_cache.rb
-- lib/active_matrix/util/cacheable.rb
-- lib/active_matrix/util/events.rb
-- lib/active_matrix/util/extensions.rb
-- lib/active_matrix/util/state_event_cache.rb
-- lib/active_matrix/util/uri.rb
 - lib/active_matrix/version.rb
+- lib/activematrix.rb
 - lib/generators/active_matrix/bot/bot_generator.rb
 - lib/generators/active_matrix/bot/templates/bot.rb.erb
 - lib/generators/active_matrix/bot/templates/bot_spec.rb.erb
@@ -304,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rails gem for connecting to Matrix protocol
 test_files: []

data/lib/active_matrix/bot/main.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveMatrix::Bot
-  PARAMS_CONFIG = {} # rubocop:disable Style/MutableConstant Intended
-
-  require 'optparse'
-  parser = OptionParser.new do |op|
-    op.on('-s homeserver', 'Specify homeserver') { |val| PARAMS_CONFIG[:homeserver] = val }
-
-    op.on('-T token', 'Token') { |val| PARAMS_CONFIG[:access_token] = val }
-    op.on('-U username', 'Username') { |val| PARAMS_CONFIG[:username] = val }
-    op.on('-P password', 'Password') { |val| PARAMS_CONFIG[:password] = val }
-
-    op.on('-q', 'Disable logging') { PARAMS_CONFIG[:logging] = false }
-    op.on('-v', 'Enable verbose output') { PARAMS_CONFIG[:logging] = !(PARAMS_CONFIG[:log_level] = :debug).nil? }
-  end
-
-  begin
-    parser.parse!(ARGV.dup)
-  rescue StandardError => e
-    PARAMS_CONFIG[:optparse_error] = e
-  end
-
-  ActiveMatrix.logger.appenders.each do |log|
-    log.layout = Logging::Layouts.pattern(
-      pattern: "%d|%.1l %c : %m\n"
-    )
-  end
-  ActiveMatrix.debug! if ENV['MATRIX_DEBUG'] == '1'
-
-  class Instance < Base
-    set :logging, true
-    set :log_level, :info
-
-    set :app_file, caller_files.first || $PROGRAM_NAME
-    set(:run) { File.expand_path($PROGRAM_NAME) == File.expand_path(app_file) }
-
-    if run? && ARGV.any?
-      error = PARAMS_CONFIG.delete(:optparse_error)
-      raise error if error
-
-      PARAMS_CONFIG.each { |k, v| set k, v }
-    end
-  end
-
-  module Delegator
-    def self.delegate(*methods)
-      methods.each do |method_name|
-        define_method(method_name) do |*args, &block|
-          return super(*args, &block) if respond_to? method_name
-
-          Delegator.target.send(method_name, *args, &block)
-        end
-        # ensure keyword argument passing is compatible with ruby >= 2.7
-        ruby2_keywords(method_name) if respond_to?(:ruby2_keywords, true)
-        private method_name
-      end
-    end
-
-    delegate :command, :client, :event,
-             :settings,
-             :set, :enable, :disable
-
-    class << self
-      attr_accessor :target
-    end
-
-    self.target = Instance
-  end
-
-  # Trigger the global instance to run once the main class finishes
-  at_exit do
-    remove_const(:PARAMS_CONFIG)
-    Instance.run! if $!.nil? && Instance.run? # rubocop:disable Style/SpecialGlobalVars Don't want to require into global scope
-  end
-end
-
-extend ActiveMatrix::Bot::Delegator # rubocop:disable Style/MixinUsage Intended

data/lib/active_matrix/util/cacheable.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveMatrix
-  module Util
-    # Provides caching functionality for Matrix objects
-    # Handles serialization/deserialization to work with Rails.cache
-    module Cacheable
-      extend ActiveSupport::Concern
-
-      included do
-        attr_accessor :cached_at
-      end
-
-      class_methods do
-        # Reconstruct object from cached data
-        def from_cache(client, data)
-          return nil unless data.is_a?(Hash) && data[:_cache_class] == name
-
-          # Remove cache metadata
-          attrs = data.except(:_cache_class, :_cached_at)
-
-          # Reconstruct based on class type
-          case name
-          when 'ActiveMatrix::User'
-            new(client, attrs[:id], attrs.except(:id))
-          when 'ActiveMatrix::Room'
-            new(client, attrs[:id], attrs.except(:id))
-          else
-            new(client, attrs)
-          end
-        end
-      end
-
-      # Convert object to cacheable hash
-      def to_cache
-        data = cache_attributes.merge(
-          _cache_class: self.class.name,
-          _cached_at: Time.current
-        )
-
-        # Ensure we only cache serializable data
-        data.deep_stringify_keys
-      end
-
-      # Override in each class to specify what to cache
-      def cache_attributes
-        if respond_to?(:attributes)
-          attributes
-        elsif respond_to?(:to_h)
-          to_h
-        else
-          {}
-        end
-      end
-
-      # Generate a cache key for this object
-      def cache_key(*suffixes)
-        base_key = "#{self.class.name.underscore}:#{cache_id}"
-        suffixes.any? ? "#{base_key}:#{suffixes.join(':')}" : base_key
-      end
-
-      # Override in each class if ID method is different
-      def cache_id
-        respond_to?(:id) ? id : object_id
-      end
-
-      # Check if this object was loaded from cache
-      def from_cache?
-        @cached_at.present?
-      end
-    end
-  end
-end