xot 0.3.15 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5106dfe6e2a51aa5564dd80ef829359effc9975343a86a6c7e06b858627976
-  data.tar.gz: e10270555bcf1fbbafb4d8c5a38808be5384b5c319b6bdac38c8ef34078ed4df
+  metadata.gz: 7e347867590b9d9d97a002320ac500f075dde62556b0944b2a35705b415e2806
+  data.tar.gz: c684375fa42a755e7cef817aad1c658fd26f484b515876cb35323e56e1c313bd
 SHA512:
-  metadata.gz: f77793be260e041b0acca7a8603191a661bf79b90539d41d60cee109bca721c0d83b268e3f2b44a966ee47bab2f99d8e825b7939e6afa10ac2bba26f819b7c10
-  data.tar.gz: ff16e23f9bac7b71a8864147f17211412a33a7c8ac1ee83ba2089a66567c95a46a7c4c6457a271046e9b588ef868409fa9761c0c80ac6ce938284e754879c4cf
+  metadata.gz: d94d2378ba6835df631dd21ef26140f3cc43af8c370478d7b7c6ce0e6e433fd08deafa45810970995942e3f1a1f04f4343894aa9ce5c5a276c60f442f1faf0de
+  data.tar.gz: 2dd7f8827dd1804be81babfe7b89410f41a96b280ac57f30724c67b63b3356a2ab71cddb4d10465e4ee49c34450d1e5f961dff24a84931a89a0bbf5f60159cda

data/.github/workflows/release-gem.yml

@@ -26,8 +26,17 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: packages
+        run: bundle exec rake packages
+
+      - name: setup zig
+        if: github.event.repository.name == 'reflex-terminal'
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.16.0
+
       - name: test
-        run: bundle exec rake packages test
+        run: bundle exec rake test
 
       - name: create gem
         id: gem

data/.github/workflows/test.yml

@@ -27,6 +27,15 @@ jobs:
       - name: packages
         run: bundle exec rake verbose packages
 
+      - name: setup zig
+        if: github.event.repository.name == 'reflex-terminal'
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.16.0
+
+      - name: vendor
+        run: bundle exec rake vendor
+
       - name: lib
         run: bundle exec rake verbose lib
 

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # xot ChangeLog
 
 
+## [v0.4.0] - 2026-08-04
+
+- [BREAKING] Rework String conversions to std::wstring and CFString
+- Add a String constructor taking a pointer and a size
+- Add Xot.warn with a uniq option to suppress duplicate warnings
+- Let a source raise _WIN32_WINNT above the Windows 7 baseline
+
+
 ## [v0.3.15] - 2026-06-23
 
 - Add WeakRef for weak references to RefCountable

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.4.0

data/include/xot/defs.h

@@ -54,7 +54,7 @@ namespace Xot
 	}// Types
 
 
-	using namespace Types;
+	using namespace Xot::Types;
 
 
 }// Xot

data/include/xot/string.h

@@ -26,7 +26,9 @@
 
 
 #if defined(OSX) || defined(IOS)
-	struct __CFString;
+
+struct __CFString;
+
 #endif
 
 
@@ -34,6 +36,13 @@ namespace Xot
 {
 
 
+#if defined(OSX) || defined(IOS)
+
+	typedef std::shared_ptr<const __CFString> CFStringPtr;
+
+#endif
+
+
 	class String : public std::string
 	{
 
@@ -45,6 +54,8 @@ namespace Xot
 
 			String (const char* str);
 
+			String (const char* str, size_t size);
+
 			String (const std::string& str);
 
 			template <typename ITERATOR>
@@ -64,6 +75,18 @@ namespace Xot
 
 			friend String operator + (const char*   lhs, const String& rhs);
 
+#if defined(OSX) || defined(IOS)
+
+			CFStringPtr to_cfstr () const;
+
+#elif defined(WIN32)
+
+			String (const wchar_t* str, size_t size);
+
+			std::wstring to_wstr () const;
+
+#endif
+
 	};// String
 
 
@@ -79,15 +102,6 @@ namespace Xot
 	template <typename T> String to_s (const T& val);
 
 
-#if defined(OSX) || defined(IOS)
-
-	typedef std::shared_ptr<const __CFString> CFStringPtr;
-
-	CFStringPtr cfstring (const char* str);
-
-#endif
-
-
 }// Xot
 
 

data/include/xot/windows.h

@@ -6,7 +6,11 @@
 
 #ifdef WIN32
 	#undef  _WIN32_WINNT
-	#define _WIN32_WINNT _WIN32_WINNT_WIN7
+	#ifdef XOT_WIN32_WINNT
+		#define _WIN32_WINNT XOT_WIN32_WINNT
+	#else
+		#define _WIN32_WINNT _WIN32_WINNT_WIN7
+	#endif
 	#include <windows.h>
 	#include <windowsx.h>
 #endif

data/lib/xot/extension.rb

@@ -6,7 +6,7 @@ module Xot
     module_function
 
     def name(downcase = false)
-      super().split('::')[-2].then {|s|
+      super().split('::')[..-2].join.then {|s|
         downcase ? s.gsub(/([a-z])([A-Z])/) {"#{$1}-#{$2}"}.downcase : s
       }
     end

data/lib/xot/util.rb

@@ -6,6 +6,15 @@ module Xot
 
   extend module Util
 
+    def warn(message, uniq: false)
+      if uniq
+        @warnings__ ||= {}
+        return if @warnings__[message]
+        @warnings__[message] = true
+      end
+      Kernel.warn message
+    end
+
     def get_env!(name, defval = nil)
       val = ENV[name.to_s] || Object.const_get(name) rescue defval
       val.dup rescue val

data/src/string.cpp

@@ -1,13 +1,16 @@
 #include "xot/string.h"
 
 
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
 #include "xot/exception.h"
 
 #if defined(OSX) || defined(IOS)
-#import <CoreFoundation/CoreFoundation.h>
+	#import <CoreFoundation/CoreFoundation.h>
+#elif defined(WIN32)
+	#include "xot/windows.h"
 #endif
 
 
@@ -24,6 +27,11 @@ namespace Xot
 	{
 	}
 
+	String::String (const char* str, size_t size)
+	:	Super(str, size)
+	{
+	}
+
 	String::String (const std::string& str)
 	:	Super(str)
 	{
@@ -88,6 +96,57 @@ namespace Xot
 		return t;
 	}
 
+#if defined(OSX) || defined(IOS)
+
+	static void
+	release_cfstring (CFTypeRef ref)
+	{
+		if (ref) CFRelease(ref);
+	}
+
+	CFStringPtr
+	String::to_cfstr () const
+	{
+		return CFStringPtr(
+			CFStringCreateWithCString(kCFAllocatorDefault, c_str(), kCFStringEncodingUTF8),
+			release_cfstring);
+	}
+
+#elif defined(WIN32)
+
+	String::String (const wchar_t* str, size_t size)
+	{
+		if (size > INT_MAX)
+			argument_error(__FILE__, __LINE__);
+		if (!str || size == 0) return;
+
+		int len = WideCharToMultiByte(CP_UTF8, 0, str, (int) size, NULL, 0, NULL, NULL);
+		if (len <= 0) system_error(__FILE__, __LINE__);
+
+		resize((size_t) len);
+		WideCharToMultiByte(CP_UTF8, 0, str, (int) size, &(*this)[0], len, NULL, NULL);
+	}
+
+	std::wstring
+	String::to_wstr () const
+	{
+		if (empty()) return std::wstring();
+
+		size_t size = this->size();
+		if (size > INT_MAX)
+			invalid_state_error(__FILE__, __LINE__);
+
+		int len = MultiByteToWideChar(CP_UTF8, 0, data(), (int) size, NULL, 0);
+		if (len <= 0) system_error(__FILE__, __LINE__);
+
+		std::wstring result;
+		result.resize((size_t) len);
+		MultiByteToWideChar(CP_UTF8, 0, data(), (int) size, &result[0], len);
+		return result;
+	}
+
+#endif
+
 
 	String
 	stringf (const char* format, ...)
@@ -199,21 +258,6 @@ namespace Xot
 		return to_s((CFStringRef) val.get());
 	}
 
-
-	static void
-	release_cfstring (CFTypeRef ref)
-	{
-		if (ref) CFRelease(ref);
-	}
-
-	CFStringPtr
-	cfstring (const char* str)
-	{
-		CFStringRef ref = CFStringCreateWithCString(
-			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
-		return CFStringPtr(ref, release_cfstring);
-	}
-
 #endif
 
 

data/test/test_util.rb

@@ -0,0 +1,33 @@
+require_relative 'helper'
+require 'stringio'
+
+
+class TestUtil < Test::Unit::TestCase
+
+  def util()
+    Object.new.extend Xot::Util
+  end
+
+  def capture_stderr(&block)
+    stderr, $stderr = $stderr, StringIO.new
+    block.call
+    $stderr.string
+  ensure
+    $stderr = stderr
+  end
+
+  def test_warn()
+    u = util
+    assert_equal "x\nx\n", capture_stderr {u.warn "x"; u.warn "x"}
+  end
+
+  def test_warn_uniq()
+    u = util
+    assert_equal "x\ny\n", capture_stderr {
+      u.warn "x", uniq: true
+      u.warn "x", uniq: true
+      u.warn "y", uniq: true
+    }
+  end
+
+end# TestUtil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.4.0
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-22 00:00:00.000000000 Z
+date: 2026-08-04 00:00:00.000000000 Z
 dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.
@@ -81,6 +81,7 @@ files:
 - test/test_setter.rb
 - test/test_tester.rb
 - test/test_universal_accessor.rb
+- test/test_util.rb
 - xot.gemspec
 homepage: https://github.com/xord/xot
 licenses:
@@ -119,3 +120,4 @@ test_files:
 - test/test_setter.rb
 - test/test_tester.rb
 - test/test_universal_accessor.rb
+- test/test_util.rb