enju_purchase_request 0.1.0 → 0.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +2 -2
  3. data/app/controllers/purchase_requests_controller.rb +6 -1
  4. data/app/views/purchase_requests/_index.html.erb +7 -3
  5. data/app/views/purchase_requests/show.html.erb +18 -14
  6. data/lib/enju_purchase_request/version.rb +1 -1
  7. data/spec/controllers/purchase_requests_controller_spec.rb +24 -8
  8. metadata +17 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1c2664b46e5a3955efb894f96277e36a386f5a50
4
- data.tar.gz: 4d49d263199bcbf4f357573fbce782ca8bd8a6ee
3
+ metadata.gz: 2fc1305c5c75d6ff4de30d9b5cc02cabe80595d8
4
+ data.tar.gz: 4b02362108242aef5a2b9c89f5385a7e19a1243d
5
5
  SHA512:
6
- metadata.gz: 962f4a0d6234ce06da2bc207ee16445b23a3018f8bcf613acf3755022283a3160dcf741b1ffd72df98a2b86471c4976e89c9de515de78b7fbf8736676257bd4d
7
- data.tar.gz: 45cb5c3979404b7d51a7543101f94d167937cb88f00747e88abb6fd5ac713edb32cbcd82697d5137cbbfab0b1d09792ff8e1c893412b8c60b4ff29ba49ee129d
6
+ metadata.gz: 0cc6e411c383bdf18939112eeb7826b6d1c179f62298e4f9c1e8e5a892aa80d24feb9c338b32c51a6f3343ff93ce9dc9c140dd5b6d17794e9a32e4efcd5c6e3a
7
+ data.tar.gz: b57ee7d68df3cc461cc02b784330f267634f592eafbb5af58b2fce548925b444a987340d40610fec1df6977bd4c64f6ae785c95315f6f0cc442a4e29cefdfd31
data/README.rdoc CHANGED
@@ -1,6 +1,6 @@
1
1
  = EnjuPurchaseRequest
2
- {<img src="https://secure.travis-ci.org/next-l/enju_purchase_request.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_purchase_request]
3
- {<img src="https://coveralls.io/repos/next-l/enju_purchase_request/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_purchase_request?branch=1.1]
2
+ {<img src="https://travis-ci.org/next-l/enju_purchase_request.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_purchase_request]
3
+ {<img src="https://coveralls.io/repos/next-l/enju_purchase_request/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_purchase_request?branch=1.1]
4
4
  {<img src="https://hakiri.io/github/next-l/enju_purchase_request/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_purchase_request/1.1]
5
5
 
6
6
  This project rocks and uses MIT-LICENSE.
data/app/controllers/purchase_requests_controller.rb CHANGED
@@ -23,6 +23,9 @@ class PurchaseRequestsController < ApplicationController
23
23
 
24
24
  user = @user
25
25
  unless current_user.has_role?('Librarian')
26
+ if @order_list
27
+ access_denied; return
28
+ end
26
29
  if user and user != current_user
27
30
  access_denied; return
28
31
  end
@@ -39,7 +42,9 @@ class PurchaseRequestsController < ApplicationController
39
42
  if user
40
43
  with(:user_id).equal_to user.id
41
44
  else
42
- with(:user_id).equal_to current_user.id
45
+ unless current_user.has_role?('Librarian')
46
+ with(:user_id).equal_to current_user.id
47
+ end
43
48
  end
44
49
  with(:order_list_id).equal_to order_list.id if order_list
45
50
  case mode
data/app/views/purchase_requests/_index.html.erb CHANGED
@@ -27,12 +27,16 @@
27
27
  <%= purchase_request.author -%>
28
28
  <%= purchase_request.publisher -%>
29
29
  <%= purchase_request.pub_date -%>
30
- <br />
31
- <%= t('activerecord.models.order_list') %>: <%= link_to purchase_request.order_list.title, purchase_requests_path(order_list_id: purchase_request.order_list.id) if purchase_request.order_list -%>
30
+ <% if current_user.has_role?('Librarian') %>
31
+ <br />
32
+ <%= t('activerecord.models.order_list') %>: <%= link_to purchase_request.order_list.title, purchase_requests_path(order_list_id: purchase_request.order_list.id) if purchase_request.order_list -%>
33
+ <% end %>
32
34
  </td>
33
35
  <td><%= purchase_request.price -%></td>
34
36
  <td>
35
- <%= link_to t('page.edit'), edit_purchase_request_path(purchase_request) -%>
37
+ <%- if can? :update, purchase_request %>
38
+ <%= link_to t('page.edit'), edit_purchase_request_path(purchase_request) -%>
39
+ <%- end -%>
36
40
  <%- if can? :delete, purchase_request %>
37
41
  <%= link_to t('page.destroy'), purchase_request, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
38
42
  <%- end -%>
data/app/views/purchase_requests/show.html.erb CHANGED
@@ -8,14 +8,16 @@
8
8
  <%= link_to @purchase_request.user.username, @purchase_request.user.profile -%>
9
9
  </p>
10
10
 
11
- <p>
12
- <strong><%= t('activerecord.models.order_list') -%>:</strong>
13
- <%- if @purchase_request.order_list -%>
14
- <%= link_to @purchase_request.order_list.title, purchase_requests_path(order_list_id: @purchase_request.order_list.id) -%>
15
- <%- else -%>
16
- <%= t('purchase_request.not_ordered') -%>
17
- <%- end -%>
18
- </p>
11
+ <% if current_user.has_role?('Librarian') %>
12
+ <p>
13
+ <strong><%= t('activerecord.models.order_list') -%>:</strong>
14
+ <%- if @purchase_request.order_list -%>
15
+ <%= link_to @purchase_request.order_list.title, purchase_requests_path(order_list_id: @purchase_request.order_list.id) -%>
16
+ <%- else -%>
17
+ <%= t('purchase_request.not_ordered') -%>
18
+ <%- end -%>
19
+ </p>
20
+ <% end %>
19
21
 
20
22
  <p>
21
23
  <strong><%= t('activerecord.attributes.purchase_request.title') -%>:</strong>
@@ -57,18 +59,20 @@
57
59
  <%= @purchase_request.note -%>
58
60
  </p>
59
61
 
60
- <p>
61
- <strong><%= t('activerecord.attributes.order_list.ordered_at') -%>:</strong>
62
- <%= l(@purchase_request.order_list.ordered_at) if @purchase_request.order_list rescue nil -%>
63
- </p>
62
+ <% if current_user.has_role?('Librarian') %>
63
+ <p>
64
+ <strong><%= t('activerecord.attributes.order_list.ordered_at') -%>:</strong>
65
+ <%= l(@purchase_request.order_list.ordered_at) if @purchase_request.order_list rescue nil -%>
66
+ </p>
67
+ <% end %>
64
68
 
65
69
  <p>
66
- <strong><%= t('page.created_at') -%>:</strong>
70
+ <strong><%= t('page.created_at') -%>:</strong>
67
71
  <%= l(@purchase_request.created_at) -%>
68
72
  </p>
69
73
 
70
74
  <p>
71
- <strong><%= t('page.updated_at') -%>:</strong>
75
+ <strong><%= t('page.updated_at') -%>:</strong>
72
76
  <%= l(@purchase_request.updated_at) -%>
73
77
  </p>
74
78
 
data/lib/enju_purchase_request/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuPurchaseRequest
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
data/spec/controllers/purchase_requests_controller_spec.rb CHANGED
@@ -22,12 +22,21 @@ describe PurchaseRequestsController do
22
22
 
23
23
  it "assigns all purchase_requests as @purchase_requests" do
24
24
  get :index
25
+ assigns(:purchase_requests).total_entries.should eq PurchaseRequest.count
25
26
  assigns(:purchase_requests).should_not be_empty
26
27
  end
27
28
 
28
- it "should get other user's index without user_id" do
29
- get :index
29
+ it "should get other user's index with user_id" do
30
+ get :index, user_id: users(:user1).username
31
+ response.should be_success
32
+ assigns(:purchase_requests).total_entries.should eq users(:user1).purchase_requests.count
33
+ assigns(:purchase_requests).should_not be_empty
34
+ end
35
+
36
+ it "should get other user's index with order_list_id" do
37
+ get :index, order_list_id: 1
30
38
  response.should be_success
39
+ assigns(:purchase_requests).total_entries.should eq order_lists(:order_list_00001).purchase_requests.count
31
40
  assigns(:purchase_requests).should_not be_empty
32
41
  end
33
42
  end
@@ -43,29 +52,36 @@ describe PurchaseRequestsController do
43
52
  it "should be get my index without user_id" do
44
53
  get :index
45
54
  assigns(:purchase_requests).should eq users(:user1).purchase_requests
55
+ assigns(:purchase_requests).total_entries.should eq users(:user1).purchase_requests.count
46
56
  response.should be_success
47
57
  end
48
58
 
49
59
  it "should get my index" do
50
- get :index, :user_id => users(:user1).username
60
+ get :index, user_id: users(:user1).username
51
61
  response.should redirect_to purchase_requests_url
52
62
  assigns(:purchase_requests).should be_nil
53
63
  end
54
64
 
65
+ it "should not get index with order_list_id" do
66
+ get :index, order_list_id: 1
67
+ response.should be_forbidden
68
+ assigns(:purchase_requests).should be_nil
69
+ end
70
+
55
71
  it "should get my index in csv format" do
56
- get :index, :user_id => users(:user1).username, :format => 'csv'
72
+ get :index, user_id: users(:user1).username, :format => 'csv'
57
73
  response.should redirect_to purchase_requests_url(:format => :csv)
58
74
  assigns(:purchase_requests).should be_nil
59
75
  end
60
76
 
61
77
  it "should get my index in rss format" do
62
- get :index, :user_id => users(:user1).username, :format => 'rss'
78
+ get :index, user_id: users(:user1).username, :format => 'rss'
63
79
  response.should redirect_to purchase_requests_url(:format => :rss)
64
80
  assigns(:purchase_requests).should be_nil
65
81
  end
66
82
 
67
83
  it "should not get other user's index" do
68
- get :index, :user_id => users(:librarian1).username
84
+ get :index, user_id: users(:librarian1).username
69
85
  response.should be_forbidden
70
86
  end
71
87
  end
@@ -288,7 +304,7 @@ describe PurchaseRequestsController do
288
304
  end
289
305
 
290
306
  it "should create purchase_request with other user's user_id" do
291
- post :create, :purchase_request => {:title => 'test', :user_id => users(:user1).id}
307
+ post :create, :purchase_request => {:title => 'test', user_id: users(:user1).id}
292
308
  response.should redirect_to purchase_request_url(assigns(:purchase_request))
293
309
  end
294
310
  end
@@ -321,7 +337,7 @@ describe PurchaseRequestsController do
321
337
  end
322
338
 
323
339
  it "should create purchase_request without user_id" do
324
- post :create, :purchase_request => {:title => 'test', :user_id => users(:user1).id, :pub_date => 2010}
340
+ post :create, :purchase_request => {:title => 'test', user_id: users(:user1).id, :pub_date => 2010}
325
341
  assigns(:purchase_request).date_of_publication.should eq Time.zone.parse('2010-01-01')
326
342
  response.should redirect_to purchase_request_url(assigns(:purchase_request))
327
343
  end
metadata CHANGED
@@ -1,57 +1,57 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_purchase_request
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-11 00:00:00.000000000 Z
11
+ date: 2015-12-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: statesman
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: '1.3'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: '1.3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: enju_leaf
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.1.0
33
+ version: 1.1.2
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.1.0
40
+ version: 1.1.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: enju_bookmark
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.2
47
+ version: 0.1.3
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.2
54
+ version: 0.1.3
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sqlite3
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '3.3'
103
+ version: '3.4'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: '3.3'
110
+ version: '3.4'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: factory_girl_rails
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
126
126
  name: sunspot_solr
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: '2.2'
131
+ version: 2.2.0
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - "~>"
136
+ - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: '2.2'
138
+ version: 2.2.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: simplecov
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -473,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
473
473
  version: '0'
474
474
  requirements: []
475
475
  rubyforge_project:
476
- rubygems_version: 2.4.5.1
476
+ rubygems_version: 2.5.0
477
477
  signing_key:
478
478
  specification_version: 4
479
479
  summary: enju_purchase_request plugin