simple_mutex 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386f8c08c9a13c4402812145555a49a710fe28bf016455491bb779aa58cd7a90
-  data.tar.gz: 1a7e87acc3d54d3a90fd31a515c92c861823e10c054511c1466303fd5afc5e1f
+  metadata.gz: 003ab1f3d7a72c1ed87d20272d4e7e84c8b486fd7dc3a34539ee8ce21688199d
+  data.tar.gz: e392b0b025b830ea18f062e402c1608562ad3992d3c8c100a266e77f7392dbb5
 SHA512:
-  metadata.gz: c94e26f6ac88dd2d3be0b7a788051ef0bf8cda52acd41173d18dabb53521c9bb1feb639ba76deac1feccae666a0e3c359563569a5c5fd81175980d87bd324eac
-  data.tar.gz: bc0f67a008af4a252e118673584c691de022ad5568b83a088654e9070ad45a20c3fec5c77b2b2abd1f1208ca4831b36a4e276a20fbe49d3854886eda48dfd81f
+  metadata.gz: 4385df59ccb07e0781ff83575d2137907ebc022e2971d2cb9e5f000c70075f7685585e5f93ac3b8dcf5d8798dbb28400441f1bf263c6d34167a22740f1661edd
+  data.tar.gz: 1c0bd82fce378dfe91f8d778792a325f14191547ce3e6d464cb1b472299480378299283a28340c4299ff5a1d4dd63ab49204e825d31ba85adcc7e7f0f8719784

data/.github/{worklows/ci.yml → workflows/main.yml}

@@ -28,6 +28,7 @@ jobs:
       - run: bundle exec rubocop
       - run: bundle exec rspec
 
-      - uses: coverallsapp/github-action@v1.1.2
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [1.0.1]
+
+- Bugfix with active job/batches memoization in `SimpleMutex::SidekiqSupport::JobCleaner` and
+`SimpleMutex:SidekiqSupport::BatchCleaner`
+- Simplecov added
+- More tests added for 100% coverage
+
+## [1.0.0]
+
+Initial public release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_mutex (1.0.0)
+    simple_mutex (1.0.1)
       redis
       redis-namespace
       sidekiq
@@ -22,6 +22,7 @@ GEM
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     diff-lcs (1.4.4)
+    docile (1.4.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
@@ -84,10 +85,17 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    sidekiq (6.2.2)
+    sidekiq (6.3.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.3)
     thor (1.1.0)
     timecop (0.9.4)
     tzinfo (2.0.4)
@@ -107,6 +115,8 @@ DEPENDENCIES
   rubocop-config-umbrellio
   rubocop-rspec
   simple_mutex!
+  simplecov
+  simplecov-lcov
   timecop
 
 BUNDLED WITH

data/README.md

@@ -1,4 +1,6 @@
-# SimpleMutex
+
+# SimpleMutex · [![Gem Version](https://badge.fury.io/rb/simple_mutex.svg)](https://badge.fury.io/rb/simple_mutex) [![Coverage Status](https://coveralls.io/repos/github/umbrellio/simple_mutex/badge.svg?branch=main)](https://coveralls.io/github/umbrellio/simple_mutex?branch=main)
+
 
 `SimpleMutex::Mutex` - Redis-based locks with ability to store custom data inside them.
 

data/lib/simple_mutex/base_cleaner.rb

@@ -21,11 +21,11 @@ module SimpleMutex
 
           next redis.unwatch if entity_id.nil? || active?(entity_id)
 
-          return_value = redis.multi { redis.del(lock_key) }
+          return_value = redis.multi { |multi| multi.del(lock_key) }
 
           log_iteration(lock_key, raw_data, return_value) unless logger.nil?
 
-          return_value.first.positive?
+          return_value&.first&.positive?
         end
       end
 
@@ -38,17 +38,9 @@ module SimpleMutex
       active_entity_ids.include?(entity_id)
     end
 
-    def type
-      raise NoMethodError
-    end
-
-    def path_to_entity_id
-      raise NoMethodError
-    end
-
-    def get_active_entity_ids
-      raise NoMethodError
-    end
+    # @!method type
+    # @!method path_to_entity_id
+    # @!method get_active_entity_ids
 
     def safe_parse(raw_data)
       JSON.parse(raw_data)
@@ -65,11 +57,12 @@ module SimpleMutex
     def log_iteration(lock_key, raw_data, return_value)
       log_msg = generate_log_msg(lock_key, raw_data, return_value)
 
-      if return_value&.first.is_a?(Integer)
-        logger.info(log_msg)
-      else
-        logger.error(log_msg)
+      # should not happen, but we encountered this few times long time ago
+      unless return_value&.first.is_a?(Integer)
+        return logger.error(log_msg)
       end
+
+      return_value&.first&.positive? ? logger.info(log_msg) : logger.warn(log_msg)
     end
 
     def start_msg

data/lib/simple_mutex/mutex.rb

@@ -105,7 +105,7 @@ module SimpleMutex
         return false if raw_data.nil?
 
         JSON.parse(raw_data)["signature"] == signature
-      rescue JSON::ParseError, TypeError
+      rescue JSON::ParserError, TypeError
         false
       end
     end

data/lib/simple_mutex/sidekiq_support/batch_cleaner.rb

@@ -24,7 +24,7 @@ module SimpleMutex
         %w[payload bid]
       end
 
-      def active_entity_ids
+      def get_active_entity_ids
         ::Sidekiq::BatchSet.new.map(&:bid)
       end
     end

data/lib/simple_mutex/sidekiq_support/job_cleaner.rb

@@ -19,7 +19,7 @@ module SimpleMutex
         %w[payload jid]
       end
 
-      def active_entity_ids
+      def get_active_entity_ids
         ::Sidekiq::Workers.new.map { |_pid, _tid, work| work["payload"]["jid"] }
       end
     end

data/lib/simple_mutex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleMutex
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/simple_mutex.gemspec

@@ -36,5 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-config-umbrellio"
   spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-lcov"
   spec.add_development_dependency "timecop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_mutex
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - bob-umbr
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -171,10 +199,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/worklows/ci.yml"
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -213,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Redis-based mutex library for using with sidekiq jobs and batches.