comable-core 0.6.0 → 0.7.0.beta1

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 (42) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/comable/application_controller.rb +4 -0
  3. data/app/helpers/comable/application_helper.rb +23 -8
  4. data/app/helpers/comable/products_helper.rb +0 -63
  5. data/app/models/comable/image.rb +1 -1
  6. data/app/models/comable/navigation.rb +12 -0
  7. data/app/models/comable/navigation_item.rb +52 -0
  8. data/app/models/comable/option_type.rb +19 -0
  9. data/app/models/comable/option_value.rb +14 -0
  10. data/app/models/comable/order.rb +1 -0
  11. data/app/models/comable/order_item/csvable.rb +1 -1
  12. data/app/models/comable/order_item.rb +38 -7
  13. data/app/models/comable/page.rb +3 -1
  14. data/app/models/comable/payment.rb +1 -1
  15. data/app/models/comable/product/csvable.rb +1 -0
  16. data/app/models/comable/product.rb +68 -9
  17. data/app/models/comable/stock/csvable.rb +5 -6
  18. data/app/models/comable/stock.rb +45 -8
  19. data/app/models/comable/store.rb +0 -2
  20. data/app/models/comable/theme.rb +10 -0
  21. data/app/models/comable/variant.rb +46 -0
  22. data/app/models/concerns/comable/cart_owner.rb +6 -2
  23. data/app/models/concerns/comable/checkout.rb +2 -2
  24. data/app/models/concerns/comable/linkable.rb +46 -0
  25. data/app/models/concerns/comable/sku_choice.rb +1 -9
  26. data/app/uploaders/comable/image_uploader.rb +9 -0
  27. data/config/locales/en.yml +67 -2
  28. data/config/locales/ja.yml +66 -2
  29. data/db/migrate/20150701094210_create_comable_navigation.rb +8 -0
  30. data/db/migrate/20150706085056_create_comable_navigation_item.rb +15 -0
  31. data/db/migrate/20150805074914_add_published_at_to_comable_products.rb +9 -0
  32. data/db/migrate/20150823071425_create_comable_variants.rb +10 -0
  33. data/db/migrate/20150823072622_create_comable_option_types.rb +10 -0
  34. data/db/migrate/20150823072955_create_comable_option_values.rb +11 -0
  35. data/db/migrate/20150823073250_create_comable_variants_option_values.rb +8 -0
  36. data/db/migrate/20150823073809_change_comable_products_and_comable_stocks.rb +82 -0
  37. data/db/migrate/20150823102819_change_comable_order_items.rb +50 -0
  38. data/lib/comable/core.rb +1 -0
  39. data/lib/comable/deprecator.rb +1 -1
  40. data/lib/comable/errors.rb +7 -0
  41. metadata +74 -21
  42. data/app/uploaders/image_uploader.rb +0 -7
data/db/migrate/20150823102819_change_comable_order_items.rb ADDED
@@ -0,0 +1,50 @@
1
+ class ChangeComableOrderItems < ActiveRecord::Migration
2
+ def change
3
+ reversible do |dir|
4
+ change_table :comable_order_items do |t|
5
+ dir.up { t.references :variant }
6
+ dir.down { t.remove :variant_id }
7
+ end
8
+
9
+ dir.up { up_records }
10
+ dir.down { down_records }
11
+
12
+ change_table :comable_order_items do |t|
13
+ dir.up { t.remove :stock_id }
14
+ dir.down { t.references :stock, null: false }
15
+
16
+ dir.up { t.rename :code, :sku }
17
+ dir.down { t.rename :sku, :code }
18
+
19
+ dir.up { t.change :sku, :string, null: true }
20
+ dir.down { t.change :code, :string, null: false }
21
+
22
+ dir.up { t.remove :sku_h_item_name }
23
+ dir.down { t.string :sku_h_item_name }
24
+
25
+ dir.up { t.remove :sku_v_item_name }
26
+ dir.down { t.string :sku_v_item_name }
27
+
28
+ dir.up { t.remove :sku_h_choice_name }
29
+ dir.down { t.string :sku_h_choice_name }
30
+
31
+ dir.up { t.remove :sku_v_choice_name }
32
+ dir.down { t.string :sku_v_choice_name }
33
+
34
+ dir.up { t.change :variant_id, :integer, null: false }
35
+ end
36
+ end
37
+ end
38
+
39
+ private
40
+
41
+ def up_records
42
+ Comable::OrderItem.all.each do |order_item|
43
+ stock = Comable::Stock.find(order_item.stock_id)
44
+ order_item.update_attribute(:variant_id, stock.variant_id)
45
+ end
46
+ end
47
+
48
+ def down_records
49
+ end
50
+ end
data/lib/comable/core.rb CHANGED
@@ -18,6 +18,7 @@ require 'comable/core/engine'
18
18
  require 'comable/payment_provider'
19
19
  require 'comable/state_machine_patch'
20
20
  require 'comable/deprecator'
21
+ require 'comable/errors'
21
22
 
22
23
  require 'comma_extractor_extentions'
23
24
 
data/lib/comable/deprecator.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  if Rails::VERSION::MAJOR > 3
2
2
  module Comable
3
3
  class Deprecator < ActiveSupport::Deprecation
4
- def initialize(deprecation_horizon = '0.4.0', gem_name = 'Comable')
4
+ def initialize(deprecation_horizon = '0.8.0', gem_name = 'Comable')
5
5
  super
6
6
  end
7
7
  end
data/lib/comable/errors.rb ADDED
@@ -0,0 +1,7 @@
1
+ module Comable
2
+ # = Comable Payment Errors
3
+ #
4
+ # Generic Payment exception class.
5
+ class PaymentError < StandardError
6
+ end
7
+ end
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.6.0
4
+ version: 0.7.0.beta1
5
5
  platform: ruby
6
6
  authors:
7
7
  - YOSHIDA Hiroki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-16 00:00:00.000000000 Z
11
+ date: 2015-09-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 3.2.0
19
+ version: 4.0.0
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: '5'
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 3.2.0
29
+ version: 4.0.0
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '5'
@@ -36,84 +36,90 @@ dependencies:
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: '3.2'
39
+ version: '3.5'
40
+ - - "<="
41
+ - !ruby/object:Gem::Version
42
+ version: 3.5.1
40
43
  type: :runtime
41
44
  prerelease: false
42
45
  version_requirements: !ruby/object:Gem::Requirement
43
46
  requirements:
44
47
  - - "~>"
45
48
  - !ruby/object:Gem::Version
46
- version: '3.2'
49
+ version: '3.5'
50
+ - - "<="
51
+ - !ruby/object:Gem::Version
52
+ version: 3.5.1
47
53
  - !ruby/object:Gem::Dependency
48
54
  name: enumerize
49
55
  requirement: !ruby/object:Gem::Requirement
50
56
  requirements:
51
57
  - - "~>"
52
58
  - !ruby/object:Gem::Version
53
- version: 0.9.0
59
+ version: '0.9'
54
60
  type: :runtime
55
61
  prerelease: false
56
62
  version_requirements: !ruby/object:Gem::Requirement
57
63
  requirements:
58
64
  - - "~>"
59
65
  - !ruby/object:Gem::Version
60
- version: 0.9.0
66
+ version: '0.9'
61
67
  - !ruby/object:Gem::Dependency
62
68
  name: state_machine
63
69
  requirement: !ruby/object:Gem::Requirement
64
70
  requirements:
65
71
  - - "~>"
66
72
  - !ruby/object:Gem::Version
67
- version: 1.2.0
73
+ version: '1.2'
68
74
  type: :runtime
69
75
  prerelease: false
70
76
  version_requirements: !ruby/object:Gem::Requirement
71
77
  requirements:
72
78
  - - "~>"
73
79
  - !ruby/object:Gem::Version
74
- version: 1.2.0
80
+ version: '1.2'
75
81
  - !ruby/object:Gem::Dependency
76
82
  name: ancestry
77
83
  requirement: !ruby/object:Gem::Requirement
78
84
  requirements:
79
85
  - - "~>"
80
86
  - !ruby/object:Gem::Version
81
- version: 2.1.0
87
+ version: '2.1'
82
88
  type: :runtime
83
89
  prerelease: false
84
90
  version_requirements: !ruby/object:Gem::Requirement
85
91
  requirements:
86
92
  - - "~>"
87
93
  - !ruby/object:Gem::Version
88
- version: 2.1.0
94
+ version: '2.1'
89
95
  - !ruby/object:Gem::Dependency
90
96
  name: acts_as_list
91
97
  requirement: !ruby/object:Gem::Requirement
92
98
  requirements:
93
99
  - - "~>"
94
100
  - !ruby/object:Gem::Version
95
- version: 0.6.0
101
+ version: '0.6'
96
102
  type: :runtime
97
103
  prerelease: false
98
104
  version_requirements: !ruby/object:Gem::Requirement
99
105
  requirements:
100
106
  - - "~>"
101
107
  - !ruby/object:Gem::Version
102
- version: 0.6.0
108
+ version: '0.6'
103
109
  - !ruby/object:Gem::Dependency
104
110
  name: carrierwave
105
111
  requirement: !ruby/object:Gem::Requirement
106
112
  requirements:
107
113
  - - "~>"
108
114
  - !ruby/object:Gem::Version
109
- version: 0.10.0
115
+ version: '0.10'
110
116
  type: :runtime
111
117
  prerelease: false
112
118
  version_requirements: !ruby/object:Gem::Requirement
113
119
  requirements:
114
120
  - - "~>"
115
121
  - !ruby/object:Gem::Version
116
- version: 0.10.0
122
+ version: '0.10'
117
123
  - !ruby/object:Gem::Dependency
118
124
  name: cancancan
119
125
  requirement: !ruby/object:Gem::Requirement
@@ -133,6 +139,9 @@ dependencies:
133
139
  requirement: !ruby/object:Gem::Requirement
134
140
  requirements:
135
141
  - - "~>"
142
+ - !ruby/object:Gem::Version
143
+ version: '1.6'
144
+ - - ">="
136
145
  - !ruby/object:Gem::Version
137
146
  version: 1.6.21
138
147
  type: :runtime
@@ -140,6 +149,9 @@ dependencies:
140
149
  version_requirements: !ruby/object:Gem::Requirement
141
150
  requirements:
142
151
  - - "~>"
152
+ - !ruby/object:Gem::Version
153
+ version: '1.6'
154
+ - - ">="
143
155
  - !ruby/object:Gem::Version
144
156
  version: 1.6.21
145
157
  - !ruby/object:Gem::Dependency
@@ -147,6 +159,9 @@ dependencies:
147
159
  requirement: !ruby/object:Gem::Requirement
148
160
  requirements:
149
161
  - - "~>"
162
+ - !ruby/object:Gem::Version
163
+ version: '3.2'
164
+ - - ">="
150
165
  - !ruby/object:Gem::Version
151
166
  version: 3.2.4
152
167
  type: :runtime
@@ -154,6 +169,9 @@ dependencies:
154
169
  version_requirements: !ruby/object:Gem::Requirement
155
170
  requirements:
156
171
  - - "~>"
172
+ - !ruby/object:Gem::Version
173
+ version: '3.2'
174
+ - - ">="
157
175
  - !ruby/object:Gem::Version
158
176
  version: 3.2.4
159
177
  - !ruby/object:Gem::Dependency
@@ -162,19 +180,22 @@ dependencies:
162
180
  requirements:
163
181
  - - "~>"
164
182
  - !ruby/object:Gem::Version
165
- version: 0.3.0
183
+ version: '0.3'
166
184
  type: :runtime
167
185
  prerelease: false
168
186
  version_requirements: !ruby/object:Gem::Requirement
169
187
  requirements:
170
188
  - - "~>"
171
189
  - !ruby/object:Gem::Version
172
- version: 0.3.0
190
+ version: '0.3'
173
191
  - !ruby/object:Gem::Dependency
174
192
  name: roo
175
193
  requirement: !ruby/object:Gem::Requirement
176
194
  requirements:
177
195
  - - "~>"
196
+ - !ruby/object:Gem::Version
197
+ version: '1.13'
198
+ - - ">="
178
199
  - !ruby/object:Gem::Version
179
200
  version: 1.13.2
180
201
  type: :runtime
@@ -182,6 +203,9 @@ dependencies:
182
203
  version_requirements: !ruby/object:Gem::Requirement
183
204
  requirements:
184
205
  - - "~>"
206
+ - !ruby/object:Gem::Version
207
+ version: '1.13'
208
+ - - ">="
185
209
  - !ruby/object:Gem::Version
186
210
  version: 1.13.2
187
211
  - !ruby/object:Gem::Dependency
@@ -189,6 +213,9 @@ dependencies:
189
213
  requirement: !ruby/object:Gem::Requirement
190
214
  requirements:
191
215
  - - "~>"
216
+ - !ruby/object:Gem::Version
217
+ version: '3.0'
218
+ - - ">="
192
219
  - !ruby/object:Gem::Version
193
220
  version: 3.0.2
194
221
  type: :runtime
@@ -196,6 +223,9 @@ dependencies:
196
223
  version_requirements: !ruby/object:Gem::Requirement
197
224
  requirements:
198
225
  - - "~>"
226
+ - !ruby/object:Gem::Version
227
+ version: '3.0'
228
+ - - ">="
199
229
  - !ruby/object:Gem::Version
200
230
  version: 3.0.2
201
231
  - !ruby/object:Gem::Dependency
@@ -203,6 +233,9 @@ dependencies:
203
233
  requirement: !ruby/object:Gem::Requirement
204
234
  requirements:
205
235
  - - "~>"
236
+ - !ruby/object:Gem::Version
237
+ version: '0.1'
238
+ - - ">="
206
239
  - !ruby/object:Gem::Version
207
240
  version: 0.1.2
208
241
  type: :runtime
@@ -210,6 +243,9 @@ dependencies:
210
243
  version_requirements: !ruby/object:Gem::Requirement
211
244
  requirements:
212
245
  - - "~>"
246
+ - !ruby/object:Gem::Version
247
+ version: '0.1'
248
+ - - ">="
213
249
  - !ruby/object:Gem::Version
214
250
  version: 0.1.2
215
251
  - !ruby/object:Gem::Dependency
@@ -243,6 +279,7 @@ files:
243
279
  - Rakefile
244
280
  - app/assets/javascripts/comable/application.js
245
281
  - app/assets/stylesheets/comable/application.css
282
+ - app/controllers/comable/application_controller.rb
246
283
  - app/controllers/concerns/comable/permitted_attributes.rb
247
284
  - app/helpers/comable/application_helper.rb
248
285
  - app/helpers/comable/products_helper.rb
@@ -251,6 +288,10 @@ files:
251
288
  - app/models/comable/address.rb
252
289
  - app/models/comable/category.rb
253
290
  - app/models/comable/image.rb
291
+ - app/models/comable/navigation.rb
292
+ - app/models/comable/navigation_item.rb
293
+ - app/models/comable/option_type.rb
294
+ - app/models/comable/option_value.rb
254
295
  - app/models/comable/order.rb
255
296
  - app/models/comable/order/associations.rb
256
297
  - app/models/comable/order/callbacks.rb
@@ -272,16 +313,18 @@ files:
272
313
  - app/models/comable/theme.rb
273
314
  - app/models/comable/tracker.rb
274
315
  - app/models/comable/user.rb
316
+ - app/models/comable/variant.rb
275
317
  - app/models/concerns/comable/cart_owner.rb
276
318
  - app/models/concerns/comable/checkout.rb
277
319
  - app/models/concerns/comable/importable.rb
320
+ - app/models/concerns/comable/linkable.rb
278
321
  - app/models/concerns/comable/liquidable.rb
279
322
  - app/models/concerns/comable/product/search.rb
280
323
  - app/models/concerns/comable/ransackable.rb
281
324
  - app/models/concerns/comable/role_owner.rb
282
325
  - app/models/concerns/comable/sku_choice.rb
283
326
  - app/models/concerns/comable/sku_item.rb
284
- - app/uploaders/image_uploader.rb
327
+ - app/uploaders/comable/image_uploader.rb
285
328
  - app/views/comable/order_mailer/complete.text.erb
286
329
  - config/initializers/comma.rb
287
330
  - config/locales/en.yml
@@ -304,12 +347,22 @@ files:
304
347
  - db/migrate/20150519080729_create_comable_pages.rb
305
348
  - db/migrate/20150612143226_create_comable_themes.rb
306
349
  - db/migrate/20150612143445_add_theme_id_to_comable_stores.rb
350
+ - db/migrate/20150701094210_create_comable_navigation.rb
351
+ - db/migrate/20150706085056_create_comable_navigation_item.rb
352
+ - db/migrate/20150805074914_add_published_at_to_comable_products.rb
353
+ - db/migrate/20150823071425_create_comable_variants.rb
354
+ - db/migrate/20150823072622_create_comable_option_types.rb
355
+ - db/migrate/20150823072955_create_comable_option_values.rb
356
+ - db/migrate/20150823073250_create_comable_variants_option_values.rb
357
+ - db/migrate/20150823073809_change_comable_products_and_comable_stocks.rb
358
+ - db/migrate/20150823102819_change_comable_order_items.rb
307
359
  - db/seeds.rb
308
360
  - db/seeds/comable/users.rb
309
361
  - lib/comable/core.rb
310
362
  - lib/comable/core/configuration.rb
311
363
  - lib/comable/core/engine.rb
312
364
  - lib/comable/deprecator.rb
365
+ - lib/comable/errors.rb
313
366
  - lib/comable/payment_provider.rb
314
367
  - lib/comable/payment_provider/base.rb
315
368
  - lib/comable/payment_provider/general.rb
@@ -333,9 +386,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
333
386
  version: 2.1.5
334
387
  required_rubygems_version: !ruby/object:Gem::Requirement
335
388
  requirements:
336
- - - ">="
389
+ - - ">"
337
390
  - !ruby/object:Gem::Version
338
- version: '0'
391
+ version: 1.3.1
339
392
  requirements: []
340
393
  rubyforge_project:
341
394
  rubygems_version: 2.2.2
data/app/uploaders/image_uploader.rb DELETED
@@ -1,7 +0,0 @@
1
- class ImageUploader < CarrierWave::Uploader::Base
2
- storage :file
3
-
4
- def store_dir
5
- "#{model.class.to_s.underscore}/#{model.id}"
6
- end
7
- end