ollama_chat 0.0.48 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1e4b299c79b7a7c31c4a9c91b72a65739123ae4cf1d6db7ca0949b8b2965de
-  data.tar.gz: 2eca8b68cb0484b4664e2bcf12132ea529ab9fad3f3c709d083122e44acfde45
+  metadata.gz: 913e3ff0ad4e2b4a7a6d2825f5772f8a4e68dc2931925d096d0989b23e153756
+  data.tar.gz: ae44b7d36ebbdc1013bc90841e4dfacd685d99d949a84c201ab0f8cc512dee0b
 SHA512:
-  metadata.gz: 42844ce0fc93dceba6b70dec976be9c6bbe1aaef93f937c8c42e9f555f2533beb69b24975c35142dc6b42de15ba5d74a9cb1afff7e5b324e97a6c915f014a0c1
-  data.tar.gz: c771c974561288203645875f8491f5b7aa9d63c712197fada535614347b067ca22f02c72da71d6d772e034008448551de94b5ffb37ef4ea307ebcb2ed5c1d3f2
+  metadata.gz: 7ce3e6e9cebf291d8ffb56fa8960b244f500e6f1e15f65f49a6f1905779032b22559e3b720b8fa22bef2f9992ae634f1aad6a92797a61e080788e9277ca1ee89
+  data.tar.gz: 2c7a36c2487c92767345e00a65c3167b5b41339891918421700322fe2722efeda525c6baf447553cd3021fd7a174a10b2d93c32aa555ed274b4eac89dc671a96

data/CHANGES.md

@@ -1,5 +1,36 @@
 # Changes
 
+## 2026-01-03 v0.0.50
+
+- Use Redis-based expiring cache implementation with the new
+  `OllamaChat::RedisCache` class
+- Replaced `Documentrix::Documents::RedisCache` with `OllamaChat::RedisCache`
+  in the `setup_cache` method
+- Updated `GemHadar` development dependency to version **2.16.3**
+- Integrated changelog generation capability into GemHadar configuration
+- Updated Redis image to valkey version **8.1.5** with latest bug fixes and
+  improvements
+- Improved file path resolution using `Pathname` for better handling of
+  relative paths and home directory shortcuts
+- Enhanced test suite configuration and stubbing for more consistent test
+  execution
+- Updated Ruby image tag to stable **4.0**-alpine
+- Added `lib/ollama_chat/redis_cache.rb` to `extra_rdoc_files` and `files`
+  lists in gemspec
+- Added `spec/ollama_chat/redis_cache_spec.rb` to `test_files` list in gemspec
+- Removed duplicate entry for `lib/ollama_chat/redis_cache.rb` from `files`
+  list
+- Improved test setup for source fetching with explicit configuration file
+
+## 2025-12-24 v0.0.49
+
+- Updated `unix_socks` gem dependency from **~> 0.2** to **~> 0.3**
+- Replaced `UnixSocks::Server` with `UnixSocks::DomainSocketServer` in
+  `lib/ollama_chat/server_socket.rb`
+- Updated test expectations in `spec/ollama_chat/server_socket_spec.rb` to
+  match new class name
+- Bumped `gem_hadar` development dependency from **>= 2.16.0** to **>= 2.16.2**
+
 ## 2025-12-23 v0.0.48
 
 - Updated `unix_socks` dependency to version **0.2.3**

data/Rakefile

@@ -28,6 +28,10 @@ GemHadar do
 
   readme      'README.md'
 
+  changelog do
+    filename 'CHANGES.md'
+  end
+
   required_ruby_version  '>= 3.2'
 
   executables << 'ollama_chat' << 'ollama_chat_send'
@@ -36,14 +40,10 @@ GemHadar do
     'static.yml' => {}
   )
 
-  changelog do
-    filename 'CHANGES.md'
-  end
-
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.18'
   dependency             'documentrix',           '>= 0.0.4'
-  dependency             'unix_socks',            '~> 0.2', '>= 0.2.3'
+  dependency             'unix_socks',            '~> 0.3'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'redis',                 '~> 5.0'

data/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   redis:
     container_name: redis
-    image: valkey/valkey:8.1.3-alpine
+    image: valkey/valkey:8.1.5-alpine
     restart: unless-stopped
     ports: [ "127.0.0.1:9736:6379" ]
     volumes:

data/lib/ollama_chat/chat.rb

@@ -749,12 +749,12 @@ class OllamaChat::Chat
   # The setup_cache method initializes and returns a Redis cache instance with
   # expiring keys if a Redis URL is configured.
   #
-  # @return [ Documentrix::Documents::RedisCache, nil ] the configured Redis
+  # @return [ OllamaChat::RedisCache, nil ] the configured Redis
   #   cache instance or nil if no URL is set.
   def setup_cache
     if url = config.redis.expiring.url?
       ex = config.redis.expiring.ex?.to_i
-      Documentrix::Documents::RedisCache.new(
+      OllamaChat::RedisCache.new(
         prefix: 'Expiring-',
         url:,
         ex:

data/lib/ollama_chat/message_output.rb

@@ -78,10 +78,11 @@ module OllamaChat::MessageOutput
   # @return [ TrueClass ] returns true if the file was successfully written
   # @return [ nil ] returns nil if the user chose not to overwrite or if an error occurred
   def attempt_to_write_file(filename, message)
-    if !File.exist?(filename) ||
-        ask?(prompt: "File #{filename.inspect} already exists, overwrite? (y/n) ") =~ /\Ay/i
+    path = Pathname.new(filename.to_s).expand_path
+    if !path.exist? ||
+        ask?(prompt: "File #{path.to_s.inspect} already exists, overwrite? (y/n) ") =~ /\Ay/i
     then
-      File.open(filename, ?w) do |output|
+      File.open(path, ?w) do |output|
         output.write(message.content)
       end
     else

data/lib/ollama_chat/redis_cache.rb

@@ -0,0 +1,158 @@
+require 'redis'
+
+# A Redis-based cache implementation for OllamaChat
+#
+# This class provides a wrapper around Redis that offers a simple key-value
+# caching interface with support for expiration times and namespace isolation.
+# It's designed to be used as a cache backend for various components in the
+# OllamaChat application.
+#
+# @example Basic usage
+#   cache = OllamaChat::RedisCache.new(prefix: 'myapp-', url: 'redis://localhost:6379')
+#   cache['key'] = 'value'
+#   value = cache['key']
+#   cache.delete('key')
+#
+# @example With expiration
+#   cache = OllamaChat::RedisCache.new(prefix: 'expiring-', url: 'redis://localhost:6379', ex: 3600)
+#   cache['key'] = 'value' # Automatically expires in 1 hour
+#
+# @example Iteration
+#   cache.each do |key, value|
+#     puts "#{key}: #{value}"
+#   end
+#
+# @example Cache management
+#   cache.clear # Remove all entries with this prefix
+#   size = cache.size # Get number of entries
+module OllamaChat
+  class RedisCache
+    include Enumerable
+
+    # Initializes a new RedisCache instance
+    #
+    # @param prefix [String] The prefix to use for all keys in this cache
+    # @param url [String, nil] The Redis connection URL (defaults to ENV['REDIS_URL'])
+    # @param ex [Integer, nil] Default expiration time in seconds
+    #
+    # @raise [ArgumentError] If no Redis URL is provided
+    def initialize(prefix:, url: ENV['REDIS_URL'], ex: nil)
+      @prefix = prefix
+      @url = url
+      @ex = ex
+      raise ArgumentError, 'require redis url' unless @url
+    end
+
+    # Returns the Redis connection instance
+    #
+    # This method lazily initializes the Redis connection to avoid
+    # establishing connections until they're actually needed.
+    #
+    # @return [Redis] The Redis client instance
+    def redis
+      @redis ||= Redis.new(url: @url)
+    end
+
+    # Retrieves a value from the cache by key
+    #
+    # @param key [String] The cache key to retrieve
+    # @return [String, nil] The cached value or nil if not found
+    def [](key)
+      value = redis.get(pre(key))
+      value
+    end
+
+    # Stores a value in the cache with the given key
+    #
+    # @param key [String] The cache key
+    # @param value [String] The value to cache
+    # @return [String] The cached value
+    def []=(key, value)
+      set(key, value)
+    end
+
+    # Stores a value in the cache with optional expiration
+    #
+    # @param key [String] The cache key
+    # @param value [String] The value to cache
+    # @param ex [Integer, nil] Expiration time in seconds (overrides default)
+    # @return [String] The cached value
+    def set(key, value, ex: nil)
+      ex ||= @ex
+      if !ex.nil? && ex < 1
+        redis.del(pre(key))
+      else
+        redis.set(pre(key), value, ex:)
+      end
+      value
+    end
+
+    # Gets the time-to-live for a key
+    #
+    # @param key [String] The cache key
+    # @return [Integer] The remaining time-to-live in seconds, or -1 if not found
+    def ttl(key)
+      redis.ttl(pre(key))
+    end
+
+    # Checks if a key exists in the cache
+    #
+    # @param key [String] The cache key to check
+    # @return [Boolean] true if the key exists, false otherwise
+    def key?(key)
+      !!redis.exists?(pre(key))
+    end
+
+    # Deletes a key from the cache
+    #
+    # @param key [String] The cache key to delete
+    # @return [Boolean] true if the key was deleted, false if it didn't exist
+    def delete(key)
+      redis.del(pre(key)) == 1
+    end
+
+    # Gets the number of entries in the cache
+    #
+    # @return [Integer] The number of entries
+    def size
+      s = 0
+      redis.scan_each(match: "#{@prefix}*") { |key| s += 1 }
+      s
+    end
+
+    # Clears all entries from the cache with this prefix
+    #
+    # @return [OllamaChat::RedisCache] Returns self for chaining
+    def clear
+      redis.scan_each(match: "#{@prefix}*") { |key| redis.del(key) }
+      self
+    end
+
+    # Iterates over all entries in the cache
+    #
+    # @yield [key, value] Yields each key-value pair
+    # @return [OllamaChat::RedisCache] Returns self for chaining
+    def each(&block)
+      redis.scan_each(match: "#{@prefix}*") { |key| block.(key, self[unpre(key)]) }
+      self
+    end
+
+    private
+
+    # Prepends the prefix to a key
+    #
+    # @param key [String] The key to prefix
+    # @return [String] The prefixed key
+    def pre(key)
+      [ @prefix, key ].join
+    end
+
+    # Removes the prefix from a key
+    #
+    # @param key [String] The prefixed key
+    # @return [String] The key without prefix
+    def unpre(key)
+      key.sub(/\A#@prefix/, '')
+    end
+  end
+end

data/lib/ollama_chat/server_socket.rb

@@ -58,7 +58,7 @@ module OllamaChat::ServerSocket
     # The create_socket_server method constructs and returns a Unix domain
     # socket server instance for communication with the Ollama Chat client.
     #
-    # This method initializes a UnixSocks::Server object configured to listen
+    # This method initializes a UnixSocks::DomainSocketServer object configured to listen
     # for incoming messages on a named socket file. It supports specifying a
     # custom runtime directory for the socket, which is useful for isolating
     # multiple instances or environments. If no runtime directory is provided
@@ -70,19 +70,19 @@ module OllamaChat::ServerSocket
     # @param runtime_dir [ String ] pathname to runtime_dir of socket file
     # @param working_dir [ String ] pathname to working_dir used for deriving socket file
     #
-    # @return [UnixSocks::Server] a configured Unix domain socket server
+    # @return [UnixSocks::DomainSocketServer] a configured Unix domain socket server
     # instance ready to receive messages
     def create_socket_server(config:, runtime_dir: nil, working_dir: nil)
       working_dir ||= Dir.pwd
       if runtime_dir
-        return UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
+        return UnixSocks::DomainSocketServer.new(socket_name: 'ollama_chat.sock', runtime_dir:)
       end
       if config.working_dir_dependent_socket
         path   = File.expand_path(working_dir)
         digest = Digest::MD5.hexdigest(path)
-        UnixSocks::Server.new(socket_name: "ollama_chat-#{digest}.sock")
+        UnixSocks::DomainSocketServer.new(socket_name: "ollama_chat-#{digest}.sock")
       else
-        UnixSocks::Server.new(socket_name: 'ollama_chat.sock')
+        UnixSocks::DomainSocketServer.new(socket_name: 'ollama_chat.sock')
       end
     end
   end

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.48'
+  VERSION         = '0.0.50'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama_chat.rb

@@ -15,6 +15,7 @@ require 'documentrix'
 require 'unix_socks'
 require 'ollama_chat/version'
 require 'ollama_chat/utils'
+require 'ollama_chat/redis_cache'
 require 'ollama_chat/message_format'
 require 'ollama_chat/ollama_chat_config'
 require 'ollama_chat/follow_chat'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.48 ruby lib
+# stub: ollama_chat 0.0.50 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.48".freeze
+  s.version = "0.0.50".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,19 +12,19 @@ Gem::Specification.new do |s|
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze, "ollama_chat_send".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
-  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
+  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/env_config.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/redis_cache.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/think_control.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/example_with_quote.html".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
   s.rubygems_version = "4.0.2".freeze
   s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
-  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.16.0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.16.3".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.18".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.0.4".freeze])
-  s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.2".freeze, ">= 0.2.3".freeze])
+  s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])

data/spec/ollama_chat/chat_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe OllamaChat::Chat, protect_env: true do
+  use_default_config = -> a {
+    a << '-f' << 'lib/ollama_chat/ollama_chat_config/default_config.yml'
+  }
+
   let :argv do
-    %w[ -C test ]
+    use_default_config.(%w[ -C test ])
   end
 
   before do
@@ -94,7 +98,7 @@ describe OllamaChat::Chat, protect_env: true do
     end
 
     it 'returns :next when input is "/model"' do
-      expect(chat).to receive(:choose_model).with('', 'llama3.1')
+      expect(chat).to receive(:choose_model).and_return 'llama3.1'
       expect(chat.handle_input("/model")).to eq :next
     end
 
@@ -226,7 +230,7 @@ describe OllamaChat::Chat, protect_env: true do
     connect_to_ollama_server(instantiate: false)
 
     let :argv do
-      %w[ -C test -c ] << asset('conversation.json')
+      use_default_config.(%w[ -C test -c ] << asset('conversation.json'))
     end
 
     it 'dispays the last exchange of the converstation' do
@@ -243,7 +247,7 @@ describe OllamaChat::Chat, protect_env: true do
     context 'with MemoryCache' do
 
       let :argv do
-        %w[ -M ]
+        use_default_config.(%w[ -M ])
       end
 
       it 'can use MemoryCache' do
@@ -265,7 +269,7 @@ describe OllamaChat::Chat, protect_env: true do
     connect_to_ollama_server(instantiate: false)
 
       let :argv do
-        %w[ -C test -D ] << asset('example.html')
+        use_default_config.(%w[ -C test -D ] << asset('example.html'))
       end
 
       it 'Adds documents passed to app via -D option' do

data/spec/ollama_chat/redis_cache_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe OllamaChat::RedisCache do
+  let :prefix do
+    'test-'
+  end
+
+  let :cache do
+    described_class.new(prefix:, url: 'something').expose
+  end
+
+  it 'can be instantiated' do
+    expect(cache).to be_a described_class
+  end
+
+  it 'raises ArgumentError if url is missing' do
+    expect {
+      described_class.new prefix:, url: nil
+    }.to raise_error ArgumentError
+  end
+
+  context 'test redis interactions' do
+    let :redis do
+      double('Redis')
+    end
+
+    before do
+      allow_any_instance_of(described_class).to receive(:redis).and_return(redis)
+    end
+
+    it 'has Redis client' do
+      expect(cache.redis).to eq redis
+    end
+
+    it 'can get a key' do
+      key = 'foo'
+      expect(redis).to receive(:get).with(prefix + key).and_return 'some_value'
+      expect(cache[key]).to eq 'some_value'
+    end
+
+    it 'can set a value for a key' do
+      key, value = 'foo', 'some_value'
+      expect(redis).to receive(:set).with(prefix + key, value, ex: nil)
+      cache[key] = value
+    end
+
+    it 'can set a value for a key with ttl' do
+      cache = described_class.new prefix:, url: 'something', ex: 3_600
+      key, value = 'foo', 'some_value'
+      expect(redis).to receive(:set).with(prefix + key, value, ex: 3_600)
+      cache[key] = value
+      expect(redis).to receive(:ttl).with(prefix + key).and_return 3_600
+      expect(cache.ttl(key)).to eq 3_600
+    end
+
+    it 'can determine if key exists' do
+      key = 'foo'
+      expect(redis).to receive(:exists?).with(prefix + key).and_return(false, true)
+      expect(cache.key?('foo')).to eq false
+      expect(cache.key?('foo')).to eq true
+    end
+
+    it 'can delete' do
+      key = 'foo'
+      expect(redis).to receive(:del).with(prefix + key).and_return 1
+      expect(cache.delete(key)).to eq true
+      expect(redis).to receive(:del).with(prefix + key).and_return 0
+      expect(cache.delete(key)).to eq false
+    end
+
+    it 'can iterate over keys, values' do
+      key, value = 'foo', 'some_value'
+      expect(redis).to receive(:set).with(prefix + key, value, ex: nil)
+      cache[key] = value
+      expect(redis).to receive(:scan_each).with(match: "#{prefix}*").
+        and_yield("#{prefix}foo")
+      expect(redis).to receive(:get).with(prefix + key).and_return('some_value')
+      cache.each do |k, v|
+        expect(k).to eq prefix + key
+        expect(v).to eq value
+      end
+    end
+
+    it 'returns size' do
+      expect(redis).to receive(:scan_each).with(match: "#{prefix}*").
+        and_yield("#{prefix}foo").
+        and_yield("#{prefix}bar").
+        and_yield("#{prefix}baz")
+      expect(cache.size).to eq 3
+    end
+
+    it 'can clear' do
+      expect(redis).to receive(:scan_each).with(match: 'test-*').and_yield(
+        'test-foo'
+      )
+      expect(redis).to receive(:del).with('test-foo')
+      expect(cache.clear).to eq cache
+    end
+
+    it 'can iterate over keys under a prefix' do
+      expect(redis).to receive(:scan_each).with(match: 'test-*')
+      cache.to_a
+    end
+
+    it 'can compute prefix with pre' do
+      expect(cache.pre('foo')).to eq 'test-foo'
+    end
+
+    it 'can remove prefix with unpre' do
+      expect(cache.unpre('test-foo')).to eq 'foo'
+    end
+  end
+end
+

data/spec/ollama_chat/server_socket_spec.rb

@@ -131,7 +131,7 @@ describe OllamaChat::ServerSocket do
     context 'with working dir dependent socket' do
       it 'can be created with configured runtime_dir' do
         config = double('Config', working_dir_dependent_socket: true)
-        expect(UnixSocks::Server).to receive(:new).with(
+        expect(UnixSocks::DomainSocketServer).to receive(:new).with(
           socket_name: /\Aollama_chat-\h{32}.sock\z/,
         ).and_return :unix_socks_server
 
@@ -143,7 +143,7 @@ describe OllamaChat::ServerSocket do
     context 'with default runtime_dir and name' do
       it 'can be created with default runtime_dir' do
         config = double('Config', working_dir_dependent_socket: false)
-        expect(UnixSocks::Server).to receive(:new).with(
+        expect(UnixSocks::DomainSocketServer).to receive(:new).with(
           socket_name: 'ollama_chat.sock'
         ).and_return :unix_socks_server
 

data/spec/ollama_chat/source_fetching_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe OllamaChat::SourceFetching do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new(
+      argv: %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
+    )
   end
 
   connect_to_ollama_server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.50
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.16.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 2.16.3
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -169,20 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -417,6 +411,7 @@ extra_rdoc_files:
 - lib/ollama_chat/model_handling.rb
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/parsing.rb
+- lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
@@ -457,6 +452,7 @@ files:
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/ollama_chat_config/default_config.yml
 - lib/ollama_chat/parsing.rb
+- lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
@@ -497,6 +493,7 @@ files:
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
 - spec/ollama_chat/parsing_spec.rb
+- spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb
@@ -542,6 +539,7 @@ test_files:
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
 - spec/ollama_chat/parsing_spec.rb
+- spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb