riaction 1.2.2 → 1.2.3
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +5 -0
- data/Gemfile.lock +1 -1
- data/db/riaction.db +0 -0
- data/lib/riaction/riaction.rb +9 -2
- data/lib/riaction/version.rb +1 -1
- data/spec/riaction_spec.rb +6 -1
- metadata +17 -17
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,10 @@
|
|
1
1
|
# CHANGELOG #
|
2
2
|
|
3
|
+
## 1.2.3 ##
|
4
|
+
|
5
|
+
* Fixing bug with default params for riaction events not being evaluated correctly as methods
|
6
|
+
* Multiple calls to setting the default params will merge, and not replace one-another
|
7
|
+
|
3
8
|
## 1.2.2 ##
|
4
9
|
|
5
10
|
* Fixed bug in event performer when perform() received event name as a string rather than a symbol
|
data/Gemfile.lock
CHANGED
data/db/riaction.db
CHANGED
Binary file
|
data/lib/riaction/riaction.rb
CHANGED
@@ -26,7 +26,14 @@ module Riaction
|
|
26
26
|
add_or_update_riaction_event(opts.delete(:name), opts)
|
27
27
|
elsif type == :option || type == :options
|
28
28
|
opts.each_pair do |option, value|
|
29
|
-
|
29
|
+
if ::Riaction::Constants.riaction_options.has_key?(option)
|
30
|
+
# merge hashes, replace all else;
|
31
|
+
if riaction_options[option].is_a? Hash
|
32
|
+
riaction_options[option].merge! value
|
33
|
+
else
|
34
|
+
riaction_options[option] = value
|
35
|
+
end
|
36
|
+
end
|
30
37
|
end
|
31
38
|
end
|
32
39
|
end
|
@@ -347,7 +354,7 @@ module Riaction
|
|
347
354
|
:id => profile_keys.first.last.first.last
|
348
355
|
}
|
349
356
|
end
|
350
|
-
resolved_hash[event_name][:params] = riaction_resolve_param(args[:params]).merge(self.class.riaction_options[:default_event_params])
|
357
|
+
resolved_hash[event_name][:params] = riaction_resolve_param(args[:params]).merge(riaction_resolve_param(self.class.riaction_options[:default_event_params]))
|
351
358
|
end
|
352
359
|
resolved_hash
|
353
360
|
end
|
data/lib/riaction/version.rb
CHANGED
data/spec/riaction_spec.rb
CHANGED
@@ -903,6 +903,11 @@ describe "Riaction" do
|
|
903
903
|
Comment.class_eval do
|
904
904
|
riaction :event, :name => :make_a_comment, :trigger => :create, :profile => :user, :params => {:foo => 'bar'}
|
905
905
|
riaction :option, :default_event_params => {:extra => 'params'}
|
906
|
+
riaction :option, :default_event_params => {:stars => :star_count}
|
907
|
+
|
908
|
+
def star_count
|
909
|
+
'five'
|
910
|
+
end
|
906
911
|
end
|
907
912
|
@comment = Comment.riactionless{ Comment.create(:user_id => @user.id, :content => 'this is a comment') }
|
908
913
|
end
|
@@ -915,7 +920,7 @@ describe "Riaction" do
|
|
915
920
|
:id_type => :custom,
|
916
921
|
:id => @user.id
|
917
922
|
},
|
918
|
-
:params => {:foo => 'bar', :extra => 'params'}
|
923
|
+
:params => {:foo => 'bar', :extra => 'params', :stars => 'five'}
|
919
924
|
}
|
920
925
|
}).should == @comment.riaction_event_params
|
921
926
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: riaction
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
16
|
-
requirement: &
|
16
|
+
requirement: &2153284460 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '2.6'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2153284460
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: sqlite3
|
27
|
-
requirement: &
|
27
|
+
requirement: &2153284020 !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: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2153284020
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: ruby-debug19
|
38
|
-
requirement: &
|
38
|
+
requirement: &2153283560 !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: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2153283560
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rake
|
49
|
-
requirement: &
|
49
|
+
requirement: &2153283140 !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: *
|
57
|
+
version_requirements: *2153283140
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: activerecord
|
60
|
-
requirement: &
|
60
|
+
requirement: &2153282640 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: 3.0.0
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2153282640
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: activesupport
|
71
|
-
requirement: &
|
71
|
+
requirement: &2153282140 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: 3.0.0
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2153282140
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: resque
|
82
|
-
requirement: &
|
82
|
+
requirement: &2153281760 !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: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *2153281760
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: ruby-iactionable
|
93
|
-
requirement: &
|
93
|
+
requirement: &2153281220 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,7 +98,7 @@ dependencies:
|
|
98
98
|
version: 0.0.2
|
99
99
|
type: :runtime
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *2153281220
|
102
102
|
description: Wrapper for IActionable's restful API and an "acts-as" style interface
|
103
103
|
for models to behave as profiles and drive game events.
|
104
104
|
email:
|