ohm-contrib 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ca2996cd69a1f85572aa47bd899c8a939498b5
-  data.tar.gz: d71adacef87ae7cd37165afe78c900d2eb158c8b
+  metadata.gz: a52426f91b67c71d40fe30b9349b19523cc2ae49
+  data.tar.gz: b3e078c7c34c4f5936d1674317f71b6607c81f4e
 SHA512:
-  metadata.gz: bac2979be97da13d457139c85309b45783b77e4d1520de1a95914e1db70587472468bfb190acd1c7172b5266e004af3e1c51aec0a799b3557b670293c8016857
-  data.tar.gz: 5f900d67c1a7166970ae10bdc8042018bec1d60171acc9a8d1c40eaab27388a9b7d4dc7ba07fb7ce3d84de7f05709edc250289dc4c5c9af045e467cb16e6bc42
+  metadata.gz: 1bb1072d4f28ea0e59bb49cc0057e950f25cc831da0e4a12cc25b09ed613dba38e455efea60209cf8c8376d34f82afae804c909d437a1b6b83a01901441ead50
+  data.tar.gz: 5842bd888c672735b63919fd819e6bad5f8c75252c104664d445fe60728b7bcb49e2ed5fc8ba4fa6cf810dcdf9b554937c18249b96eef5d710cf259a7b651de7

data/lib/ohm/locking.rb

@@ -12,10 +12,9 @@ module Ohm
     #   post.mutex(0.01) do
     #     # this block is in a mutex!
     #   end
-    def mutex(wait = 0.1)
+    def spinlock(wait = 0.1)
       lock!(wait)
       yield
-      self
     ensure
       unlock!
     end
@@ -27,8 +26,8 @@ module Ohm
     #
     # @see Model#mutex
     def lock!(wait = 0.1)
-      until redis.call("SETNX", key[:_lock], lock_timeout)
-        next unless lock = redis.call("HGET", key[:_lock])
+      until redis.call("SETNX", key[:_lock], lock_timeout) == 1
+        next unless lock = redis.call("GET", key[:_lock])
         sleep(wait) and next unless lock_expired?(lock)
 
         break unless lock = redis.call("GETSET", key[:_lock], lock_timeout)

data/ohm-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm-contrib"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
   s.summary = %{A collection of decoupled drop-in modules for Ohm.}
   s.description = %{Includes a couple of core functions such as callbacks, timestamping, typecasting and lots of generic validation routines.}
   s.author = "Cyril David"
@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
 
-  s.add_dependency "ohm", "~> 2.0.0"
+  s.add_dependency "ohm", "~> 2.0"
 
-  s.add_development_dependency "cutest"
-  s.add_development_dependency "iconv"
-  s.add_development_dependency "override"
+  s.add_development_dependency "cutest", "~> 1.2"
+  s.add_development_dependency "iconv", "~> 1.0"
+  s.add_development_dependency "override", "~> 0.0"
 end

data/test/locking.rb

@@ -3,8 +3,40 @@ require_relative "../lib/ohm/locking"
 
 class Server < Ohm::Model
   include Ohm::Locking
+  extend Ohm::Locking
+
+  attribute :taken
+  index :taken
+
+  def self.acquire
+    spinlock do
+      s = Server.find(taken: 0).first
+
+      if s
+        s.update(taken: 1)
+      end
+
+      return s
+    end
+  end
 end
 
 test "mutex method is added at instance and class level" do
-  assert Server.new.respond_to?(:mutex)
+  assert Server.new.respond_to?(:spinlock)
+end
+
+test "acquire with concurrency" do
+  s = Server.create(taken: 0)
+
+  res = {}
+
+  threads = 5.times.map do |i|
+    Thread.new(i, res) do |idx, e|
+      e[idx] = Server.acquire
+    end
+  end
+
+  threads.each(&:join)
+
+  assert_equal 1, res.values.compact.size
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: iconv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: override
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 description: Includes a couple of core functions such as callbacks, timestamping,
   typecasting and lots of generic validation routines.
 email: cyx@cyx.is
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gems
-- .gitignore
+- ".gems"
+- ".gitignore"
 - CHANGELOG.md
 - LICENSE
 - README.markdown
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A collection of decoupled drop-in modules for Ohm.