ollama_chat 0.0.56 → 0.0.58

data/spec/ollama_chat/message_output_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OllamaChat::MessageOutput do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new argv: chat_default_config
   end
 
   connect_to_ollama_server

data/spec/ollama_chat/model_handling_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OllamaChat::ModelHandling do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new argv: chat_default_config
   end
 
   connect_to_ollama_server

data/spec/ollama_chat/parsing_spec.rb

@@ -3,8 +3,8 @@ require 'pathname'
 
 describe OllamaChat::Parsing do
   let :chat do
-    OllamaChat::Chat.new.tap do |chat|
-      chat.document_policy = 'importing'
+    OllamaChat::Chat.new(argv: chat_default_config).tap do |chat|
+      chat.document_policy.selected = 'importing'
     end
   end
 
@@ -233,14 +233,14 @@ describe OllamaChat::Parsing do
 
     context 'document_policy' do
       it 'can be ignoring' do
-        chat.document_policy = 'ignoring'
+        chat.document_policy.selected = 'ignoring'
         c = "see #{Dir.pwd}/spec/assets/example.html"
         content, = chat.parse_content(c, [])
         expect(content).to eq(c)
       end
 
       it 'can be importing' do
-        chat.document_policy = 'importing'
+        chat.document_policy.selected = 'importing'
         c = "see #{Dir.pwd}/spec/assets/example.html"
         content, = chat.parse_content(c, [])
         expect(content).to include(<<~EOT)
@@ -253,7 +253,7 @@ describe OllamaChat::Parsing do
       end
 
       it 'can be embedding' do
-        chat.document_policy = 'embedding'
+        chat.document_policy.selected = 'embedding'
         c = "see #{Dir.pwd}/spec/assets/example.html"
         expect(chat).to receive(:embed_source).with(
           kind_of(IO),
@@ -264,7 +264,7 @@ describe OllamaChat::Parsing do
       end
 
       it 'can be summarizing' do
-        chat.document_policy = 'summarizing'
+        chat.document_policy.selected = 'summarizing'
         c = "see #{Dir.pwd}/spec/assets/example.html"
         content, = chat.parse_content(c, [])
         expect(content).to start_with(<<~EOT)

data/spec/ollama_chat/source_fetching_spec.rb

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

data/spec/ollama_chat/state_selectors_spec.rb

@@ -0,0 +1,193 @@
+require 'spec_helper'
+
+describe OllamaChat::StateSelectors::StateSelector do
+  let(:name) { 'Test Selector' }
+  let(:states) { %w[ enabled disabled low high ] }
+  let(:default) { 'enabled' }
+  let(:off) { %w[ disabled ] }
+
+  let(:selector) do
+    described_class.new(
+      name: name,
+      states: states,
+      default: default,
+      off: off
+    )
+  end
+
+  describe '#initialize' do
+    it 'creates a new StateSelector with provided parameters' do
+      expect(selector).to be_a described_class
+    end
+
+    it 'sets the name correctly' do
+      expect(selector.instance_variable_get(:@name)).to eq name
+    end
+
+    it 'sets the states correctly' do
+      expect(selector.instance_variable_get(:@states)).to eq Set.new(states)
+    end
+
+    it 'sets the default state' do
+      expect(selector.instance_variable_get(:@default)).to eq default
+    end
+
+    it 'sets the off states correctly' do
+      expect(selector.instance_variable_get(:@off)).to eq off
+    end
+
+    it 'sets the selected state to default' do
+      expect(selector.selected).to eq default
+    end
+
+    context 'with empty states' do
+      it 'raises ArgumentError when states are empty' do
+        expect {
+          described_class.new(name: 'Test', states: [])
+        }.to raise_error(ArgumentError, 'states cannot be empty')
+      end
+    end
+
+    context 'with invalid default' do
+      it 'raises ArgumentError when default is not in states' do
+        expect {
+          described_class.new(name: 'Test', states: %w[ a b ], default: 'c')
+        }.to raise_error(ArgumentError, 'default has to be one of a, b.')
+      end
+    end
+  end
+
+  describe '#selected' do
+    it 'returns the currently selected state' do
+      expect(selector.selected).to eq default
+    end
+  end
+
+  describe '#selected=' do
+    it 'sets the selected state to a valid value' do
+      selector.selected = 'low'
+      expect(selector.selected).to eq 'low'
+    end
+
+    it 'raises ArgumentError when setting invalid state' do
+      expect {
+        selector.selected = 'invalid'
+      }.to raise_error(ArgumentError, 'value has to be one of enabled, disabled, low, high.')
+    end
+  end
+
+  describe '#allow_empty?' do
+    it 'returns false by default' do
+      expect(selector.allow_empty?).to be false
+    end
+
+    context 'when allow_empty is true' do
+      let(:selector) do
+        described_class.new(
+          name: name,
+          states: states,
+          default: nil,
+          allow_empty: true
+        )
+      end
+
+      it 'returns true when allow_empty is set' do
+        expect(selector.allow_empty?).to be true
+      end
+    end
+  end
+
+  describe '#off?' do
+    it 'returns true when selected state is in off set' do
+      selector.selected = 'disabled'
+      expect(selector.off?).to be true
+    end
+
+    it 'returns false when selected state is not in off set' do
+      selector.selected = 'enabled'
+      expect(selector.off?).to be false
+    end
+  end
+
+  describe '#on?' do
+    it 'returns true when selected state is not in off set' do
+      selector.selected = 'enabled'
+      expect(selector.on?).to be true
+    end
+
+    it 'returns false when selected state is in off set' do
+      selector.selected = 'disabled'
+      expect(selector.on?).to be false
+    end
+  end
+
+  describe '#choose' do
+    it 'allows user to select a state from available options' do
+      # Mock the chooser to return a specific choice
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).with(
+        %w[ enabled disabled low high [EXIT] ]
+      ).and_return('low')
+
+      selector.choose
+      expect(selector.selected).to eq 'low'
+    end
+
+    it 'exits when user selects [EXIT]' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('[EXIT]')
+
+      selector.choose
+      expect(selector.selected).to eq default
+    end
+
+    it 'exits when user cancels selection' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return(nil)
+
+      selector.choose
+      expect(selector.selected).to eq default
+    end
+  end
+
+  describe '#show' do
+    it 'outputs the current state to stdout' do
+      expect(STDOUT).to receive(:puts).with(/Test Selector is .*?enabled.*?\./)
+      selector.show
+    end
+  end
+
+  describe '#to_s' do
+    it 'returns the string representation of the selected state' do
+      expect(selector.to_s).to eq default
+    end
+
+    it 'returns the string representation after changing state' do
+      selector.selected = 'low'
+      expect(selector.to_s).to eq 'low'
+    end
+  end
+
+  describe 'with allow_empty true' do
+    let(:selector) do
+      described_class.new(
+        name: 'Empty Selector',
+        states: %w[ a b c ],
+        default: nil,
+        allow_empty: true
+      )
+    end
+
+    it 'allows setting nil as selected state' do
+      selector.selected = nil
+      expect(selector.selected).to eq ""
+    end
+
+    it 'allows empty state when allow_empty is true' do
+      expect(selector.allow_empty?).to be true
+    end
+
+    it 'raises no error when setting invalid state' do
+      expect {
+        selector.selected = 'invalid'
+      }.not_to raise_error
+    end
+  end
+end

data/spec/ollama_chat/think_control_spec.rb

@@ -2,153 +2,93 @@ require 'spec_helper'
 
 describe OllamaChat::ThinkControl do
   let :chat do
-    OllamaChat::Chat.new(
-      argv: %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
-    )
+    OllamaChat::Chat.new(argv: chat_default_config)
   end
 
   connect_to_ollama_server
 
   describe '#think' do
-    it 'returns the current think mode state' do
+    it 'returns false when the think mode selector is off' do
+      chat.think_mode.selected = 'disabled'
       expect(chat.think).to be false
-      chat.instance_variable_set(:@think, true)
+    end
+
+    it 'returns true when the think mode selector is enabled' do
+      chat.think_mode.selected = 'enabled'
       expect(chat.think).to be true
-      chat.instance_variable_set(:@think, false)
-      expect(chat.think).to be false
-      chat.instance_variable_set(:@think, 'low')
+    end
+
+    it 'returns the selected value when it is not “enabled”' do
+      chat.think_mode.selected = 'low'
       expect(chat.think).to eq 'low'
     end
   end
 
   describe '#think?' do
-    it 'returns true when think mode is enabled (boolean true)' do
-      chat.instance_variable_set(:@think, true)
+    it 'returns true when the think mode selector is on' do
+      chat.think_mode.selected = 'enabled'
       expect(chat.think?).to be true
     end
 
-    it 'returns true when think mode is enabled (string value)' do
-      chat.instance_variable_set(:@think, 'high')
+    it 'returns true when the think mode selector is on but the value is a string' do
+      chat.think_mode.selected = 'high'
       expect(chat.think?).to be true
     end
 
-    it 'returns false when think mode is disabled (boolean false)' do
-      chat.instance_variable_set(:@think, false)
-      expect(chat.think?).to be false
-    end
-
-    it 'returns false when think mode is nil' do
-      chat.instance_variable_set(:@think, nil)
+    it 'returns false when the think mode selector is off' do
+      chat.think_mode.selected = 'disabled'
       expect(chat.think?).to be false
     end
   end
 
   describe '#think_mode' do
-    it 'returns "enabled" when think is true' do
-      chat.instance_variable_set(:@think, true)
-      expect(chat.think_mode).to eq 'enabled'
+    it 'exposes a StateSelector instance' do
+      expect(chat.think_mode).to be_a OllamaChat::StateSelectors::StateSelector
     end
 
-    it 'returns the think value when it is a string' do
-      chat.instance_variable_set(:@think, 'medium')
-      expect(chat.think_mode).to eq 'medium'
-    end
-
-    it 'returns "disabled" when think is false' do
-      chat.instance_variable_set(:@think, false)
-      expect(chat.think_mode).to eq 'disabled'
-    end
-
-    it 'returns "disabled" when think is nil' do
-      chat.instance_variable_set(:@think, nil)
-      expect(chat.think_mode).to eq 'disabled'
-    end
-  end
-
-  describe '#think_show' do
-    it 'displays the current think mode status' do
-      chat.instance_variable_set(:@think, true)
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1menabled\e\[0m\./)
-      chat.think_show
-    end
-
-    it 'displays the think mode level when set to string' do
-      chat.instance_variable_set(:@think, 'high')
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mhigh\e\[0m\./)
-      chat.think_show
-    end
-
-    it 'displays "disabled" when think is false' do
-      chat.instance_variable_set(:@think, false)
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m\./)
-      chat.think_show
-    end
-
-    it 'displays "disabled" when think is nil' do
-      chat.instance_variable_set(:@think, nil)
-      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m\./)
-      chat.think_show
+    it 'has the correct default selection (disabled)' do
+      expect(chat.think_mode.selected).to eq 'disabled'
     end
   end
 
   describe '#think_loud?' do
-    it 'returns false when think is disabled' do
-      chat.instance_variable_set(:@think, false)
+    it 'returns false when the think mode selector is off' do
+      chat.think_mode.selected = 'disabled'
       expect(chat.think_loud?).to be false
     end
 
-    it 'returns false when think_loud is off' do
-      chat.instance_variable_set(:@think, true)
+    it 'returns false when the think_loud switch is off' do
+      chat.think_mode.selected = 'enabled'
       allow(chat).to receive(:think_loud).and_return(double(on?: false))
       expect(chat.think_loud?).to be false
     end
 
-    it 'returns true when both think and think_loud are enabled' do
-      chat.instance_variable_set(:@think, true)
+    it 'returns true when both the think mode selector and think_loud switch are on' do
+      chat.think_mode.selected = 'enabled'
       allow(chat).to receive(:think_loud).and_return(double(on?: true))
       expect(chat.think_loud?).to be true
     end
   end
 
-  describe '#choose_think_mode' do
-    it 'can select "off" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('off')
-      chat.choose_think_mode
-      expect(chat.think).to be false
+  describe '#think_mode.show' do
+    it 'prints the current think mode in bold' do
+      chat.think_mode.selected = 'high'
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mhigh\e\[0m/)
+      chat.think_mode.show
     end
 
-    it 'can select "on" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('on')
-      chat.choose_think_mode
-      expect(chat.think).to be true
+    it 'prints “disabled” when the selector is off' do
+      chat.think_mode.selected = 'disabled'
+      expect(STDOUT).to receive(:puts).with(/Think mode is \e\[1mdisabled\e\[0m/)
+      chat.think_mode.show
     end
+  end
 
-    it 'can select "low" mode' do
+  describe '#think_mode.choose' do
+    it 'updates the selector based on the user choice' do
       expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('low')
-      chat.choose_think_mode
-      expect(chat.think).to eq 'low'
-    end
-
-    it 'can select "medium" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('medium')
-      chat.choose_think_mode
-      expect(chat.think).to eq 'medium'
-    end
-
-    it 'can select "high" mode' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('high')
-      chat.choose_think_mode
-      expect(chat.think).to eq 'high'
-    end
-
-    it 'can exit selection' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return('[EXIT]')
-      expect { chat.choose_think_mode }.not_to change { chat.think }
-    end
-
-    it 'can handle nil selection' do
-      expect(OllamaChat::Utils::Chooser).to receive(:choose).and_return(nil)
-      expect { chat.choose_think_mode }.not_to change { chat.think }
+      chat.think_mode.choose
+      expect(chat.think_mode.selected).to eq 'low'
     end
   end
 end

data/spec/ollama_chat/web_searching_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe OllamaChat::WebSearching do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new(argv: chat_default_config)
   end
 
   connect_to_ollama_server

data/spec/spec_helper.rb

@@ -58,7 +58,7 @@ module AssetHelpers
   # @yield [ io ] yields the IO object for the asset file to the provided block
   #
   # @return [ File, nil ] returns the IO object for the asset file, or nil if a
-  # block is provided and the block does not return a value
+  #   block is provided and the block does not return a value
   def asset_io(name, &block)
     io = File.new(File.join(__dir__, 'assets', name))
     if block
@@ -86,6 +86,10 @@ module AssetHelpers
   end
 end
 
+def chat_default_config(a = [])
+  a + %w[ -f lib/ollama_chat/ollama_chat_config/default_config.yml ]
+end
+
 # A module that provides functionality for stubbing Ollama server responses.
 #
 # The StubOllamaServer module enables developers to simulate Ollama API
@@ -126,7 +130,7 @@ module ProtectEnvVars
   # during test execution.
   #
   # @return [Proc] a lambda that wraps test execution with environment variable
-  # preservation
+  #   preservation
   def self.apply
     -> example do
       if example.metadata[:protect_env]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.58
 platform: ruby
 authors:
 - Florian Frank
@@ -121,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: utils
+  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: excon
   requirement: !ruby/object:Gem::Requirement
@@ -430,6 +444,7 @@ extra_rdoc_files:
 - lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
+- lib/ollama_chat/state_selectors.rb
 - lib/ollama_chat/switches.rb
 - lib/ollama_chat/think_control.rb
 - lib/ollama_chat/utils.rb
@@ -473,6 +488,7 @@ files:
 - lib/ollama_chat/redis_cache.rb
 - lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
+- lib/ollama_chat/state_selectors.rb
 - lib/ollama_chat/switches.rb
 - lib/ollama_chat/think_control.rb
 - lib/ollama_chat/utils.rb
@@ -516,6 +532,7 @@ files:
 - spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
+- spec/ollama_chat/state_selectors_spec.rb
 - spec/ollama_chat/switches_spec.rb
 - spec/ollama_chat/think_control_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb
@@ -566,6 +583,7 @@ test_files:
 - spec/ollama_chat/redis_cache_spec.rb
 - spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
+- spec/ollama_chat/state_selectors_spec.rb
 - spec/ollama_chat/switches_spec.rb
 - spec/ollama_chat/think_control_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb