modis 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636b12c6a5c346586ec5fed639ea9c7de44e18f8
-  data.tar.gz: d8bb31a3245b62c556a8bcee449a3555cf8c2bb6
+  metadata.gz: c6359a4c5d347150ae7cb19754caf5398fd42d0d
+  data.tar.gz: 330ef4946885313394c85425599e4d1274cda2f8
 SHA512:
-  metadata.gz: c379ef03514854bf7221a57c387635fa080c2cd97a9c75ed0620da4ee3166a4cd4ac32d66280f4e1e428679507d74fde8a2faaf2250be0eeb3c41728fe68ebfc
-  data.tar.gz: 677634bb19c26bfa9bd9f6836629466b45c00f4b39112d06cb82b817707cbfedc41a7d2b875154b743090b8e6478222b5e82d3d8fbe37da49c40620101e7be54
+  metadata.gz: dd3275c3569475972681d14c3e1d877d12baf9a872367d4cf0700caf52bb587752414408aeb16afe4886e26a540b5fdcb86da64a0cc6dc3d07dc80b001c4c6e1
+  data.tar.gz: 8527e4159f4b2d7c4ab0c2874518f3de5e24a854b646a26ad5a75be8e4e3d457d47878798167eb6fb1c071c25993ef9984431f9fd13cbb657d350127578f9481

data/lib/modis/finders.rb

@@ -11,10 +11,15 @@ module Modis
       end
 
       def all
-        ids = Modis.redis.smembers(key_for(:all))
-        records = Modis.redis.pipelined do
-          ids.map { |id| Modis.redis.hgetall(key_for(id)) }
+        records = []
+
+        Modis.with_connection do |redis|
+          ids = redis.smembers(key_for(:all))
+          records = redis.pipelined do
+            ids.map { |id| redis.hgetall(key_for(id)) }
+          end
         end
+
         records.map do |record|
           klass = model_class(record)
           klass.new(record, new_record: false)
@@ -25,7 +30,7 @@ module Modis
         if id.nil?
           raise RecordNotFound, "Couldn't find #{name} without an ID"
         end
-        values = Modis.redis.hgetall(key_for(id))
+        values = Modis.with_connection { |redis| redis.hgetall(key_for(id)) }
         unless values['id'].present?
           raise RecordNotFound, "Couldn't find #{name} with id=#{id}"
         end

data/lib/modis/persistence.rb

@@ -86,10 +86,10 @@ module Modis
     end
 
     def destroy
-      self.class.transaction do
+      self.class.transaction do |redis|
         run_callbacks :destroy do
-          Modis.redis.del(key)
-          untrack(id)
+          redis.del(key)
+          untrack(id, redis)
         end
       end
     end
@@ -126,14 +126,14 @@ module Modis
       future = nil
       set_id if new_record?
 
-      self.class.transaction do
+      self.class.transaction do |redis|
         run_callbacks :save do
           callback = new_record? ? :create : :update
           run_callbacks callback do
             attrs = []
             attributes.each { |k, v| attrs << k << coerce_to_string(k, v) }
-            future = Modis.redis.hmset(self.class.key_for(id), attrs)
-            track(id) if new_record?
+            future = redis.hmset(self.class.key_for(id), attrs)
+            track(id, redis) if new_record?
           end
         end
       end
@@ -148,15 +148,17 @@ module Modis
     end
 
     def set_id
-      self.id = Modis.redis.incr("#{self.class.absolute_namespace}_id_seq")
+      Modis.with_connection do |redis|
+        self.id = redis.incr("#{self.class.absolute_namespace}_id_seq")
+      end
     end
 
-    def track(id)
-      Modis.redis.sadd(self.class.key_for(:all), id)
+    def track(id, redis)
+      redis.sadd(self.class.key_for(:all), id)
     end
 
-    def untrack(id)
-      Modis.redis.srem(self.class.key_for(:all), id)
+    def untrack(id, redis)
+      redis.srem(self.class.key_for(:all), id)
     end
   end
 end

data/lib/modis/transaction.rb

@@ -6,7 +6,7 @@ module Modis
 
     module ClassMethods
       def transaction
-        Modis.redis.multi { yield }
+        Modis.with_connection { |redis| redis.multi { yield(redis) } }
       end
     end
   end

data/lib/modis/version.rb

@@ -1,3 +1,3 @@
 module Modis
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/modis.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'connection_pool'
 require 'active_model'
 require 'active_support/all'
 require 'multi_json'
@@ -15,13 +16,24 @@ require 'modis/model'
 module Modis
   @mutex = Mutex.new
 
-  def self.redis
-    return @redis if @redis
-    @mutex.synchronize { @redis = Redis.new }
-    @redis
+  class << self
+    attr_accessor :connection_pool, :redis_options, :connection_pool_size,
+      :connection_pool_timeout
   end
 
-  def self.redis=(redis)
-    @redis = redis
+  self.redis_options = {}
+  self.connection_pool_size = 5
+  self.connection_pool_timeout = 5
+
+  def self.connection_pool
+    return @connection_pool if @connection_pool
+    @mutex.synchronize do
+      options = { size: connection_pool_size, timeout: connection_pool_timeout }
+      @connection_pool = ConnectionPool.new(options) { Redis.new(redis_options) }
+    end
+  end
+
+  def self.with_connection
+    connection_pool.with { |connection| yield(connection) }
   end
 end

data/modis.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activemodel', '>= 3.0'
   gem.add_dependency 'activesupport', '>= 3.0'
   gem.add_dependency 'redis', '>= 3.0'
+  gem.add_dependency 'connection_pool', '>= 2'
 end

data/spec/spec_helper.rb

@@ -14,7 +14,9 @@ end
 
 RSpec.configure do |config|
   config.after :each do
-    keys = Modis.redis.keys "#{Modis.config.namespace}:*"
-    Modis.redis.del *keys unless keys.empty?
+    Modis.with_connection do |connection|
+      keys = connection.keys "#{Modis.config.namespace}:*"
+      connection.del *keys unless keys.empty?
+    end
   end
 end

data/spec/transaction_spec.rb

@@ -8,7 +8,9 @@ end
 
 describe Modis::Transaction do
   it 'yields the block in a transaction' do
-    Modis.redis.should_receive(:multi).and_yield
+    redis = double.as_null_object
+    Modis.stub(:with_connection).and_yield(redis)
+    redis.should_receive(:multi)
     TransactionSpec::MockModel.transaction {}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 description: ActiveModel + Redis
 email:
 - port001@gmail.com