native_btree 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71b1e34d117e61eb4ef28533f3d4371447b942e81bbfaa23b85af4fc81210ad
-  data.tar.gz: 45b6b186bb06e9a58d5a26871f8ebb97dce6f3bffeeccb02169ea43dca972f86
+  metadata.gz: 6e2df9fa087346ceb88e3352b81707085432b0f2b55cb6315175236bcdfb5167
+  data.tar.gz: 5ce010f70cfafe99d7a89ffe1517330da355bde7a52bc3255711dc56e159b14e
 SHA512:
-  metadata.gz: 3bea00617a86a99ad538d31825538ff2547748b30e377e55dcfa98134a25777a0cf33466405395c99836e9bba337f2177ec2d033efc7a4cca17fbe615c087d82
-  data.tar.gz: 1d9ab5a418e9a9ad1e865ff31c1b126b738f2f546b35278fe483df1e357f8fccf427f9234fdc9ce031075d61956b28600af669aa7187d8b2d7f06a6146ff252d
+  metadata.gz: 5a071792ca329c65f44f04ab4609dce810136fe96d2250d785bdce5d26008adc8c81c03b36a7bc1afd5a7000932ce069af74d368fa4f504afad5fdca5d828efb
+  data.tar.gz: 5790f7446d3390d004101d25c8b7f716c19cdc79cbec64e8f4741667aee281fb8d72ef3b9dca28aef4382d0c52b678a626220cd673ac32e8e8e1f4f3b41cb0b6

data/CHANGELOG.md

@@ -1,5 +1,28 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
 ## [Unreleased]
 
-## [0.1.0.alpha1] - 2022-08-20
+* filter()
+* filter!()
+* each_key()
+* each_value()
+* select()
+* select!
+
+## [0.2.0] - 2022-09-07
+
+### Changed
+
+* Small refactoring
+
+### Added
 
-- Initial release
+* to_a()
+* to_h()
+* clear()
+* includes?()

data/CMakeLists.txt

@@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
 
 project(ruby-native-btree
 	LANGUAGES C
-	VERSION 0.1.0
+	VERSION 0.2.0
   	HOMEPAGE_URL https://github.com/unixs/ruby-native-btree)
 
+include(CheckSymbolExists)
+
 set(REQUIRED_RUBY_VERSION 2.6.0)
 
 set(CMAKE_C_STANDARD 11)

data/README.md

@@ -1,12 +1,33 @@
 # GLib Balanced binary tree (GTree) bindings for Ruby
 
 [![Ruby](https://github.com/unixs/ruby-native-btree/actions/workflows/main.yml/badge.svg)](https://github.com/unixs/ruby-native-btree/actions/workflows/main.yml)
+[![Gem Version](https://badge.fury.io/rb/native_btree.svg)](https://badge.fury.io/rb/native_btree)
+[![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0)
+
 
 [GTree - balanced binary tree from GLib library](https://docs.gtk.org/glib/struct.Tree.html)
 
 In most cases it will behave same as Hash, but keys will be ordered by passed comparator.
 
-## Basic usage:
+## Requirements
+
+* **CMake** build tool version **>= 3.14.0**
+* `pkg-config` tool
+* **GLib** library
+  * On Ubuntu run:
+  ```bash
+  sudo apt-get install pkg-config cmake libglib2.0-dev
+  ```
+  * On MacOS run:
+  ```
+  brew install pkg-config cmake glib
+  ```
+  * On FreeBSD use pkg or ports.
+  * On windows use Google. I don't really know how it can work at this moment... But i think it's possible
+
+**Check CMake tool version!**
+
+## Basic usage
 
 ```ruby
 require 'native_btree'

data/ext/native_btree/CMakeLists.txt

@@ -7,11 +7,20 @@ pkg_check_modules(GLIB2 REQUIRED glib-2.0)
 
 include_directories(include ${GLIB2_INCLUDE_DIRS})
 
+list(APPEND CMAKE_REQUIRED_LIBRARIES ${GLIB2_LDFLAGS})
+list(APPEND CMAKE_REQUIRED_INCLUDES ${GLIB2_INCLUDE_DIRS})
+check_symbol_exists(g_tree_remove_all "glib.h" HAVE_GTREE_REMOVE_ALL)
+
+if(HAVE_GTREE_REMOVE_ALL)
+	add_compile_definitions(HAVE_GTREE_REMOVE_ALL)
+endif()
+
 add_library(rbtree_type OBJECT rbtree_type.c)
 add_library(constructor OBJECT constructor.c)
 add_library(instance OBJECT instance.c)
 add_library(comparator OBJECT comparator.c)
 add_library(iterators OBJECT iterators.c)
+add_library(conversion OBJECT conversion.c)
 
 add_library(${EXT_NAME}
 	SHARED
@@ -19,6 +28,7 @@ add_library(${EXT_NAME}
 
 target_link_libraries(${EXT_NAME}
 	PRIVATE
+	conversion
 	iterators
 	rbtree_type
 	constructor

data/ext/native_btree/conversion.c

@@ -0,0 +1,54 @@
+#include <conversion.h>
+
+static gboolean
+rbtree_to_h_callback(gpointer key, gpointer value, gpointer data)
+{
+  VALUE hash = (VALUE) data;
+
+  rb_hash_aset(hash, (VALUE) key, (VALUE) value);
+
+  return FALSE;
+}
+
+
+static gboolean
+rbtree_to_a_callback(gpointer key, gpointer value, gpointer data)
+{
+  VALUE array = (VALUE) data;
+  VALUE array2 = rb_ary_new2(2);
+
+  rb_ary_push(array2, (VALUE) key);
+  rb_ary_push(array2, (VALUE) value);
+
+  rb_ary_push(array, array2);
+
+  return FALSE;
+}
+
+
+VALUE
+rbtree_to_h(VALUE self)
+{
+  EXTRACT_RBTREE_SELF(rbtree);
+
+  VALUE hash = rb_hash_new();
+
+  g_tree_foreach(rbtree->gtree, rbtree_to_h_callback, (gpointer) hash);
+
+  return hash;
+}
+
+
+VALUE
+rbtree_to_a(VALUE self)
+{
+  EXTRACT_RBTREE_SELF(rbtree);
+
+  gint tree_size = g_tree_nnodes(rbtree->gtree);
+
+  VALUE array = rb_ary_new2(tree_size);
+
+  g_tree_foreach(rbtree->gtree, rbtree_to_a_callback, (gpointer) array);
+
+  return array;
+}

data/ext/native_btree/include/conversion.h

@@ -0,0 +1,8 @@
+#include <common.h>
+
+
+VALUE
+rbtree_to_h(VALUE self);
+
+VALUE
+rbtree_to_a(VALUE self);

data/ext/native_btree/include/instance.h

@@ -14,3 +14,9 @@ rbtree_size(VALUE self);
 
 VALUE
 rbtree_height(VALUE self);
+
+VALUE
+rbtree_clear(VALUE self);
+
+VALUE
+rbtree_is_include(VALUE self, VALUE key);

data/ext/native_btree/include/native_btree.h

@@ -4,43 +4,6 @@
 #include <constructor.h>
 #include <instance.h>
 #include <iterators.h>
-
-/*
-VALUE
-btree_new(VALUE klass);
-
-VALUE
-btree_init(VALUE self);
-
-VALUE
-btree_size(VALUE self);
-
-VALUE
-btree_height(VALUE self);
-
-VALUE
-btree_set(VALUE self, VALUE key, VALUE value);
-
-VALUE
-btree_get(VALUE self, VALUE key);
-
-VALUE
-btree_delete(VALUE self, VALUE key);
-
-VALUE
-btree_clear(VALUE self);
-
-VALUE
-btree_has(VALUE self, VALUE key);
-
-VALUE
-btree_each(VALUE self);
-
-VALUE
-btree_cmp(VALUE self, VALUE tree2);
-
-VALUE
-btree_equal(VALUE self, VALUE tree2);
-*/
+#include <conversion.h>
 
 #endif // _NATIVE_BTREE_

data/ext/native_btree/instance.c

@@ -1,5 +1,18 @@
 #include <instance.h>
 
+#ifndef HAVE_GTREE_REMOVE_ALL
+
+static gboolean
+rbtree_remove_node(gpointer key, gpointer val, gpointer data) {
+  RBTree *rbtree = (RBTree *) data;
+
+  g_tree_remove(rbtree->gtree, key);
+
+  return FALSE;
+}
+
+#endif
+
 
 VALUE
 rbtree_set(VALUE self, VALUE key, VALUE value)
@@ -81,3 +94,33 @@ rbtree_size(VALUE self)
 
   return result;
 }
+
+
+VALUE
+rbtree_clear(VALUE self)
+{
+  EXTRACT_RBTREE_SELF(rbtree);
+
+  #ifdef HAVE_GTREE_REMOVE_ALL
+    g_tree_remove_all(rbtree->gtree);
+  #else
+    g_tree_foreach(rbtree->gtree, rbtree_remove_node, (gpointer) rbtree);
+  #endif
+
+  return self;
+}
+
+
+VALUE
+rbtree_is_include(VALUE self, VALUE key)
+{
+  EXTRACT_RBTREE_SELF(rbtree);
+
+  gpointer exists = g_tree_lookup(rbtree->gtree, (gconstpointer) key);
+
+  if (exists == NULL) {
+    return Qfalse;
+  }
+
+  return Qtrue;
+}

data/ext/native_btree/native_btree.c

@@ -15,15 +15,14 @@ Init_native_btree()
 
   rb_define_method(rbtree_class, "[]=", rbtree_set, 2);
   rb_define_alias(rbtree_class, "set", "[]=");
-
   rb_define_method(rbtree_class, "[]", rbtree_get, 1);
   rb_define_alias(rbtree_class, "get", "[]");
-
   rb_define_method(rbtree_class, "delete", rbtree_delete, 1);
-
   rb_define_method(rbtree_class, "each", rbtree_each, 0);
-
   rb_define_method(rbtree_class, "size", rbtree_size, 0);
   rb_define_method(rbtree_class, "height", rbtree_height, 0);
+  rb_define_method(rbtree_class, "clear", rbtree_clear, 0);
+  rb_define_method(rbtree_class, "include?", rbtree_is_include, 1);
+  rb_define_method(rbtree_class, "to_h", rbtree_to_h, 0);
+  rb_define_method(rbtree_class, "to_a", rbtree_to_a, 0);
 }
-

data/lib/native_btree/version.rb

@@ -1,3 +1,3 @@
 module NativeBtree
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/native_btree_instance_spec.rb

@@ -137,8 +137,22 @@ RSpec.describe NativeBtree do
     end
 
     describe "#clear method" do
-      xit "respond to" do
-        expect(described_cless.respond_to?(:clear)).to be true
+      it "respond to" do
+        expect(tree).to respond_to(:clear)
+      end
+
+      it 'clear tree' do
+        tree[1] = 11
+        tree[2] = 22
+        tree[3] = 33
+        expect(tree.size).to be 3
+        tree.clear()
+        expect(tree.size).to be 0
+      end
+
+      it 'return self' do
+        tree[1] = 11
+        expect(tree.clear()).to be tree
       end
     end
 
@@ -155,21 +169,51 @@ RSpec.describe NativeBtree do
     end
 
     describe "#include? method" do
-      xit "respond to" do
-        expect(described_cless.respond_to?(:include?)).to be true
+      it "respond to" do
+        expect(tree).to respond_to(:include?)
+      end
+
+      it 'return true is key exists' do
+        tree[3] = 33
+        expect(tree.include?(3)).to be true
+      end
+
+      it 'return false if key not exists' do
+        tree[3] = 33
+        expect(tree.include?(4)).to be false
       end
     end
 
     describe "to_ methods" do
       describe "#to_a" do
-        xit "respond to" do
-          expect(described_cless.respond_to?(:to_a)).to be true
+        it "respond to" do
+          expect(tree).to respond_to(:to_a)
+        end
+
+        it 'return Array' do
+          expect(tree.to_a).to be_kind_of(Array)
+        end
+
+        it 'has similar items' do
+          tree[2] = 22
+          tree[1] = 11
+          expect(tree.to_a()[0][1]).to be 11
         end
       end
 
       describe "#to_h" do
-        xit "respond to" do
-          expect(described_cless.respond_to?(:to_h)).to be true
+        it "respond to" do
+          expect(tree).to respond_to(:to_h)
+        end
+
+        it "return Hash" do
+          expect(tree.to_h).to be_kind_of(Hash)
+        end
+
+        it 'has similar keys' do
+          tree[2] = 22
+          tree[1] = 11
+          expect(tree.to_h()[1]).to be 11
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: native_btree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Feodorov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings to GTree balanced binary tree from GLib library.
 email:
@@ -27,11 +27,13 @@ files:
 - ext/native_btree/CMakeLists.txt
 - ext/native_btree/comparator.c
 - ext/native_btree/constructor.c
+- ext/native_btree/conversion.c
 - ext/native_btree/extconf_cmake.rb
 - ext/native_btree/include/btree.h
 - ext/native_btree/include/common.h
 - ext/native_btree/include/comparator.h
 - ext/native_btree/include/constructor.h
+- ext/native_btree/include/conversion.h
 - ext/native_btree/include/instance.h
 - ext/native_btree/include/iterators.h
 - ext/native_btree/include/native_btree.h