redis-model-extension 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/README.markdown +12 -1
  2. data/VERSION +1 -1
  3. data/lib/database.rb +11 -1
  4. data/redis-model-extension.gemspec +2 -2
  5. data/test/test_database_module.rb +8 -0
  6. metadata +29 -29
data/README.markdown CHANGED
@@ -4,7 +4,7 @@ Redis model is basic implementation of few methods for creating model which stor
4
4
 
5
5
  ## Initialization
6
6
 
7
- You can use yml config file in `config` directory:
7
+ You can use yml config file `redis_config.yml` in `config` directory:
8
8
 
9
9
  ``` yml
10
10
  test:
@@ -20,6 +20,17 @@ Or you can setup directly in initializer (or before any of redis call) redis ins
20
20
  RedisModelExtension::Database.redis = Redis.new(host: "127.0.0.1", port: 6379, db: 0)
21
21
  ```
22
22
 
23
+ Or last way to set redis is by providing only config arguments:
24
+ Use this in your initializer and when you use Forks or resque workers this will work very nicely,
25
+ unless you will call to redis before workers are initialized.
26
+ Then you will get error Redis instance cannot be used in Forks.
27
+ You can fix this by calling in the start of worker: `RedisModelExtension::Database.redis = nil`
28
+ 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.
29
+
30
+ ``` ruby
31
+ RedisModelExtension::Database.redis_config(:host => "127.0.0.1", :port => 6379, :db => 0)
32
+ ```
33
+
23
34
  ## Usage
24
35
 
25
36
  ``` ruby
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.5
1
+ 0.3.6
data/lib/database.rb CHANGED
@@ -15,6 +15,11 @@ module RedisModelExtension
15
15
  end
16
16
  end
17
17
 
18
+ def self.redis_config= conf
19
+ raise ArgumentError, "Argument must be hash {:host => '..', :port => 6379, :db => 0 }" unless conf.has_key?(:host) && conf.has_key?(:port) && conf.has_key?(:db)
20
+ @redis_config = conf
21
+ end
22
+
18
23
  def self.redis= redis
19
24
  if redis.is_a?(Redis) #valid redis instance
20
25
  @redis = redis
@@ -26,7 +31,12 @@ module RedisModelExtension
26
31
  end
27
32
 
28
33
  def self.redis
29
- @redis ||= Redis.new(Database.config)
34
+ #if redis is already defined
35
+ return @redis if @redis
36
+ #if you provided redis config
37
+ return @redis = Redis.new(@redis_config) if @redis_config
38
+ #if you provided yml config
39
+ return @redis = Redis.new(Database.config)
30
40
  end
31
41
 
32
42
  end
data/redis-model-extension.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "redis-model-extension"
8
- s.version = "0.3.5"
8
+ s.version = "0.3.6"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ondrej Bartas"]
12
- s.date = "2012-07-31"
12
+ s.date = "2012-08-07"
13
13
  s.description = "It provides functions as find, find_by_alias, get, exists?, validate, save etc."
14
14
  s.email = "ondrej@bartas.cz"
15
15
  s.extra_rdoc_files = [
data/test/test_database_module.rb CHANGED
@@ -15,6 +15,14 @@ class DatabaseModuleTest < Test::Unit::TestCase
15
15
  assert RedisModelExtension::Database.redis.is_a? Redis
16
16
  end
17
17
 
18
+ should "be initialized by config arguments" do
19
+ assert_nothing_raised do
20
+ RedisModelExtension::Database.redis_config = {host: "127.0.0.1", port: 6379, db: 0}
21
+ RedisModelExtension::Database.redis.info
22
+ end
23
+ assert RedisModelExtension::Database.redis.is_a? Redis
24
+ end
25
+
18
26
  should "be initialized from config" do
19
27
  assert_nothing_raised do
20
28
  RedisModelExtension::Database.redis.info
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redis-model-extension
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5
4
+ version: 0.3.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-31 00:00:00.000000000 Z
12
+ date: 2012-08-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: redis
16
- requirement: &70236107785880 !ruby/object:Gem::Requirement
16
+ requirement: &70098388153940 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70236107785880
24
+ version_requirements: *70098388153940
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: i18n
27
- requirement: &70236107785360 !ruby/object:Gem::Requirement
27
+ requirement: &70098388169700 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.6.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70236107785360
35
+ version_requirements: *70098388169700
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activesupport
38
- requirement: &70236107784760 !ruby/object:Gem::Requirement
38
+ requirement: &70098388169160 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 3.1.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70236107784760
46
+ version_requirements: *70098388169160
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &70236107782140 !ruby/object:Gem::Requirement
49
+ requirement: &70098388168620 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70236107782140
57
+ version_requirements: *70098388168620
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rack
60
- requirement: &70236107778960 !ruby/object:Gem::Requirement
60
+ requirement: &70098388168040 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.3.0
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70236107778960
68
+ version_requirements: *70098388168040
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: shoulda
71
- requirement: &70236107846220 !ruby/object:Gem::Requirement
71
+ requirement: &70098388167520 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70236107846220
79
+ version_requirements: *70098388167520
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: shoulda-context
82
- requirement: &70236107845140 !ruby/object:Gem::Requirement
82
+ requirement: &70098388167040 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70236107845140
90
+ version_requirements: *70098388167040
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rdoc
93
- requirement: &70236107843880 !ruby/object:Gem::Requirement
93
+ requirement: &70098388166460 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '3.12'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70236107843880
101
+ version_requirements: *70098388166460
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: bundler
104
- requirement: &70236107842840 !ruby/object:Gem::Requirement
104
+ requirement: &70098388165460 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 1.0.0
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70236107842840
112
+ version_requirements: *70098388165460
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: jeweler
115
- requirement: &70236107842040 !ruby/object:Gem::Requirement
115
+ requirement: &70098388164480 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 1.8.3
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70236107842040
123
+ version_requirements: *70098388164480
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: turn
126
- requirement: &70236107841520 !ruby/object:Gem::Requirement
126
+ requirement: &70098388163960 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.8.2
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70236107841520
134
+ version_requirements: *70098388163960
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: minitest
137
- requirement: &70236107840860 !ruby/object:Gem::Requirement
137
+ requirement: &70098388163380 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70236107840860
145
+ version_requirements: *70098388163380
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: ansi
148
- requirement: &70236107840300 !ruby/object:Gem::Requirement
148
+ requirement: &70098388162840 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,7 +153,7 @@ dependencies:
153
153
  version: 1.2.5
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70236107840300
156
+ version_requirements: *70098388162840
157
157
  description: It provides functions as find, find_by_alias, get, exists?, validate,
158
158
  save etc.
159
159
  email: ondrej@bartas.cz
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
194
194
  version: '0'
195
195
  segments:
196
196
  - 0
197
- hash: 1648551460740035856
197
+ hash: -3875957961639998113
198
198
  required_rubygems_version: !ruby/object:Gem::Requirement
199
199
  none: false
200
200
  requirements: