roaring 0.1.0 → 0.3.0

data/ext/roaring/roaring_ruby.h

@@ -0,0 +1,17 @@
+#ifndef ROARING_RUBY_H
+#define ROARING_RUBY_H
+
+#include <ruby.h>
+
+#include "roaring.h"
+
+#ifndef RBOOL
+#define RBOOL(x) ((x) ? Qtrue : Qfalse)
+#endif
+
+extern VALUE rb_mRoaring;
+
+void rb_roaring32_init();
+void rb_roaring64_init();
+
+#endif

data/lib/roaring/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roaring
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/roaring.rb

@@ -7,36 +7,71 @@ require "set"
 module Roaring
   class Error < StandardError; end
 
-  class Bitmap
-    include Enumerable
+  module BitmapCommon
+    def self.included(base)
+      super
+
+      base.extend ClassMethods
+
+      base.alias_method :size, :cardinality
+      base.alias_method :length, :cardinality
+      base.alias_method :count, :cardinality
+
+      base.alias_method :+, :|
+      base.alias_method :union, :|
+      base.alias_method :intersection, :&
+      base.alias_method :difference, :-
+
+      base.alias_method :delete, :remove
+      base.alias_method :delete?, :remove?
 
-    alias size   cardinality
-    alias length cardinality
-    alias count  cardinality
+      base.alias_method :first, :min
+      base.alias_method :last, :max
 
-    alias + |
+      base.alias_method :eql?, :==
 
-    alias first min
-    alias last max
+      base.alias_method :===, :include?
+
+      base.alias_method :subset?, :<=
+      base.alias_method :proper_subset?, :<
+      base.alias_method :superset?, :>=
+      base.alias_method :proper_superset?, :>
+    end
+
+    module ClassMethods
+      def [](*args)
+        if args.size == 0
+          new
+        elsif args.size == 1 && !(Integer === args[0])
+          new(args[0])
+        else
+          new(args)
+        end
+      end
+
+      def _load args
+        deserialize(args)
+      end
+    end
+
+    include Enumerable
 
     def initialize(enum = nil)
       return unless enum
 
-      if enum.instance_of?(Roaring::Bitmap)
-        initialize_copy(enum)
+      if enum.instance_of?(self.class)
+        replace(enum)
       else
         enum.each { |x| self << x }
       end
     end
 
-    def self.[](*args)
-      if args.size == 0
-        new
-      elsif args.size == 1 && !(Integer === args[0])
-        new(args[0])
-      else
-        new(args)
-      end
+    def hash
+      to_a.hash
+    end
+
+    def initialize_copy(other)
+      replace(other)
     end
 
     def >(other)
@@ -47,12 +82,24 @@ module Roaring
       other <= self
     end
 
-    def _dump level
-      serialize
+    def <=>(other)
+      if self == other
+        0
+      elsif subset?(other)
+        -1
+      elsif superset?(other)
+        1
+      else
+        nil
+      end
     end
 
-    def self._load args
-      deserialize(args)
+    def disjoint?(other)
+      !intersect?(other)
+    end
+
+    def _dump level
+      serialize
     end
 
     def to_a
@@ -64,7 +111,28 @@ module Roaring
     end
 
     def inspect
-      "#<#{self.class} cardinality=#{cardinality}>"
+      cardinality = self.cardinality
+      if cardinality < 64
+        "#<#{self.class} {#{to_a.join(", ")}}>"
+      else
+        "#<#{self.class} (#{cardinality} values)>"
+      end
     end
   end
+
+  class Bitmap32
+    include BitmapCommon
+
+    MIN = 0
+    MAX = (2**32) - 1
+    RANGE = MIN..MAX
+  end
+
+  class Bitmap64
+    include BitmapCommon
+
+    MIN = 0
+    MAX = (2**64) - 1
+    RANGE = MIN..MAX
+  end
 end

data/roaring.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
+    `git ls-files --recurse-submodules -z`.split("\x0").reject do |f|
       (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roaring
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prime
@@ -38,8 +38,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/roaring/bitmap32.c
+- ext/roaring/bitmap64.c
 - ext/roaring/cext.c
 - ext/roaring/extconf.rb
+- ext/roaring/roaring.c
+- ext/roaring/roaring.h
+- ext/roaring/roaring_ruby.h
 - lib/roaring.rb
 - lib/roaring/version.rb
 - roaring.gemspec
@@ -66,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Roaring bitmaps for Ruby