redis-model-extension 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -161,9 +161,22 @@ TestRedisModel.find_by_token :field4=> true
161
161
  #=> [<TestRedisModel: ...>, <TestRedisModel: ...>, ...]
162
162
  ```
163
163
 
164
+ ## Dirty
165
+
166
+ If you want to use ActiveModel::Dirty, i.e. methods like `_changed?`, `_was?` you can include
167
+ a Dirty module to your model (right after RedisModelExtension)
168
+ ```ruby
169
+ class MyModel
170
+ include RedisModelExtension
171
+ include RedisModelExtension::Dirty
172
+ end
173
+ ```
164
174
 
165
175
  ## Change log
166
176
 
177
+ * 0.4.2
178
+ * Add ActiveModel::Dirty
179
+ * Change work with attributes to ActiveModel::Attributes
167
180
  * 0.4.1
168
181
  * Fixed bugs in intialization
169
182
  * Changed aliases to use key - array instead of key - value (enable find by category...) WIKI: [Aliases](https://github.com/ondrejbartas/redis-model-extension/wiki/Aliases)
@@ -197,4 +210,4 @@ TestRedisModel.find_by_token :field4=> true
197
210
  ## Copyright
198
211
 
199
212
  Copyright (c) 2012 Ondrej Bartas. See LICENSE.txt for
200
- further details.
213
+ further details.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.1
1
+ 0.4.2
@@ -68,5 +68,6 @@ require 'redis-model-extension/attributes'
68
68
  require 'redis-model-extension/save_destroy'
69
69
  require 'redis-model-extension/store_keys'
70
70
  require 'redis-model-extension/autoincrement_id'
71
+ require 'redis-model-extension/dirty'
71
72
  #bad naming in past, will be removed
72
73
  require 'redis-model'
@@ -20,19 +20,24 @@ module RedisModelExtension
20
20
  def to_json
21
21
  to_arg.to_json
22
22
  end
23
-
24
23
 
25
- private
24
+ private
26
25
 
27
26
  # get value from instance variable
28
27
  def value_get name
29
28
  instance_variable_get(:"@#{name}")
30
29
  end
30
+ alias :attribute :value_get
31
31
 
32
32
  # set value into instance variable
33
33
  def value_set name, value
34
34
  instance_variable_set(:"@#{name}", value_parse(value, redis_fields_defaults_config[name]))
35
35
  end
36
+ alias :attribute= :value_set
37
+
38
+ def attribute?(name)
39
+ value_get(name) && !value_get(name).blank? ? true : false
40
+ end
36
41
 
37
42
  end
38
- end
43
+ end
@@ -0,0 +1,43 @@
1
+ # -*- encoding : utf-8 -*-
2
+ module RedisModelExtension
3
+
4
+ # == Dirty
5
+ # module for easier detection of changed attributes
6
+ #
7
+ # if you want it in your model include it after RedisModelExtension, i.e.
8
+ #
9
+ # class MyModel
10
+ # include RedisModelExtension
11
+ # include RedisModelExtension::Dirty
12
+ # end
13
+ module Dirty
14
+ extend ActiveSupport::Concern
15
+
16
+ included do
17
+ include ActiveModel::Dirty
18
+ end
19
+
20
+ def attribute=(name, value)
21
+ attribute_will_change!(name) unless value == attribute(name)
22
+ super
23
+ end
24
+
25
+ def save
26
+ if result = super
27
+ @previously_changed = changes
28
+ @changed_attributes.clear
29
+ end
30
+ result
31
+ end
32
+
33
+ module ClassMethods
34
+ # hook to reset changed attributes, when load by .find or .get
35
+ def new_by_key(key)
36
+ new_instance = super
37
+ new_instance.changed_attributes.clear
38
+ new_instance
39
+ end
40
+ end
41
+
42
+ end
43
+ end
@@ -19,23 +19,11 @@ module RedisModelExtension
19
19
 
20
20
  # remember field to save into redis
21
21
  redis_fields_config[name] = type
22
+
22
23
  # remember field default value
23
24
  redis_fields_defaults_config[name] = default
24
25
 
25
- # get value
26
- define_method name do
27
- value_get name
28
- end
29
-
30
- # assign new value
31
- define_method "#{name}=" do |new_value|
32
- value_set name, new_value
33
- end
34
-
35
- # value exists? (not nil and not blank?)
36
- define_method "#{name}?" do
37
- value_get(name) && !value_get(name).blank? ? true : false
38
- end
26
+ define_attribute_methods [name]
39
27
  end
40
28
 
41
29
  def set_redis_autoincrement_key
@@ -151,9 +139,18 @@ module RedisModelExtension
151
139
  included do
152
140
  redis_save_fields_with_nil true
153
141
  set_redis_autoincrement_key
142
+
143
+ include ActiveModel::AttributeMethods
144
+ # just `attribute` is defined automatically
145
+ attribute_method_suffix '='
146
+ attribute_method_suffix '?'
147
+ end
148
+
149
+ def attribute_method?(attr_name)
150
+ self.class.redis_user_field_config.include? attr_name.to_sym
154
151
  end
155
152
 
156
- # initialize instance
153
+ # initialize instance
157
154
  def initialize(args={})
158
155
  args = HashWithIndifferentAccess.new(args)
159
156
  # look for fields in input hash
@@ -162,11 +159,12 @@ module RedisModelExtension
162
159
  raise ArgumentError, "You cannot specify #{key} (it is auto incremented)" if args[key] && type == :autoincrement && get_last_id.to_i < args[key].to_i
163
160
 
164
161
  # input hash has known field
165
- if args.has_key?(key)
166
- value_set key, value_parse(args[key], type)
162
+ value = if args.has_key?(key)
163
+ value_parse(args[key], type)
167
164
  else #there is no value set default valued
168
- value_set key, redis_fields_defaults_config[key]
165
+ redis_fields_defaults_config[key]
169
166
  end
167
+ send(:attribute=, key, value)
170
168
  end
171
169
 
172
170
  return self
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "redis-model-extension"
8
- s.version = "0.4.1"
8
+ s.version = "0.4.2"
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-08-30"
12
+ s.date = "2012-09-01"
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 = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
31
31
  "lib/redis-model-extension/attributes.rb",
32
32
  "lib/redis-model-extension/autoincrement_id.rb",
33
33
  "lib/redis-model-extension/config.rb",
34
+ "lib/redis-model-extension/dirty.rb",
34
35
  "lib/redis-model-extension/get_find.rb",
35
36
  "lib/redis-model-extension/initialize.rb",
36
37
  "lib/redis-model-extension/old_initialize.rb",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
48
49
  "test/redis_model_old/test_redis_model_old_config.rb",
49
50
  "test/redis_model_parts/test_attributes.rb",
50
51
  "test/redis_model_parts/test_autoincrement_id.rb",
52
+ "test/redis_model_parts/test_dirty.rb",
51
53
  "test/redis_model_parts/test_dynamic_alias.rb",
52
54
  "test/redis_model_parts/test_get_find.rb",
53
55
  "test/redis_model_parts/test_hooks.rb",
@@ -96,3 +96,14 @@ class NilTestOldRedisModel
96
96
  include RedisModel
97
97
  initialize_redis_model_methods REDIS_MODEL_CONF
98
98
  end
99
+
100
+ class WithDirty
101
+ include RedisModelExtension
102
+ include RedisModelExtension::Dirty
103
+
104
+ redis_field :first_field, :string
105
+ redis_field :second_field, :bool
106
+ redis_field :third_field, :integer
107
+
108
+ redis_key :first_field
109
+ end
@@ -0,0 +1,65 @@
1
+ # -*- encoding : utf-8 -*-
2
+ require 'helper'
3
+ class DirtyTest < Test::Unit::TestCase
4
+ context 'Dirty' do
5
+ setup do
6
+ @time = Time.now
7
+ @args = {
8
+ :first_field => 'foo',
9
+ :second_field => true,
10
+ :third_field => 100,
11
+ }
12
+ @test_model = WithDirty.create(@args)
13
+ end
14
+
15
+ context 'after initialize' do
16
+ should 'be dirty' do
17
+ @test_model = WithDirty.new(@args)
18
+
19
+ assert @test_model.changed?
20
+ assert_same_elements @args.keys, @test_model.changed
21
+
22
+ @test_model.changes.each do |key,value|
23
+ assert value[0].nil?
24
+ assert_equal @args[key], value[1]
25
+ end
26
+ end
27
+ end
28
+
29
+ context 'after load' do
30
+ should 'be clean' do
31
+ @model = WithDirty.get(first_field: 'foo')
32
+
33
+ refute @model.changed?
34
+ refute @model.changed.any?
35
+ end
36
+
37
+ context '& after modifying' do
38
+ setup do
39
+ @model = WithDirty.get(first_field: 'foo')
40
+ @model.first_field = 'bar'
41
+ end
42
+
43
+ should 'be dirty' do
44
+ assert @model.changed?
45
+ assert_equal ['first_field'], @model.changed
46
+ assert @model.first_field_changed?
47
+ assert_equal ['foo', 'bar'], @model.first_field_change
48
+ assert_equal 'foo', @model.first_field_was
49
+ end
50
+
51
+ context ' & after save' do
52
+ should 'be clean once again' do
53
+ @model.save
54
+ refute @model.changed?
55
+ refute @model.changed.any?
56
+
57
+ # just to be sure it successfully saved itself
58
+ assert WithDirty.get(first_field: 'bar')
59
+ end
60
+ end
61
+ end
62
+
63
+ end
64
+ end
65
+ end
@@ -41,6 +41,11 @@ class VariableTypesTest < Test::Unit::TestCase
41
41
  assert @test_model.respond_to?(:"float?")
42
42
  end
43
43
 
44
+ should "say if class has attribute method" do
45
+ assert TestRedisModel.attribute_method?(:integer)
46
+ refute TestRedisModel.attribute_method?(:nonexisting)
47
+ end
48
+
44
49
  end
45
50
  end
46
51
 
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.4.1
4
+ version: 0.4.2
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-08-30 00:00:00.000000000 Z
12
+ date: 2012-09-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: redis
16
- requirement: &70323131409560 !ruby/object:Gem::Requirement
16
+ requirement: &70278847900060 !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: *70323131409560
24
+ version_requirements: *70278847900060
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: i18n
27
- requirement: &70323131409020 !ruby/object:Gem::Requirement
27
+ requirement: &70278847899200 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70323131409020
35
+ version_requirements: *70278847899200
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activesupport
38
- requirement: &70323131408240 !ruby/object:Gem::Requirement
38
+ requirement: &70278847898100 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70323131408240
46
+ version_requirements: *70278847898100
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: activemodel
49
- requirement: &70323131407640 !ruby/object:Gem::Requirement
49
+ requirement: &70278847897540 !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: *70323131407640
57
+ version_requirements: *70278847897540
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: hashr
60
- requirement: &70323131407100 !ruby/object:Gem::Requirement
60
+ requirement: &70278847896760 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70323131407100
68
+ version_requirements: *70278847896760
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: shoulda
71
- requirement: &70323131406320 !ruby/object:Gem::Requirement
71
+ requirement: &70278847829920 !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: *70323131406320
79
+ version_requirements: *70278847829920
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: shoulda-context
82
- requirement: &70323131405480 !ruby/object:Gem::Requirement
82
+ requirement: &70278847829180 !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: *70323131405480
90
+ version_requirements: *70278847829180
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: mocha
93
- requirement: &70323131404320 !ruby/object:Gem::Requirement
93
+ requirement: &70278847828360 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70323131404320
101
+ version_requirements: *70278847828360
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: simplecov
104
- requirement: &70323131403740 !ruby/object:Gem::Requirement
104
+ requirement: &70278847827620 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70323131403740
112
+ version_requirements: *70278847827620
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rake
115
- requirement: &70323131402900 !ruby/object:Gem::Requirement
115
+ requirement: &70278847827020 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70323131402900
123
+ version_requirements: *70278847827020
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rack
126
- requirement: &70323131402080 !ruby/object:Gem::Requirement
126
+ requirement: &70278847826340 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70323131402080
134
+ version_requirements: *70278847826340
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: sdoc
137
- requirement: &70323131671260 !ruby/object:Gem::Requirement
137
+ requirement: &70278847825660 !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: *70323131671260
145
+ version_requirements: *70278847825660
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: bundler
148
- requirement: &70323131670560 !ruby/object:Gem::Requirement
148
+ requirement: &70278847825060 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70323131670560
156
+ version_requirements: *70278847825060
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: jeweler
159
- requirement: &70323131669940 !ruby/object:Gem::Requirement
159
+ requirement: &70278847824520 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *70323131669940
167
+ version_requirements: *70278847824520
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: turn
170
- requirement: &70323131669400 !ruby/object:Gem::Requirement
170
+ requirement: &70278847824000 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *70323131669400
178
+ version_requirements: *70278847824000
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: minitest
181
- requirement: &70323131668760 !ruby/object:Gem::Requirement
181
+ requirement: &70278847823520 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70323131668760
189
+ version_requirements: *70278847823520
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: ansi
192
- requirement: &70323131668020 !ruby/object:Gem::Requirement
192
+ requirement: &70278847823020 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70323131668020
200
+ version_requirements: *70278847823020
201
201
  description: It provides functions as find, find_by_alias, get, exists?, validate,
202
202
  save etc.
203
203
  email: ondrej@bartas.cz
@@ -221,6 +221,7 @@ files:
221
221
  - lib/redis-model-extension/attributes.rb
222
222
  - lib/redis-model-extension/autoincrement_id.rb
223
223
  - lib/redis-model-extension/config.rb
224
+ - lib/redis-model-extension/dirty.rb
224
225
  - lib/redis-model-extension/get_find.rb
225
226
  - lib/redis-model-extension/initialize.rb
226
227
  - lib/redis-model-extension/old_initialize.rb
@@ -238,6 +239,7 @@ files:
238
239
  - test/redis_model_old/test_redis_model_old_config.rb
239
240
  - test/redis_model_parts/test_attributes.rb
240
241
  - test/redis_model_parts/test_autoincrement_id.rb
242
+ - test/redis_model_parts/test_dirty.rb
241
243
  - test/redis_model_parts/test_dynamic_alias.rb
242
244
  - test/redis_model_parts/test_get_find.rb
243
245
  - test/redis_model_parts/test_hooks.rb
@@ -264,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
264
266
  version: '0'
265
267
  segments:
266
268
  - 0
267
- hash: 4312848391343916827
269
+ hash: -27895008965142288
268
270
  required_rubygems_version: !ruby/object:Gem::Requirement
269
271
  none: false
270
272
  requirements: