merit 0.7.0 → 0.7.1
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.
- data/Gemfile.lock +1 -1
- data/lib/merit/controller_extensions.rb +2 -1
- data/lib/merit/rule.rb +1 -1
- data/merit.gemspec +1 -1
- metadata +14 -14
data/Gemfile.lock
CHANGED
|
@@ -12,7 +12,8 @@ module Merit
|
|
|
12
12
|
target_id = params[:id]
|
|
13
13
|
# TODO: target_object should be configurable (now it's singularized controller name)
|
|
14
14
|
target_object = instance_variable_get(:"@#{controller_name.singularize}")
|
|
15
|
-
|
|
15
|
+
# id nil, or string (friendly_id); target_object found
|
|
16
|
+
if target_object.present? && (target_id.nil? || !(target_id =~ /^[0-9]+$/))
|
|
16
17
|
target_id = target_object.try(:id)
|
|
17
18
|
end
|
|
18
19
|
|
data/lib/merit/rule.rb
CHANGED
|
@@ -57,7 +57,7 @@ module Merit
|
|
|
57
57
|
begin
|
|
58
58
|
action.target_object(model_name).send(to)
|
|
59
59
|
rescue NoMethodError
|
|
60
|
-
Rails.logger.warn "[merit] #{action.target_model.singularize}.find(#{action.target_id}) not found, no badges giving today"
|
|
60
|
+
Rails.logger.warn "[merit] #{action.target_model.singularize.camelize}.find(#{action.target_id}) not found, no badges giving today"
|
|
61
61
|
return
|
|
62
62
|
end
|
|
63
63
|
end
|
data/merit.gemspec
CHANGED
|
@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
|
|
|
4
4
|
s.description = "Manage badges, points and rankings (reputation) of resources in a Rails application."
|
|
5
5
|
s.homepage = "http://github.com/tute/merit"
|
|
6
6
|
s.files = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
|
|
7
|
-
s.version = "0.7.
|
|
7
|
+
s.version = "0.7.1"
|
|
8
8
|
s.authors = ["Tute Costa"]
|
|
9
9
|
s.email = 'tutecosta@gmail.com'
|
|
10
10
|
s.add_dependency 'ambry'
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.7.
|
|
4
|
+
version: 0.7.1
|
|
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-
|
|
12
|
+
date: 2012-06-03 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: ambry
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &70152203180420 !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: *
|
|
24
|
+
version_requirements: *70152203180420
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: rails
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &70152203179200 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ~>
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: 3.2.3
|
|
33
33
|
type: :development
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *70152203179200
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: sqlite3
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &70152203178280 !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: *70152203178280
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: haml
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &70152203177500 !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: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *70152203177500
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: capybara
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &70152203176360 !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: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *70152203176360
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: simplecov
|
|
71
|
-
requirement: &
|
|
71
|
+
requirement: &70152203175780 !ruby/object:Gem::Requirement
|
|
72
72
|
none: false
|
|
73
73
|
requirements:
|
|
74
74
|
- - ! '>='
|
|
@@ -76,7 +76,7 @@ dependencies:
|
|
|
76
76
|
version: '0'
|
|
77
77
|
type: :development
|
|
78
78
|
prerelease: false
|
|
79
|
-
version_requirements: *
|
|
79
|
+
version_requirements: *70152203175780
|
|
80
80
|
description: Manage badges, points and rankings (reputation) of resources in a Rails
|
|
81
81
|
application.
|
|
82
82
|
email: tutecosta@gmail.com
|