xot 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb32bfca53b907bc70eda1e106532a0122abb189b0ff74fe150213bfc4b54e27
-  data.tar.gz: 5ab847804b982c1f5ab647237a87bd4665e2fbf5713d9b072b88aa409f8b9896
+  metadata.gz: b2990bbdfda0d6d33a86bbc3a17541ed0bab27d49fbcaaf28c5f4df12992f280
+  data.tar.gz: bfe965639a4592d05a39d73a467328a7c2d3188b85da9e999867ae796484d047
 SHA512:
-  metadata.gz: d1e9dab3c783e57d0c2623955a575a8f1f097ae00246695275b11407d2ee7c338f23785eac5f371179d259765bd177a36e005ca96d680c7e5f2a1e0d4692bfe6
-  data.tar.gz: 03f3adb2c666002145f1d3874221721dc23d04e93431574b163387fda9ccaa13430b292dd554af7d9f239577852297e2e7327f7edd7627ba100041006d338db1
+  metadata.gz: b63394e1a1cc9b8bfa1b6c4832ce059b668d023a7e18be341dd9cfb1af9c33d5cbe715651bb3904247de9d5fd4c0ad7f719b43f8a82550800ecc7ad36efa7c1c
+  data.tar.gz: 8869fdafed934a52a321204b3874ad9bedac0279b8d8ec5ce3efd605cd72999b1fa51b4ad7858ff00ca2e928f9012f8a36cc708880b743b37065560daedbfc85

data/ChangeLog.md

@@ -1,6 +1,11 @@
 # xot ChangeLog
 
 
+## [v0.3.6] - 2025-04-08
+
+- Move cfrelease() and CFStringPtr from rays to xot
+
+
 ## [v0.3.5] - 2025-03-24
 
 - Add PULL_REQUEST_TEMPLATE.md

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/include/xot/string.h

@@ -5,6 +5,7 @@
 
 
 #include <stdarg.h>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -24,6 +25,11 @@
 	while (false)
 
 
+#if defined(OSX) || defined(IOS)
+	struct __CFString;
+#endif
+
+
 namespace Xot
 {
 
@@ -71,6 +77,15 @@ 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/util.h

@@ -131,6 +131,13 @@ namespace Xot
 	}
 
 
+#if defined(OSX) || defined(IOS)
+
+	void safe_cfrelease (const void* ref);
+
+#endif
+
+
 }// Xot
 
 

data/src/string.cpp

@@ -4,9 +4,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
-#include <memory>
 #include "xot/exception.h"
 
+#if defined(OSX) || defined(IOS)
+#import <CoreFoundation/CoreFoundation.h>
+#endif
+
 
 namespace Xot
 {
@@ -167,5 +170,46 @@ namespace Xot
 		return val;
 	}
 
+#if defined(OSX) || defined(IOS)
+
+	template <> String
+	to_s<CFStringRef> (const CFStringRef& val)
+	{
+		if (!val || CFGetTypeID(val) != CFStringGetTypeID())
+			return String();
+
+		CFIndex len = CFStringGetMaximumSizeForEncoding(
+			CFStringGetLength(val), kCFStringEncodingUTF8) + 1;
+
+		std::unique_ptr<char[]> buffer(new char[len]);
+		if (!CFStringGetCString(val, buffer.get(), len, kCFStringEncodingUTF8))
+			system_error(__FILE__, __LINE__);
+
+		return buffer.get();
+	}
+
+	template <> String
+	to_s<CFStringPtr> (const CFStringPtr& val)
+	{
+		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
+
 
 }// Xot

data/src/util.cpp

@@ -3,6 +3,10 @@
 
 #include <stdlib.h>
 
+#if defined(OSX) || defined(IOS)
+#import <CoreFoundation/CFBase.h>
+#endif
+
 
 namespace Xot
 {
@@ -49,4 +53,15 @@ namespace Xot
 	}
 
 
+#if defined(OSX) || defined(IOS)
+
+	void
+	safe_cfrelease (const void* ref)
+	{
+		if (ref) CFRelease(ref);
+	}
+
+#endif
+
+
 }// Xot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xot
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies: []
 description: This library include some useful utility classes and functions for development
   with C++.