roaring 0.2.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.2.0"
+  VERSION = "0.3.0"
 end

data/lib/roaring.rb

@@ -7,31 +7,60 @@ 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, :-
 
-    alias size   cardinality
-    alias length cardinality
-    alias count  cardinality
+      base.alias_method :delete, :remove
+      base.alias_method :delete?, :remove?
 
-    alias + |
-    alias union |
-    alias intersection &
-    alias difference -
+      base.alias_method :first, :min
+      base.alias_method :last, :max
 
-    alias delete remove
-    alias delete? remove?
+      base.alias_method :eql?, :==
 
-    alias first min
-    alias last max
+      base.alias_method :===, :include?
 
-    alias === 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
@@ -41,21 +70,8 @@ module Roaring
       to_a.hash
     end
 
-    alias eql? ==
-
-    def replace(other)
-      # FIXME: this should probably be initialize_copy and replace should be in C
-      initialize_copy(other)
-    end
-
-    def self.[](*args)
-      if args.size == 0
-        new
-      elsif args.size == 1 && !(Integer === args[0])
-        new(args[0])
-      else
-        new(args)
-      end
+    def initialize_copy(other)
+      replace(other)
     end
 
     def >(other)
@@ -66,11 +82,6 @@ module Roaring
       other <= self
     end
 
-    alias subset? <=
-    alias proper_subset? <
-    alias superset? >=
-    alias proper_superset? >
-
     def <=>(other)
       if self == other
         0
@@ -91,10 +102,6 @@ module Roaring
       serialize
     end
 
-    def self._load args
-      deserialize(args)
-    end
-
     def to_a
       map(&:itself)
     end
@@ -112,4 +119,20 @@ module Roaring
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roaring
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prime
@@ -38,13 +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/LICENSE
-- ext/roaring/roaring/README.md
-- ext/roaring/roaring/roaring.c
-- ext/roaring/roaring/roaring.h
-- ext/roaring/roaring/roaring.hh
+- ext/roaring/roaring.c
+- ext/roaring/roaring.h
+- ext/roaring/roaring_ruby.h
 - lib/roaring.rb
 - lib/roaring/version.rb
 - roaring.gemspec
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Roaring bitmaps for Ruby

data/ext/roaring/roaring/LICENSE

@@ -1,235 +0,0 @@
- The CRoaring project is under a dual license (Apache/MIT).
-Users of the library may choose one or the other license.
-
-------------------
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2016-2022 The CRoaring authors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
------------------------------------
-
-MIT License
-
-Copyright 2016-2022 The CRoaring authors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

data/ext/roaring/roaring/README.md

@@ -1,42 +0,0 @@
-# CRoaringUnityBuild
-Dumps of CRoaring unity builds (for convenience)
-
-This code is automatically generated from https://github.com/RoaringBitmap/CRoaring
-
-## Building
-
-```bash
- echo -e "#include <roaring.hh>\n int main(){Roaring x;}" > test.cpp && cc -c roaring.c -I. -std=c11 && c++ -o test test.cpp roaring.o -I. -std=c++11
-```
-
-You need to compile and link `roaring.c` with your project: this is not a header-only build.
-
-## Usage (C)
-
-```C
-#include <stdio.h>
-#include "roaring.c"
-int main() {
-  roaring_bitmap_t *r1 = roaring_bitmap_create();
-  for (uint32_t i = 100; i < 1000; i++) roaring_bitmap_add(r1, i);
-  printf("cardinality = %d\n", (int) roaring_bitmap_get_cardinality(r1));
-  roaring_bitmap_free(r1);
-  return 0;
-}
-```
-## Usage (C++)
-
-
-```C++
-#include <iostream>
-#include "roaring.hh"
-#include "roaring.c"
-int main() {
-  Roaring r1;
-  for (uint32_t i = 100; i < 1000; i++) {
-    r1.add(i);
-  }
-  std::cout << "cardinality = " << r1.cardinality() << std::endl;
-  return 0;
-}
-```