redised 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 50c138c1a2d87e138b4eff56cc9b4d076c421949
+  data.tar.gz: 675544c4ab1d336ce67eb52701f898b6a89af79c
+SHA512:
+  metadata.gz: 28af67b03c0e1bf7e5c9a69d5a05d2c977584072dbaba2a8c937b3041f2f962c8205843910f211976e3f9559ac59f81a745067a7aea91227e8d27e4021fdad8d
+  data.tar.gz: 9257d5f476d0f862ab1ac1aa38e1319703c444720edcf87082c593843137d83b1d36e21f53ef4cd61756caaf07d20c9923ce9270b966f1f8a66cf546a4866008

data/Gemfile

@@ -9,7 +9,7 @@ gem 'redis-namespace'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "mocha"
+  gem "minitest"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.8.3"
+  gem "jeweler"
 end

data/Gemfile.lock

@@ -1,18 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
+    addressable (2.3.5)
+    builder (3.2.2)
+    descendants_tracker (0.0.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.6)
+    github_api (0.11.2)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.6.5)
-    metaclass (0.0.1)
-    mocha (0.10.3)
-      metaclass (~> 0.0.1)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     redis (3.0.6)
     redis-namespace (1.3.2)
@@ -24,8 +56,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  jeweler (~> 1.8.3)
-  mocha
+  jeweler
+  minitest
   redis (~> 3)
   redis-namespace
   shoulda

data/lib/redised.rb

@@ -1,8 +1,10 @@
 require 'redis/namespace'
+require 'yaml'
+
 # Redised allows for the common patter of module access to redis, when included
 # a .redis and .redis= method are provided
 module Redised
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
   # Get a reusable connection based on a set of params. The
   # params are the same as the options you pass to `Redis.new`
@@ -65,8 +67,19 @@ module Redised
     @_redised_config = nil
   end
 
-  def self.included(klass)
+  # Set global redis options
+  #
+  #     Redised.redis_options = {:timeout => 1.0}
+  #
+  def self.redis_options=(options)
+    @_redised_redis_options = options || {}
+  end
+
+  def self.redis_options
+    @_redised_redis_options || {}
+  end
 
+  def self.included(klass)
     klass.module_eval do
 
       # Accepts:
@@ -85,13 +98,13 @@ module Redised
           else
             server, namespace = server.split('/', 2)
             host, port, db, password = server.split(':')
-            conn = ::Redised.redis_connection({
+            conn = ::Redised.redis_connection(Redised.redis_options.merge({
                 :host => host,
                 :port => port,
                 :thread_safe => true,
                 :db => db,
                 :password => password
-            })
+            }))
           end
 
           @_redis = namespace ? Redis::Namespace.new(namespace, :redis => conn) : conn

data/redised.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: redised 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "redised"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Aaron Quint"]
-  s.date = "2013-11-07"
+  s.date = "2014-02-09"
   s.description = "redised provides a single module `Redised` that when included in your class provides a self.redis= and self.redis methods. It also has the ability to load the urls from a YAML config file"
   s.email = "aaron@quirkey.com"
   s.extra_rdoc_files = [
@@ -31,35 +33,34 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/paperlesspost/redised"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.1"
   s.summary = "a simple module that allows you to setup your class or module with a redis connection"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<redis>, ["~> 3"])
       s.add_runtime_dependency(%q<redis-namespace>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<redis>, ["~> 3"])
       s.add_dependency(%q<redis-namespace>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<redis>, ["~> 3"])
     s.add_dependency(%q<redis-namespace>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -9,7 +9,6 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_redised.rb

@@ -57,6 +57,19 @@ class TestRedised < Test::Unit::TestCase
       assert_equal 2, redis.client.db
       assert_equal 'mypass', redis.client.password
       assert_equal 'namespace', redis.namespace
+      assert_equal 5.0, redis.client.timeout
+    end
+
+    should "use redis_options" do
+      Redised.redis_options = {:timeout => 1.0}
+      RedisedClass.redis = 'localhost:5678:2:mypass/namespace'
+      redis = RedisedClass.redis
+      assert_equal 'localhost', redis.client.host
+      assert_equal 5678, redis.client.port
+      assert_equal 2, redis.client.db
+      assert_equal 'mypass', redis.client.password
+      assert_equal 'namespace', redis.namespace
+      assert_equal 1.0, redis.client.timeout
     end
 
   end

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: redised
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Aaron Quint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
 description: redised provides a single module `Redised` that when included in your
   class provides a self.redis= and self.redis methods. It also has the ability to
   load the urls from a YAML config file
@@ -117,7 +104,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -131,30 +118,26 @@ files:
 homepage: http://github.com/paperlesspost/redised
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2742425785523815070
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: a simple module that allows you to setup your class or module with a redis
   connection
 test_files: []