perobs 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c77003da7bd628fa753bfe35918d8c702b433ac5113ba9fc206f7afa114f6c
-  data.tar.gz: c38f786cb10a040048b7d08b75c16baf034c116a3f9648ece3af7b50e7898446
+  metadata.gz: ab088013ef7d418174d01ec9ca992a8af41740f90e05857b58bb0f6696dcef3a
+  data.tar.gz: 65ec2df5c10d4725e91b8fcbaa8676a921afc11c899f179fc6895a4fb43d18c0
 SHA512:
-  metadata.gz: 1fea934c359190c3b171c99e4dbffb3af58ec2f9dd755eedc0acb7db556f0e2471bd3c527a2910e5d8f17cd59b3f1ca4079436bc80bd11ea5d6efa60f55a54e9
-  data.tar.gz: db71320a9672848a3e35088e7a8b3389278c987a1bea905336e3f8bfff6daeb27564724b6f9d681d364684a57ce8593021041626615dace155e1849b0944003b
+  metadata.gz: 83387ebc8c3b6288c54db762aa4ff22be19bbe40368fa5435a51ccefb8231d8afd4d4bdae6bb1e8920f0a89749ab1d25938fd28529e66b84e97604673b34d6e6
+  data.tar.gz: 1de1c7b4e10b19e6a55634980a87839b84cf22f400bb0c5b94e765056f1890f59a8253048127c912e35fc1d21dbfdba03516de24e832a3b4ccf92f6e9fecf540

data/.github/workflows/ruby.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -1,6 +1,5 @@
 .bundle/
 .yardoc
-Gemfile.lock
 _yardoc/
 coverage/
 doc/

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in perobs.gemspec
 gemspec
+

data/lib/perobs/Array.rb

@@ -1,5 +1,5 @@
-# encoding: UTF-8
-#
+# frozen_string_literal: true
+
 # = Array.rb -- Persistent Ruby Object Store
 #
 # Copyright (c) 2015, 2016, 2017 by Chris Schlaeger <chris@taskjuggler.org>
@@ -25,11 +25,10 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'perobs/Log'
-require 'perobs/ObjectBase'
+require_relative 'Log'
+require_relative 'ObjectBase'
 
 module PEROBS
-
   # An Array that is transparently persisted onto the back-end storage. It is
   # very similar to the Ruby built-in Array class but like other PEROBS
   # object classes it converts direct references to other PEROBS objects into
@@ -41,15 +40,14 @@ module PEROBS
   # with BasicObject.initialize_copy. You can use PEROBS::Array.replace()
   # instead.
   class Array < ObjectBase
-
     attr_reader :data
 
     # These methods do not mutate the Array but create a new PEROBS::Array
     # object. They only perform read operations.
-    ([
-      :|, :&, :+, :-, :collect, :compact, :drop, :drop_while,
-      :flatten, :map, :reject, :reverse, :rotate, :select, :shuffle, :slice,
-      :sort, :take, :take_while, :uniq, :values_at
+    (%i[
+      | & + - collect compact drop drop_while
+      flatten map reject reverse rotate select shuffle slice
+      sort take take_while uniq values_at
     ] + Enumerable.instance_methods).uniq.each do |method_sym|
       define_method(method_sym) do |*args, &block|
         @store.cache.cache_read(self)
@@ -59,12 +57,12 @@ module PEROBS
 
     # These methods do not mutate the Array and only perform read operations.
     # They do not return basic objects types.
-    ([
-      :==, :[], :<=>, :at, :bsearch, :bsearch_index, :count, :cycle,
-      :each, :each_index, :empty?, :eql?, :fetch, :find_index, :first,
-      :frozen?, :include?, :index, :join, :last, :length, :pack,
-      :pretty_print, :pretty_print_cycle, :reverse_each, :rindex, :sample,
-      :size, :to_a, :to_ary, :to_s
+    (%i[
+      == [] <=> at bsearch bsearch_index count cycle
+      each each_index empty? eql? fetch find_index first
+      frozen? include? index join last length pack
+      pretty_print pretty_print_cycle reverse_each rindex sample
+      size to_a to_ary to_s
     ] + Enumerable.instance_methods).uniq.each do |method_sym|
       define_method(method_sym) do |*args, &block|
         @store.cache.cache_read(self)
@@ -73,11 +71,11 @@ module PEROBS
     end
 
     # These methods mutate the Array and return self.
-    [
-      :<<, :clear, :collect!, :compact!, :concat,
-      :fill, :flatten!, :insert, :keep_if, :map!, :push,
-      :reject!, :replace, :select!, :reverse!, :rotate!, :shuffle!,
-      :slice!, :sort!, :sort_by!, :uniq!
+    %i[
+      << clear collect! compact! concat
+      fill flatten! insert keep_if map! push
+      reject! replace select! reverse! rotate! shuffle!
+      slice! sort! sort_by! uniq!
     ].each do |method_sym|
       define_method(method_sym) do |*args, &block|
         @store.cache.cache_write(self)
@@ -87,8 +85,8 @@ module PEROBS
     end
 
     # These methods mutate the Array.
-    [
-      :delete, :delete_at, :delete_if, :shift, :pop
+    %i[
+      delete delete_at delete_if shift pop
     ].each do |method_sym|
       define_method(method_sym) do |*args, &block|
         @store.cache.cache_write(self)
@@ -104,7 +102,7 @@ module PEROBS
     #        Array to initialize
     # @param default [Any] The default value that is returned when no value is
     #        stored for a specific key.
-    def initialize(p, arg1 = 0, default = nil, &block)
+    def initialize(p, arg1 = 0, default = nil)
       super(p)
       if arg1.is_a?(::Array)
         arg1.each { |v| _check_assignment_value(v) }
@@ -123,7 +121,7 @@ module PEROBS
 
     # Proxy for the assignment method.
     def []=(*args)
-      if (args.length == 2)
+      if args.length == 2
         _check_assignment_value(args[1])
       else
         _check_assignment_value(args[2])
@@ -144,8 +142,8 @@ module PEROBS
     # @return [Array of Integer] IDs of referenced objects
     def _referenced_object_ids
       @data.each.select do |v|
-        v && v.respond_to?(:is_poxreference?)
-      end.map { |o| o.id }
+        v&.respond_to?(:is_poxreference?)
+      end.map(&:id)
     end
 
     # This method should only be used during store repair operations. It will
@@ -199,8 +197,5 @@ module PEROBS
         end
       end
     end
-
   end
-
 end
-

data/lib/perobs/BigArray.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# # frozen_string_literal: true
 #
 # = BigArray.rb -- Persistent Ruby Object Store
 #
@@ -26,20 +26,16 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'perobs/Object'
-require 'perobs/BigArrayNode'
+require_relative 'Object'
+require_relative 'BigArrayNode'
 
 module PEROBS
-
   # The BigArray class implements an Array that stores the data in segments. It
   # only loads the currently needed parts of the Array into memory. To provide
   # an efficient access to the data by index a B+Tree like data structure is
   # used. Each segment is stored in a leaf node of the B+Tree.
   class BigArray < PEROBS::Object
-
-    class Stats < Struct.new(:leaf_nodes, :branch_nodes, :min_depth,
-                             :max_depth)
-    end
+    Stats = Struct.new(:leaf_nodes, :branch_nodes, :min_depth, :max_depth)
 
     attr_persist :node_size, :root, :first_leaf, :last_leaf, :entry_counter
 
@@ -53,12 +49,8 @@ module PEROBS
     #        range to try.
     def initialize(p, node_size = 150)
       super(p)
-      unless node_size > 3
-        PEROBS.log.fatal "Node size (#{node_size}) must be larger than 3"
-      end
-      unless node_size % 2 == 0
-        PEROBS.log.fatal "Node size (#{node_size}) must be an even number"
-      end
+      PEROBS.log.fatal "Node size (#{node_size}) must be larger than 3" unless node_size > 3
+      PEROBS.log.fatal "Node size (#{node_size}) must be an even number" unless (node_size % 2).zero?
 
       self.node_size = node_size
       clear
@@ -146,11 +138,9 @@ module PEROBS
     # @param index [Integer] Index in the BigArray
     # @return [Object] found value or nil
     def delete_at(index)
-      if index < 0
-        index = @entry_counter + index
-      end
+      index = @entry_counter + index if index.negative?
 
-      return nil if index < 0 || index >= @entry_counter
+      return nil if index.negative? || index >= @entry_counter
 
       deleted_value = nil
       @store.transaction do
@@ -176,9 +166,7 @@ module PEROBS
       old_root = @root
       clear
       old_root.each do |k, v|
-        if !yield(k, v)
-          insert(k, v)
-        end
+        insert(k, v) unless yield(k, v)
       end
     end
 
@@ -191,7 +179,7 @@ module PEROBS
 
     # Return true if the BigArray has no stored entries.
     def empty?
-      @entry_counter == 0
+      @entry_counter.zero?
     end
 
     # Return the first entry of the Array.
@@ -215,6 +203,7 @@ module PEROBS
       node = @first_leaf
       while node
         break unless node.each(&block)
+
         node = node.next_sibling
       end
     end
@@ -226,6 +215,7 @@ module PEROBS
       node = @last_leaf
       while node
         break unless node.reverse_each(&block)
+
         node = node.prev_sibling
       end
     end
@@ -236,7 +226,7 @@ module PEROBS
     def to_a
       ary = []
       node = @first_leaf
-      while node do
+      while node
         ary += node.values
         node = node.next_sibling
       end
@@ -267,10 +257,10 @@ module PEROBS
     private
 
     def validate_index_range(index)
-      if index < 0
+      if index.negative?
         if -index > @entry_counter
-          raise IndexError, "index #{index} too small for array; " +
-            "minimum #{-@entry_counter}"
+          raise IndexError, "index #{index} too small for array; " \
+                            "minimum #{-@entry_counter}"
         end
 
         index = @entry_counter + index
@@ -278,8 +268,5 @@ module PEROBS
 
       index
     end
-
   end
-
 end
-