hella-redis 0.1.1 → 0.2.0

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.log
 *.rbc
+.rbx/
 .bundle
 .config
 .yardoc

data/Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
+gem 'pry', "~> 0.9.0"

data/README.md

@@ -4,18 +4,18 @@ It's-a hella-redis!
 
 ## Usage
 
-### RedisConnection
+### Connection
 
 ```ruby
 # config and create a connection
-@config = OpenStruct.new({
+@config = {
   :timeout  => 1,
   :size     => 5,
   :redis_ns => 'hella-redis-test',
   :driver   => 'ruby',
   :url      => 'redis://localhost:6379/0'
-})
-@conn = HellaRedis::RedisConnection.new(@config)
+}
+@conn = HellaRedis::Connection.new(@config)
 
 # it's actually a pool of connections
 @conn.with do |conn|

data/hella-redis.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency("assert")
 
-  gem.add_dependency("redis",           ["~> 3.0"])
-  gem.add_dependency("redis-namespace", ["~> 1.0"])
+  gem.add_dependency("redis",           ["~> 3.2"])
+  gem.add_dependency("redis-namespace", ["~> 1.5"])
   gem.add_dependency("connection_pool", ["=  0.9.2"]) # temp, for 1.8.7 support
 
 end

data/lib/hella-redis.rb

@@ -1,5 +1,5 @@
-require "hella-redis/version"
-require "hella-redis/redis_connection"
+require 'hella-redis/version'
+require 'hella-redis/connection'
 
 module HellaRedis
 end

data/lib/hella-redis/connection.rb

@@ -0,0 +1,35 @@
+require 'connection_pool'
+require 'redis'
+require 'redis-namespace'
+
+module HellaRedis
+
+  module Connection
+
+    def self.new(config)
+      config = Config.new(config) if config.kind_of?(::Hash)
+      ::ConnectionPool.new(:timeout => config.timeout, :size => config.size) do
+        ::Redis::Namespace.new(config.redis_ns, {
+          :redis => ::Redis.new({
+            :url    => config.url,
+            :driver => config.driver
+          })
+        })
+      end
+    end
+
+    class Config
+      attr_reader :url, :driver, :redis_ns, :timeout, :size
+
+      def initialize(args)
+        @url      = args[:url]
+        @driver   = args[:driver]
+        @redis_ns = args[:ns]
+        @timeout  = args[:timeout]
+        @size     = args[:size] || 1
+      end
+    end
+
+  end
+
+end

data/lib/hella-redis/connection_spy.rb

@@ -0,0 +1,58 @@
+require 'redis'
+require 'hella-redis/connection'
+
+module HellaRedis
+
+  class ConnectionSpy
+
+    attr_reader :config, :redis_spy, :with_calls
+
+    def initialize(config, redis_spy = nil)
+      @config     = config
+      @with_calls = []
+      @redis_spy  = redis_spy || RedisSpy.new(config)
+    end
+
+    def with(*args, &block)
+      @with_calls << WithCall.new(args, block)
+      block.call(@redis_spy)
+    end
+
+    def redis_calls
+      @redis_spy.calls
+    end
+
+  end
+
+  class RedisSpy
+
+    attr_reader :calls
+
+    def initialize(config)
+      # mimic the real conection behavior, accept hash or object
+      config = Connection::Config.new(config) if config.kind_of?(::Hash)
+      @instance = ::Redis.new({
+        :url    => config.url,
+        :driver => config.driver
+      })
+      @calls = []
+    end
+
+    def method_missing(name, *args, &block)
+      if self.respond_to?(name)
+        @calls << RedisCall.new(name, args, block)
+      else
+        super
+      end
+    end
+
+    def respond_to?(*args)
+      super || @instance.respond_to?(*args)
+    end
+
+  end
+
+  WithCall  = Struct.new(:args, :block)
+  RedisCall = Struct.new(:command, :args, :block)
+
+end

data/lib/hella-redis/version.rb

@@ -1,3 +1,3 @@
 module HellaRedis
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/helper.rb

@@ -3,3 +3,8 @@
 
 # add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
+
+# require pry for debugging (`binding.pry`)
+require 'pry'
+
+require 'test/support/factory'

data/test/support/factory.rb

@@ -0,0 +1,6 @@
+require 'assert/factory'
+
+module Factory
+  extend Assert::Factory
+
+end

data/test/unit/connection_spy_tests.rb

@@ -0,0 +1,100 @@
+require 'assert'
+require 'hella-redis/connection_spy'
+
+class HellaRedis::ConnectionSpy
+
+  class UnitTests < Assert::Context
+    setup do
+      @config = {
+        :url    => 'redis://localhost:6379/0',
+        :driver => 'ruby'
+      }
+    end
+
+  end
+
+  class ConnectionSpyTests < UnitTests
+    desc "HellaRedis::ConnectionSpy"
+    setup do
+      @connection_spy = HellaRedis::ConnectionSpy.new(@config)
+    end
+    subject{ @connection_spy }
+
+    should have_readers :config, :redis_spy, :with_calls
+    should have_imeths :with, :redis_calls
+
+    should "know its config and redis spy" do
+      assert_equal @config, subject.config
+      assert_instance_of HellaRedis::RedisSpy, subject.redis_spy
+    end
+
+    should "default its with calls" do
+      assert_equal [], subject.with_calls
+    end
+
+    should "know its redis spy's calls" do
+      assert_same subject.redis_spy.calls, subject.redis_calls
+    end
+
+    should "yield its redis spy using `with`" do
+      yielded = nil
+      subject.with{ |c| yielded = c }
+      assert_same subject.redis_spy, yielded
+    end
+
+    should "track calls to with" do
+      overrides = { :timeout => Factory.integer }
+      block = proc{ |c| Factory.string }
+      subject.with(overrides, &block)
+      call = subject.with_calls.last
+      assert_equal [overrides], call.args
+      assert_equal block, call.block
+    end
+
+    should "allow passing a custom redis spy" do
+      redis_spy = Factory.string
+      spy = HellaRedis::ConnectionSpy.new(@config, redis_spy)
+      assert_equal redis_spy, spy.redis_spy
+    end
+
+  end
+
+  class RedisSpyTests < UnitTests
+    desc "HellaRedis::RedisSpy"
+    setup do
+      @redis_spy = HellaRedis::RedisSpy.new(@config)
+    end
+    subject{ @redis_spy }
+
+    should have_readers :calls
+
+    should "default its calls" do
+      assert_equal [], subject.calls
+    end
+
+    should "allow passing a config object" do
+      config = OpenStruct.new(@config)
+      assert_nothing_raised{ HellaRedis::RedisSpy.new(config) }
+    end
+
+    should "track redis calls made to it" do
+      assert_true subject.respond_to?(:set)
+
+      key, value = [Factory.string, Factory.string]
+      subject.set(key, value)
+
+      call = subject.calls.first
+      assert_equal :set, call.command
+      assert_equal [key, value], call.args
+    end
+
+    should "raise no method errors for non-redis methods" do
+      assert_false subject.respond_to?(:super_awesome_set)
+      assert_raises(NoMethodError) do
+        subject.super_awesome_set(Factory.string, Factory.string)
+      end
+    end
+
+  end
+
+end

data/test/unit/connection_tests.rb

@@ -0,0 +1,75 @@
+require 'assert'
+require 'hella-redis/connection'
+
+require 'connection_pool'
+require 'ostruct'
+
+module HellaRedis::Connection
+
+  class UnitTests < Assert::Context
+    desc "HellaRedis::Connection"
+    setup do
+      @config_hash = {
+        :timeout  => 1,
+        :size     => 5,
+        :redis_ns => 'hella-redis-test',
+        :driver   => 'ruby',
+        :url      => 'redis://localhost:6379/0'
+      }
+      @conn = HellaRedis::Connection.new(@config_hash)
+    end
+    subject{ @conn }
+
+    should "build a connection pool" do
+      assert_instance_of ::ConnectionPool, subject
+    end
+
+    should "connect to the redis instance that was provided" do
+      assert_nothing_raised do
+        subject.with{ |c| c.info }
+      end
+    end
+
+    should "build a redis namespace and yield it using `with`" do
+      subject.with do |conn|
+        assert_instance_of ::Redis::Namespace, conn
+      end
+    end
+
+    should "allow passing a config object when building a connection" do
+      conn = nil
+      assert_nothing_raised do
+        config = OpenStruct.new(@config_hash)
+        conn = HellaRedis::Connection.new(config)
+      end
+      assert_instance_of ::ConnectionPool, conn
+    end
+
+  end
+
+  class ConfigTests < UnitTests
+    desc "Config"
+    setup do
+      @config = Config.new(@config_hash)
+    end
+    subject{ @config }
+
+    should have_readers :url, :driver, :redis_ns, :timeout, :size
+
+    should "know its attributes" do
+      assert_equal @config_hash[:url],     subject.url
+      assert_equal @config_hash[:driver],  subject.driver
+      assert_equal @config_hash[:ns],      subject.redis_ns
+      assert_equal @config_hash[:timeout], subject.timeout
+      assert_equal @config_hash[:size],    subject.size
+    end
+
+    should "default its size" do
+      @config_hash.delete(:size)
+      config = Config.new(@config_hash)
+      assert_equal 1, config.size
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hella-redis
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,12 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-02 00:00:00 Z
+date: 2014-12-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: assert
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,42 +28,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  version_requirements: *id001
+  type: :development
+  name: assert
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: redis
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
-        - 0
-        version: "3.0"
-  requirement: *id002
+        - 2
+        version: "3.2"
+  version_requirements: *id002
+  type: :runtime
+  name: redis
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: redis-namespace
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 5
         segments: 
         - 1
-        - 0
-        version: "1.0"
-  requirement: *id003
+        - 5
+        version: "1.5"
+  version_requirements: *id003
+  type: :runtime
+  name: redis-namespace
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: connection_pool
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -76,7 +74,9 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  requirement: *id004
+  version_requirements: *id004
+  type: :runtime
+  name: connection_pool
   prerelease: false
 description: It's-a hella-redis!
 email: 
@@ -96,11 +96,14 @@ files:
 - Rakefile
 - hella-redis.gemspec
 - lib/hella-redis.rb
-- lib/hella-redis/redis_connection.rb
+- lib/hella-redis/connection.rb
+- lib/hella-redis/connection_spy.rb
 - lib/hella-redis/version.rb
 - log/.gitkeep
 - test/helper.rb
-- test/unit/redis_connection_tests.rb
+- test/support/factory.rb
+- test/unit/connection_spy_tests.rb
+- test/unit/connection_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/hella-redis
 licenses: []
@@ -131,10 +134,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: It's-a hella-redis!
 test_files: 
 - test/helper.rb
-- test/unit/redis_connection_tests.rb
+- test/support/factory.rb
+- test/unit/connection_spy_tests.rb
+- test/unit/connection_tests.rb

data/lib/hella-redis/redis_connection.rb

@@ -1,19 +0,0 @@
-require 'redis'
-require 'redis-namespace'
-require 'connection_pool'
-require 'hella-redis/version'
-
-module HellaRedis::RedisConnection
-
-  def self.new(config)
-    @pool = ::ConnectionPool.new(:timeout => config.timeout, :size => config.size) do
-      ::Redis::Namespace.new(config.redis_ns, {
-        :redis => ::Redis.connect({
-          :url    => config.url,
-          :driver => config.driver
-        })
-      })
-    end
-  end
-
-end

data/test/unit/redis_connection_tests.rb

@@ -1,36 +0,0 @@
-require 'assert'
-require 'hella-redis/redis_connection'
-require 'connection_pool'
-require 'ostruct'
-
-module HellaRedis::RedisConnection
-
-  class BaseTests < Assert::Context
-    desc "a RedisConnection"
-    setup do
-      @config = OpenStruct.new({
-        :timeout  => 1,
-        :size     => 5,
-        :redis_ns => 'hella-redis-test',
-        :driver   => 'ruby',
-        :url      => 'redis://localhost:6379/0'
-      })
-      @conn = HellaRedis::RedisConnection.new(@config)
-    end
-    subject{ @conn }
-
-    should "be a connection pool with the configured size and timeout" do
-      assert_kind_of ConnectionPool, subject
-    end
-
-    should "connect to the redis url" do
-      assert_nothing_raised do
-        subject.with do |conn|
-          assert_kind_of Redis::Namespace, conn
-        end
-      end
-    end
-
-  end
-
-end