locker 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ddf2a9f70dca510ad4dc728ce283dde0102e9a2
-  data.tar.gz: 5c7d2bfa20e1642815fed9ffab42d2f7ed9b982f
+SHA256:
+  metadata.gz: 6848498a3a915838b9b0df22e796e21ac1fdf39c36ffa0256d83a2e217c82d99
+  data.tar.gz: 816eb78e162302a315944f4863b5c5373a64f69e927af60ed8d4dd8299178f18
 SHA512:
-  metadata.gz: b4ffe8ab76a4396b98292862e87837b82dd969aae85e55b02f3eab4cc0af582a95758dbc229dd027d38fd654539c1062ae7c868ab9fd791262585ee37459c836
-  data.tar.gz: e2185e9144a35d2fcf6206d4fbf546cc73f0443e0531a78f2310b1d8aea6eaee64a9422c271187d11315e69cee1228c4b6ed05a87310d4aa64e0e98095ee6e17
+  metadata.gz: cc30fcb1130c337230549c235b8f7bb13bb66870a8e3a69e08e56a19cd330e52742cbb553718a6db8da3b48a0a1ddb4a087ff8c99b072ce346e7a2448f87fab1
+  data.tar.gz: 5cccbb2b52a857a052145498f9cad6001c05e8d19bb7b1eb3574ff9f1d908ffbb46af72456214814bdd2d9a0e31ad3c94a1ae419b39f7abdf07fafa091cf9769

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.5

data/.travis.yml

@@ -2,14 +2,38 @@ language: ruby
 gemfile:
   - Gemfile_rails_3
   - Gemfile_rails_4
+  - Gemfile_rails_5
 rvm:
   - ruby-2.1.10
   - ruby-2.2.7
   - ruby-2.3.4
   - ruby-2.4.1
+  - ruby-2.5.5
   - jruby-9.1.9.0
 script: bundle exec rspec
 matrix:
   exclude:
     - rvm: ruby-2.4.1
       gemfile: Gemfile_rails_3
+    - rvm: ruby-2.1.10
+      gemfile: Gemfile_rails_5
+    - rvm: ruby-2.2.7
+      gemfile: Gemfile_rails_5
+    - rvm: ruby-2.3.4
+      gemfile: Gemfile_rails_5
+    - rvm: ruby-2.4.1
+      gemfile: Gemfile_rails_5
+    - rvm: ruby-2.5.5
+      gemfile: Gemfile_rails_3
+    - rvm: ruby-2.5.5
+      gemfile: Gemfile_rails_4
+    - rvm: jruby-9.1.9.0
+      gemfile: Gemfile_rails_5
+services:
+  - postgresql
+addons:
+  postgresql: "10"
+  apt:
+    packages:
+      - postgresql-10
+      - postgresql-client-10

data/Gemfile

@@ -1,17 +1,17 @@
 source "https://rubygems.org"
 
-gem "activerecord", ">=3.2", "<5"
+gem "activerecord", ">=3.2", "<6"
 
 group :development, :test do
   platform :ruby do
-    gem "pg"
-    gem "pry", "~> 0.10.4"
-    gem "pry-byebug", "~> 3.4.2"
+    gem "pg", "~> 0.21.0", "< 1.0"
+    gem "pry", "~> 0.13.1"
+    gem "pry-byebug", "~> 3.9.0"
   end
 
   platform :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter', '= 1.3.25'
   end
 
-  gem "rspec", "~> 3.2.0"
+  gem "rspec", "~> 3.9.0"
 end

data/Gemfile_rails_3

@@ -4,13 +4,13 @@ gem "activerecord", ">=3.2", "<4"
 
 group :development, :test do
   platform :ruby do
-    gem "pg"
+    gem "pg", "< 1.0"
     gem "pry", "~> 0.10.4"
     gem "pry-byebug", "~> 3.4.2"
   end
 
   platform :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter', '= 1.3.25'
   end
 
   gem "rspec", "~> 3.2.0"

data/Gemfile_rails_4

@@ -4,13 +4,13 @@ gem "activerecord", ">=4", "<5"
 
 group :development, :test do
   platform :ruby do
-    gem "pg"
+    gem "pg", "< 1.0"
     gem "pry", "~> 0.10.4"
     gem "pry-byebug", "~> 3.4.2"
   end
 
   platform :jruby do
-    gem 'activerecord-jdbcpostgresql-adapter'
+    gem 'activerecord-jdbcpostgresql-adapter', '= 1.3.25'
   end
 
   gem "rspec", "~> 3.2.0"

data/Gemfile_rails_5

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5"
+
+group :development, :test do
+  platform :ruby do
+    gem "pg", "~> 0.21.0", "< 1.0"
+    gem "pry", "~> 0.13.1"
+    gem "pry-byebug", "~> 3.9.0"
+  end
+
+  platform :jruby do
+    gem 'activerecord-jdbcpostgresql-adapter', "~> 50"
+  end
+
+  gem "rspec", "~> 3.9.0"
+end

data/README.md

@@ -2,7 +2,7 @@
 
 Locker is a locking mechanism for limiting the concurrency of ruby code using the database.
 
-Locker is dependent on Postgres and the ActiveRecord (>= 3.2.0) gem.
+Locker is dependent on Postgres and the ActiveRecord (>= 3.2.0 and < 6.0) gem.
 
 ## Supported Rubies
 

data/lib/locker/advisory.rb

@@ -6,8 +6,12 @@ class Locker
 
     attr_reader :key, :crc, :lockspace, :blocking, :locked
 
+    # The advisory function we use from PostgreSQL needs the arguments to be
+    # INT, therefore this are the range of int numbers for PostgreSQL
     MAX_LOCK = 2147483647
     MIN_LOCK = -2147483648
+
+    # Max number that a 32bit computer can hold
     OVERFLOW_ADJUSTMENT = 2**32
 
     def initialize(key, options={})
@@ -83,7 +87,13 @@ class Locker
   protected
 
     def get(connection)
-      result = exec_query(connection, "SELECT pg_try_advisory_xact_lock(#{connection.quote(@lockspace)}, #{connection.quote(@crc)})")
+      lockspace_quote = connection.quote(@lockspace)
+      crc_quote = connection.quote(@crc)
+
+      result = exec_query(
+        connection,
+        "SELECT pg_try_advisory_xact_lock(#{lockspace_quote}, #{crc_quote})"
+      )
       @locked = successful_result?(result)
     end
 
@@ -94,6 +104,8 @@ class Locker
       end
     end
 
+    # CRC32 digest to get a decimal numeric of the key used, make sure the
+    # resulting number is within PostgreSql max and min Integer numbers
     def convert_to_crc(key)
       crc = Zlib.crc32(key)
       crc -= OVERFLOW_ADJUSTMENT if crc > MAX_LOCK
@@ -101,7 +113,11 @@ class Locker
     end
 
     def successful_result?(result)
-      result.rows.size == 1 && result.rows[0].size == 1 && result.rows[0][0] == "t"
+      result.rows.size == 1 &&
+        result.rows[0].size == 1 && (
+          result.rows[0][0] == 't' || # Checking for old ActiveRecord
+          result.rows[0][0].class == TrueClass # Checking for the value true
+        )
     end
 
     def exec_query(connection, query)

data/lib/locker/version.rb

@@ -1,3 +1,3 @@
 class Locker
-  VERSION = "0.5.0"
+  VERSION = "0.6.0".freeze
 end

data/locker.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 require "locker/version"
 
 Gem::Specification.new do |s|
@@ -7,8 +6,8 @@ Gem::Specification.new do |s|
   s.version     = Locker::VERSION
   s.authors     = ["Nathan Sutton", "Justin Greer"]
   s.email       = ["nate@zencoder.com", "justin@zencoder.com"]
-  s.summary     = %q{Locker is a locking mechanism for limiting the concurrency of ruby code using the database.}
-  s.description = %q{Locker is a locking mechanism for limiting the concurrency of ruby code using the database. It presently only works with PostgreSQL.}
+  s.summary     = 'Locker is a locking mechanism for limiting the concurrency of ruby code using the database.'
+  s.description = 'Locker is a locking mechanism for limiting the concurrency of ruby code using the database. It presently only works with PostgreSQL.'
 
   s.rubyforge_project = "locker"
 
@@ -16,9 +15,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord",  ">=3.2", "<5"
-  s.add_development_dependency "pg", "~> 0"
-  s.add_development_dependency "rspec", "~> 3.2"
+  s.add_dependency "activerecord", ">=3.2", "< 6"
+  s.add_development_dependency "pg", "~> 0", "< 1"
   s.add_development_dependency "pry", "~> 0.10.4"
   s.add_development_dependency "pry-byebug", "~> 3.4.2"
+  s.add_development_dependency "rspec", "~> 3.2"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: locker
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Nathan Sutton
 - Justin Greer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,48 +48,51 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3.2'
 description: Locker is a locking mechanism for limiting the concurrency of ruby code
   using the database. It presently only works with PostgreSQL.
 email:
@@ -97,13 +103,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile_rails_3
 - Gemfile_rails_4
+- Gemfile_rails_5
 - LICENSE
 - README.md
 - Rakefile
@@ -123,10 +129,10 @@ files:
 - spec/locker/advisory_spec.rb
 - spec/locker/locker_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,8 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: locker
-rubygems_version: 2.6.2
-signing_key: 
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Locker is a locking mechanism for limiting the concurrency of ruby code using
   the database.

data/.ruby-gemset

@@ -1 +0,0 @@
-locker

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.2.1