fog-internet-archive 0.0.1 → 0.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (77) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/README.md +8 -1
  4. data/lib/fog/bin/internet_archive.rb +1 -1
  5. data/lib/fog/internet_archive.rb +294 -1
  6. data/lib/fog/internet_archive/version.rb +1 -1
  7. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/access_control_list.rb +0 -0
  8. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/complete_multipart_upload.rb +0 -0
  9. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/copy_object.rb +0 -0
  10. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/cors_configuration.rb +0 -0
  11. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/delete_multiple_objects.rb +0 -0
  12. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_bucket.rb +0 -0
  13. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_bucket_lifecycle.rb +0 -0
  14. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_bucket_location.rb +0 -0
  15. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_bucket_logging.rb +0 -0
  16. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_bucket_website.rb +0 -0
  17. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_request_payment.rb +0 -0
  18. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/get_service.rb +0 -0
  19. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/initiate_multipart_upload.rb +0 -0
  20. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/list_multipart_uploads.rb +0 -0
  21. data/lib/fog/{internet_archive/parsers/storage → parsers/storage/internet_archive}/list_parts.rb +0 -0
  22. data/lib/fog/{internet_archive/storage.rb → storage/internet_archive.rb} +2 -4
  23. data/lib/fog/{internet_archive/models/storage → storage/internet_archive/models}/directories.rb +1 -1
  24. data/lib/fog/{internet_archive/models/storage → storage/internet_archive/models}/directory.rb +2 -2
  25. data/lib/fog/{internet_archive/models/storage → storage/internet_archive/models}/file.rb +1 -1
  26. data/lib/fog/{internet_archive/models/storage → storage/internet_archive/models}/files.rb +1 -1
  27. data/lib/fog/{internet_archive/models/storage → storage/internet_archive/models}/ia_attributes.rb +0 -0
  28. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/abort_multipart_upload.rb +0 -0
  29. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/acl_utils.rb +1 -1
  30. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/complete_multipart_upload.rb +1 -1
  31. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/copy_object.rb +1 -1
  32. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/cors_utils.rb +1 -1
  33. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_bucket.rb +0 -0
  34. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_bucket_cors.rb +0 -0
  35. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_bucket_lifecycle.rb +0 -0
  36. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_bucket_policy.rb +0 -0
  37. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_bucket_website.rb +0 -0
  38. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_multiple_objects.rb +1 -1
  39. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/delete_object.rb +0 -0
  40. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket.rb +1 -1
  41. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_acl.rb +2 -2
  42. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_cors.rb +2 -2
  43. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_lifecycle.rb +1 -1
  44. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_location.rb +1 -1
  45. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_logging.rb +1 -1
  46. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_policy.rb +0 -0
  47. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_bucket_website.rb +1 -1
  48. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_object.rb +0 -0
  49. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_object_acl.rb +2 -2
  50. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_object_http_url.rb +0 -0
  51. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_object_https_url.rb +0 -0
  52. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_object_torrent.rb +0 -0
  53. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_object_url.rb +0 -0
  54. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_request_payment.rb +1 -1
  55. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/get_service.rb +1 -1
  56. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/head_object.rb +0 -0
  57. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/initiate_multipart_upload.rb +1 -1
  58. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/list_multipart_uploads.rb +1 -1
  59. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/list_parts.rb +1 -1
  60. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/post_object_hidden_fields.rb +0 -0
  61. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket.rb +0 -0
  62. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket_acl.rb +1 -1
  63. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket_cors.rb +1 -1
  64. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket_lifecycle.rb +0 -0
  65. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket_logging.rb +0 -0
  66. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket_policy.rb +0 -0
  67. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_bucket_website.rb +0 -0
  68. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_object.rb +0 -0
  69. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_object_acl.rb +1 -1
  70. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_object_url.rb +0 -0
  71. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/put_request_payment.rb +0 -0
  72. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/sync_clock.rb +0 -0
  73. data/lib/fog/{internet_archive/requests/storage → storage/internet_archive/requests}/upload_part.rb +0 -0
  74. data/tests/internet_archive/requests/storage/acl_utils_tests.rb +1 -1
  75. data/tests/internet_archive/requests/storage/cors_utils_tests.rb +1 -1
  76. metadata +70 -72
  77. data/lib/fog/internet_archive/core.rb +0 -291
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 94710d784c47b28d190892fdf284515b6382ac64
4
- data.tar.gz: 375d275354e6ace2c9d0ad949d94cf5bceb39901
2
+ SHA256:
3
+ metadata.gz: 3a7666f85d4e49248117a890892cd5e8539b20432ad53c01774012391838acb8
4
+ data.tar.gz: 6c9c59781e9f8fea63aba9a648365ea5ccba78b7934abe3a81fb813b322b6e29
5
5
  SHA512:
6
- metadata.gz: 158d67cec65a44cfab9ca2ff9064f01ce115eb2fd955190a8fffb5cf14ac59b39b11880ba11e894b89d281f2ce6c317cd7c5fd76deef062bc46192586c739bc2
7
- data.tar.gz: 26ffb37c02a94dda853a8d399f930305bffd4f2b2d0474d8b07e6a1a9c2159ced1e4d76b37185fbddab970dd73d13ee27e30fbdb4eed628d2a291c8975b02050
6
+ metadata.gz: 718d42dd8736b07f16adfbec7c35017ff912562d65796003c110406cf47bc0750ff7148c1f6908ddd0b9cded1fef09f8b7a9dc8b5c75a68f599683098c4b8a3a
7
+ data.tar.gz: bfd3e71af7d39e40c246500262895bcaa8047a203d72b3513ca67919352ee7ccb046d5280cb81eba42dccb6167a8ee7d6ab01f61a5839dca680d5c6cee2333f7
data/.gitignore CHANGED
@@ -51,3 +51,4 @@ Gemfile.lock
51
51
 
52
52
  # Fog specific stuff
53
53
  .fog
54
+ .DS_Store
data/README.md CHANGED
@@ -1,6 +1,13 @@
1
1
  # fog-internet-archive
2
2
 
3
- Internet Archive Storage support for Fog
3
+ Internet Archive Storage support for Fog.
4
4
 
5
+ [![Build Status](https://travis-ci.org/fog/fog-internet-archive.svg?branch=master)](https://travis-ci.org/fog/fog-internet-archive)
5
6
 
6
7
  Go to https://archive.org/account/s3.php to generate keys.
8
+
9
+ ## Contributing
10
+
11
+ For Pull Requests please assign to [@icco](https://github.com/icco).
12
+
13
+ Thanks!
@@ -16,7 +16,7 @@ class InternetArchive < Fog::Bin
16
16
  @@connections ||= Hash.new do |hash, key|
17
17
  hash[key] = case key
18
18
  when :storage
19
- Fog::Logger.warning("InternetArchive[:storage] is not recommended, use Storage[:aws] for portability")
19
+ Fog::Logger.warning("InternetArchive[:storage] is not recommended, use Fog::Storage[:internetarchive] for portability")
20
20
  Fog::Storage.new(:provider => 'InternetArchive')
21
21
  else
22
22
  raise ArgumentError, "Unrecognized service: #{key.inspect}"
@@ -1 +1,294 @@
1
- require 'fog/internet_archive/storage'
1
+ require 'fog/core'
2
+ require 'fog/xml'
3
+
4
+ module Fog
5
+ module InternetArchive
6
+ autoload :SignatureV4, File.expand_path('../internet_archive/signaturev4', __FILE__)
7
+
8
+ DOMAIN_NAME = 'archive.org'
9
+ API_DOMAIN_NAME = 's3.us.' + DOMAIN_NAME
10
+ COMPLIANT_BUCKET_NAMES = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/
11
+
12
+ extend Fog::Provider
13
+
14
+ service(:storage, 'Storage')
15
+
16
+ def self.indexed_param(key, values)
17
+ params = {}
18
+ unless key.include?('%d')
19
+ key << '.%d'
20
+ end
21
+ [*values].each_with_index do |value, index|
22
+ if value.respond_to?('keys')
23
+ k = format(key, index + 1)
24
+ value.each do | vkey, vvalue |
25
+ params["#{k}.#{vkey}"] = vvalue
26
+ end
27
+ else
28
+ params[format(key, index + 1)] = value
29
+ end
30
+ end
31
+ params
32
+ end
33
+
34
+ def self.serialize_keys(key, value, options = {})
35
+ case value
36
+ when Hash
37
+ value.each do | k, v |
38
+ options.merge!(serialize_keys("#{key}.#{k}", v))
39
+ end
40
+ return options
41
+ when Array
42
+ value.each_with_index do | it, idx |
43
+ options.merge!(serialize_keys("#{key}.member.#{(idx + 1)}", it))
44
+ end
45
+ return options
46
+ else
47
+ return {key => value}
48
+ end
49
+ end
50
+
51
+ def self.indexed_request_param(name, values)
52
+ idx = -1
53
+ Array(values).reduce({}) do |params, value|
54
+ params["#{name}.#{idx += 1}"] = value
55
+ params
56
+ end
57
+ end
58
+
59
+ def self.indexed_filters(filters)
60
+ params = {}
61
+ filters.keys.each_with_index do |key, key_index|
62
+ key_index += 1
63
+ params[format('Filter.%d.Name', key_index)] = key
64
+ [*filters[key]].each_with_index do |value, value_index|
65
+ value_index += 1
66
+ params[format('Filter.%d.Value.%d', key_index, value_index)] = value
67
+ end
68
+ end
69
+ params
70
+ end
71
+
72
+ def self.escape(string)
73
+ string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
74
+ "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
75
+ }
76
+ end
77
+
78
+ def self.signed_params(params, options = {})
79
+ params.merge!({
80
+ 'AWSAccessKeyId' => options[:ia_access_key_id],
81
+ 'SignatureMethod' => 'HmacSHA256',
82
+ 'SignatureVersion' => '2',
83
+ 'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
84
+ 'Version' => options[:version]
85
+ })
86
+
87
+ params.merge!({
88
+ 'SecurityToken' => options[:ia_session_token]
89
+ }) if options[:ia_session_token]
90
+
91
+ body = ''
92
+ for key in params.keys.sort
93
+ unless (value = params[key]).nil?
94
+ body << "#{key}=#{escape(value.to_s)}&"
95
+ end
96
+ end
97
+ string_to_sign = "POST\n#{options[:host]}:#{options[:port]}\n#{options[:path]}\n" << body.chop
98
+ signed_string = options[:hmac].sign(string_to_sign)
99
+ body << "Signature=#{escape(Base64.encode64(signed_string).chomp!)}"
100
+
101
+ body
102
+ end
103
+
104
+ class Mock
105
+ def self.arn(vendor, account_id, path, region = nil)
106
+ "arn:aws:#{vendor}:#{region}:#{account_id}:#{path}"
107
+ end
108
+
109
+ def self.availability_zone(region)
110
+ "#{region}#{Fog::Mock.random_selection('abcd', 1)}"
111
+ end
112
+
113
+ def self.box_usage
114
+ sprintf("%0.10f", rand / 100).to_f
115
+ end
116
+
117
+ def self.console_output
118
+ # "[ 0.000000] Linux version 2.6.18-xenU-ec2-v1.2 (root@domU-12-31-39-07-51-82) (gcc version 4.1.2 20070626 (Red Hat 4.1.2-13)) #2 SMP Wed Aug 19 09:04:38 EDT 2009"
119
+ Base64.decode64("WyAwLjAwMDAwMF0gTGludXggdmVyc2lvbiAyLjYuMTgteGVuVS1lYzItdjEu\nMiAocm9vdEBkb21VLTEyLTMxLTM5LTA3LTUxLTgyKSAoZ2NjIHZlcnNpb24g\nNC4xLjIgMjAwNzA2MjYgKFJlZCBIYXQgNC4xLjItMTMpKSAjMiBTTVAgV2Vk\nIEF1ZyAxOSAwOTowNDozOCBFRFQgMjAwOQ==\n")
120
+ end
121
+
122
+ def self.dns_name_for(ip_address)
123
+ "ec2-#{ip_address.gsub('.','-')}.compute-1.amazonaws.com"
124
+ end
125
+
126
+ def self.private_dns_name_for(ip_address)
127
+ "ip-#{ip_address.gsub('.','-')}.ec2.internal"
128
+ end
129
+
130
+ def self.image
131
+ path = []
132
+ (rand(3) + 2).times do
133
+ path << Fog::Mock.random_letters(rand(9) + 8)
134
+ end
135
+ {
136
+ "imageOwnerId" => Fog::Mock.random_letters(rand(5) + 4),
137
+ "blockDeviceMapping" => [],
138
+ "productCodes" => [],
139
+ "kernelId" => kernel_id,
140
+ "ramdiskId" => ramdisk_id,
141
+ "imageState" => "available",
142
+ "imageId" => image_id,
143
+ "architecture" => "i386",
144
+ "isPublic" => true,
145
+ "imageLocation" => path.join('/'),
146
+ "imageType" => "machine",
147
+ "rootDeviceType" => ["ebs","instance-store"][rand(2)],
148
+ "rootDeviceName" => "/dev/sda1"
149
+ }
150
+ end
151
+
152
+ def self.image_id
153
+ "ami-#{Fog::Mock.random_hex(8)}"
154
+ end
155
+
156
+ def self.key_fingerprint
157
+ fingerprint = []
158
+ 20.times do
159
+ fingerprint << Fog::Mock.random_hex(2)
160
+ end
161
+ fingerprint.join(':')
162
+ end
163
+
164
+ def self.instance_id
165
+ "i-#{Fog::Mock.random_hex(8)}"
166
+ end
167
+
168
+ def self.ip_address
169
+ ip = []
170
+ 4.times do
171
+ ip << Fog::Mock.random_numbers(rand(3) + 1).to_i.to_s # remove leading 0
172
+ end
173
+ ip.join('.')
174
+ end
175
+
176
+ def self.private_ip_address
177
+ ip_address.gsub(/^\d{1,3}\./,"10.")
178
+ end
179
+
180
+ def self.kernel_id
181
+ "aki-#{Fog::Mock.random_hex(8)}"
182
+ end
183
+
184
+ def self.key_material
185
+ OpenSSL::PKey::RSA.generate(1024).to_s
186
+ end
187
+
188
+ def self.owner_id
189
+ Fog::Mock.random_numbers(12)
190
+ end
191
+
192
+ def self.ramdisk_id
193
+ "ari-#{Fog::Mock.random_hex(8)}"
194
+ end
195
+
196
+ def self.request_id
197
+ request_id = []
198
+ request_id << Fog::Mock.random_hex(8)
199
+ 3.times do
200
+ request_id << Fog::Mock.random_hex(4)
201
+ end
202
+ request_id << Fog::Mock.random_hex(12)
203
+ request_id.join('-')
204
+ end
205
+ class << self
206
+ alias_method :reserved_instances_id, :request_id
207
+ alias_method :reserved_instances_offering_id, :request_id
208
+ alias_method :sqs_message_id, :request_id
209
+ alias_method :sqs_sender_id, :request_id
210
+ end
211
+
212
+ def self.reservation_id
213
+ "r-#{Fog::Mock.random_hex(8)}"
214
+ end
215
+
216
+ def self.snapshot_id
217
+ "snap-#{Fog::Mock.random_hex(8)}"
218
+ end
219
+
220
+ def self.volume_id
221
+ "vol-#{Fog::Mock.random_hex(8)}"
222
+ end
223
+
224
+ def self.security_group_id
225
+ "sg-#{Fog::Mock.random_hex(8)}"
226
+ end
227
+
228
+ def self.network_interface_id
229
+ "eni-#{Fog::Mock.random_hex(8)}"
230
+ end
231
+ def self.internet_gateway_id
232
+ "igw-#{Fog::Mock.random_hex(8)}"
233
+ end
234
+ def self.dhcp_options_id
235
+ "dopt-#{Fog::Mock.random_hex(8)}"
236
+ end
237
+ def self.vpc_id
238
+ "vpc-#{Fog::Mock.random_hex(8)}"
239
+ end
240
+ def self.subnet_id
241
+ "subnet-#{Fog::Mock.random_hex(8)}"
242
+ end
243
+ def self.zone_id
244
+ "zone-#{Fog::Mock.random_hex(8)}"
245
+ end
246
+ def self.change_id
247
+ "change-#{Fog::Mock.random_hex(8)}"
248
+ end
249
+ def self.nameservers
250
+ [
251
+ 'ns-2048.awsdns-64.com',
252
+ 'ns-2049.awsdns-65.net',
253
+ 'ns-2050.awsdns-66.org',
254
+ 'ns-2051.awsdns-67.co.uk'
255
+ ]
256
+ end
257
+
258
+ def self.key_id(length=21)
259
+ #Probably close enough
260
+ Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',length)
261
+ end
262
+
263
+ def self.rds_address(db_name,region)
264
+ "#{db_name}.#{Fog::Mock.random_letters(rand(12) + 4)}.#{region}.rds.amazonaws.com"
265
+ end
266
+ end
267
+
268
+ def self.parse_security_group_options(group_name, options)
269
+ options ||= Hash.new
270
+ if group_name.is_a?(Hash)
271
+ options = group_name
272
+ elsif group_name
273
+ if options.key?('GroupName')
274
+ raise Fog::Compute::InternetArchive::Error, 'Arguments specified both group_name and GroupName in options'
275
+ end
276
+ options = options.clone
277
+ options['GroupName'] = group_name
278
+ end
279
+ name_specified = options.key?('GroupName') && !options['GroupName'].nil?
280
+ group_id_specified = options.key?('GroupId') && !options['GroupId'].nil?
281
+ unless name_specified || group_id_specified
282
+ raise Fog::Compute::InternetArchive::Error, 'Neither GroupName nor GroupId specified'
283
+ end
284
+ if name_specified && group_id_specified
285
+ options.delete('GroupName')
286
+ end
287
+ options
288
+ end
289
+ end
290
+
291
+ module Storage
292
+ autoload :InternetArchive, File.expand_path('../storage/internet_archive', __FILE__)
293
+ end
294
+ end
@@ -1,5 +1,5 @@
1
1
  module Fog
2
2
  module InternetArchive
3
- VERSION = "0.0.1".freeze
3
+ VERSION = "0.0.2".freeze
4
4
  end
5
5
  end
@@ -1,5 +1,3 @@
1
- require 'fog/internet_archive/core'
2
-
3
1
  module Fog
4
2
  module Storage
5
3
  class InternetArchive < Fog::Service
@@ -8,13 +6,13 @@ module Fog
8
6
 
9
7
  secrets :ia_secret_access_key, :hmac
10
8
 
11
- model_path 'fog/internet_archive/models/storage'
9
+ model_path 'fog/storage/internet_archive/models'
12
10
  collection :directories
13
11
  model :directory
14
12
  collection :files
15
13
  model :file
16
14
 
17
- request_path 'fog/internet_archive/requests/storage'
15
+ request_path 'fog/storage/internet_archive/requests'
18
16
  request :abort_multipart_upload
19
17
  request :complete_multipart_upload
20
18
  request :copy_object
@@ -1,5 +1,5 @@
1
1
  require 'fog/core/collection'
2
- require 'fog/internet_archive/models/storage/directory'
2
+ require 'fog/storage/internet_archive/models/directory'
3
3
 
4
4
  module Fog
5
5
  module Storage
@@ -1,6 +1,6 @@
1
1
  require 'fog/core/model'
2
- require 'fog/internet_archive/models/storage/files'
3
- require 'fog/internet_archive/models/storage/ia_attributes.rb'
2
+ require 'fog/storage/internet_archive/models/files'
3
+ require 'fog/storage/internet_archive/models/ia_attributes.rb'
4
4
 
5
5
  module Fog
6
6
  module Storage
@@ -1,5 +1,5 @@
1
1
  require 'fog/core/model'
2
- require 'fog/internet_archive/models/storage/ia_attributes.rb'
2
+ require 'fog/storage/internet_archive/models/ia_attributes.rb'
3
3
 
4
4
  module Fog
5
5
  module Storage
@@ -1,5 +1,5 @@
1
1
  require 'fog/core/collection'
2
- require 'fog/internet_archive/models/storage/file'
2
+ require 'fog/storage/internet_archive/models/file'
3
3
 
4
4
  module Fog
5
5
  module Storage
@@ -1,7 +1,7 @@
1
1
  module Fog
2
2
  module Storage
3
3
  class InternetArchive
4
- require 'fog/internet_archive/parsers/storage/access_control_list'
4
+ require 'fog/parsers/storage/internet_archive/access_control_list'
5
5
 
6
6
  private
7
7
  def self.hash_to_acl(acl)