familia 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41c7c66be20ea8a959ec23a2cbf7124ad7bd78e7fd63949ee97dbdee85461207
-  data.tar.gz: 3befcbeb6154d9efe92ec3bf519fb8e14257f7ad6b4f09a2a348782745f45374
+  metadata.gz: 85be10b89ba21af81625429bd874cb415ea83325c52811cbf73ccadb436e83ad
+  data.tar.gz: 0c60a40a22069927164afc9c3426f294f7b7d4e5066f5197c206a0940fc8b16a
 SHA512:
-  metadata.gz: 54b20874123486ea007225c8aa5953a8d08a9682f13cec3cd208c9c73d4ec2d91a42fa13a2d81f2709e9b5977a91d169cf2e356c2975da0e752893a9305c6cfa
-  data.tar.gz: 6fdd2f5713f8ba9e1cfcf51bd508b28212f92ab829514bb5c78cd151c3679451ef7ac71b01930c9f2aa521178599f94fcabe3a6ec2772128dc5880167db12d91
+  metadata.gz: 57d68342db867a3e472b6a1c27b3d9f1c728d7b8ca821caf79d80d44f03fca0546263532ea5e43659cd379331d421a666b0fb94dd707de248f5453bfb0c527be
+  data.tar.gz: 1251c83b61231e5b392da125b88cc8312b65d6892df285f6fed3ef4a12d354304c5f3a21f5d6f5cc95f2479ad04b53a98783e0429868d469c224506f46a41f70

data/.github/workflows/ruby.yml

@@ -0,0 +1,69 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        include:
+          - ruby: '3.3'
+            bundler: latest
+            rubygems: latest
+
+          - ruby: '3.2'
+            bundler: latest
+            rubygems: latest
+
+          - ruby: '3.1'
+            bundler: latest
+            rubygems: latest
+
+          - ruby: '3.0'
+            bundler: latest
+            rubygems: latest
+
+          - ruby: '2.7'
+            bundler: '2.4.22'
+            rubygems: '3.2.3'
+
+    services:
+      redis:
+        image: redis:bookworm@sha256:e422889e156ebea83856b6ff973bfe0c86bce867d80def228044eeecf925592b
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 3s
+          --health-retries 5
+        ports:
+          # https://docs.github.com/en/actions/using-containerized-services/creating-redis-service-containers#running-jobs-in-containers
+          # Maps port 6379 on service container to the host
+          - 6379:6379
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        rubygems: ${{ matrix.rubygems }}
+        bundler: ${{ matrix.bundler }}
+        # When the following is true, also run "bundle install",
+        # and cache the result automatically. Ran into an issue
+        # with the caching and multiple ruby versions. Needs
+        # further investigation.
+        bundler-cache: false
+
+    - name: Re-run bundle install
+      run: bundle install
+
+    - name: Run the tryouts
+      run: bundle exec try -v

data/.pre-commit-config.yaml

@@ -0,0 +1,69 @@
+##
+# Pre-Commit Configuration
+#
+# Initial setup:
+#
+#   0. Install the pre-commit framework (if it isn't already on your system):
+
+#         $ pip install pre-commit
+#
+#   1. Install the git hook:
+#
+#         $ pre-commit install
+#
+#
+# Other commands:
+#
+#   Run it on all the files in this repo:
+#     $ pre-commit run --all-files
+#
+#   Updating plugin repositories:
+#     $ pre-commit autoupdate
+#
+#   Automatically enable pre-commit on repositories
+#     $ git config --global init.templateDir ~/.git-template
+#     $ pre-commit init-templatedir ~/.git-template
+#
+# See also:
+#   - https://pre-commit.com for more information
+#   - https://pre-commit.com/hooks.html for more hooks
+#
+
+default_install_hook_types:
+  - pre-commit
+  - prepare-commit-msg
+
+fail_fast: true
+
+repos:
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+      - id: identity
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: detect-private-key
+      - id: mixed-line-ending
+      - id: check-added-large-files
+        args: ["--maxkb=1000"]
+      - id: no-commit-to-branch
+        args: ["--branch", "develop", "--branch", "rel/.*"]
+      - id: check-merge-conflict
+      - id: forbid-submodules
+
+  - repo: https://github.com/avilaton/add-msg-issue-prefix-hook
+    rev: v0.0.11
+    hooks:
+      - id: add-msg-issue-prefix
+        stages: [prepare-commit-msg]
+        name: Link commit to Github issue
+        args:
+          - "--default=[NOJIRA]"
+          - "--pattern=[a-zA-Z0-9]{0,10}-?[0-9]{1,5}"
+          - "--template=[#{}]"

data/Gemfile

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 
-ruby '>= 2.6.8'
+ruby '>= 2.7.8'
 
-gem 'redis', '>= 4.8', '< 7'
-gem 'uri-redis'
-gem 'gibbler'
-gem 'storable'
-gem 'multi_json'
+gem 'redis', '>= 4.8.1', '< 6.0'
+gem 'uri-redis', '>= 1.3.0'
+gem 'gibbler', '~> 1.0.0'
+gem 'storable', '~> 0.10.0'
+gem 'multi_json', '~> 1.15'
 
 group :development, :test do
-  gem 'tryouts', '~> 2.2'
+  gem 'pry-byebug', '~> 3.10.1', require: false
+  gem 'tryouts', '~> 2.2', require: false
 end

data/Gemfile.lock

@@ -1,36 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    attic (1.0.0)
+    attic (1.0.1)
       rake (~> 13.0.6)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    connection_pool (2.4.1)
     drydock (0.6.9)
     gibbler (1.0.0)
       attic (~> 1.0)
       rake (~> 13.0)
+    method_source (1.1.0)
     multi_json (1.15.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
     rake (13.0.6)
-    redis (4.8.1)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.2)
+      connection_pool
     storable (0.10.0)
     sysinfo (0.10.0)
       drydock (< 1.0)
       storable (~> 0.10)
     tryouts (2.2.0)
       sysinfo (~> 0.10)
-    uri-redis (0.4.2)
+    uri-redis (1.3.0)
 
 PLATFORMS
-  arm64-darwin-22
+  arm64-darwin-24
+  ruby
 
 DEPENDENCIES
-  gibbler
-  multi_json
-  redis (~> 4.8)
-  storable
+  gibbler (~> 1.0.0)
+  multi_json (~> 1.15)
+  pry-byebug (~> 3.10.1)
+  redis (>= 4.8.1, < 6.0)
+  storable (~> 0.10.0)
   tryouts (~> 2.2)
-  uri-redis
+  uri-redis (>= 1.3.0)
 
 RUBY VERSION
-   ruby 2.6.8p205
+   ruby 3.2.4p170
 
 BUNDLED WITH
-   2.4.12
+   2.5.9

data/README.md

@@ -1,7 +1,14 @@
-# Familia - 0.9 (2024-04-04)
+# Familia - 0.10.0
 
-**Organize and store ruby objects in Redis**
+**Organize and store ruby objects in Redis. A Ruby ORM for Redis.**
 
+## Installation
+
+Get it in one of the following ways:
+
+* In your Gemfile: `gem 'familia', '>= 0.10.0'`
+* Install it by hand: `gem install familia`
+* Or for development: `git clone git@github.com:delano/familia.git`
 
 ## Basic Example
 
@@ -21,4 +28,5 @@
 
 ## More Information
 
-* [Codes](https://github.com/delano/familia)
+* [Github](https://github.com/delano/familia)
+* [Rubygems](https://rubygems.org/gems/familia)

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :MAJOR: 0
-:MINOR: 9
-:PATCH: 3
+:MINOR: 10
+:PATCH: 0

data/familia.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = "familia"
-  s.version     = "0.9.3"
+  s.version     = "0.10.0"
   s.summary     = "Organize and store ruby objects in Redis"
   s.description = "Familia: #{s.summary}"
   s.authors     = ["Delano Mandelbaum"]
-  s.email       = "delano@solutious.com"
+  s.email       = "gems@solutious.com"
   s.homepage    = "https://github.com/delano/familia"
   s.license     = "MIT"
 
@@ -13,11 +13,5 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.6.8")
-
-  s.add_dependency "redis", ">= 4.8", "< 7"
-  s.add_dependency "uri-redis", ">= 1.0.0"
-  s.add_dependency "gibbler", "~> 1.0.0"
-  s.add_dependency "storable", "~> 0.10.0"
-  s.add_dependency "multi_json", "~> 1.15"
+  s.required_ruby_version = Gem::Requirement.new(">= 2.7.8")
 end

data/lib/familia/redisobject.rb

@@ -46,7 +46,7 @@ module Familia
       end
     end
 
-    attr_reader :name, :parent
+    attr_reader :name, :parent, :opts
     attr_writer :redis
 
       # RedisObject instances are frozen. `cache` is a hash
@@ -260,7 +260,7 @@ module Familia
     def to_redis v
       return v unless @opts[:class]
       ret = case @opts[:class]
-      when ::Symbol, ::String, ::Fixnum, ::Float, Gibbler::Digest
+      when ::Symbol, ::String, ::Integer, ::Float, Gibbler::Digest
         v
       else
         if ::String === v
@@ -297,7 +297,7 @@ module Familia
         v.to_s
       when ::Symbol
         v.to_s.to_sym
-      when ::Fixnum, ::Float
+      when ::Integer, ::Float
         @opts[:class].induced_from v
       else
         objs = values
@@ -734,7 +734,7 @@ module Familia
       #
       #   sorted_sets.rb:374:in `zrevrange': wrong number of arguments (given 4, expected 3) (ArgumentError)
       #
-      redis.zrange(rediskey, sidx, eidx, :withscores => opts[:withscores])
+      redis.zrange(rediskey, sidx, eidx, **opts)
     end
 
     def revrange sidx, eidx, opts={}
@@ -744,7 +744,7 @@ module Familia
     end
 
     def revrangeraw sidx, eidx, opts={}
-      redis.zrevrange(rediskey, sidx, eidx, :withscores => opts[:withscores])
+      redis.zrevrange(rediskey, sidx, eidx, **opts)
     end
 
     # e.g. obj.metrics.rangebyscore (now-12.hours), now, :limit => [0, 10]
@@ -756,7 +756,7 @@ module Familia
 
     def rangebyscoreraw sscore, escore, opts={}
       echo :rangebyscoreraw, caller[0] if Familia.debug
-      redis.zrangebyscore(rediskey, sscore, escore, :withscores => opts[:withscores])
+      redis.zrangebyscore(rediskey, sscore, escore, **opts)
     end
 
     def remrangebyrank srank, erank

data/lib/familia/test_helpers.rb

@@ -36,5 +36,5 @@ class Limiter < Storable
   include Familia
   index :name
   field :name
-  string :counter, :quantize => true, :ttl => 1.hour, :quantize => [10.minutes, '%H:%M', 1302468980]
-end
+  string :counter, :ttl => 1.hour, :quantize => [10.minutes, '%H:%M', 1302468980]
+end

data/lib/familia.rb

@@ -46,13 +46,13 @@ module Familia
     def ld *msg
       info *msg if debug?
     end
-    def trace label, redis_client, ident, context=nil
+    def trace label, redis_instance, ident, context=nil
       return unless Familia.debug?
-      info "[%s] %s/%s" % [label, redis_client.uri, ident] 
+      info "[%s] %s/%s" % [label, redis_instance.id, ident]
       if context
         context = [context].flatten
         context.reject! { |line| line =~ /lib\/familia/ }
-        info "   %s" % context[0..6].join("\n   ") 
+        info "   %s" % context[0..6].join("\n   ")
       end
     end
     def uri= v
@@ -61,9 +61,9 @@ module Familia
     end
     # A convenience method for returning the appropriate Redis
     # connection. If +uri+ is an Integer, we'll treat it as a
-    # database number. If it's a String, we'll treat it as a 
+    # database number. If it's a String, we'll treat it as a
     # full URI (e.g. redis://1.2.3.4/15).
-    # Otherwise we'll return the default connection. 
+    # Otherwise we'll return the default connection.
     def redis(uri=nil)
       if Integer === uri
         tmp = Familia.uri
@@ -73,7 +73,7 @@ module Familia
         uri &&= URI.parse uri
       end
       uri ||= Familia.uri
-      connect(uri) unless @clients[uri.serverid] 
+      connect(uri) unless @clients[uri.serverid]
       @clients[uri.serverid]
     end
     def log(level, path)
@@ -111,29 +111,29 @@ module Familia
       el.unshift @apiversion unless @apiversion.nil?
       el.join(Familia.delim)
     end
-    def apiversion(r=nil, &blk)  
+    def apiversion(r=nil, &blk)
       if blk.nil?
-        @apiversion = r if r; 
+        @apiversion = r if r;
       else
         tmp = @apiversion
         @apiversion = r
         blk.call
         @apiversion = tmp
       end
-      @apiversion 
+      @apiversion
     end
     def now n=Time.now
       n.utc.to_i
     end
     # A quantized timestamp
     # e.g. 12:32 -> 12:30
-    # 
+    #
     def qnow quantum=10.minutes, now=Familia.now
       rounded = now - (now % quantum)
       Time.at(rounded).utc.to_i
     end
   end
-  
+
   class Problem < RuntimeError; end
   class NoIndex < Problem; end
   class NonUniqueKey < Problem; end
@@ -146,7 +146,7 @@ module Familia
       "No client for #{uri.serverid}"
     end
   end
-  
+
   def self.included(obj)
     obj.send :include, Familia::InstanceMethods
     obj.send :include, Gibbler::Complex
@@ -154,7 +154,7 @@ module Familia
     obj.class_zset :instances, :class => obj, :reference => true
     Familia.classes << obj
   end
-  
+
   require 'familia/object'
   require 'familia/helpers'
 
@@ -170,5 +170,5 @@ module Familia
     def included(obj)
       self.klasses << obj
     end
-  end  
+  end
 end

data/try/21_redis_object_zset_try.rb

@@ -1,6 +1,8 @@
 require 'familia'
 require 'familia/test_helpers'
 
+# Familia.debug = true
+
 @a = Bone.new 'atoken', 'akey'
 
 ## Familia::SortedSet#add
@@ -9,11 +11,11 @@ require 'familia/test_helpers'
 @a.metrics.add 0, :metric0
 @a.metrics.add 1, :metric1
 @a.metrics.add 3, :metric3
-##=> true
+#=> true
 
 ## Familia::SortedSet#members
 @a.metrics.members
-##=> ['metric0', 'metric1', 'metric2', 'metric3', 'metric4']
+#=> ['metric0', 'metric1', 'metric2', 'metric3', 'metric4']
 
 ## Familia::SortedSet#members
 @a.metrics.revmembers

metadata

@@ -1,98 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: familia
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Delano Mandelbaum
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: uri-redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: gibbler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: storable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
+date: 2024-06-16 00:00:00.000000000 Z
+dependencies: []
 description: 'Familia: Organize and store ruby objects in Redis'
-email: delano@solutious.com
+email: gems@solutious.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".pre-commit-config.yaml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -119,7 +45,7 @@ homepage: https://github.com/delano/familia
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,15 +53,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.8
+      version: 2.7.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Organize and store ruby objects in Redis
 test_files: []