acts-as-approvable 0.6.3.3 → 0.6.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/CHANGELOG +4 -0
  2. data/Gemfile.lock +1 -1
  3. data/VERSION +1 -1
  4. data/gemfiles/rails2.gemfile.lock +1 -1
  5. data/gemfiles/rails30.gemfile.lock +1 -1
  6. data/gemfiles/rails31.gemfile.lock +1 -1
  7. data/gemfiles/rails32.gemfile.lock +1 -1
  8. data/generators/acts_as_approvable/templates/approvals_controller.rb +16 -17
  9. data/lib/generators/acts_as_approvable/templates/approvals_controller.rb +16 -17
  10. metadata +21 -21
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ == 0.6.4
2
+
3
+ * around_filters cannot render content
4
+
1
5
  == 0.6.3.3
2
6
 
3
7
  * Don't call #state on nil objects
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- acts-as-approvable (0.6.3.1)
4
+ acts-as-approvable (0.6.3.3)
5
5
 
6
6
  GEM
7
7
  remote: http://rubygems.org/
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.3.3
1
+ 0.6.4
data/gemfiles/rails2.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
3
3
  specs:
4
- acts-as-approvable (0.6.3.1)
4
+ acts-as-approvable (0.6.3.3)
5
5
 
6
6
  GEM
7
7
  remote: http://rubygems.org/
data/gemfiles/rails30.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
3
3
  specs:
4
- acts-as-approvable (0.6.3.1)
4
+ acts-as-approvable (0.6.3.3)
5
5
 
6
6
  GEM
7
7
  remote: http://rubygems.org/
data/gemfiles/rails31.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
3
3
  specs:
4
- acts-as-approvable (0.6.3.1)
4
+ acts-as-approvable (0.6.3.3)
5
5
 
6
6
  GEM
7
7
  remote: http://rubygems.org/
data/gemfiles/rails32.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
3
3
  specs:
4
- acts-as-approvable (0.6.3.1)
4
+ acts-as-approvable (0.6.3.3)
5
5
 
6
6
  GEM
7
7
  remote: http://rubygems.org/
data/generators/acts_as_approvable/templates/approvals_controller.rb CHANGED
@@ -2,7 +2,6 @@ class ApprovalsController < <%= options[:base] %>
2
2
  before_filter :setup_conditions, :only => [<%= collection_actions.join(', ') %>]
3
3
  before_filter :setup_partial, :only => [<%= collection_actions.join(', ') %>]
4
4
  before_filter :find_approval, :only => [<%= member_actions.join(', ') %>]
5
- around_filter :json_wrapper, :only => [<%= member_actions.join(', ') %>]
6
5
 
7
6
  def index
8
7
  state = params[:state] =~ /^-?\d+$/ ? params[:state].to_i : Approval.enumerate_state('pending')
@@ -26,22 +25,28 @@ class ApprovalsController < <%= options[:base] %>
26
25
  end
27
26
 
28
27
  def assign
29
- if params[:approval][:owner_id].empty?
30
- @approval.unassign
31
- else
32
- user = <%= options[:owner] %>.find(params[:approval][:owner_id])
33
- @approval.assign(user)
28
+ json_wrapper do
29
+ if params[:approval][:owner_id].empty?
30
+ @approval.unassign
31
+ else
32
+ user = <%= options[:owner] %>.find(params[:approval][:owner_id])
33
+ @approval.assign(user)
34
+ end
34
35
  end
35
36
  end
36
37
 
37
38
  <% end %> def approve
38
- <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
39
- <% end %> @approval.approve!
39
+ json_wrapper do
40
+ <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
41
+ <% end %> @approval.approve!
42
+ end
40
43
  end
41
44
 
42
45
  def reject
43
- <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
44
- <% end %> @approval.reject!(params[:reason])
46
+ json_wrapper do
47
+ <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
48
+ <% end %> @approval.reject!(params[:reason])
49
+ end
45
50
  end
46
51
 
47
52
  private
@@ -56,13 +61,7 @@ class ApprovalsController < <%= options[:base] %>
56
61
  json[:message] = 'An unknown error occured'
57
62
  end
58
63
 
59
- respond_to do |format|
60
- format.html do
61
- flash[:error] = json[:message] if json[:message]
62
- redirect_to :action => :index
63
- end
64
- format.json { render :json => json }
65
- end
64
+ render :json => json
66
65
  end
67
66
 
68
67
  def setup_conditions
data/lib/generators/acts_as_approvable/templates/approvals_controller.rb CHANGED
@@ -2,7 +2,6 @@ class ApprovalsController < <%= options[:base] %>
2
2
  before_filter :setup_conditions, :only => [<%= collection_actions.join(', ') %>]
3
3
  before_filter :setup_partial, :only => [<%= collection_actions.join(', ') %>]
4
4
  before_filter :find_approval, :only => [<%= member_actions.join(', ') %>]
5
- around_filter :json_wrapper, :only => [<%= member_actions.join(', ') %>]
6
5
 
7
6
  def index
8
7
  state = params[:state] =~ /^-?\d+$/ ? params[:state].to_i : Approval.enumerate_state('pending')
@@ -26,22 +25,28 @@ class ApprovalsController < <%= options[:base] %>
26
25
  end
27
26
 
28
27
  def assign
29
- if params[:approval][:owner_id].empty?
30
- @approval.unassign
31
- else
32
- user = <%= options[:owner] %>.find(params[:approval][:owner_id])
33
- @approval.assign(user)
28
+ json_wrapper do
29
+ if params[:approval][:owner_id].empty?
30
+ @approval.unassign
31
+ else
32
+ user = <%= options[:owner] %>.find(params[:approval][:owner_id])
33
+ @approval.assign(user)
34
+ end
34
35
  end
35
36
  end
36
37
 
37
38
  <% end %> def approve
38
- <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
39
- <% end %> @approval.approve!
39
+ json_wrapper do
40
+ <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
41
+ <% end %> @approval.approve!
42
+ end
40
43
  end
41
44
 
42
45
  def reject
43
- <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
44
- <% end %> @approval.reject!(params[:reason])
46
+ json_wrapper do
47
+ <% if owner? %> @approval.owner = current_user if respond_to?(:current_user)
48
+ <% end %> @approval.reject!(params[:reason])
49
+ end
45
50
  end
46
51
 
47
52
  private
@@ -56,13 +61,7 @@ class ApprovalsController < <%= options[:base] %>
56
61
  json[:message] = 'An unknown error occured'
57
62
  end
58
63
 
59
- respond_to do |format|
60
- format.html do
61
- flash[:error] = json[:message] if json[:message]
62
- redirect_to :action => :index
63
- end
64
- format.json { render :json => json }
65
- end
64
+ render :json => json
66
65
  end
67
66
 
68
67
  def setup_conditions
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: acts-as-approvable
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.3.3
4
+ version: 0.6.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -15,7 +15,7 @@ date: 2012-02-14 00:00:00.000000000Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: activerecord
18
- requirement: &70316618865380 !ruby/object:Gem::Requirement
18
+ requirement: &70189577522140 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ~>
@@ -23,10 +23,10 @@ dependencies:
23
23
  version: '2.3'
24
24
  type: :development
25
25
  prerelease: false
26
- version_requirements: *70316618865380
26
+ version_requirements: *70189577522140
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: appraisal
29
- requirement: &70316618864940 !ruby/object:Gem::Requirement
29
+ requirement: &70189577521720 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: '0'
35
35
  type: :development
36
36
  prerelease: false
37
- version_requirements: *70316618864940
37
+ version_requirements: *70189577521720
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: redcarpet
40
- requirement: &70316618864480 !ruby/object:Gem::Requirement
40
+ requirement: &70189577521260 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: '0'
46
46
  type: :development
47
47
  prerelease: false
48
- version_requirements: *70316618864480
48
+ version_requirements: *70189577521260
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: shoulda
51
- requirement: &70316618864060 !ruby/object:Gem::Requirement
51
+ requirement: &70189577520840 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: '0'
57
57
  type: :development
58
58
  prerelease: false
59
- version_requirements: *70316618864060
59
+ version_requirements: *70189577520840
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: sqlite3
62
- requirement: &70316618863640 !ruby/object:Gem::Requirement
62
+ requirement: &70189577520420 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
67
67
  version: '0'
68
68
  type: :development
69
69
  prerelease: false
70
- version_requirements: *70316618863640
70
+ version_requirements: *70189577520420
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: mocha
73
- requirement: &70316618863220 !ruby/object:Gem::Requirement
73
+ requirement: &70189577519940 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
78
78
  version: '0'
79
79
  type: :development
80
80
  prerelease: false
81
- version_requirements: *70316618863220
81
+ version_requirements: *70189577519940
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: rake
84
- requirement: &70316618862800 !ruby/object:Gem::Requirement
84
+ requirement: &70189577519520 !ruby/object:Gem::Requirement
85
85
  none: false
86
86
  requirements:
87
87
  - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
- version_requirements: *70316618862800
92
+ version_requirements: *70189577519520
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: simplecov
95
- requirement: &70316618862340 !ruby/object:Gem::Requirement
95
+ requirement: &70189577518920 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
100
100
  version: '0'
101
101
  type: :development
102
102
  prerelease: false
103
- version_requirements: *70316618862340
103
+ version_requirements: *70189577518920
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: yard
106
- requirement: &70316618861920 !ruby/object:Gem::Requirement
106
+ requirement: &70189577518440 !ruby/object:Gem::Requirement
107
107
  none: false
108
108
  requirements:
109
109
  - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
111
111
  version: '0'
112
112
  type: :development
113
113
  prerelease: false
114
- version_requirements: *70316618861920
114
+ version_requirements: *70189577518440
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: pry
117
- requirement: &70316618861500 !ruby/object:Gem::Requirement
117
+ requirement: &70189577517760 !ruby/object:Gem::Requirement
118
118
  none: false
119
119
  requirements:
120
120
  - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
122
122
  version: '0'
123
123
  type: :development
124
124
  prerelease: false
125
- version_requirements: *70316618861500
125
+ version_requirements: *70189577517760
126
126
  description: Generic approval queues for record creation and updates
127
127
  email: dwarf@girsbrain.org
128
128
  executables: []