ohm 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aab8e61021f4edc8be614c9804068a0412f521d
-  data.tar.gz: 7edd271f3f609d5a9b8701b67145d55c68ffa271
+  metadata.gz: ed9503debac38501951e7e6847229e79e1289626
+  data.tar.gz: a754d5fef582a8c80dc1ad3b51b006820d03006a
 SHA512:
-  metadata.gz: 87db7ed730a34029c2aeb84f16a79ea480918abfeff970a84d1ba0393b06b572a00a6017ca18acc79fc1768c981a40c2016c663b40c5e45c75261227d86647d4
-  data.tar.gz: c5ef751dcb8b25b7348d9e0dba04029d207c567274912b28c87e92b86e5b4b344896aa3a1df072c1510d045340d20c0aee6b9adf7b1b278d2bc00d1dd9ff70f5
+  metadata.gz: cad32b03019a2c5f2e058446cb44947e0f3261e8d9c6dd30ff780eb21c7382e4384da950e057d0762307682f25fde152dda8b8f1f59f991642315c8cbf254ef0
+  data.tar.gz: 3e2ecb21022c7fb91441077a6d2566e344c61cba242a93b9675a9a41c0271448321c0ab2e2b9daa2b3110d97856d7d6d30a1675be2ae77362d927b8a313e852f

data/.gems

@@ -1,5 +1,5 @@
-msgpack -v 0.6.0
-nido -v 0.0.1
 redic -v 1.5.0
-cutest -v 1.2.2
+msgpack -v 0.6.2
+nido -v 0.0.1
 stal -v 0.1.0
+cutest -v 1.2.2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.3.0
+
+- Retry save and delete if scripts were flushed in the server.
+- Depend on Redic ~> 1.5.0 in order to use of `call!` instead of `call`.
+
+## 2.2.1
+
+- Lock msgpack version
+
 ## 2.2.0
 
 - Use Stal for set operations

data/README.md

@@ -152,6 +152,10 @@ event.id
 event == Event[1]
 # => true
 
+# Update an event
+event.update :name => "Ohm Worldwide Conference 2032"
+# => #<Event:0x007fb4c35e2458 @attributes={:name=>"Ohm Worldwide Conference"}, @_memo={}, @id="1">
+
 # Trying to find a non existent event
 Event[2]
 # => nil

data/lib/ohm.rb

@@ -39,6 +39,11 @@ module Ohm
   class IndexNotFound < Error; end
   class UniqueIndexViolation < Error; end
 
+  module ErrorPatterns
+    DUPLICATE = /(UniqueIndexViolation: (\w+))/.freeze
+    NOSCRIPT = /^NOSCRIPT/.freeze
+  end
+
   # Instead of monkey patching Kernel or trying to be clever, it's
   # best to confine all the helper methods in a Utils module.
   module Utils
@@ -1299,23 +1304,13 @@ module Ohm
         features["id"] = @id
       end
 
-      response = script(LUA_SAVE, 0,
+      @id = script(LUA_SAVE, 0,
         features.to_msgpack,
         _sanitized_attributes.to_msgpack,
         indices.to_msgpack,
         uniques.to_msgpack
       )
 
-      if response.is_a?(RuntimeError)
-        if response.message =~ /(UniqueIndexViolation: (\w+))/
-          raise UniqueIndexViolation, $1
-        else
-          raise response
-        end
-      end
-
-      @id = response
-
       return self
     end
 
@@ -1346,18 +1341,32 @@ module Ohm
     # Run lua scripts and cache the sha in order to improve
     # successive calls.
     def script(file, *args)
-      cache = LUA_CACHE[redis.url]
+      begin
+        cache = LUA_CACHE[redis.url]
 
-      if cache.key?(file)
-        sha = cache[file]
-      else
-        src = File.read(file)
-        sha = redis.call("SCRIPT", "LOAD", src)
+        if cache.key?(file)
+          sha = cache[file]
+        else
+          src = File.read(file)
+          sha = redis.call("SCRIPT", "LOAD", src)
 
-        cache[file] = sha
-      end
+          cache[file] = sha
+        end
+
+        redis.call!("EVALSHA", sha, *args)
+
+      rescue RuntimeError
 
-      redis.call("EVALSHA", sha, *args)
+        case $!.message
+        when ErrorPatterns::NOSCRIPT
+          LUA_CACHE[redis.url].clear
+          retry
+        when ErrorPatterns::DUPLICATE
+          raise UniqueIndexViolation, $1
+        else
+          raise $!
+        end
+      end
     end
 
     # Update the model attributes and call save.

data/ohm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm"
-  s.version = "2.2.1"
+  s.version = "2.3.0"
   s.summary = %{Object-hash mapping library for Redis.}
   s.description = %Q{Ohm is a library that allows to store an object in Redis, a persistent key-value database. It has very good performance.}
   s.authors = ["Michel Martens", "Damian Janowski", "Cyril David"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "ohm"
 
-  s.add_dependency "redic"
+  s.add_dependency "redic", "~> 1.5.0"
   s.add_dependency "nido"
   s.add_dependency "stal"
   s.add_dependency "msgpack", "~> 0.5.0"

data/test/model.rb

@@ -787,3 +787,13 @@ test "poster-example for overriding writers" do
   a = Advertiser.new(:email => " FOO@BAR.COM ")
   assert_equal "foo@bar.com", a.email
 end
+
+test "scripts are flushed" do
+  m = Meetup.create(:name => "Foo")
+
+  Meetup.redis.call("SCRIPT", "FLUSH")
+
+  m.update(:name => "Bar")
+
+  assert_equal m.name, Meetup[m.id].name
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Michel Martens
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: nido
   requirement: !ruby/object:Gem::Requirement