enju_purchase_request 0.1.0.pre12 → 0.1.0.pre13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +8 -1
- data/app/controllers/order_lists_controller.rb +8 -2
- data/app/controllers/orders_controller.rb +7 -2
- data/app/controllers/purchase_requests_controller.rb +9 -2
- data/app/models/order.rb +0 -1
- data/app/models/order_list.rb +5 -3
- data/app/models/order_list_transition.rb +0 -1
- data/app/models/purchase_request.rb +2 -4
- data/lib/enju_purchase_request/version.rb +1 -1
- data/spec/controllers/purchase_requests_controller_spec.rb +2 -2
- data/spec/dummy/bin/bundle +3 -0
- data/spec/dummy/bin/rails +4 -0
- data/spec/dummy/bin/rake +4 -0
- data/spec/dummy/bin/setup +29 -0
- data/spec/fixtures/users.yml +1 -1
- data/spec/spec_helper.rb +2 -0
- metadata +45 -11
- data/spec/dummy/script/rails +0 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5d14c994ffd330f2e3330a232c2855772cfa8ecc
|
4
|
+
data.tar.gz: 248fc50b7cea04eeca2680445653dca587a43c48
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ad4459558e4b8fd82c2c3290cfde160fb170070f8fcc33a77f3c4242f1e6856df451462cecaa1c52aef3e0ac3fae775e85902d6697d0f9c87c0b72310f8889ba
|
7
|
+
data.tar.gz: 7d8b079f4efcca5ee7f78fc595ee7fdec8a7e9cc33adafb8699e9ccf98ca05be30a20d303c53788034e6f579fb55a243755062b00351fe2d3452b02dc8932838
|
data/README.rdoc
CHANGED
@@ -1,3 +1,10 @@
|
|
1
|
-
= EnjuPurchaseRequest
|
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]
|
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]
|
2
5
|
|
3
6
|
This project rocks and uses MIT-LICENSE.
|
7
|
+
|
8
|
+
== 製作者・貢献者 (Authors and contributors)
|
9
|
+
* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
|
10
|
+
* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
|
@@ -48,7 +48,7 @@ class OrderListsController < ApplicationController
|
|
48
48
|
# POST /order_lists
|
49
49
|
# POST /order_lists.json
|
50
50
|
def create
|
51
|
-
@order_list = OrderList.new(
|
51
|
+
@order_list = OrderList.new(order_list_params)
|
52
52
|
@order_list.user = current_user
|
53
53
|
|
54
54
|
respond_to do |format|
|
@@ -68,7 +68,7 @@ class OrderListsController < ApplicationController
|
|
68
68
|
def update
|
69
69
|
|
70
70
|
respond_to do |format|
|
71
|
-
if @order_list.update_attributes(
|
71
|
+
if @order_list.update_attributes(order_list_params)
|
72
72
|
if @order_list.edit_mode == 'order'
|
73
73
|
@order_list.transition_to(:ordered)
|
74
74
|
@order_list.save(validate: false)
|
@@ -97,6 +97,12 @@ class OrderListsController < ApplicationController
|
|
97
97
|
end
|
98
98
|
|
99
99
|
private
|
100
|
+
def order_list_params
|
101
|
+
params.require(:order_list).permit(
|
102
|
+
:user_id, :bookstore_id, :title, :note, :ordered_at, :edit_mode
|
103
|
+
)
|
104
|
+
end
|
105
|
+
|
100
106
|
def prepare_options
|
101
107
|
@bookstores = Bookstore.all
|
102
108
|
end
|
@@ -66,7 +66,7 @@ class OrdersController < ApplicationController
|
|
66
66
|
# POST /orders
|
67
67
|
# POST /orders.json
|
68
68
|
def create
|
69
|
-
@order = Order.new(
|
69
|
+
@order = Order.new(order_params)
|
70
70
|
|
71
71
|
respond_to do |format|
|
72
72
|
if @order.save
|
@@ -92,7 +92,7 @@ class OrdersController < ApplicationController
|
|
92
92
|
@order = Order.find(params[:id])
|
93
93
|
|
94
94
|
respond_to do |format|
|
95
|
-
if @order.update_attributes(
|
95
|
+
if @order.update_attributes(order_params)
|
96
96
|
flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.order'))
|
97
97
|
if @purchase_request
|
98
98
|
format.html { redirect_to purchase_request_order_url(@order.purchase_request, @order) }
|
@@ -126,4 +126,9 @@ class OrdersController < ApplicationController
|
|
126
126
|
end
|
127
127
|
end
|
128
128
|
end
|
129
|
+
|
130
|
+
private
|
131
|
+
def order_params
|
132
|
+
params.require(:order).permit(:order_list_id, :purchase_request_id)
|
133
|
+
end
|
129
134
|
end
|
@@ -97,7 +97,7 @@ class PurchaseRequestsController < ApplicationController
|
|
97
97
|
# POST /purchase_requests
|
98
98
|
# POST /purchase_requests.json
|
99
99
|
def create
|
100
|
-
@purchase_request = current_user.purchase_requests.new(
|
100
|
+
@purchase_request = current_user.purchase_requests.new(purchase_request_params)
|
101
101
|
|
102
102
|
respond_to do |format|
|
103
103
|
if @purchase_request.save
|
@@ -116,7 +116,7 @@ class PurchaseRequestsController < ApplicationController
|
|
116
116
|
# PUT /purchase_requests/1.json
|
117
117
|
def update
|
118
118
|
respond_to do |format|
|
119
|
-
if @purchase_request.update_attributes(
|
119
|
+
if @purchase_request.update_attributes(purchase_request_params)
|
120
120
|
@order_list.purchase_requests << @purchase_request if @order_list
|
121
121
|
flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.purchase_request'))
|
122
122
|
format.html { redirect_to(@purchase_request) }
|
@@ -138,4 +138,11 @@ class PurchaseRequestsController < ApplicationController
|
|
138
138
|
format.json { head :no_content }
|
139
139
|
end
|
140
140
|
end
|
141
|
+
|
142
|
+
private
|
143
|
+
def purchase_request_params
|
144
|
+
params.require(:purchase_request).permit(
|
145
|
+
:title, :author, :publisher, :isbn, :price, :url, :note, :pub_date
|
146
|
+
)
|
147
|
+
end
|
141
148
|
end
|
data/app/models/order.rb
CHANGED
data/app/models/order_list.rb
CHANGED
@@ -1,7 +1,5 @@
|
|
1
1
|
class OrderList < ActiveRecord::Base
|
2
|
-
include Statesman::Adapters::
|
3
|
-
attr_accessible :user_id, :bookstore_id, :title, :note, :ordered_at,
|
4
|
-
:edit_mode
|
2
|
+
include Statesman::Adapters::ActiveRecordQueries
|
5
3
|
scope :not_ordered, -> {in_state(:not_ordered)}
|
6
4
|
|
7
5
|
has_many :orders, dependent: :destroy
|
@@ -46,6 +44,10 @@ class OrderList < ActiveRecord::Base
|
|
46
44
|
def self.transition_class
|
47
45
|
OrderListTransition
|
48
46
|
end
|
47
|
+
|
48
|
+
def self.initial_state
|
49
|
+
:pending
|
50
|
+
end
|
49
51
|
end
|
50
52
|
|
51
53
|
# == Schema Information
|
@@ -1,8 +1,6 @@
|
|
1
1
|
class PurchaseRequest < ActiveRecord::Base
|
2
|
-
|
3
|
-
|
4
|
-
scope :not_ordered, includes(:order_list).where('order_lists.ordered_at IS NULL')
|
5
|
-
scope :ordered, includes(:order_list).where('order_lists.ordered_at IS NOT NULL')
|
2
|
+
scope :not_ordered, -> {includes(:order_list).where('order_lists.ordered_at IS NULL') }
|
3
|
+
scope :ordered, -> { includes(:order_list).where('order_lists.ordered_at IS NOT NULL') }
|
6
4
|
|
7
5
|
belongs_to :user, validate: true
|
8
6
|
has_one :order, dependent: :destroy
|
@@ -437,12 +437,12 @@ describe PurchaseRequestsController do
|
|
437
437
|
end
|
438
438
|
|
439
439
|
it "should update my purchase_request" do
|
440
|
-
put :update, :id => purchase_requests(:purchase_request_00003).id, :purchase_request => { }
|
440
|
+
put :update, :id => purchase_requests(:purchase_request_00003).id, :purchase_request => { note: "test" }
|
441
441
|
response.should redirect_to purchase_request_url(assigns(:purchase_request))
|
442
442
|
end
|
443
443
|
|
444
444
|
it "should not update other user's purchase_request" do
|
445
|
-
put :update, :id => purchase_requests(:purchase_request_00002).id, :purchase_request => { }
|
445
|
+
put :update, :id => purchase_requests(:purchase_request_00002).id, :purchase_request => { note: "test" }
|
446
446
|
response.should be_forbidden
|
447
447
|
end
|
448
448
|
end
|
data/spec/dummy/bin/rake
ADDED
@@ -0,0 +1,29 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
require 'pathname'
|
3
|
+
|
4
|
+
# path to your application root.
|
5
|
+
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
|
6
|
+
|
7
|
+
Dir.chdir APP_ROOT do
|
8
|
+
# This script is a starting point to setup your application.
|
9
|
+
# Add necessary setup steps to this file:
|
10
|
+
|
11
|
+
puts "== Installing dependencies =="
|
12
|
+
system "gem install bundler --conservative"
|
13
|
+
system "bundle check || bundle install"
|
14
|
+
|
15
|
+
# puts "\n== Copying sample files =="
|
16
|
+
# unless File.exist?("config/database.yml")
|
17
|
+
# system "cp config/database.yml.sample config/database.yml"
|
18
|
+
# end
|
19
|
+
|
20
|
+
puts "\n== Preparing database =="
|
21
|
+
system "bin/rake db:setup"
|
22
|
+
|
23
|
+
puts "\n== Removing old logs and tempfiles =="
|
24
|
+
system "rm -f log/*"
|
25
|
+
system "rm -rf tmp/cache"
|
26
|
+
|
27
|
+
puts "\n== Restarting application server =="
|
28
|
+
system "touch tmp/restart.txt"
|
29
|
+
end
|
data/spec/fixtures/users.yml
CHANGED
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
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.0.pre13
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2015-02-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: statesman
|
@@ -30,28 +30,28 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.1.0.
|
33
|
+
version: 1.1.0.rc17
|
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.0.rc17
|
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.2.pre21
|
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.2.pre21
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: sqlite3
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -66,20 +66,48 @@ dependencies:
|
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: mysql2
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - ">="
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: '0'
|
76
|
+
type: :development
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - ">="
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: '0'
|
83
|
+
- !ruby/object:Gem::Dependency
|
84
|
+
name: pg
|
85
|
+
requirement: !ruby/object:Gem::Requirement
|
86
|
+
requirements:
|
87
|
+
- - ">="
|
88
|
+
- !ruby/object:Gem::Version
|
89
|
+
version: '0'
|
90
|
+
type: :development
|
91
|
+
prerelease: false
|
92
|
+
version_requirements: !ruby/object:Gem::Requirement
|
93
|
+
requirements:
|
94
|
+
- - ">="
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '0'
|
69
97
|
- !ruby/object:Gem::Dependency
|
70
98
|
name: rspec-rails
|
71
99
|
requirement: !ruby/object:Gem::Requirement
|
72
100
|
requirements:
|
73
101
|
- - "~>"
|
74
102
|
- !ruby/object:Gem::Version
|
75
|
-
version: '3.
|
103
|
+
version: '3.2'
|
76
104
|
type: :development
|
77
105
|
prerelease: false
|
78
106
|
version_requirements: !ruby/object:Gem::Requirement
|
79
107
|
requirements:
|
80
108
|
- - "~>"
|
81
109
|
- !ruby/object:Gem::Version
|
82
|
-
version: '3.
|
110
|
+
version: '3.2'
|
83
111
|
- !ruby/object:Gem::Dependency
|
84
112
|
name: factory_girl_rails
|
85
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -227,6 +255,10 @@ files:
|
|
227
255
|
- spec/dummy/app/views/page/404.html.erb
|
228
256
|
- spec/dummy/app/views/page/404.mobile.erb
|
229
257
|
- spec/dummy/app/views/page/404.xml.erb
|
258
|
+
- spec/dummy/bin/bundle
|
259
|
+
- spec/dummy/bin/rails
|
260
|
+
- spec/dummy/bin/rake
|
261
|
+
- spec/dummy/bin/setup
|
230
262
|
- spec/dummy/config.ru
|
231
263
|
- spec/dummy/config/application.rb
|
232
264
|
- spec/dummy/config/application.yml
|
@@ -383,7 +415,6 @@ files:
|
|
383
415
|
- spec/dummy/public/422.html
|
384
416
|
- spec/dummy/public/500.html
|
385
417
|
- spec/dummy/public/favicon.ico
|
386
|
-
- spec/dummy/script/rails
|
387
418
|
- spec/factories/bookstore.rb
|
388
419
|
- spec/factories/library.rb
|
389
420
|
- spec/factories/order.rb
|
@@ -428,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
428
459
|
version: 1.3.1
|
429
460
|
requirements: []
|
430
461
|
rubyforge_project:
|
431
|
-
rubygems_version: 2.
|
462
|
+
rubygems_version: 2.4.5
|
432
463
|
signing_key:
|
433
464
|
specification_version: 4
|
434
465
|
summary: enju_purchase_request plugin
|
@@ -450,6 +481,10 @@ test_files:
|
|
450
481
|
- spec/dummy/app/views/page/404.html.erb
|
451
482
|
- spec/dummy/app/views/page/404.mobile.erb
|
452
483
|
- spec/dummy/app/views/page/404.xml.erb
|
484
|
+
- spec/dummy/bin/bundle
|
485
|
+
- spec/dummy/bin/rails
|
486
|
+
- spec/dummy/bin/rake
|
487
|
+
- spec/dummy/bin/setup
|
453
488
|
- spec/dummy/config/application.rb
|
454
489
|
- spec/dummy/config/application.yml
|
455
490
|
- spec/dummy/config/boot.rb
|
@@ -607,7 +642,6 @@ test_files:
|
|
607
642
|
- spec/dummy/public/500.html
|
608
643
|
- spec/dummy/public/favicon.ico
|
609
644
|
- spec/dummy/Rakefile
|
610
|
-
- spec/dummy/script/rails
|
611
645
|
- spec/factories/bookstore.rb
|
612
646
|
- spec/factories/library.rb
|
613
647
|
- spec/factories/order.rb
|
data/spec/dummy/script/rails
DELETED
@@ -1,6 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
|
3
|
-
|
4
|
-
APP_PATH = File.expand_path('../../config/application', __FILE__)
|
5
|
-
require File.expand_path('../../config/boot', __FILE__)
|
6
|
-
require 'rails/commands'
|