shoppe 0.0.21 → 1.0.0

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/MIT-LICENSE +1 -1
  3. data/Rakefile +1 -1
  4. data/app/models/shoppe/order/delivery.rb +1 -4
  5. data/app/models/shoppe/product/product_attributes.rb +3 -2
  6. data/app/models/shoppe/product_attribute.rb +6 -1
  7. data/lib/shoppe/version.rb +1 -1
  8. metadata +111 -80
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e6d38a40a2d5533bde951fd52bc1a601f0d4ce30
4
- data.tar.gz: 73ee7cff1be8653e88f76f1262a9cdd52400bc6a
3
+ metadata.gz: f538931e1391e057d5cecff9e2f104dfc1dffc65
4
+ data.tar.gz: e44da7a5e997c681c74b8727aec174af98063ad7
5
5
  SHA512:
6
- metadata.gz: 882d60266d60711f6640d77a470dc1f70ba6a82850a182ea22cea9d498219a85f1ce566fad2a9e4fe3ef4d1032b50e0df397d9f473c0e295aafe6807bc2b4d8b
7
- data.tar.gz: 3c6262699f3fcf668843c6f0f69e18e0c02ff340c57d7f51d6e8ee86299d6f4b698bcbbcfca83c9ee8de492112985309b03f0323f261d6847e49637a9dad2a57
6
+ metadata.gz: 0006cf0c9d160cac11c1fc694a219204a114423c09f79c8b87e8b328b7cd3b939f0e398e364c3c7b3c880d113cde4009f1314724098c82a0119cb86be0f5627a
7
+ data.tar.gz: f2b9eb945cb343a3ec1ebd2e6e2f91a9f6acb752ed7bd1d1a8f6c4d0bbb7570409a24d7e00c65b0c10afd30e9676cc2a16b2f918580f9c9aaecb3a19c0d512df
data/MIT-LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright 2013 Niftyware Limited.
1
+ Copyright 2013 aTech Media Limited.
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
data/Rakefile CHANGED
@@ -20,7 +20,7 @@ end
20
20
  namespace :shoppe do
21
21
  desc 'Publish the release notes'
22
22
  task :changelog do
23
- system "scp CHANGELOG.md rubyapps@tryshoppe.com:/opt/rubyapps/shoppe-website/shared/CHANGELOG.md"
23
+ system "scp -P 32032 CHANGELOG.md vdt@185.44.252.32:/app/docs/CHANGELOG.md"
24
24
  end
25
25
 
26
26
  desc "Publish RDoc documentation from doc to api.tryshoppe.com"
data/app/models/shoppe/order/delivery.rb CHANGED
@@ -33,10 +33,7 @@ module Shoppe
33
33
  if self.delivery_required?
34
34
  if self.delivery_service.nil?
35
35
  errors.add :delivery_service_id, "must be specified"
36
- return
37
- end
38
-
39
- unless self.valid_delivery_service?
36
+ elsif !self.valid_delivery_service?
40
37
  errors.add :delivery_service_id, "is not suitable for this order"
41
38
  end
42
39
  end
data/app/models/shoppe/product/product_attributes.rb CHANGED
@@ -11,8 +11,9 @@ module Shoppe
11
11
  # After saving automatically try to update the product attributes based on the
12
12
  # the contents of the product_attributes_array array.
13
13
  after_save do
14
- return unless product_attributes_array.is_a?(Array)
15
- self.product_attributes.update_from_array(product_attributes_array)
14
+ if product_attributes_array.is_a?(Array)
15
+ self.product_attributes.update_from_array(product_attributes_array)
16
+ end
16
17
  end
17
18
 
18
19
  end
data/app/models/shoppe/product_attribute.rb CHANGED
@@ -15,7 +15,7 @@ module Shoppe
15
15
  scope :searchable, -> { where(:searchable => true) }
16
16
 
17
17
  # All attributes which are public
18
- scope :public, -> { where(:public => true) }
18
+ scope :publicly_accessible, -> { where(:public => true) }
19
19
 
20
20
  # Return the the available options as a hash
21
21
  #
@@ -56,6 +56,11 @@ module Shoppe
56
56
  self.where(:key => existing_keys - array.map { |h| h['key']}).delete_all
57
57
  true
58
58
  end
59
+
60
+ def self.public
61
+ ActiveSupport::Deprecation.warn("The use of Shoppe::ProductAttribute.public is deprecated. use Shoppe::ProductAttribute.publicly_accessible.")
62
+ self.publicly_accessible
63
+ end
59
64
 
60
65
  end
61
66
  end
data/lib/shoppe/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Shoppe
2
- VERSION = "0.0.21"
2
+ VERSION = "1.0.0"
3
3
  end
metadata CHANGED
@@ -1,303 +1,335 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shoppe
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.21
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Cooke
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-02 00:00:00.000000000 Z
11
+ date: 2014-07-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.1
19
+ version: 4.0.0
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '5.0'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - ~>
27
+ - - ">="
25
28
  - !ruby/object:Gem::Version
26
- version: 4.0.1
29
+ version: 4.0.0
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '5.0'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: bcrypt-ruby
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - ~>
37
+ - - "~>"
38
+ - !ruby/object:Gem::Version
39
+ version: '3.1'
40
+ - - ">="
32
41
  - !ruby/object:Gem::Version
33
42
  version: 3.1.2
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
37
46
  requirements:
38
- - - ~>
47
+ - - "~>"
48
+ - !ruby/object:Gem::Version
49
+ version: '3.1'
50
+ - - ">="
39
51
  - !ruby/object:Gem::Version
40
52
  version: 3.1.2
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: ransack
43
55
  requirement: !ruby/object:Gem::Requirement
44
56
  requirements:
45
- - - ~>
57
+ - - "~>"
46
58
  - !ruby/object:Gem::Version
47
- version: 1.0.0
59
+ version: '1.2'
48
60
  type: :runtime
49
61
  prerelease: false
50
62
  version_requirements: !ruby/object:Gem::Requirement
51
63
  requirements:
52
- - - ~>
64
+ - - "~>"
53
65
  - !ruby/object:Gem::Version
54
- version: 1.0.0
66
+ version: '1.2'
55
67
  - !ruby/object:Gem::Dependency
56
68
  name: kaminari
57
69
  requirement: !ruby/object:Gem::Requirement
58
70
  requirements:
59
- - - ~>
71
+ - - ">="
60
72
  - !ruby/object:Gem::Version
61
73
  version: 0.14.1
74
+ - - "<"
75
+ - !ruby/object:Gem::Version
76
+ version: '0.16'
62
77
  type: :runtime
63
78
  prerelease: false
64
79
  version_requirements: !ruby/object:Gem::Requirement
65
80
  requirements:
66
- - - ~>
81
+ - - ">="
67
82
  - !ruby/object:Gem::Version
68
83
  version: 0.14.1
84
+ - - "<"
85
+ - !ruby/object:Gem::Version
86
+ version: '0.16'
69
87
  - !ruby/object:Gem::Dependency
70
88
  name: haml
71
89
  requirement: !ruby/object:Gem::Requirement
72
90
  requirements:
73
- - - ~>
91
+ - - "~>"
74
92
  - !ruby/object:Gem::Version
75
- version: 4.0.3
93
+ version: '4.0'
76
94
  type: :runtime
77
95
  prerelease: false
78
96
  version_requirements: !ruby/object:Gem::Requirement
79
97
  requirements:
80
- - - ~>
98
+ - - "~>"
81
99
  - !ruby/object:Gem::Version
82
- version: 4.0.3
100
+ version: '4.0'
83
101
  - !ruby/object:Gem::Dependency
84
102
  name: dynamic_form
85
103
  requirement: !ruby/object:Gem::Requirement
86
104
  requirements:
87
- - - ~>
105
+ - - "~>"
106
+ - !ruby/object:Gem::Version
107
+ version: '1.1'
108
+ - - ">="
88
109
  - !ruby/object:Gem::Version
89
110
  version: 1.1.4
90
111
  type: :runtime
91
112
  prerelease: false
92
113
  version_requirements: !ruby/object:Gem::Requirement
93
114
  requirements:
94
- - - ~>
115
+ - - "~>"
116
+ - !ruby/object:Gem::Version
117
+ version: '1.1'
118
+ - - ">="
95
119
  - !ruby/object:Gem::Version
96
120
  version: 1.1.4
97
121
  - !ruby/object:Gem::Dependency
98
122
  name: jquery-rails
99
123
  requirement: !ruby/object:Gem::Requirement
100
124
  requirements:
101
- - - ~>
125
+ - - "~>"
102
126
  - !ruby/object:Gem::Version
103
- version: 3.0.4
127
+ version: '3'
104
128
  type: :runtime
105
129
  prerelease: false
106
130
  version_requirements: !ruby/object:Gem::Requirement
107
131
  requirements:
108
- - - ~>
132
+ - - "~>"
109
133
  - !ruby/object:Gem::Version
110
- version: 3.0.4
134
+ version: '3'
111
135
  - !ruby/object:Gem::Dependency
112
136
  name: coffee-rails
113
137
  requirement: !ruby/object:Gem::Requirement
114
138
  requirements:
115
- - - ~>
139
+ - - "~>"
116
140
  - !ruby/object:Gem::Version
117
- version: 4.0.0
141
+ version: '4'
118
142
  type: :runtime
119
143
  prerelease: false
120
144
  version_requirements: !ruby/object:Gem::Requirement
121
145
  requirements:
122
- - - ~>
146
+ - - "~>"
123
147
  - !ruby/object:Gem::Version
124
- version: 4.0.0
148
+ version: '4'
125
149
  - !ruby/object:Gem::Dependency
126
150
  name: sass-rails
127
151
  requirement: !ruby/object:Gem::Requirement
128
152
  requirements:
129
- - - ~>
153
+ - - "~>"
130
154
  - !ruby/object:Gem::Version
131
- version: 4.0.0
155
+ version: '4.0'
132
156
  type: :runtime
133
157
  prerelease: false
134
158
  version_requirements: !ruby/object:Gem::Requirement
135
159
  requirements:
136
- - - ~>
160
+ - - "~>"
137
161
  - !ruby/object:Gem::Version
138
- version: 4.0.0
162
+ version: '4.0'
139
163
  - !ruby/object:Gem::Dependency
140
164
  name: uglifier
141
165
  requirement: !ruby/object:Gem::Requirement
142
166
  requirements:
143
- - - '>='
167
+ - - ">="
144
168
  - !ruby/object:Gem::Version
145
- version: 2.2.0
169
+ version: '2.2'
170
+ - - "<"
171
+ - !ruby/object:Gem::Version
172
+ version: '3.0'
146
173
  type: :runtime
147
174
  prerelease: false
148
175
  version_requirements: !ruby/object:Gem::Requirement
149
176
  requirements:
150
- - - '>='
177
+ - - ">="
178
+ - !ruby/object:Gem::Version
179
+ version: '2.2'
180
+ - - "<"
151
181
  - !ruby/object:Gem::Version
152
- version: 2.2.0
182
+ version: '3.0'
153
183
  - !ruby/object:Gem::Dependency
154
184
  name: nifty-key-value-store
155
185
  requirement: !ruby/object:Gem::Requirement
156
186
  requirements:
157
- - - ~>
187
+ - - "~>"
158
188
  - !ruby/object:Gem::Version
159
- version: 1.0.0
189
+ version: '1.0'
160
190
  type: :runtime
161
191
  prerelease: false
162
192
  version_requirements: !ruby/object:Gem::Requirement
163
193
  requirements:
164
- - - ~>
194
+ - - "~>"
165
195
  - !ruby/object:Gem::Version
166
- version: 1.0.0
196
+ version: '1.0'
167
197
  - !ruby/object:Gem::Dependency
168
198
  name: nifty-utils
169
199
  requirement: !ruby/object:Gem::Requirement
170
200
  requirements:
171
- - - ~>
201
+ - - "~>"
172
202
  - !ruby/object:Gem::Version
173
- version: 1.0.0
203
+ version: '1.0'
174
204
  type: :runtime
175
205
  prerelease: false
176
206
  version_requirements: !ruby/object:Gem::Requirement
177
207
  requirements:
178
- - - ~>
208
+ - - "~>"
179
209
  - !ruby/object:Gem::Version
180
- version: 1.0.0
210
+ version: '1.0'
181
211
  - !ruby/object:Gem::Dependency
182
212
  name: nifty-attachments
183
213
  requirement: !ruby/object:Gem::Requirement
184
214
  requirements:
185
- - - ~>
215
+ - - "~>"
186
216
  - !ruby/object:Gem::Version
187
- version: 1.0.0
217
+ version: '1.0'
188
218
  type: :runtime
189
219
  prerelease: false
190
220
  version_requirements: !ruby/object:Gem::Requirement
191
221
  requirements:
192
- - - ~>
222
+ - - "~>"
193
223
  - !ruby/object:Gem::Version
194
- version: 1.0.0
224
+ version: '1.0'
195
225
  - !ruby/object:Gem::Dependency
196
226
  name: nifty-dialog
197
227
  requirement: !ruby/object:Gem::Requirement
198
228
  requirements:
199
- - - ~>
229
+ - - "~>"
200
230
  - !ruby/object:Gem::Version
201
- version: 1.0.0
231
+ version: '1.0'
202
232
  type: :runtime
203
233
  prerelease: false
204
234
  version_requirements: !ruby/object:Gem::Requirement
205
235
  requirements:
206
- - - ~>
236
+ - - "~>"
207
237
  - !ruby/object:Gem::Version
208
- version: 1.0.0
238
+ version: '1.0'
209
239
  - !ruby/object:Gem::Dependency
210
240
  name: sqlite3
211
241
  requirement: !ruby/object:Gem::Requirement
212
242
  requirements:
213
- - - '>='
243
+ - - "~>"
214
244
  - !ruby/object:Gem::Version
215
- version: '0'
245
+ version: '1.3'
216
246
  type: :development
217
247
  prerelease: false
218
248
  version_requirements: !ruby/object:Gem::Requirement
219
249
  requirements:
220
- - - '>='
250
+ - - "~>"
221
251
  - !ruby/object:Gem::Version
222
- version: '0'
252
+ version: '1.3'
223
253
  - !ruby/object:Gem::Dependency
224
254
  name: mysql2
225
255
  requirement: !ruby/object:Gem::Requirement
226
256
  requirements:
227
- - - '>='
257
+ - - "~>"
228
258
  - !ruby/object:Gem::Version
229
- version: '0'
259
+ version: '0.3'
230
260
  type: :development
231
261
  prerelease: false
232
262
  version_requirements: !ruby/object:Gem::Requirement
233
263
  requirements:
234
- - - '>='
264
+ - - "~>"
235
265
  - !ruby/object:Gem::Version
236
- version: '0'
266
+ version: '0.3'
237
267
  - !ruby/object:Gem::Dependency
238
268
  name: yard
239
269
  requirement: !ruby/object:Gem::Requirement
240
270
  requirements:
241
- - - '>='
271
+ - - "~>"
242
272
  - !ruby/object:Gem::Version
243
273
  version: '0'
244
274
  type: :development
245
275
  prerelease: false
246
276
  version_requirements: !ruby/object:Gem::Requirement
247
277
  requirements:
248
- - - '>='
278
+ - - "~>"
249
279
  - !ruby/object:Gem::Version
250
280
  version: '0'
251
281
  - !ruby/object:Gem::Dependency
252
282
  name: yard-activerecord
253
283
  requirement: !ruby/object:Gem::Requirement
254
284
  requirements:
255
- - - '>='
285
+ - - "~>"
256
286
  - !ruby/object:Gem::Version
257
287
  version: '0'
258
288
  type: :development
259
289
  prerelease: false
260
290
  version_requirements: !ruby/object:Gem::Requirement
261
291
  requirements:
262
- - - '>='
292
+ - - "~>"
263
293
  - !ruby/object:Gem::Version
264
294
  version: '0'
265
295
  - !ruby/object:Gem::Dependency
266
296
  name: markdown
267
297
  requirement: !ruby/object:Gem::Requirement
268
298
  requirements:
269
- - - '>='
299
+ - - "~>"
270
300
  - !ruby/object:Gem::Version
271
- version: '0'
301
+ version: '1.0'
272
302
  type: :development
273
303
  prerelease: false
274
304
  version_requirements: !ruby/object:Gem::Requirement
275
305
  requirements:
276
- - - '>='
306
+ - - "~>"
277
307
  - !ruby/object:Gem::Version
278
- version: '0'
308
+ version: '1.0'
279
309
  - !ruby/object:Gem::Dependency
280
310
  name: factory_girl_rails
281
311
  requirement: !ruby/object:Gem::Requirement
282
312
  requirements:
283
- - - ~>
313
+ - - "~>"
284
314
  - !ruby/object:Gem::Version
285
315
  version: '4.0'
286
316
  type: :development
287
317
  prerelease: false
288
318
  version_requirements: !ruby/object:Gem::Requirement
289
319
  requirements:
290
- - - ~>
320
+ - - "~>"
291
321
  - !ruby/object:Gem::Version
292
322
  version: '4.0'
293
323
  description: A full Rails engine providing e-commerce functionality for any Rails
294
324
  4 application.
295
325
  email:
296
- - adam@niftyware.io
326
+ - adam@atechmedia.com
297
327
  executables: []
298
328
  extensions: []
299
329
  extra_rdoc_files: []
300
330
  files:
331
+ - MIT-LICENSE
332
+ - Rakefile
301
333
  - app/assets/images/shoppe/chosen-sprite.png
302
334
  - app/assets/images/shoppe/chosen-sprite@2x.png
303
335
  - app/assets/images/shoppe/document.svg
@@ -371,16 +403,16 @@ files:
371
403
  - app/models/shoppe/country.rb
372
404
  - app/models/shoppe/delivery_service.rb
373
405
  - app/models/shoppe/delivery_service_price.rb
406
+ - app/models/shoppe/order.rb
374
407
  - app/models/shoppe/order/actions.rb
375
408
  - app/models/shoppe/order/billing.rb
376
409
  - app/models/shoppe/order/delivery.rb
377
410
  - app/models/shoppe/order/states.rb
378
- - app/models/shoppe/order.rb
379
411
  - app/models/shoppe/order_item.rb
380
412
  - app/models/shoppe/payment.rb
413
+ - app/models/shoppe/product.rb
381
414
  - app/models/shoppe/product/product_attributes.rb
382
415
  - app/models/shoppe/product/variants.rb
383
- - app/models/shoppe/product.rb
384
416
  - app/models/shoppe/product_attribute.rb
385
417
  - app/models/shoppe/product_category.rb
386
418
  - app/models/shoppe/setting.rb
@@ -465,6 +497,7 @@ files:
465
497
  - db/seeds_data/t46gn.jpg
466
498
  - db/seeds_data/w52p.jpg
467
499
  - db/seeds_data/yhs32.jpg
500
+ - lib/shoppe.rb
468
501
  - lib/shoppe/associated_countries.rb
469
502
  - lib/shoppe/country_importer.rb
470
503
  - lib/shoppe/default_navigation.rb
@@ -484,12 +517,10 @@ files:
484
517
  - lib/shoppe/setup_generator.rb
485
518
  - lib/shoppe/version.rb
486
519
  - lib/shoppe/view_helpers.rb
487
- - lib/shoppe.rb
488
520
  - lib/tasks/shoppe.rake
489
- - MIT-LICENSE
490
- - Rakefile
491
521
  homepage: http://tryshoppe.com
492
- licenses: []
522
+ licenses:
523
+ - MIT
493
524
  metadata: {}
494
525
  post_install_message:
495
526
  rdoc_options: []
@@ -497,17 +528,17 @@ require_paths:
497
528
  - lib
498
529
  required_ruby_version: !ruby/object:Gem::Requirement
499
530
  requirements:
500
- - - '>='
531
+ - - ">="
501
532
  - !ruby/object:Gem::Version
502
533
  version: '0'
503
534
  required_rubygems_version: !ruby/object:Gem::Requirement
504
535
  requirements:
505
- - - '>='
536
+ - - ">="
506
537
  - !ruby/object:Gem::Version
507
538
  version: '0'
508
539
  requirements: []
509
540
  rubyforge_project:
510
- rubygems_version: 2.0.3
541
+ rubygems_version: 2.2.2
511
542
  signing_key:
512
543
  specification_version: 4
513
544
  summary: Just an e-commerce platform.