solidus_product_assembly 1.1.0 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +48 -10
  3. data/.github/stale.yml +4 -4
  4. data/.github_changelog_generator +2 -0
  5. data/.gitignore +4 -0
  6. data/.rspec +0 -1
  7. data/.rubocop.yml +4 -1
  8. data/.rubocop_todo.yml +153 -29
  9. data/CHANGELOG.md +2 -18
  10. data/Gemfile +28 -8
  11. data/OLD_CHANGELOG.md +116 -0
  12. data/README.md +64 -73
  13. data/Rakefile +1 -0
  14. data/app/decorators/models/solidus_product_assembly/spree/product_decorator.rb +19 -6
  15. data/app/decorators/models/solidus_product_assembly/spree/stock/differentiator_decorator.rb +17 -0
  16. data/app/views/spree/admin/parts/_parts_table.html.erb +1 -1
  17. data/app/views/spree/admin/shared/_product_assembly_product_tabs.html.erb +3 -3
  18. data/bin/rails +4 -12
  19. data/bin/rails-engine +13 -0
  20. data/bin/rails-sandbox +16 -0
  21. data/bin/rake +7 -0
  22. data/bin/sandbox +102 -0
  23. data/bin/setup +1 -1
  24. data/lib/generators/solidus_product_assembly/install/install_generator.rb +15 -9
  25. data/lib/generators/solidus_product_assembly/install/templates/initializer.rb +6 -0
  26. data/lib/solidus_product_assembly/configuration.rb +21 -0
  27. data/lib/solidus_product_assembly/engine.rb +3 -1
  28. data/lib/solidus_product_assembly/version.rb +1 -1
  29. data/lib/solidus_product_assembly.rb +1 -3
  30. data/solidus_product_assembly.gemspec +34 -37
  31. data/spec/features/admin/orders_spec.rb +0 -1
  32. data/spec/features/admin/parts_spec.rb +7 -6
  33. data/spec/features/admin/return_items_spec.rb +18 -9
  34. data/spec/models/spree/inventory_unit_spec.rb +0 -1
  35. data/spec/models/spree/line_item_spec.rb +0 -1
  36. data/spec/models/spree/order_inventory_assembly_spec.rb +6 -3
  37. data/spec/models/spree/product_spec.rb +18 -0
  38. data/spec/spec_helper.rb +13 -10
  39. metadata +41 -65
  40. data/app/assets/javascripts/spree/frontend/solidus_product_assembly.js +0 -1
  41. data/app/assets/stylesheets/spree/frontend/solidus_product_assembly.css +0 -3
  42. data/app/decorators/controllers/solidus_product_assembly/spree/checkout_controller_decorator.rb +0 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d61612432f21d73321086ff0d33ae48e3d9f9d81aa5107ad377eb22beeddb08b
4
- data.tar.gz: b849af2369bc531a1c6270e28f1a36827f2b1883b80984a3c5372edeab4f407e
3
+ metadata.gz: 274a4532455c23274d411612b99ff6aa22619f3d764153711fbb769c8a60c39c
4
+ data.tar.gz: c1319377dcd923f5d327e669cdb8586bce1da7d308cd2ae4471709a7cdd49311
5
5
  SHA512:
6
- metadata.gz: b02fd5570c1cdc3a8337ce5938141a8df21b25752bda01e3e157a7fdbf07503342ccc43e87607aa775c29b706181450b7c932c4931403f896e4a3053bb248e36
7
- data.tar.gz: 8f2c61439371cd9f425fa215edf1473c1607a06da73032946c4a7677baa123d0e719f7cf76e4715e4f998474f571a223dc73474317b1550a958b6a41f531cb5d
6
+ metadata.gz: 6a923b251c002850f85141265e33abc02e183760e0e1a12af562ae7eb88411c3d79d68ec402ee5d7fe657807d70ff6686504345b030a1ddf84bb33b17c4720a7
7
+ data.tar.gz: 53d65715db1f179ffd4a1995731ec4f260a520875427ca574ea52d59512ff53f1daa5f8f908fd5d7712f5a231280af308cb2949ce5dd450f4abbe91d56dd3651
data/.circleci/config.yml CHANGED
@@ -1,6 +1,9 @@
1
1
  version: 2.1
2
2
 
3
3
  orbs:
4
+ # Required for feature specs.
5
+ browser-tools: circleci/browser-tools@1.1
6
+
4
7
  # Always take the latest version of the orb, this allows us to
5
8
  # run specs against Solidus supported versions only without the need
6
9
  # to change this configuration every time a Solidus version is released
@@ -8,20 +11,49 @@ orbs:
8
11
  solidusio_extensions: solidusio/extensions@volatile
9
12
 
10
13
  jobs:
11
- run-specs-with-postgres:
12
- executor: solidusio_extensions/postgres
14
+ run-specs:
15
+ parameters:
16
+ solidus:
17
+ type: string
18
+ default: main
19
+ db:
20
+ type: string
21
+ default: "postgres"
22
+ ruby:
23
+ type: string
24
+ default: "3.2"
25
+ executor:
26
+ name: solidusio_extensions/<< parameters.db >>
27
+ ruby_version: << parameters.ruby >>
13
28
  steps:
14
- - solidusio_extensions/run-tests
15
- run-specs-with-mysql:
16
- executor: solidusio_extensions/mysql
29
+ - checkout
30
+ - browser-tools/install-chrome
31
+ - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
32
+
33
+ lint-code:
34
+ executor:
35
+ name: solidusio_extensions/sqlite
36
+ ruby_version: "3.0"
17
37
  steps:
18
- - solidusio_extensions/run-tests
38
+ - solidusio_extensions/lint-code
19
39
 
20
40
  workflows:
21
41
  "Run specs on supported Solidus versions":
22
42
  jobs:
23
- - run-specs-with-postgres
24
- - run-specs-with-mysql
43
+ - run-specs:
44
+ name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
45
+ matrix:
46
+ parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
47
+ - run-specs:
48
+ name: *name
49
+ matrix:
50
+ parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
51
+ - run-specs:
52
+ name: *name
53
+ matrix:
54
+ parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
55
+ - lint-code
56
+
25
57
  "Weekly run specs against master":
26
58
  triggers:
27
59
  - schedule:
@@ -31,5 +63,11 @@ workflows:
31
63
  only:
32
64
  - master
33
65
  jobs:
34
- - run-specs-with-postgres
35
- - run-specs-with-mysql
66
+ - run-specs:
67
+ name: *name
68
+ matrix:
69
+ parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
70
+ - run-specs:
71
+ name: *name
72
+ matrix:
73
+ parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
data/.github/stale.yml CHANGED
@@ -1,17 +1,17 @@
1
1
  # Number of days of inactivity before an issue becomes stale
2
2
  daysUntilStale: 60
3
3
  # Number of days of inactivity before a stale issue is closed
4
- daysUntilClose: 7
4
+ daysUntilClose: false
5
5
  # Issues with these labels will never be considered stale
6
6
  exemptLabels:
7
7
  - pinned
8
8
  - security
9
9
  # Label to use when marking an issue as stale
10
- staleLabel: wontfix
10
+ staleLabel: stale
11
11
  # Comment to post when marking an issue as stale. Set to `false` to disable
12
12
  markComment: >
13
13
  This issue has been automatically marked as stale because it has not had
14
- recent activity. It will be closed if no further activity occurs. Thank you
14
+ recent activity. It might be closed if no further activity occurs. Thank you
15
15
  for your contributions.
16
16
  # Comment to post when closing a stale issue. Set to `false` to disable
17
- closeComment: false
17
+ closeComment: false
@@ -0,0 +1,2 @@
1
+ issues=false
2
+ exclude-labels=infrastructure
data/.gitignore CHANGED
@@ -14,3 +14,7 @@ pkg
14
14
  *.swp
15
15
  spec/dummy
16
16
  spec/examples.txt
17
+ /sandbox
18
+ .rvmrc
19
+ .ruby-version
20
+ .ruby-gemset
data/.rspec CHANGED
@@ -1,3 +1,2 @@
1
1
  --color
2
- --format progress
3
2
  --require spec_helper
data/.rubocop.yml CHANGED
@@ -1,4 +1,7 @@
1
+ inherit_from: .rubocop_todo.yml
2
+
1
3
  require:
2
4
  - solidus_dev_support/rubocop
3
5
 
4
- inherit_from: .rubocop_todo.yml
6
+ AllCops:
7
+ NewCops: disable
data/.rubocop_todo.yml CHANGED
@@ -1,46 +1,139 @@
1
1
  # This configuration was generated by
2
2
  # `rubocop --auto-gen-config`
3
- # on 2020-01-22 17:16:56 +0100 using RuboCop version 0.76.0.
3
+ # on 2022-09-14 16:19:15 UTC using RuboCop version 1.36.0.
4
4
  # The point is for the user to remove these configuration records
5
5
  # one by one as the offenses are removed from the code base.
6
6
  # Note that changes in the inspected code, or installation of new
7
7
  # versions of RuboCop, may require this file to be generated again.
8
8
 
9
+ # Offense count: 1
10
+ # This cop supports safe autocorrection (--autocorrect).
11
+ # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
12
+ # Include: **/*.gemfile, **/Gemfile, **/gems.rb
13
+ Bundler/OrderedGems:
14
+ Exclude:
15
+ - 'Gemfile'
16
+
9
17
  # Offense count: 2
10
- # Cop supports --auto-correct.
11
- Capybara/CurrentPathExpectation:
18
+ # This cop supports safe autocorrection (--autocorrect).
19
+ # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
20
+ # Include: **/*.gemspec
21
+ Gemspec/OrderedDependencies:
12
22
  Exclude:
13
- - 'spec/features/checkout_spec.rb'
23
+ - 'solidus_product_assembly.gemspec'
24
+
25
+ # Offense count: 1
26
+ # Configuration parameters: Include.
27
+ # Include: **/*.gemspec
28
+ Gemspec/RequiredRubyVersion:
29
+ Exclude:
30
+ - 'solidus_product_assembly.gemspec'
31
+
32
+ # Offense count: 21
33
+ # This cop supports safe autocorrection (--autocorrect).
34
+ # Configuration parameters: EnforcedStyle, IndentationWidth.
35
+ # SupportedStyles: with_first_argument, with_fixed_indentation
36
+ Layout/ArgumentAlignment:
37
+ Exclude:
38
+ - 'app/decorators/models/solidus_product_assembly/spree/product_decorator.rb'
39
+ - 'app/decorators/models/solidus_product_assembly/spree/shipment_decorator.rb'
40
+ - 'app/models/spree/assemblies_part.rb'
41
+ - 'app/overrides/add_admin_product_form_fields.rb'
42
+ - 'app/overrides/add_admin_tabs.rb'
43
+ - 'app/overrides/add_line_item_description.rb'
14
44
 
15
45
  # Offense count: 2
16
- # Cop supports --auto-correct.
17
- # Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
46
+ # This cop supports safe autocorrection (--autocorrect).
47
+ # Configuration parameters: EnforcedStyleAlignWith, Severity.
18
48
  # SupportedStylesAlignWith: keyword, variable, start_of_line
19
49
  Layout/EndAlignment:
20
50
  Exclude:
21
51
  - 'db/migrate/20091029165620_add_parts_fields_to_products.rb'
22
52
 
23
53
  # Offense count: 1
54
+ # This cop supports safe autocorrection (--autocorrect).
55
+ # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
56
+ Layout/ExtraSpacing:
57
+ Exclude:
58
+ - 'solidus_product_assembly.gemspec'
59
+
60
+ # Offense count: 1
61
+ # This cop supports safe autocorrection (--autocorrect).
62
+ # Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
63
+ Layout/IndentationWidth:
64
+ Exclude:
65
+ - 'spec/models/spree/shipment_spec.rb'
66
+
67
+ # Offense count: 8
68
+ # This cop supports safe autocorrection (--autocorrect).
69
+ # Configuration parameters: EnforcedStyle, IndentationWidth.
70
+ # SupportedStyles: aligned, indented, indented_relative_to_receiver
71
+ Layout/MultilineMethodCallIndentation:
72
+ Exclude:
73
+ - 'app/decorators/models/solidus_product_assembly/spree/product_decorator.rb'
74
+ - 'spec/models/spree/order_contents_spec.rb'
75
+
76
+ # Offense count: 1
77
+ # This cop supports safe autocorrection (--autocorrect).
78
+ # Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
79
+ # SupportedStylesForExponentOperator: space, no_space
80
+ Layout/SpaceAroundOperators:
81
+ Exclude:
82
+ - 'solidus_product_assembly.gemspec'
83
+
84
+ # Offense count: 1
85
+ # This cop supports safe autocorrection (--autocorrect).
86
+ # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
87
+ # SupportedStyles: space, no_space
88
+ # SupportedStylesForEmptyBraces: space, no_space
89
+ Layout/SpaceInsideBlockBraces:
90
+ Exclude:
91
+ - 'spec/models/spree/shipment_spec.rb'
92
+
93
+ # Offense count: 1
94
+ # This cop supports safe autocorrection (--autocorrect).
95
+ # Configuration parameters: AllowInHeredoc.
96
+ Layout/TrailingWhitespace:
97
+ Exclude:
98
+ - 'spec/features/checkout_spec.rb'
99
+
100
+ # Offense count: 1
101
+ # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
24
102
  Lint/AmbiguousBlockAssociation:
25
103
  Exclude:
26
104
  - 'spec/models/spree/order_inventory_spec.rb'
27
105
 
28
- # Offense count: 2
106
+ # Offense count: 1
107
+ # This cop supports safe autocorrection (--autocorrect).
29
108
  Lint/AmbiguousOperator:
30
109
  Exclude:
31
110
  - 'app/views/spree/api/line_items/show.v1.rabl'
32
- - 'lib/solidus_product_assembly/engine.rb'
33
111
 
34
- # Offense count: 4
112
+ # Offense count: 1
113
+ Lint/MissingSuper:
114
+ Exclude:
115
+ - 'app/models/spree/order_inventory_assembly.rb'
116
+
117
+ # Offense count: 1
118
+ # This cop supports safe autocorrection (--autocorrect).
119
+ Lint/RedundantCopDisableDirective:
120
+ Exclude:
121
+ - 'lib/generators/solidus_product_assembly/install/install_generator.rb'
122
+
123
+ # Offense count: 3
35
124
  Lint/ShadowingOuterLocalVariable:
36
125
  Exclude:
37
126
  - 'app/decorators/models/solidus_product_assembly/spree/shipment_decorator.rb'
38
- - 'app/models/spree/order_inventory_assembly.rb'
39
127
  - 'lib/tasks/spree2_upgrade.rake'
40
128
 
129
+ # Offense count: 2
130
+ # This cop supports safe autocorrection (--autocorrect).
131
+ Performance/BigDecimalWithNumericArgument:
132
+ Exclude:
133
+ - 'spec/models/spree/inventory_unit_spec.rb'
134
+
41
135
  # Offense count: 3
42
- # Cop supports --auto-correct.
43
- # Configuration parameters: AutoCorrect.
136
+ # This cop supports unsafe autocorrection (--autocorrect-all).
44
137
  Performance/TimesMap:
45
138
  Exclude:
46
139
  - 'app/decorators/models/solidus_product_assembly/spree/stock/inventory_unit_builder_decorator.rb'
@@ -52,8 +145,14 @@ RSpec/AnyInstance:
52
145
  - 'spec/features/admin/return_items_spec.rb'
53
146
  - 'spec/models/spree/stock/availability_validator_spec.rb'
54
147
 
148
+ # Offense count: 2
149
+ # This cop supports safe autocorrection (--autocorrect).
150
+ RSpec/Capybara/CurrentPathExpectation:
151
+ Exclude:
152
+ - 'spec/features/checkout_spec.rb'
153
+
55
154
  # Offense count: 42
56
- # Configuration parameters: Prefixes.
155
+ # Configuration parameters: Prefixes, AllowedPatterns.
57
156
  # Prefixes: when, with, without
58
157
  RSpec/ContextWording:
59
158
  Exclude:
@@ -72,6 +171,12 @@ RSpec/ContextWording:
72
171
  - 'spec/models/spree/variant_spec.rb'
73
172
  - 'spec/support/shared_contexts/order_with_bundle.rb'
74
173
 
174
+ # Offense count: 2
175
+ # This cop supports safe autocorrection (--autocorrect).
176
+ RSpec/EmptyLineAfterFinalLet:
177
+ Exclude:
178
+ - 'spec/models/spree/shipment_spec.rb'
179
+
75
180
  # Offense count: 9
76
181
  RSpec/ExpectInHook:
77
182
  Exclude:
@@ -84,7 +189,7 @@ RSpec/InstanceVariable:
84
189
  Exclude:
85
190
  - 'spec/models/spree/product_spec.rb'
86
191
 
87
- # Offense count: 13
192
+ # Offense count: 14
88
193
  RSpec/LetSetup:
89
194
  Exclude:
90
195
  - 'spec/features/checkout_spec.rb'
@@ -101,11 +206,15 @@ RSpec/MessageSpies:
101
206
  EnforcedStyle: receive
102
207
 
103
208
  # Offense count: 19
104
- # Configuration parameters: AggregateFailuresByDefault.
105
209
  RSpec/MultipleExpectations:
106
210
  Max: 14
107
211
 
108
- # Offense count: 22
212
+ # Offense count: 23
213
+ # Configuration parameters: AllowSubject.
214
+ RSpec/MultipleMemoizedHelpers:
215
+ Max: 10
216
+
217
+ # Offense count: 23
109
218
  # Configuration parameters: IgnoreSharedExamples.
110
219
  RSpec/NamedSubject:
111
220
  Exclude:
@@ -114,23 +223,26 @@ RSpec/NamedSubject:
114
223
  - 'spec/models/spree/order_contents_spec.rb'
115
224
  - 'spec/models/spree/order_inventory_assembly_spec.rb'
116
225
  - 'spec/models/spree/order_inventory_spec.rb'
226
+ - 'spec/models/spree/product_spec.rb'
117
227
  - 'spec/models/spree/stock/availability_validator_spec.rb'
118
228
  - 'spec/models/spree/stock/coordinator_spec.rb'
119
229
  - 'spec/models/spree/stock/inventory_unit_builder_spec.rb'
120
230
 
121
231
  # Offense count: 2
232
+ # Configuration parameters: AllowedGroups.
122
233
  RSpec/NestedGroups:
123
234
  Max: 5
124
235
 
125
236
  # Offense count: 3
237
+ # This cop supports safe autocorrection (--autocorrect).
126
238
  RSpec/ScatteredLet:
127
239
  Exclude:
128
240
  - 'spec/models/spree/order_inventory_spec.rb'
129
241
 
130
- # Offense count: 1
131
- RSpec/SubjectStub:
242
+ # Offense count: 2
243
+ RSpec/StubbedMock:
132
244
  Exclude:
133
- - 'spec/models/spree/stock/availability_validator_spec.rb'
245
+ - 'spec/models/spree/line_item_spec.rb'
134
246
 
135
247
  # Offense count: 2
136
248
  # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
@@ -147,15 +259,21 @@ Rails/CreateTableWithTimestamps:
147
259
  - 'db/migrate/20091028152124_add_many_to_many_relation_to_products.rb'
148
260
 
149
261
  # Offense count: 2
150
- # Configuration parameters: Include.
262
+ # Configuration parameters: IgnoreScopes, Include.
151
263
  # Include: app/models/**/*.rb
152
264
  Rails/InverseOf:
153
265
  Exclude:
154
266
  - 'app/models/spree/assemblies_part.rb'
155
267
 
268
+ # Offense count: 2
269
+ # This cop supports safe autocorrection (--autocorrect).
270
+ Rails/RedundantForeignKey:
271
+ Exclude:
272
+ - 'app/models/spree/assemblies_part.rb'
273
+
156
274
  # Offense count: 8
157
- # Configuration parameters: Blacklist, Whitelist.
158
- # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
275
+ # Configuration parameters: ForbiddenMethods, AllowedMethods.
276
+ # ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
159
277
  Rails/SkipsModelValidations:
160
278
  Exclude:
161
279
  - 'lib/tasks/spree2_upgrade.rake'
@@ -168,8 +286,8 @@ Rails/SkipsModelValidations:
168
286
  - 'spec/models/spree/stock/coordinator_spec.rb'
169
287
 
170
288
  # Offense count: 2
171
- # Cop supports --auto-correct.
172
- # Configuration parameters: AutoCorrect, EnforcedStyle.
289
+ # This cop supports unsafe autocorrection (--autocorrect-all).
290
+ # Configuration parameters: EnforcedStyle.
173
291
  # SupportedStyles: nested, compact
174
292
  Style/ClassAndModuleChildren:
175
293
  Exclude:
@@ -177,16 +295,22 @@ Style/ClassAndModuleChildren:
177
295
  - 'app/models/spree/calculator/returns/assemblies_default_refund_amount.rb'
178
296
 
179
297
  # Offense count: 3
180
- # Configuration parameters: MinBodyLength.
298
+ # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
181
299
  Style/GuardClause:
182
300
  Exclude:
183
301
  - 'app/decorators/models/solidus_product_assembly/spree/line_item_decorator.rb'
184
302
  - 'app/decorators/models/solidus_product_assembly/spree/stock/inventory_validator_decorator.rb'
185
303
  - 'app/models/spree/order_inventory_assembly.rb'
186
304
 
187
- # Offense count: 26
188
- # Cop supports --auto-correct.
189
- # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
305
+ # Offense count: 2
306
+ # This cop supports safe autocorrection (--autocorrect).
307
+ Style/OrAssignment:
308
+ Exclude:
309
+ - 'app/models/spree/order_inventory_assembly.rb'
310
+
311
+ # Offense count: 6
312
+ # This cop supports safe autocorrection (--autocorrect).
313
+ # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
190
314
  # URISchemes: http, https
191
- Metrics/LineLength:
315
+ Layout/LineLength:
192
316
  Max: 146
data/CHANGELOG.md CHANGED
@@ -1,19 +1,3 @@
1
- ## [v1.0.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.0.0) (2016-09-06)
2
- **Closed issues:**
1
+ # Changelog
3
2
 
4
- - Inventory Validation fail upon checkout, for the assembly product [\#3](https://github.com/solidusio-contrib/solidus_product_assembly/issues/3)
5
-
6
- **Merged pull requests:**
7
-
8
- - Add support for Solidus 2.0 and Rails 5 [\#10](https://github.com/solidusio-contrib/solidus_product_assembly/pull/10) ([jhawthorn](https://github.com/jhawthorn))
9
- - Fix installation instructions in README [\#9](https://github.com/solidusio-contrib/solidus_product_assembly/pull/9) ([alexblackie](https://github.com/alexblackie))
10
- - Add missing translation for actions.delete [\#8](https://github.com/solidusio-contrib/solidus_product_assembly/pull/8) ([Sinetheta](https://github.com/Sinetheta))
11
- - Fix a load order issue when redefining inventory validator. [\#7](https://github.com/solidusio-contrib/solidus_product_assembly/pull/7) ([Senjai](https://github.com/Senjai))
12
- - Fix product sub\_menu display on new Solidus [\#6](https://github.com/solidusio-contrib/solidus_product_assembly/pull/6) ([Sinetheta](https://github.com/Sinetheta))
13
- - Inventory validation [\#5](https://github.com/solidusio-contrib/solidus_product_assembly/pull/5) ([Sinetheta](https://github.com/Sinetheta))
14
- - Rename to solidus\_product\_assembly [\#2](https://github.com/solidusio-contrib/solidus_product_assembly/pull/2) ([Sinetheta](https://github.com/Sinetheta))
15
- - Upgrade from spree 2.4 to solidus 1.1-1.3 [\#1](https://github.com/solidusio-contrib/solidus_product_assembly/pull/1) ([Sinetheta](https://github.com/Sinetheta))
16
-
17
-
18
-
19
- \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
3
+ See https://github.com/solidusio-contrib/solidus_product_assembly/releases or [OLD_CHANGELOG.md](OLD_CHANGELOG.md) for older versions.
data/Gemfile CHANGED
@@ -3,13 +3,30 @@
3
3
  source 'https://rubygems.org'
4
4
  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
5
5
 
6
- branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
6
+ branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
7
7
  gem 'solidus', github: 'solidusio/solidus', branch: branch
8
8
 
9
+ # The solidus_frontend gem has been pulled out since v3.2
10
+ if branch >= 'v3.2'
11
+ gem 'solidus_frontend'
12
+ elsif branch == 'main'
13
+ gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
14
+ else
15
+ gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
16
+ end
17
+
18
+ # Needed to help Bundler figure out how to resolve dependencies,
19
+ # otherwise it takes forever to resolve them.
20
+ # See https://github.com/bundler/bundler/issues/6677
21
+ gem 'rails', '>0.a'
22
+
9
23
  # Provides basic authentication functionality for testing parts of your engine
10
24
  gem 'solidus_auth_devise'
11
25
 
12
- case ENV['DB']
26
+ gem 'friendly_id-globalize', github: 'norman/friendly_id-globalize', branch: "master"
27
+ gem 'solidus_globalize', github: 'solidusio-contrib/solidus_globalize'
28
+
29
+ case ENV.fetch('DB', nil)
13
30
  when 'mysql'
14
31
  gem 'mysql2'
15
32
  when 'postgresql'
@@ -18,13 +35,16 @@ else
18
35
  gem 'sqlite3'
19
36
  end
20
37
 
21
- group :test do
22
- gem 'webdrivers'
23
- gem 'selenium-webdriver'
24
- end
38
+ # While we still support Ruby < 3 we need to workaround a limitation in
39
+ # the 'async' gem that relies on the latest ruby, since RubyGems doesn't
40
+ # resolve gems based on the required ruby version.
41
+ gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
25
42
 
26
43
  gemspec
27
44
 
28
45
  # Use a local Gemfile to include development dependencies that might not be
29
- # relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
30
- eval_gemfile 'Gemfile-local' if File.exist? 'Gemfile-local'
46
+ # relevant for the project or for other contributors, e.g. pry-byebug.
47
+ #
48
+ # We use `send` instead of calling `eval_gemfile` to work around an issue with
49
+ # how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
50
+ send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
data/OLD_CHANGELOG.md ADDED
@@ -0,0 +1,116 @@
1
+ # Changelog
2
+
3
+ ## [v1.2.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.2.0) (2022-11-02)
4
+
5
+ [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/v1.1.0...v1.2.0)
6
+
7
+ **Merged pull requests:**
8
+
9
+ - Fix before payment override [\#112](https://github.com/solidusio-contrib/solidus_product_assembly/pull/112) ([cpfergus1](https://github.com/cpfergus1))
10
+ - Update to use forked solidus\_frontend when needed [\#111](https://github.com/solidusio-contrib/solidus_product_assembly/pull/111) ([waiting-for-dev](https://github.com/waiting-for-dev))
11
+ - Search part globalize [\#109](https://github.com/solidusio-contrib/solidus_product_assembly/pull/109) ([AlistairNorman](https://github.com/AlistairNorman))
12
+
13
+ ## [v1.1.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.1.0) (2021-10-19)
14
+
15
+ [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/v1.0.0...v1.1.0)
16
+
17
+ **Closed issues:**
18
+
19
+ - Dependabot couldn't find a Gemfile-local for this project [\#107](https://github.com/solidusio-contrib/solidus_product_assembly/issues/107)
20
+ - Prepare Solidus Product Assembly for Solidus 3.0 [\#102](https://github.com/solidusio-contrib/solidus_product_assembly/issues/102)
21
+ - Error on running specs locally [\#91](https://github.com/solidusio-contrib/solidus_product_assembly/issues/91)
22
+ - Dependabot can't resolve your Ruby dependency files [\#80](https://github.com/solidusio-contrib/solidus_product_assembly/issues/80)
23
+ - Dependabot can't resolve your Ruby dependency files [\#79](https://github.com/solidusio-contrib/solidus_product_assembly/issues/79)
24
+ - Dependabot can't resolve your Ruby dependency files [\#78](https://github.com/solidusio-contrib/solidus_product_assembly/issues/78)
25
+ - Dependabot can't resolve your Ruby dependency files [\#77](https://github.com/solidusio-contrib/solidus_product_assembly/issues/77)
26
+ - Dependabot can't resolve your Ruby dependency files [\#76](https://github.com/solidusio-contrib/solidus_product_assembly/issues/76)
27
+ - Dependabot can't resolve your Ruby dependency files [\#75](https://github.com/solidusio-contrib/solidus_product_assembly/issues/75)
28
+ - Dependabot can't resolve your Ruby dependency files [\#74](https://github.com/solidusio-contrib/solidus_product_assembly/issues/74)
29
+ - Dependabot can't resolve your Ruby dependency files [\#73](https://github.com/solidusio-contrib/solidus_product_assembly/issues/73)
30
+ - Action links for assembly don't work [\#62](https://github.com/solidusio-contrib/solidus_product_assembly/issues/62)
31
+ - Wrong return item amounts when returning orders with line items with quantity \> 1 [\#46](https://github.com/solidusio-contrib/solidus_product_assembly/issues/46)
32
+ - `method_missing': undefined method `add\_routes' [\#39](https://github.com/solidusio-contrib/solidus_product_assembly/issues/39)
33
+ - Deface is required [\#37](https://github.com/solidusio-contrib/solidus_product_assembly/issues/37)
34
+ - Javascript not registering Events [\#23](https://github.com/solidusio-contrib/solidus_product_assembly/issues/23)
35
+ - Cannot select parts [\#18](https://github.com/solidusio-contrib/solidus_product_assembly/issues/18)
36
+
37
+ **Merged pull requests:**
38
+
39
+ - Solidus 3 preparation [\#106](https://github.com/solidusio-contrib/solidus_product_assembly/pull/106) ([cpfergus1](https://github.com/cpfergus1))
40
+ - Upgrade to GitHub-native Dependabot [\#104](https://github.com/solidusio-contrib/solidus_product_assembly/pull/104) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
41
+ - Bump solidus\_support dependency to \(~\> 0.5\) [\#96](https://github.com/solidusio-contrib/solidus_product_assembly/pull/96) ([jcsanti](https://github.com/jcsanti))
42
+ - Display parts' available\_on in the admin's "parts" tab \(feature proposal\) [\#95](https://github.com/solidusio-contrib/solidus_product_assembly/pull/95) ([jcsanti](https://github.com/jcsanti))
43
+ - Fix Community Guidelines link in Readme [\#94](https://github.com/solidusio-contrib/solidus_product_assembly/pull/94) ([jcsanti](https://github.com/jcsanti))
44
+ - Fix failing test in shipment\_spec due to missing store [\#93](https://github.com/solidusio-contrib/solidus_product_assembly/pull/93) ([jcsanti](https://github.com/jcsanti))
45
+ - Fix deprecation warning about SolidusSupport.solidus\_gem\_version [\#84](https://github.com/solidusio-contrib/solidus_product_assembly/pull/84) ([stem](https://github.com/stem))
46
+ - Upgrade the extension using solidus\_dev\_support [\#81](https://github.com/solidusio-contrib/solidus_product_assembly/pull/81) ([blocknotes](https://github.com/blocknotes))
47
+ - Adopt solidus\_extension\_dev\_tools [\#71](https://github.com/solidusio-contrib/solidus_product_assembly/pull/71) ([aldesantis](https://github.com/aldesantis))
48
+ - Remove deprecation for Reimbursement\#simulate [\#69](https://github.com/solidusio-contrib/solidus_product_assembly/pull/69) ([spaghetticode](https://github.com/spaghetticode))
49
+ - Remove broken buttons in Shipments page [\#68](https://github.com/solidusio-contrib/solidus_product_assembly/pull/68) ([spaghetticode](https://github.com/spaghetticode))
50
+ - Update factory\_bot requirement from 5.1.0 to 5.1.1 [\#67](https://github.com/solidusio-contrib/solidus_product_assembly/pull/67) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
51
+ - Update puma requirement from ~\> 3.12 to ~\> 4.2 [\#66](https://github.com/solidusio-contrib/solidus_product_assembly/pull/66) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
52
+ - Update factory\_bot requirement from 4.10.0 to 5.1.0 [\#65](https://github.com/solidusio-contrib/solidus_product_assembly/pull/65) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
53
+ - Update pg requirement from ~\> 0.21 to ~\> 1.1 [\#64](https://github.com/solidusio-contrib/solidus_product_assembly/pull/64) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
54
+ - Update sqlite3 requirement from ~\> 1.3.6 to ~\> 1.4.1 [\#63](https://github.com/solidusio-contrib/solidus_product_assembly/pull/63) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
55
+ - Use `ActionView::Helpers::TranslationHelper.t` [\#60](https://github.com/solidusio-contrib/solidus_product_assembly/pull/60) ([spaghetticode](https://github.com/spaghetticode))
56
+ - Releasing new gem version to RubyGems, changelog generation [\#57](https://github.com/solidusio-contrib/solidus_product_assembly/pull/57) ([spaghetticode](https://github.com/spaghetticode))
57
+ - Remove Travis CI [\#56](https://github.com/solidusio-contrib/solidus_product_assembly/pull/56) ([spaghetticode](https://github.com/spaghetticode))
58
+ - Add SKU to \_stock\_item [\#55](https://github.com/solidusio-contrib/solidus_product_assembly/pull/55) ([ericsaupe](https://github.com/ericsaupe))
59
+ - Add CircleCI build [\#54](https://github.com/solidusio-contrib/solidus_product_assembly/pull/54) ([spaghetticode](https://github.com/spaghetticode))
60
+ - Load Capybara config from `solidus_support` gem [\#53](https://github.com/solidusio-contrib/solidus_product_assembly/pull/53) ([spaghetticode](https://github.com/spaghetticode))
61
+ - Fix build on Travis [\#52](https://github.com/solidusio-contrib/solidus_product_assembly/pull/52) ([spaghetticode](https://github.com/spaghetticode))
62
+ - Update `#determine_target_shipment` after Solidus \#3197 [\#50](https://github.com/solidusio-contrib/solidus_product_assembly/pull/50) ([spaghetticode](https://github.com/spaghetticode))
63
+ - Show split/delete actions for all items \(admin/orders/shipment\) [\#49](https://github.com/solidusio-contrib/solidus_product_assembly/pull/49) ([MinasMazar](https://github.com/MinasMazar))
64
+ - Show correct RMA amounts when assembly has more than one piece for var… [\#48](https://github.com/solidusio-contrib/solidus_product_assembly/pull/48) ([spaghetticode](https://github.com/spaghetticode))
65
+ - Fix build on Travis [\#47](https://github.com/solidusio-contrib/solidus_product_assembly/pull/47) ([spaghetticode](https://github.com/spaghetticode))
66
+ - Fix return item amounts with multiple items [\#45](https://github.com/solidusio-contrib/solidus_product_assembly/pull/45) ([spaghetticode](https://github.com/spaghetticode))
67
+ - add deface as a development dependency in gemspec [\#44](https://github.com/solidusio-contrib/solidus_product_assembly/pull/44) ([kevinjbayer](https://github.com/kevinjbayer))
68
+ - Round up default refund amount for assembly parts [\#43](https://github.com/solidusio-contrib/solidus_product_assembly/pull/43) ([spaghetticode](https://github.com/spaghetticode))
69
+ - Remove assembly part prices from carton manifest [\#42](https://github.com/solidusio-contrib/solidus_product_assembly/pull/42) ([spaghetticode](https://github.com/spaghetticode))
70
+ - Split refund amount proportionally on each assembly part [\#41](https://github.com/solidusio-contrib/solidus_product_assembly/pull/41) ([spaghetticode](https://github.com/spaghetticode))
71
+ - Fix stock finalization with non-backorderable stock and Solidus \>= 2.8 [\#40](https://github.com/solidusio-contrib/solidus_product_assembly/pull/40) ([spaghetticode](https://github.com/spaghetticode))
72
+ - Replace `Spree.t` with `I18n.t` [\#38](https://github.com/solidusio-contrib/solidus_product_assembly/pull/38) ([spaghetticode](https://github.com/spaghetticode))
73
+ - Lock SQLite3 to version 1.3 [\#36](https://github.com/solidusio-contrib/solidus_product_assembly/pull/36) ([aitbw](https://github.com/aitbw))
74
+ - Add Solidus v2.8 to Travis config [\#35](https://github.com/solidusio-contrib/solidus_product_assembly/pull/35) ([aitbw](https://github.com/aitbw))
75
+ - Remove stale edit button [\#34](https://github.com/solidusio-contrib/solidus_product_assembly/pull/34) ([spaghetticode](https://github.com/spaghetticode))
76
+ - Use Selenium with Chrome headless instead of Poltergeist [\#33](https://github.com/solidusio-contrib/solidus_product_assembly/pull/33) ([spaghetticode](https://github.com/spaghetticode))
77
+ - Fix `stock_item` partial for splitting items [\#32](https://github.com/solidusio-contrib/solidus_product_assembly/pull/32) ([spaghetticode](https://github.com/spaghetticode))
78
+ - Fix admin edit for shipping costs and tracking [\#31](https://github.com/solidusio-contrib/solidus_product_assembly/pull/31) ([spaghetticode](https://github.com/spaghetticode))
79
+ - AvailabilityValidator delegates to Solidus implementation when product is not an assembly [\#30](https://github.com/solidusio-contrib/solidus_product_assembly/pull/30) ([spaghetticode](https://github.com/spaghetticode))
80
+ - Test suite maintenance [\#29](https://github.com/solidusio-contrib/solidus_product_assembly/pull/29) ([aitbw](https://github.com/aitbw))
81
+ - Remove 2.2 from CI \(EOL\) [\#28](https://github.com/solidusio-contrib/solidus_product_assembly/pull/28) ([jacobherrington](https://github.com/jacobherrington))
82
+ - Remove versions past EOL from .travis.yml [\#27](https://github.com/solidusio-contrib/solidus_product_assembly/pull/27) ([jacobherrington](https://github.com/jacobherrington))
83
+ - Add Solidus 2.7 to .travis.yml [\#26](https://github.com/solidusio-contrib/solidus_product_assembly/pull/26) ([jacobherrington](https://github.com/jacobherrington))
84
+ - Update for Solidus 2.5 [\#21](https://github.com/solidusio-contrib/solidus_product_assembly/pull/21) ([jhawthorn](https://github.com/jhawthorn))
85
+ - Fix warnings [\#20](https://github.com/solidusio-contrib/solidus_product_assembly/pull/20) ([jhawthorn](https://github.com/jhawthorn))
86
+ - 2.4 fixes [\#19](https://github.com/solidusio-contrib/solidus_product_assembly/pull/19) ([jhawthorn](https://github.com/jhawthorn))
87
+ - Avoid stubbing in spec [\#17](https://github.com/solidusio-contrib/solidus_product_assembly/pull/17) ([jhawthorn](https://github.com/jhawthorn))
88
+ - Remove old Spree information from README [\#16](https://github.com/solidusio-contrib/solidus_product_assembly/pull/16) ([brchristian](https://github.com/brchristian))
89
+ - Removing small\_image Method Call. Replacing It To Avoid Error. [\#15](https://github.com/solidusio-contrib/solidus_product_assembly/pull/15) ([hugohernani](https://github.com/hugohernani))
90
+ - Fix deprecations and removals [\#14](https://github.com/solidusio-contrib/solidus_product_assembly/pull/14) ([jhawthorn](https://github.com/jhawthorn))
91
+ - Remove add\_routes fo routes.draw [\#13](https://github.com/solidusio-contrib/solidus_product_assembly/pull/13) ([denissellu](https://github.com/denissellu))
92
+ - Fix migration to allow rollback [\#12](https://github.com/solidusio-contrib/solidus_product_assembly/pull/12) ([tudorpavel](https://github.com/tudorpavel))
93
+ - Parts informations in API [\#11](https://github.com/solidusio-contrib/solidus_product_assembly/pull/11) ([DanielePalombo](https://github.com/DanielePalombo))
94
+
95
+ ## [v1.0.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.0.0) (2016-09-06)
96
+
97
+ [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/7a6d85258735c0035d675364fc9000cdd7355e0e...v1.0.0)
98
+
99
+ **Closed issues:**
100
+
101
+ - Inventory Validation fail upon checkout, for the assembly product [\#3](https://github.com/solidusio-contrib/solidus_product_assembly/issues/3)
102
+
103
+ **Merged pull requests:**
104
+
105
+ - Add support for Solidus 2.0 and Rails 5 [\#10](https://github.com/solidusio-contrib/solidus_product_assembly/pull/10) ([jhawthorn](https://github.com/jhawthorn))
106
+ - Fix installation instructions in README [\#9](https://github.com/solidusio-contrib/solidus_product_assembly/pull/9) ([alexblackie](https://github.com/alexblackie))
107
+ - Add missing translation for actions.delete [\#8](https://github.com/solidusio-contrib/solidus_product_assembly/pull/8) ([Sinetheta](https://github.com/Sinetheta))
108
+ - Fix a load order issue when redefining inventory validator. [\#7](https://github.com/solidusio-contrib/solidus_product_assembly/pull/7) ([Senjai](https://github.com/Senjai))
109
+ - Fix product sub\_menu display on new Solidus [\#6](https://github.com/solidusio-contrib/solidus_product_assembly/pull/6) ([Sinetheta](https://github.com/Sinetheta))
110
+ - Inventory validation [\#5](https://github.com/solidusio-contrib/solidus_product_assembly/pull/5) ([Sinetheta](https://github.com/Sinetheta))
111
+ - Rename to solidus\_product\_assembly [\#2](https://github.com/solidusio-contrib/solidus_product_assembly/pull/2) ([Sinetheta](https://github.com/Sinetheta))
112
+ - Upgrade from spree 2.4 to solidus 1.1-1.3 [\#1](https://github.com/solidusio-contrib/solidus_product_assembly/pull/1) ([Sinetheta](https://github.com/Sinetheta))
113
+
114
+
115
+
116
+ \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*