comable_core 0.2.3 → 0.3.0

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.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +20 -0
  3. data/Rakefile +16 -4
  4. data/app/controllers/concerns/comable/permitted_attributes.rb +15 -0
  5. data/app/helpers/comable/application_helper.rb +36 -1
  6. data/app/helpers/comable/products_helper.rb +35 -8
  7. data/app/mailers/comable/order_mailer.rb +1 -1
  8. data/app/models/comable/ability.rb +18 -0
  9. data/app/models/comable/address.rb +6 -2
  10. data/app/models/comable/category.rb +72 -0
  11. data/app/models/comable/customer.rb +53 -53
  12. data/app/models/comable/image.rb +11 -0
  13. data/app/models/comable/order.rb +42 -47
  14. data/app/models/comable/order_detail.rb +30 -37
  15. data/app/models/comable/payment_method.rb +26 -0
  16. data/app/models/comable/product.rb +29 -3
  17. data/app/models/comable/shipment_method.rb +4 -0
  18. data/app/models/comable/stock.rb +8 -24
  19. data/app/models/comable/store.rb +7 -2
  20. data/{lib → app/models/concerns}/comable/cart_owner.rb +25 -11
  21. data/app/models/concerns/comable/checkout.rb +90 -0
  22. data/app/models/concerns/comable/product/search.rb +41 -0
  23. data/app/models/concerns/comable/role_owner.rb +15 -0
  24. data/app/uploaders/image_uploader.rb +7 -0
  25. data/app/views/comable/order_mailer/complete.text.erb +7 -9
  26. data/config/locales/ja.yml +237 -8
  27. data/db/migrate/20140120032559_create_comable_customers.rb +1 -4
  28. data/db/migrate/20140502060116_create_comable_stocks.rb +2 -3
  29. data/db/migrate/20140723175431_create_comable_orders.rb +4 -5
  30. data/db/migrate/20140723175810_create_comable_order_details.rb +3 -3
  31. data/db/migrate/20140817194104_create_comable_payment_methods.rb +11 -0
  32. data/db/migrate/20140926063541_create_comable_stores.rb +1 -1
  33. data/db/migrate/20141024025526_create_comable_addresses.rb +2 -2
  34. data/db/migrate/20150111031228_create_comable_categories.rb +9 -0
  35. data/db/migrate/20150111031229_create_comable_products_categories.rb +8 -0
  36. data/db/migrate/20150112173706_create_comable_images.rb +8 -0
  37. data/lib/comable/core/configuration.rb +6 -0
  38. data/lib/comable/core/engine.rb +23 -11
  39. data/lib/comable/errors.rb +0 -3
  40. data/lib/comable/{payment_method → payment_provider}/base.rb +1 -1
  41. data/lib/comable/{payment_method → payment_provider}/general.rb +1 -1
  42. data/lib/comable/{payment_method.rb → payment_provider.rb} +3 -3
  43. data/lib/comable/state_machine_patch.rb +16 -0
  44. data/lib/comable_core.rb +13 -3
  45. metadata +97 -10
  46. data/app/models/comable/order_delivery.rb +0 -21
  47. data/app/models/comable/payment.rb +0 -24
  48. data/db/migrate/20140723175624_create_comable_order_deliveries.rb +0 -9
  49. data/db/migrate/20140817194104_create_comable_payments.rb +0 -11
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: comable_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - YOSHIDA Hiroki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-29 00:00:00.000000000 Z
11
+ date: 2015-02-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -17,6 +17,9 @@ dependencies:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 3.2.0
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: 4.2.0
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
24
27
  - - ">="
25
28
  - !ruby/object:Gem::Version
26
29
  version: 3.2.0
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: 4.2.0
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: devise
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,76 @@ dependencies:
52
58
  - - ">="
53
59
  - !ruby/object:Gem::Version
54
60
  version: '0'
61
+ - !ruby/object:Gem::Dependency
62
+ name: state_machine
63
+ requirement: !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: '0'
68
+ type: :runtime
69
+ prerelease: false
70
+ version_requirements: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ version: '0'
75
+ - !ruby/object:Gem::Dependency
76
+ name: ancestry
77
+ requirement: !ruby/object:Gem::Requirement
78
+ requirements:
79
+ - - ">="
80
+ - !ruby/object:Gem::Version
81
+ version: '0'
82
+ type: :runtime
83
+ prerelease: false
84
+ version_requirements: !ruby/object:Gem::Requirement
85
+ requirements:
86
+ - - ">="
87
+ - !ruby/object:Gem::Version
88
+ version: '0'
89
+ - !ruby/object:Gem::Dependency
90
+ name: acts_as_list
91
+ requirement: !ruby/object:Gem::Requirement
92
+ requirements:
93
+ - - ">="
94
+ - !ruby/object:Gem::Version
95
+ version: '0'
96
+ type: :runtime
97
+ prerelease: false
98
+ version_requirements: !ruby/object:Gem::Requirement
99
+ requirements:
100
+ - - ">="
101
+ - !ruby/object:Gem::Version
102
+ version: '0'
103
+ - !ruby/object:Gem::Dependency
104
+ name: carrierwave
105
+ requirement: !ruby/object:Gem::Requirement
106
+ requirements:
107
+ - - ">="
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
110
+ type: :runtime
111
+ prerelease: false
112
+ version_requirements: !ruby/object:Gem::Requirement
113
+ requirements:
114
+ - - ">="
115
+ - !ruby/object:Gem::Version
116
+ version: '0'
117
+ - !ruby/object:Gem::Dependency
118
+ name: cancancan
119
+ requirement: !ruby/object:Gem::Requirement
120
+ requirements:
121
+ - - "~>"
122
+ - !ruby/object:Gem::Version
123
+ version: '1.10'
124
+ type: :runtime
125
+ prerelease: false
126
+ version_requirements: !ruby/object:Gem::Requirement
127
+ requirements:
128
+ - - "~>"
129
+ - !ruby/object:Gem::Version
130
+ version: '1.10'
55
131
  description: Provide core functions for Comable.
56
132
  email:
57
133
  - hyoshida@appirits.com
@@ -59,43 +135,54 @@ executables: []
59
135
  extensions: []
60
136
  extra_rdoc_files: []
61
137
  files:
138
+ - MIT-LICENSE
62
139
  - Rakefile
63
140
  - app/assets/javascripts/comable/application.js
64
141
  - app/assets/stylesheets/comable/application.css
142
+ - app/controllers/concerns/comable/permitted_attributes.rb
65
143
  - app/helpers/comable/application_helper.rb
66
144
  - app/helpers/comable/products_helper.rb
67
145
  - app/mailers/comable/order_mailer.rb
146
+ - app/models/comable/ability.rb
68
147
  - app/models/comable/address.rb
148
+ - app/models/comable/category.rb
69
149
  - app/models/comable/customer.rb
150
+ - app/models/comable/image.rb
70
151
  - app/models/comable/order.rb
71
- - app/models/comable/order_delivery.rb
72
152
  - app/models/comable/order_detail.rb
73
- - app/models/comable/payment.rb
153
+ - app/models/comable/payment_method.rb
74
154
  - app/models/comable/product.rb
75
155
  - app/models/comable/shipment_method.rb
76
156
  - app/models/comable/stock.rb
77
157
  - app/models/comable/store.rb
158
+ - app/models/concerns/comable/cart_owner.rb
159
+ - app/models/concerns/comable/checkout.rb
160
+ - app/models/concerns/comable/product/search.rb
161
+ - app/models/concerns/comable/role_owner.rb
78
162
  - app/models/concerns/comable/sku_choice.rb
79
163
  - app/models/concerns/comable/sku_item.rb
164
+ - app/uploaders/image_uploader.rb
80
165
  - app/views/comable/order_mailer/complete.text.erb
81
166
  - config/locales/ja.yml
82
167
  - db/migrate/20131214194807_create_comable_products.rb
83
168
  - db/migrate/20140120032559_create_comable_customers.rb
84
169
  - db/migrate/20140502060116_create_comable_stocks.rb
85
170
  - db/migrate/20140723175431_create_comable_orders.rb
86
- - db/migrate/20140723175624_create_comable_order_deliveries.rb
87
171
  - db/migrate/20140723175810_create_comable_order_details.rb
88
- - db/migrate/20140817194104_create_comable_payments.rb
172
+ - db/migrate/20140817194104_create_comable_payment_methods.rb
89
173
  - db/migrate/20140921191416_create_comable_shipment_methods.rb
90
174
  - db/migrate/20140926063541_create_comable_stores.rb
91
175
  - db/migrate/20141024025526_create_comable_addresses.rb
92
- - lib/comable/cart_owner.rb
176
+ - db/migrate/20150111031228_create_comable_categories.rb
177
+ - db/migrate/20150111031229_create_comable_products_categories.rb
178
+ - db/migrate/20150112173706_create_comable_images.rb
93
179
  - lib/comable/core/configuration.rb
94
180
  - lib/comable/core/engine.rb
95
181
  - lib/comable/errors.rb
96
- - lib/comable/payment_method.rb
97
- - lib/comable/payment_method/base.rb
98
- - lib/comable/payment_method/general.rb
182
+ - lib/comable/payment_provider.rb
183
+ - lib/comable/payment_provider/base.rb
184
+ - lib/comable/payment_provider/general.rb
185
+ - lib/comable/state_machine_patch.rb
99
186
  - lib/comable_core.rb
100
187
  - lib/tasks/comable_tasks.rake
101
188
  homepage: https://github.com/hyoshida/comable#comable
@@ -1,21 +0,0 @@
1
- module Comable
2
- class OrderDelivery < ActiveRecord::Base
3
- belongs_to :order, class_name: Comable::Order.name, foreign_key: Comable::Order.table_name.singularize.foreign_key
4
- has_many :order_details, dependent: :destroy, class_name: Comable::OrderDetail.name, foreign_key: table_name.singularize.foreign_key, inverse_of: :order_delivery
5
-
6
- accepts_nested_attributes_for :order_details
7
-
8
- delegate :customer, to: :order
9
- delegate :guest_token, to: :order
10
- delegate :complete?, to: :order
11
-
12
- def save_to_complete
13
- order_details.each(&:save_to_complete)
14
- end
15
-
16
- # 氏名を取得
17
- def full_name
18
- [family_name, first_name].join(' ')
19
- end
20
- end
21
- end
@@ -1,24 +0,0 @@
1
- module Comable
2
- class Payment < ActiveRecord::Base
3
- validates :name, presence: true
4
- validates :payment_method_type, presence: true
5
- validates :payment_method_kind, presence: true
6
-
7
- def payment_method
8
- return unless Object.const_defined?(payment_method_type)
9
- Object.const_get(payment_method_type)
10
- end
11
-
12
- def payment_method_name
13
- payment_method.display_name
14
- end
15
-
16
- def payment_method_kind_key
17
- payment_method.kind.keys.slice(payment_method_kind)
18
- end
19
-
20
- def payment_method_kind_name
21
- payment_method.kind.slice(payment_method_kind_key).values.first
22
- end
23
- end
24
- end
@@ -1,9 +0,0 @@
1
- class CreateComableOrderDeliveries < ActiveRecord::Migration
2
- def change
3
- create_table :comable_order_deliveries do |t|
4
- t.integer :comable_order_id, null: false
5
- t.string :family_name
6
- t.string :first_name
7
- end
8
- end
9
- end
@@ -1,11 +0,0 @@
1
- class CreateComablePayments < ActiveRecord::Migration
2
- def change
3
- create_table :comable_payments do |t|
4
- t.string :name, null: false
5
- t.string :payment_method_type, null: false
6
- t.integer :payment_method_kind, null: false
7
- t.integer :enable_price_from
8
- t.integer :enable_price_to
9
- end
10
- end
11
- end