gettextpo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 939f88fac034fa8ae14d06943e12163df3a34ca1797c625c7d5c6c591c18756b
-  data.tar.gz: 972a70b2e9f8c5c623e839a7e8c5d54e2b95cd62d1fe0d3f6c26fe4f3d53b429
+  metadata.gz: c2eb5f08e68980571ccd30f9bb661e776084f6f87766e9180567b4501b038c3d
+  data.tar.gz: b22296f8b7d74673c8328c556acb0cdf59e369c19ec281ca0914b5cbec50817c
 SHA512:
-  metadata.gz: 9d1f6fbf4c89921e78629b4f23b2f120671fb04db1dfcb09d73db5f28c6396d37f4bf792a9f69e034ce5ab077ac5c79b3d310beb0deb7707966be306065e8a2f
-  data.tar.gz: b9bdbc78813ad3e20c783e5a2745297624c7c629fc2b97a55081a5b7f904fa3be99df556dc0b6664199e4d71e2e4e02c0d59340129f6f273ff3ae2e8607de3ad
+  metadata.gz: d0d2f86a241e358acd074ed86460072382cc7331afdaedae52f711e050b3442cb65e0bdee28d3cdd7967039bd4119f4d4713788dbd9feb8db390ec5ca5956e05
+  data.tar.gz: 5aca003840bf9bba6f601c8faea83a3c16dcbbb9eaec1d6baf27bba2f25c4f8d80f265d36e7fd4caeaf20c9ea9ed802ae7c4fbf0ac44ca6d85a899c0405f1c69

data/.rdoc_options

@@ -5,3 +5,8 @@ exclude:
   - Rakefile
   - Gemfile
   - vendor
+  - test.cruby/**/*
+  - build_config.rb.lock
+  - mrbgem.rake
+  - mrblib/mrb_gettextpo.rb
+  - mrblib/mrb_gettextpo_version.rb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## CRuby version 0.1.3
+
+- CRuby: Fix file not found case.
+
 ## CRuby version 0.1.2 and mruby version 0.1.0 - 2026-03-11
 
 - Add mruby version.

data/README.md

@@ -3,8 +3,8 @@
 This is a Ruby library for the GNU gettext PO files.  This is a C
 binding of the libgettextpo library, which is provided by the GNU
 gettext package.  The API of this gem is designed to promote Ruby's
-idiomatic coding style while avoiding memory safety.  Currently this
-supports both CRuby and mruby.
+idiomatic coding style while paying attensiton to memory safety.
+Currently this supports both CRuby and mruby.
 
 ## Installation
 

data/ext/gettextpo/gettextpo.c

@@ -24,6 +24,7 @@
  */
 
 #include "gettextpo.h"
+#include <gettext-po.h>
 #include <ruby/internal/core/rdata.h>
 #include <ruby/internal/intern/variable.h>
 
@@ -551,10 +552,17 @@ gettextpo_po_message_m_check_format (int argc, VALUE *argv, VALUE self)
 
 /* ********** file ********** */
 
+void
+gettextpo_file_free (void *file)
+{
+  if (file)
+    po_file_free (file);
+}
+
 static const rb_data_type_t gettextpo_po_file_type = {
   .wrap_struct_name = "gettextpo PO file",
   .function = {
-    .dfree = (void (*)(void *)) po_file_free,
+    .dfree = gettextpo_file_free,
   },
   .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
@@ -602,13 +610,17 @@ gettextpo_po_file_m_read (int argc, VALUE *argv, VALUE klass)
     gettextpo_xerror_context.user_xerror = &kwargs_vals[0];
   if (kwargs_vals[1] != Qundef)
     gettextpo_xerror_context.user_xerror2 = &kwargs_vals[1];
-  /* TODO: po_file_read can return NULL when not found?  Also check
-     null at file free. */
-  DATA_PTR (self)
+  po_file_t file
       = po_file_read (StringValueCStr (filename), &gettextpo_xerror_handler);
-  if (gettextpo_xerror_context.error)
-    rb_raise (ERROR, "failed to read");
-  return self;
+  if (file)
+    {
+      DATA_PTR (self) = file;
+      if (gettextpo_xerror_context.error)
+        rb_raise (ERROR, "failed to read");
+      return self;
+    }
+  else
+    rb_raise (ERROR, "failed to read file, maybe file not found?");
 }
 
 /**

data/lib/gettextpo/version.rb

@@ -19,5 +19,5 @@
 
 module GettextPO
   # Version of this gem.
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/gettextpo.rb

@@ -17,57 +17,4 @@
 
 require_relative "gettextpo/version"
 require_relative "gettextpo/gettextpo"
-
-# The main entrypoints to parse PO files are GettextPO::File.new and
-# GettextPO::File.read.
-#
-# == Error handling
-#
-# There are two kinds of errors in this gem.  The first is for
-# exception handlings of libgettextpo.  The second is regular error
-# raising from this gem.
-#
-# Some functions takes exception error handling paramters like
-# +xerror+ and +xerror2+.  These parameters expect +Proc+ object which
-# takes several parameters.  See also the description of
-# GettextPO::File.read method.  The +severity+ parameter among these
-# parameters is either SEVERITY_WARNING, SEVERITY_ERROR, or
-# SEVERITY_FATAL_ERROR.
-#
-# This gem normally raises +GettextPO::Error+ object, except for the
-# standard ones, +StopIteration+ for example.
-#
-module GettextPO
-  class Error < StandardError; end # :nodoc:
-
-  # This class doesn't provide the +new+ class method.  Refre to
-  # GettextPO::MessageIterator#next or
-  # GettextPO::MessageIterator#insert.
-  class Message
-    private_class_method :new
-  end
-
-  # This class doesn't provide the +new+ class method.  See also
-  # GettextPO::File#message_iterator.
-  class MessageIterator
-    private_class_method :new
-
-    def each # yields: message
-      while true
-        begin
-          yield self.next
-        rescue StopIteration
-          return self
-        end
-      end
-    end
-
-    include Enumerable
-  end
-
-  # This class doesn't provide the +new+ class method.  See also
-  # GettextPO::Message#filepos.
-  class FilePos
-    private_class_method :new
-  end
-end
+require_relative "../mrblib/mrb_gettextpo_common"

data/mrblib/mrb_gettextpo.rb

@@ -37,31 +37,7 @@ module GettextPO
     end
   end
 
-  class MessageIterator
-    def self.new
-      raise NoMethodError,
-            "please use other methods instead, such as GettextPO::File#message_iterator"
-    end
-
-    def each # yields: message
-      while true
-        begin
-          yield self.next
-        rescue StopIteration
-          return self
-        end
-      end
-    end
-
-    include Enumerable
-  end
-
   class Message
-    def self.new
-      raise NoMethodError,
-            "please use other methods instead, such as GettextPO::MessageIterator#next"
-    end
-
     # It seems that calling Proc with keyword arguments is not yet
     # supported.
     alias original_check_all check_all
@@ -79,11 +55,4 @@ module GettextPO
                             xerror2: xerror2 && Proc.new { |kwargs| xerror2.(**kwargs) })
     end
   end
-
-  class FilePos
-    def self.new
-      raise NoMethodError,
-            "please use other methods instead, such as GettextPO::Message#filepos"
-    end
-  end
 end

data/mrblib/mrb_gettextpo_common.rb

@@ -0,0 +1,79 @@
+#--
+# Copyright (C) 2026  gemmaro
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#++
+
+# The main entrypoints to parse PO files are GettextPO::File.new and
+# GettextPO::File.read.
+#
+# == Error handling
+#
+# There are two kinds of errors in this gem.  The first is for
+# exception handlings of libgettextpo.  The second is regular error
+# raising from this gem.
+#
+# Some functions takes exception error handling paramters like
+# +xerror+ and +xerror2+.  These parameters expect +Proc+ object which
+# takes several parameters.  See also the description of
+# GettextPO::File.read method.  The +severity+ parameter among these
+# parameters is either SEVERITY_WARNING, SEVERITY_ERROR, or
+# SEVERITY_FATAL_ERROR.
+#
+# This gem normally raises +GettextPO::Error+ object, except for the
+# standard ones, +StopIteration+ for example.
+#
+module GettextPO
+  Error = Class.new(StandardError) # :nodoc:
+
+  # This class doesn't provide the +new+ class method.  See also
+  # GettextPO::File#message_iterator.
+  class MessageIterator
+    def self.new
+      raise NoMethodError,
+            "please use other methods instead, such as GettextPO::File#message_iterator"
+    end
+
+    def each # yields: message
+      while true
+        begin
+          yield self.next
+        rescue StopIteration
+          return self
+        end
+      end
+    end
+
+    include Enumerable
+  end
+
+  # This class doesn't provide the +new+ class method.  Refre to
+  # GettextPO::MessageIterator#next or
+  # GettextPO::MessageIterator#insert.
+  class Message
+    def self.new
+      raise NoMethodError,
+            "please use other methods instead, such as GettextPO::MessageIterator#next"
+    end
+  end
+
+  # This class doesn't provide the +new+ class method.  See also
+  # GettextPO::Message#filepos.
+  class FilePos
+    def self.new
+      raise NoMethodError,
+            "please use other methods instead, such as GettextPO::Message#filepos"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettextpo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - gemmaro
@@ -36,7 +36,8 @@ files:
 - lib/gettextpo/version.rb
 - mrbgem.rake
 - mrblib/mrb_gettextpo.rb
-- mrblib/version.rb
+- mrblib/mrb_gettextpo_common.rb
+- mrblib/mrb_gettextpo_version.rb
 - sig/gettextpo.rbs
 - src/mrb_gettextpo.c
 - test.cruby/gettextpo_test.rb
@@ -71,7 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- libgettextpo
 rubygems_version: 3.6.9
 specification_version: 4
 summary: GNU gettext PO file parser library