restruct 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348743cb28cb1159c9d59162d3f39233424afc66
-  data.tar.gz: ec7f662e9b67b0762f0cd5dd7f5314e37cafecca
+  metadata.gz: 220d7c61ca9fe2daff93071982a18b7934967c71
+  data.tar.gz: bc038fb7d2126b6d30d770ab1d28687b031111a0
 SHA512:
-  metadata.gz: be6d4f14461f91b75265eef5a327709c192f966d26a56dec4ff83ec0c8563a7ad5070653a240c8e96f2c8fb5222d3473d83aae10eee72617c795cc9fb7577cd7
-  data.tar.gz: 3543ef892445534d84dee4aca23430a7a7c0804dbeb45c7a681018152715ae14b29e3cefce3fdb71a7416628b95b7f25f628e75ee19cb9a2f55ae95a17b338a8
+  metadata.gz: 3357b7800bb6da26bdb54675d097300cd9f33b652f63ad7c5e9d1a0a71f4038459f20e8bade86f12d2b6562f57e08af5ed74400139307cbaea20d35fa5b2273f
+  data.tar.gz: 5740e1bc9699cef63a9c5632c2c6198a48164b99aaf78e3b60bef61983352b5fcc6d48ce3a8b8524af50b673a905caa65c1655e97c3bc4500ee9e0e21fc5b4f5

data/.ruby-version

@@ -1 +1 @@
-ruby 2.1
+ruby 2.0

data/lib/restruct.rb

@@ -4,23 +4,28 @@ require 'forwardable'
 require 'securerandom'
 
 require_relative 'restruct/version'
+require_relative 'restruct/errors'
 require_relative 'restruct/structure'
 require_relative 'restruct/id'
 require_relative 'restruct/array'
 require_relative 'restruct/set'
 require_relative 'restruct/hash'
+require_relative 'restruct/queue'
 require_relative 'restruct/nested_hash'
 require_relative 'restruct/marshalizable'
 require_relative 'restruct/marshal_array'
 require_relative 'restruct/marshal_set'
 require_relative 'restruct/marshal_hash'
-require_relative 'restruct/batch'
+require_relative 'restruct/marshal_queue'
+require_relative 'restruct/locker'
+require_relative 'restruct/connection'
+
 
 module Restruct
 
   extend ClassConfig
 
-  attr_config :redis, Redic.new
+  attr_config :connection, Connection.new
   attr_config :id_separator, ':'
   attr_config :id_generator, ->() { Id.new(:restruct)[SecureRandom.uuid] }
 

data/lib/restruct/array.rb

@@ -7,7 +7,7 @@ module Restruct
     def_delegators :to_a, :uniq, :join, :reverse, :+, :-, :&, :|
 
     def at(index)
-      deserialize redis.call('LINDEX', id, index)
+      deserialize connection.call('LINDEX', id, index)
     end
 
     def values_at(*args)
@@ -48,11 +48,11 @@ module Restruct
       validate_index_type! index
       validate_index_bounds! index
 
-      redis.call 'LSET', id, index, serialize(element)
+      connection.lazy 'LSET', id, index, serialize(element)
     end
 
     def push(*elements)
-      redis.call 'RPUSH', id, *elements.map { |e| serialize e }
+      connection.lazy 'RPUSH', id, *elements.map { |e| serialize e }
       self
     end
     alias_method :<<, :push
@@ -70,7 +70,7 @@ module Restruct
 
     def pop(count=1)
       if count == 1
-        deserialize redis.call('RPOP', id)
+        deserialize connection.lazy('RPOP', id)
       else
         [count, size].min.times.map { pop }.reverse
       end
@@ -78,15 +78,15 @@ module Restruct
 
     def shift(count=1)
       if count == 1
-        deserialize redis.call('LPOP', id)
+        deserialize connection.lazy('LPOP', id)
       else
         [count, size].min.times.map { shift }
       end
     end
 
     def delete(element)
-      removed_count = redis.call 'LREM', id, 0, serialize(element)
-      removed_count > 0 ? element : nil
+      removed_count = connection.lazy 'LREM', id, 0, serialize(element)
+      removed_count && removed_count > 0 ? element : nil
     end
 
     def delete_at(index)
@@ -117,7 +117,7 @@ module Restruct
     end
 
     def size
-      redis.call 'LLEN', id
+      connection.call 'LLEN', id
     end
     alias_method :count, :size
     alias_method :length, :size
@@ -161,7 +161,7 @@ module Restruct
 
     def range(start, stop)
       return nil if start > size
-      redis.call('LRANGE', id, start, stop).map { |e| deserialize e }
+      connection.call('LRANGE', id, start, stop).map { |e| deserialize e }
     end
 
     def validate_index_type!(index)

data/lib/restruct/connection.rb

@@ -0,0 +1,71 @@
+module Restruct
+  class Connection
+
+    def initialize(*args)
+      @redis = Redic.new *args
+      @scripts = {}
+      @nesting = ::Hash.new { |h,k| h[k] = 0 }
+    end
+
+    def call(*args)
+      raise ArgumentError if args.empty?
+      redis.call! *args
+    rescue RuntimeError => ex
+      raise ConnectionErrorFactory.create(ex)
+    end
+
+    def lazy(*args)
+      if nested?
+        redis.queue *args
+        nil
+      else
+        call *args
+      end
+    end
+
+    def script(lua_src, *args)
+      scripts[lua_src] ||= call 'SCRIPT', 'LOAD', lua_src
+      call 'EVALSHA', scripts[lua_src], *args
+    rescue NoScriptError
+      scripts.delete lua_src
+      retry
+    end
+
+    def batch
+      incr_nesting
+      begin
+        result = yield
+      ensure
+        decr_nesting
+      end
+      commit unless nested?
+    rescue => ex   
+      redis.clear unless nested?
+      raise ex
+    end
+
+    private 
+
+    attr_reader :redis, :scripts
+
+    def nested?
+      @nesting[Thread.current.object_id] > 0
+    end
+
+    def incr_nesting
+      @nesting[Thread.current.object_id] += 1
+    end
+
+    def decr_nesting
+      @nesting[Thread.current.object_id] -= 1
+    end
+
+    def commit
+      results = redis.commit 
+      error = results.detect { |r| r === RuntimeError }
+      raise ConnectionErrorFactory.create(error) if error
+      results
+    end
+
+  end
+end

data/lib/restruct/errors.rb

@@ -0,0 +1,54 @@
+module Restruct
+  class Error < StandardError
+  end
+
+  class ConnectionErrorFactory
+    def self.create(exception)
+      error_type = NoScriptError.match?(exception) ? NoScriptError : ConnectionError
+      error_type.new exception
+    end
+  end
+
+  class ConnectionError < Error
+
+    def initialize(inner_exception)
+      @inner_exception = inner_exception
+    end
+
+    def message
+      @inner_exception.message
+    end
+
+    def backtrace
+      @inner_exception.backtrace
+    end
+
+  end
+
+  class NoScriptError < ConnectionError
+    def self.match?(exception)
+      exception.message.start_with? 'NOSCRIPT No matching script'
+    end
+  end
+
+  class LockerError < Error
+
+    def initialize(inner_exception)
+      @inner_exception = inner_exception
+    end
+
+    def message
+      @parsed_message ||= parse_message @inner_exception.message
+    end
+
+    def backtrace
+      @inner_exception.backtrace
+    end
+    
+    def parse_message(message)
+      match_data = /^(ERR Error running script.*@user_script.*user_script.*: )/.match message
+      match_data ? message.gsub(match_data.captures.first,'').strip : message
+    end
+  end
+
+end

data/lib/restruct/hash.rb

@@ -7,7 +7,7 @@ module Restruct
     def_delegators :to_h, :merge, :flatten, :invert
 
     def [](key)
-      deserialize redis.call('HGET', id, key)
+      deserialize connection.call('HGET', id, key)
     end
 
     def fetch(key, default=nil, &block)
@@ -25,7 +25,7 @@ module Restruct
     end
 
     def store(key, value)
-      redis.call 'HSET', id, key, serialize(value)
+      connection.lazy 'HSET', id, key, serialize(value)
       value
     end
     alias_method :[]=, :store
@@ -38,7 +38,7 @@ module Restruct
 
     def delete(key)
       value = self[key]
-      redis.call 'HDEL', id, key
+      connection.lazy 'HDEL', id, key
       value
     end
 
@@ -59,11 +59,11 @@ module Restruct
     end
 
     def keys
-      redis.call 'HKEYS', id
+      connection.call 'HKEYS', id
     end
 
     def values
-      redis.call('HVALS', id).map { |v| deserialize v }
+      connection.call('HVALS', id).map { |v| deserialize v }
     end
 
     def values_at(*keys)
@@ -71,7 +71,7 @@ module Restruct
     end
 
     def key?(key)
-      redis.call('HEXISTS', id, key) == 1
+      connection.call('HEXISTS', id, key) == 1
     end
     alias_method :has_key?, :key?
 
@@ -81,7 +81,7 @@ module Restruct
     alias_method :has_value?, :value?
 
     def size
-      redis.call 'HLEN', id
+      connection.call 'HLEN', id
     end
     alias_method :count, :size
     alias_method :length, :size
@@ -104,7 +104,7 @@ module Restruct
     end
 
     def to_h
-      redis.call('HGETALL', id).each_slice(2).each_with_object({}) do |(k,v), hash|
+      connection.call('HGETALL', id).each_slice(2).each_with_object({}) do |(k,v), hash|
         hash[k] = deserialize v
       end
     end

data/lib/restruct/locker.rb

@@ -0,0 +1,43 @@
+module Restruct
+  class Locker < Structure
+
+    REGISTER_LUA   = File.read "#{File.dirname(__FILE__)}/../../lua/register.lua"
+    UNREGISTER_LUA = File.read "#{File.dirname(__FILE__)}/../../lua/unregister.lua"
+
+    def lock(key, &block)
+      _lock key, false, &block
+    end
+
+    def lock!(key, &block)
+      _lock key, true, &block
+    end
+
+    alias_method :unlock!, :destroy
+
+    alias_method :locked?, :exists?
+
+    def key
+      connection.call('HGET', id, 'key')
+    end
+    alias_method :locked_by, :key
+
+    def to_h
+      ::Hash[connection.call('HGETALL', id).each_slice(2).to_a]
+    end
+    alias_method :to_primitive, :to_h
+    
+    private
+
+    def _lock(key, exclusive)
+      connection.script REGISTER_LUA,   0, id, key, exclusive
+      begin
+        yield
+      ensure  
+        connection.script UNREGISTER_LUA, 0, id
+      end      
+    rescue Restruct::ConnectionError => ex
+      raise LockerError.new ex
+    end
+
+  end
+end

data/lib/restruct/marshal_queue.rb

@@ -0,0 +1,5 @@
+module Restruct
+  class MarshalQueue < Queue
+    include Marshalizable
+  end
+end

data/lib/restruct/nested_hash.rb

@@ -9,7 +9,7 @@ module Restruct
         const_set :TYPE, type
 
         def [](key)
-          self.class::TYPE.new id: id[key], redis: redis, parent: self
+          self.class::TYPE.new id: id[key], connection: connection, parent: self
         end
 
         def fetch(key)
@@ -39,7 +39,7 @@ module Restruct
 
         def keys
           sections = id.sections.count + 1
-          redis.call('KEYS', id['*']).map do |k| 
+          connection.call('KEYS', id['*']).map do |k| 
             Id.new(k).sections.take(sections).last
           end.uniq.sort
         end

data/lib/restruct/queue.rb

@@ -0,0 +1,38 @@
+module Restruct
+  class Queue < Structure
+
+    def push(object)
+      connection.lazy 'RPUSH', id, serialize(object)
+    end
+
+    def pop
+      deserialize connection.lazy('LPOP', id)
+    end
+
+    def size
+      connection.call 'LLEN', id
+    end
+    alias_method :count, :size
+    alias_method :length, :size
+
+    def empty?
+      size == 0
+    end
+
+    def to_a
+      connection.call('LRANGE', id, 0, -1).map { |o| deserialize o }
+    end
+    alias_method :to_primitive, :to_a
+
+    private
+
+    def serialize(string)
+      string
+    end
+
+    def deserialize(string)
+      string
+    end
+
+  end
+end

data/lib/restruct/set.rb

@@ -57,7 +57,7 @@ module Restruct
     end
 
     def size
-      redis.call 'SCARD', id
+      connection.call 'SCARD', id
     end
     alias_method :count, :size
     alias_method :length, :size
@@ -67,7 +67,7 @@ module Restruct
     end
 
     def include?(member)
-      redis.call('SISMEMBER', id, serialize(member)) == 1
+      connection.call('SISMEMBER', id, serialize(member)) == 1
     end
 
     def each(&block)
@@ -75,7 +75,7 @@ module Restruct
     end
 
     def to_a
-      redis.call('SMEMBERS', id).map { |e| deserialize e }
+      connection.call('SMEMBERS', id).map { |e| deserialize e }
     end
 
     def to_set
@@ -99,11 +99,11 @@ module Restruct
     private
 
     def _add(*members)
-      redis.call 'SADD', id, *members.map { |m| serialize m }
+      connection.lazy 'SADD', id, *members.map { |m| serialize m }
     end
 
     def _delete(*members)
-      redis.call 'SREM', id, *members.map { |m| serialize m }
+      connection.lazy 'SREM', id, *members.map { |m| serialize m }
     end