redis-model-extension 0.3.5 → 0.3.6

data/README.markdown

@@ -4,7 +4,7 @@ Redis model is basic implementation of few methods for creating model which stor
 
 ## Initialization
 
-You can use yml config file in `config` directory:
+You can use yml config file `redis_config.yml` in `config` directory:
 
 ``` yml
 test:
@@ -20,6 +20,17 @@ Or you can setup directly in initializer (or before any of redis call) redis ins
 RedisModelExtension::Database.redis = Redis.new(host: "127.0.0.1", port: 6379, db: 0)
 ```
 
+Or last way to set redis is by providing only config arguments:
+Use this in your initializer and when you use Forks or resque workers this will work very nicely, 
+unless you will call to redis before workers are initialized.
+Then you will get error Redis instance cannot be used in Forks. 
+You can fix this by calling in the start of worker: `RedisModelExtension::Database.redis = nil`
+This will remove old not possible to use redis instance and in first call to redis will use new config and create new redis instance.
+
+``` ruby
+RedisModelExtension::Database.redis_config(:host => "127.0.0.1", :port => 6379, :db => 0)
+```
+
 ## Usage
 
 ``` ruby

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/database.rb

@@ -15,6 +15,11 @@ module RedisModelExtension
       end
     end
     
+    def self.redis_config= conf
+      raise ArgumentError, "Argument must be hash {:host => '..', :port => 6379, :db => 0 }" unless conf.has_key?(:host) && conf.has_key?(:port) && conf.has_key?(:db)
+      @redis_config = conf
+    end
+
     def self.redis= redis
       if redis.is_a?(Redis) #valid redis instance
         @redis = redis  
@@ -26,7 +31,12 @@ module RedisModelExtension
     end
 
     def self.redis
-      @redis ||= Redis.new(Database.config)
+      #if redis is already defined
+      return @redis if @redis
+      #if you provided redis config
+      return @redis = Redis.new(@redis_config) if @redis_config
+      #if you provided yml config
+      return @redis = Redis.new(Database.config)
     end
 
   end

data/redis-model-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redis-model-extension"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2012-07-31"
+  s.date = "2012-08-07"
   s.description = "It provides functions as find, find_by_alias, get, exists?, validate, save etc."
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [

data/test/test_database_module.rb

@@ -15,6 +15,14 @@ class DatabaseModuleTest < Test::Unit::TestCase
       assert RedisModelExtension::Database.redis.is_a? Redis
     end
 
+    should "be initialized by config arguments" do
+      assert_nothing_raised do
+        RedisModelExtension::Database.redis_config = {host: "127.0.0.1", port: 6379, db: 0}
+        RedisModelExtension::Database.redis.info
+      end
+      assert RedisModelExtension::Database.redis.is_a? Redis
+    end
+
     should "be initialized from config" do
       assert_nothing_raised do
         RedisModelExtension::Database.redis.info

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-model-extension
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70236107785880 !ruby/object:Gem::Requirement
+  requirement: &70098388153940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236107785880
+  version_requirements: *70098388153940
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70236107785360 !ruby/object:Gem::Requirement
+  requirement: &70098388169700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236107785360
+  version_requirements: *70098388169700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70236107784760 !ruby/object:Gem::Requirement
+  requirement: &70098388169160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236107784760
+  version_requirements: *70098388169160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70236107782140 !ruby/object:Gem::Requirement
+  requirement: &70098388168620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236107782140
+  version_requirements: *70098388168620
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70236107778960 !ruby/object:Gem::Requirement
+  requirement: &70098388168040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70236107778960
+  version_requirements: *70098388168040
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70236107846220 !ruby/object:Gem::Requirement
+  requirement: &70098388167520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236107846220
+  version_requirements: *70098388167520
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70236107845140 !ruby/object:Gem::Requirement
+  requirement: &70098388167040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236107845140
+  version_requirements: *70098388167040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70236107843880 !ruby/object:Gem::Requirement
+  requirement: &70098388166460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70236107843880
+  version_requirements: *70098388166460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70236107842840 !ruby/object:Gem::Requirement
+  requirement: &70098388165460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70236107842840
+  version_requirements: *70098388165460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70236107842040 !ruby/object:Gem::Requirement
+  requirement: &70098388164480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70236107842040
+  version_requirements: *70098388164480
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70236107841520 !ruby/object:Gem::Requirement
+  requirement: &70098388163960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70236107841520
+  version_requirements: *70098388163960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70236107840860 !ruby/object:Gem::Requirement
+  requirement: &70098388163380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236107840860
+  version_requirements: *70098388163380
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70236107840300 !ruby/object:Gem::Requirement
+  requirement: &70098388162840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70236107840300
+  version_requirements: *70098388162840
 description: It provides functions as find, find_by_alias, get, exists?, validate,
   save etc.
 email: ondrej@bartas.cz
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1648551460740035856
+      hash: -3875957961639998113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: