extpp 0.0.3 → 0.0.4

data/test/fixtures/protect/extconf.rb

@@ -0,0 +1,4 @@
+require "mkmf"
+require "extpp"
+
+create_makefile("protect")

data/test/fixtures/protect/mkmf.log

@@ -0,0 +1,140 @@
+check_debug_build: checking --enable-debug-build option... -------------------- no
+
+--------------------
+
+check_version: checking g++ version... -------------------- 8.2
+
+--------------------
+
+"g++ -Werror -Wall -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wextra -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wdeprecated-declarations -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wduplicated-cond -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wimplicit-function-declaration -c conftest.cpp"
+cc1plus: error: command line option ‘-Wimplicit-function-declaration’ is valid for C/ObjC but not for C++ [-Werror]
+cc1plus: all warnings being treated as errors
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wimplicit-int -c conftest.cpp"
+cc1plus: error: command line option ‘-Wimplicit-int’ is valid for C/ObjC but not for C++ [-Werror]
+cc1plus: all warnings being treated as errors
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wmisleading-indentation -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wpointer-arith -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wwrite-strings -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wimplicit-fallthrough=0 -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wmissing-noreturn -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wcast-function-type -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wconstant-logical-operand -c conftest.cpp"
+g++: error: unrecognized command line option ‘-Wconstant-logical-operand’; did you mean ‘-Wno-tautological-compare’?
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wlong-long -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wmissing-field-initializers -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Woverlength-strings -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wpacked-bitfield-compat -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wparentheses-equality -c conftest.cpp"
+g++: error: unrecognized command line option ‘-Wparentheses-equality’; did you mean ‘-Wparentheses’?
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wself-assign -c conftest.cpp"
+g++: error: unrecognized command line option ‘-Wself-assign’; did you mean ‘-Wcast-align’?
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wtautological-compare -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wunused-parameter -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wunused-value -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wsuggest-attribute=format -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wsuggest-attribute=noreturn -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+
+"g++ -Werror -Wunused-variable -c conftest.cpp"
+checked program was:
+/* begin */
+1: int main(void) {return 0;}/* end */
+

data/test/fixtures/protect/protect.cpp

@@ -0,0 +1,70 @@
+#include <ruby.hpp>
+
+namespace {
+  class Notifier {
+  public:
+    Notifier(std::string prefix, rb::Object listener) :
+      prefix_(prefix),
+      listener_(listener) {
+      notify("constructed");
+    }
+
+    ~Notifier() {
+      notify("destructed");
+    }
+
+    void notify(const char* name) {
+      auto event = prefix_ + name;
+      auto x = rb::Object(rb_str_new(event.data(), event.size()));
+      listener_.send("notify", {x});
+    }
+
+  private:
+    std::string prefix_;
+    rb::Object listener_;
+  };
+};
+
+extern "C" void
+Init_protect(void)
+{
+  rb::Class klass("ProtectMethods");
+  klass.define_method("protect_raw", [](int argc, VALUE *argv, VALUE self) {
+      VALUE rb_listener;
+      VALUE rb_block;
+      rb_scan_args(argc, argv, "1&", &rb_listener, &rb_block);
+      Notifier outer("outer: ", rb::Object(rb_listener));
+      try {
+        Notifier inner("inner: ", rb::Object(rb_listener));
+        rb::protect(
+          [](VALUE rb_block) -> VALUE {
+            return rb::Object(rb_block).send("call");
+          },
+          rb_block);
+        inner.notify("called");
+      } catch (rb::State& state) {
+        outer.notify("caught");
+        state.jump();
+      }
+      outer.notify("jumped");
+      return Qnil;
+    });
+  klass.define_method("protect_closure", [](int argc, VALUE *argv, VALUE self) {
+      VALUE rb_listener;
+      VALUE rb_block;
+      rb_scan_args(argc, argv, "1&", &rb_listener, &rb_block);
+      Notifier outer("outer: ", rb::Object(rb_listener));
+      try {
+        Notifier inner("inner: ", rb::Object(rb_listener));
+        rb::protect([&rb_block]() -> VALUE {
+                      return rb::Object(rb_block).send("call");
+                    });
+        inner.notify("called");
+      } catch (rb::State& state) {
+        outer.notify("caught");
+        state.jump();
+      }
+      outer.notify("jumped");
+      return Qnil;
+    });
+}

data/test/test-cast.rb

@@ -39,4 +39,8 @@ class CastTest < Test::Unit::TestCase
   def test_string
     assert_equal("Hello", @caster.cast_string("Hello"))
   end
+
+  def test_std_string
+    assert_equal("Hello", @caster.cast_std_string("Hello"))
+  end
 end

data/test/test-protect.rb

@@ -0,0 +1,54 @@
+class ProtectTest < Test::Unit::TestCase
+  extend Helper::Fixture
+
+  class << self
+    def startup
+      return unless self == ProtectTest
+      lib_dir = File.join(__dir__, "..", "lib")
+      Dir.chdir(fixture_path("protect")) do
+        system(RbConfig.ruby, "-w", "-I", lib_dir, "extconf.rb")
+        system("make")
+      end
+      require fixture_path("protect", "protect")
+    end
+  end
+
+  class Listener
+    attr_reader :events
+    def initialize
+      @events = []
+    end
+
+    def notify(event)
+      @events << event
+    end
+  end
+
+  def setup
+    @protect_methods = ProtectMethods.new
+  end
+
+  def assert_protect(method_name)
+    listener = Listener.new
+    assert_raise(RuntimeError.new("message")) do
+      @protect_methods.__send__(method_name, listener) do
+        raise "message"
+      end
+    end
+    assert_equal([
+                   "outer: constructed",
+                   "inner: constructed",
+                   "inner: destructed",
+                   "outer: caught",
+                 ],
+                 listener.events)
+  end
+
+  def test_raw
+    assert_protect(:protect_raw)
+  end
+
+  def test_closure
+    assert_protect(:protect_closure)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extpp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,48 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  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: kramdown
-  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: packnga
-  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: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -113,10 +71,12 @@ files:
 - ext/extpp/function.cpp
 - ext/extpp/function.hpp
 - ext/extpp/object.cpp
+- ext/extpp/protect.cpp
 - include/ruby.hpp
 - include/ruby/cast.hpp
 - include/ruby/class.hpp
 - include/ruby/object.hpp
+- include/ruby/protect.hpp
 - include/ruby/type.hpp
 - lib/extpp.rb
 - lib/extpp/compiler.rb
@@ -143,11 +103,18 @@ files:
 - test/fixtures/object/object.cpp
 - test/fixtures/object/object.o
 - test/fixtures/object/object.so
+- test/fixtures/protect/Makefile
+- test/fixtures/protect/extconf.rb
+- test/fixtures/protect/mkmf.log
+- test/fixtures/protect/protect.cpp
+- test/fixtures/protect/protect.o
+- test/fixtures/protect/protect.so
 - test/helper.rb
 - test/run-test.rb
 - test/test-cast.rb
 - test/test-class.rb
 - test/test-object.rb
+- test/test-protect.rb
 homepage: https://github.com/red-data-tools/extpp
 licenses:
 - BSD-2-Clause
@@ -168,12 +135,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ext++ is a Ruby extension that provides C++ API for writing Ruby extension.
 test_files:
 - test/test-object.rb
+- test/test-protect.rb
 - test/test-class.rb
 - test/fixtures/class/class.so
 - test/fixtures/class/mkmf.log
@@ -181,6 +149,12 @@ test_files:
 - test/fixtures/class/class.o
 - test/fixtures/class/Makefile
 - test/fixtures/class/extconf.rb
+- test/fixtures/protect/mkmf.log
+- test/fixtures/protect/protect.so
+- test/fixtures/protect/protect.cpp
+- test/fixtures/protect/Makefile
+- test/fixtures/protect/protect.o
+- test/fixtures/protect/extconf.rb
 - test/fixtures/cast/mkmf.log
 - test/fixtures/cast/cast.cpp
 - test/fixtures/cast/cast.so