fog 1.6.0 → 1.7.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -0
- data/README.md +1 -0
- data/Rakefile +2 -1
- data/changelog.txt +184 -0
- data/docs/cdn/index.markdown +69 -3
- data/fog.gemspec +2 -2
- data/lib/fog.rb +2 -1
- data/lib/fog/atmos/models/storage/file.rb +16 -14
- data/lib/fog/aws/auto_scaling.rb +55 -13
- data/lib/fog/aws/cdn.rb +69 -9
- data/lib/fog/aws/cloud_watch.rb +15 -1
- data/lib/fog/aws/compute.rb +2 -0
- data/lib/fog/aws/models/auto_scaling/group.rb +10 -4
- data/lib/fog/aws/models/cdn/distribution.rb +93 -0
- data/lib/fog/aws/models/cdn/distribution_helper.rb +64 -0
- data/lib/fog/aws/models/cdn/distributions.rb +32 -0
- data/lib/fog/aws/models/cdn/distributions_helper.rb +47 -0
- data/lib/fog/aws/models/cdn/invalidation.rb +64 -0
- data/lib/fog/aws/models/cdn/invalidations.rb +54 -0
- data/lib/fog/aws/models/cdn/streaming_distribution.rb +77 -0
- data/lib/fog/aws/models/cdn/streaming_distributions.rb +32 -0
- data/lib/fog/aws/models/compute/server.rb +0 -23
- data/lib/fog/aws/models/compute/spot_request.rb +2 -24
- data/lib/fog/aws/models/rds/server.rb +18 -0
- data/lib/fog/aws/models/rds/subnet_group.rb +20 -0
- data/lib/fog/aws/models/rds/subnet_groups.rb +27 -0
- data/lib/fog/aws/models/storage/file.rb +1 -1
- data/lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb +15 -2
- data/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb +39 -13
- data/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_notification_types.rb +43 -0
- data/lib/fog/aws/parsers/auto_scaling/describe_metric_collection_types.rb +3 -3
- data/lib/fog/aws/parsers/auto_scaling/describe_notification_configurations.rb +42 -0
- data/lib/fog/aws/parsers/auto_scaling/describe_scaling_process_types.rb +15 -2
- data/lib/fog/aws/parsers/auto_scaling/describe_tags.rb +46 -0
- data/lib/fog/aws/parsers/auto_scaling/describe_termination_policy_types.rb +44 -0
- data/lib/fog/aws/parsers/cdn/get_invalidation.rb +32 -0
- data/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb +1 -1
- data/lib/fog/aws/parsers/cloud_watch/list_metrics.rb +1 -1
- data/lib/fog/aws/parsers/compute/describe_availability_zones.rb +13 -2
- data/lib/fog/aws/parsers/compute/describe_reserved_instances.rb +1 -1
- data/lib/fog/aws/parsers/elasticache/base.rb +0 -2
- data/lib/fog/aws/parsers/elasticache/engine_defaults_parser.rb +1 -1
- data/lib/fog/aws/parsers/elasticache/event_list.rb +2 -0
- data/lib/fog/aws/parsers/rds/base.rb +32 -0
- data/lib/fog/aws/parsers/rds/create_db_subnet_group.rb +38 -0
- data/lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb +38 -0
- data/lib/fog/aws/parsers/rds/event_list.rb +40 -0
- data/lib/fog/aws/parsers/rds/subnet_group_parser.rb +38 -0
- data/lib/fog/aws/parsers/rds/tag_list_parser.rb +35 -0
- data/lib/fog/aws/rds.rb +24 -7
- data/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb +36 -16
- data/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb +19 -12
- data/lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb +63 -0
- data/lib/fog/aws/requests/auto_scaling/delete_auto_scaling_group.rb +10 -3
- data/lib/fog/aws/requests/auto_scaling/delete_notification_configuration.rb +21 -5
- data/lib/fog/aws/requests/auto_scaling/delete_policy.rb +2 -2
- data/lib/fog/aws/requests/auto_scaling/delete_tags.rb +63 -0
- data/lib/fog/aws/requests/auto_scaling/describe_adjustment_types.rb +4 -3
- data/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_groups.rb +17 -13
- data/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_instances.rb +1 -1
- data/lib/fog/aws/requests/auto_scaling/describe_auto_scaling_notification_types.rb +55 -0
- data/lib/fog/aws/requests/auto_scaling/describe_metric_collection_types.rb +6 -5
- data/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb +79 -0
- data/lib/fog/aws/requests/auto_scaling/describe_policies.rb +1 -1
- data/lib/fog/aws/requests/auto_scaling/describe_scaling_process_types.rb +4 -3
- data/lib/fog/aws/requests/auto_scaling/describe_tags.rb +74 -0
- data/lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb +53 -0
- data/lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb +1 -1
- data/lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb +2 -2
- data/lib/fog/aws/requests/auto_scaling/put_notification_configuration.rb +30 -11
- data/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb +4 -4
- data/lib/fog/aws/requests/auto_scaling/put_scheduled_update_group_action.rb +8 -5
- data/lib/fog/aws/requests/auto_scaling/set_desired_capacity.rb +2 -2
- data/lib/fog/aws/requests/auto_scaling/set_instance_health.rb +2 -2
- data/lib/fog/aws/requests/auto_scaling/suspend_processes.rb +1 -1
- data/lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb +30 -18
- data/lib/fog/aws/requests/cdn/delete_distribution.rb +31 -0
- data/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb +30 -0
- data/lib/fog/aws/requests/cdn/get_distribution.rb +28 -0
- data/lib/fog/aws/requests/cdn/get_distribution_list.rb +29 -0
- data/lib/fog/aws/requests/cdn/get_invalidation.rb +60 -0
- data/lib/fog/aws/requests/cdn/get_invalidation_list.rb +41 -0
- data/lib/fog/aws/requests/cdn/get_streaming_distribution.rb +26 -0
- data/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb +30 -0
- data/lib/fog/aws/requests/cdn/post_distribution.rb +44 -0
- data/lib/fog/aws/requests/cdn/post_invalidation.rb +33 -0
- data/lib/fog/aws/requests/cdn/post_streaming_distribution.rb +44 -0
- data/lib/fog/aws/requests/cdn/put_distribution_config.rb +28 -0
- data/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb +28 -0
- data/lib/fog/aws/requests/compute/create_image.rb +32 -5
- data/lib/fog/aws/requests/compute/create_subnet.rb +3 -3
- data/lib/fog/aws/requests/compute/create_volume.rb +2 -2
- data/lib/fog/aws/requests/compute/register_image.rb +1 -1
- data/lib/fog/aws/requests/elasticache/describe_events.rb +7 -4
- data/lib/fog/aws/requests/glacier/create_archive.rb +1 -1
- data/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb +1 -1
- data/lib/fog/aws/requests/rds/add_tags_to_resource.rb +46 -0
- data/lib/fog/aws/requests/rds/create_db_instance.rb +2 -0
- data/lib/fog/aws/requests/rds/create_db_subnet_group.rb +58 -0
- data/lib/fog/aws/requests/rds/describe_db_subnet_groups.rb +63 -0
- data/lib/fog/aws/requests/rds/describe_events.rb +52 -0
- data/lib/fog/aws/requests/rds/list_tags_for_resource.rb +44 -0
- data/lib/fog/aws/requests/rds/remove_tags_from_resource.rb +44 -0
- data/lib/fog/aws/sqs.rb +1 -1
- data/lib/fog/aws/storage.rb +1 -1
- data/lib/fog/bin/openstack.rb +5 -0
- data/lib/fog/bluebox/models/compute/server.rb +0 -19
- data/lib/fog/bluebox/requests/compute/create_block.rb +8 -8
- data/lib/fog/brightbox/compute.rb +56 -7
- data/lib/fog/brightbox/models/compute/accounts.rb +29 -0
- data/lib/fog/brightbox/models/compute/api_client.rb +37 -0
- data/lib/fog/brightbox/models/compute/api_clients.rb +24 -0
- data/lib/fog/brightbox/models/compute/application.rb +27 -0
- data/lib/fog/brightbox/models/compute/applications.rb +28 -0
- data/lib/fog/brightbox/models/compute/server.rb +3 -1
- data/lib/fog/brightbox/models/compute/users.rb +1 -3
- data/lib/fog/brightbox/requests/compute/create_application.rb +13 -0
- data/lib/fog/brightbox/requests/compute/create_cloud_ip.rb +2 -2
- data/lib/fog/brightbox/requests/compute/destroy_application.rb +14 -0
- data/lib/fog/brightbox/requests/compute/get_account.rb +28 -4
- data/lib/fog/brightbox/requests/compute/get_application.rb +14 -0
- data/lib/fog/brightbox/requests/compute/get_authenticated_user.rb +19 -0
- data/lib/fog/brightbox/requests/compute/get_scoped_account.rb +19 -0
- data/lib/fog/brightbox/requests/compute/get_user.rb +28 -5
- data/lib/fog/brightbox/requests/compute/list_accounts.rb +13 -0
- data/lib/fog/brightbox/requests/compute/list_applications.rb +13 -0
- data/lib/fog/brightbox/requests/compute/reset_secret_application.rb +14 -0
- data/lib/fog/brightbox/requests/compute/update_account.rb +51 -3
- data/lib/fog/brightbox/requests/compute/update_application.rb +15 -0
- data/lib/fog/brightbox/requests/compute/update_firewall_rule.rb +4 -2
- data/lib/fog/brightbox/requests/compute/update_scoped_account.rb +37 -0
- data/lib/fog/clodo/models/compute/server.rb +7 -44
- data/lib/fog/compute/models/server.rb +23 -2
- data/lib/fog/core/time.rb +2 -0
- data/lib/fog/core/wait_for.rb +0 -2
- data/lib/fog/ecloud/models/compute/servers.rb +3 -1
- data/lib/fog/ecloud/requests/compute/get_servers.rb +1 -1
- data/lib/fog/ecloud/requests/compute/get_tasks.rb +1 -1
- data/lib/fog/go_grid/models/compute/server.rb +0 -4
- data/lib/fog/google/storage.rb +1 -1
- data/lib/fog/hp/models/compute/server.rb +1 -23
- data/lib/fog/hp/storage.rb +0 -1
- data/lib/fog/joyent/models/compute/server.rb +4 -0
- data/lib/fog/joyent/models/compute/servers.rb +4 -3
- data/lib/fog/libvirt/models/compute/server.rb +1 -27
- data/lib/fog/linode/models/compute/server.rb +0 -1
- data/lib/fog/local/models/storage/directory.rb +1 -1
- data/lib/fog/network.rb +26 -0
- data/lib/fog/ninefold/compute.rb +8 -0
- data/lib/fog/ninefold/requests/compute/assign_to_load_balancer_rule.rb +13 -0
- data/lib/fog/ninefold/requests/compute/create_load_balancer_rule.rb +11 -0
- data/lib/fog/ninefold/requests/compute/delete_load_balancer_rule.rb +11 -0
- data/lib/fog/ninefold/requests/compute/list_load_balancer_rule_instances.rb +15 -0
- data/lib/fog/ninefold/requests/compute/list_load_balancer_rules.rb +14 -0
- data/lib/fog/ninefold/requests/compute/remove_from_load_balancer_rule.rb +12 -0
- data/lib/fog/ninefold/requests/compute/update_load_balancer_rule.rb +15 -0
- data/lib/fog/ninefold/storage.rb +14 -112
- data/lib/fog/openstack.rb +4 -1
- data/lib/fog/openstack/compute.rb +20 -1
- data/lib/fog/openstack/identity.rb +67 -18
- data/lib/fog/openstack/image.rb +12 -4
- data/lib/fog/openstack/models/compute/security_group.rb +1 -1
- data/lib/fog/openstack/models/compute/server.rb +5 -23
- data/lib/fog/openstack/models/identity/tenants.rb +5 -3
- data/lib/fog/openstack/models/identity/users.rb +4 -1
- data/lib/fog/openstack/models/image/image.rb +6 -1
- data/lib/fog/openstack/models/network/network.rb +46 -0
- data/lib/fog/openstack/models/network/networks.rb +34 -0
- data/lib/fog/openstack/models/network/port.rb +52 -0
- data/lib/fog/openstack/models/network/ports.rb +34 -0
- data/lib/fog/openstack/models/network/subnet.rb +55 -0
- data/lib/fog/openstack/models/network/subnets.rb +34 -0
- data/lib/fog/openstack/network.rb +234 -0
- data/lib/fog/openstack/requests/compute/attach_volume.rb +10 -0
- data/lib/fog/openstack/requests/compute/create_security_group.rb +15 -11
- data/lib/fog/openstack/requests/compute/create_security_group_rule.rb +17 -15
- data/lib/fog/openstack/requests/compute/create_server.rb +7 -1
- data/lib/fog/openstack/requests/compute/create_volume.rb +10 -10
- data/lib/fog/openstack/requests/compute/create_volume_snapshot.rb +16 -1
- data/lib/fog/openstack/requests/compute/detach_volume.rb +5 -0
- data/lib/fog/openstack/requests/compute/get_snapshot_details.rb +4 -4
- data/lib/fog/openstack/requests/compute/get_volume_details.rb +9 -9
- data/lib/fog/openstack/requests/compute/list_security_groups.rb +3 -3
- data/lib/fog/openstack/requests/compute/list_volumes.rb +14 -14
- data/lib/fog/openstack/requests/identity/create_tenant.rb +3 -3
- data/lib/fog/openstack/requests/identity/create_user.rb +1 -1
- data/lib/fog/openstack/requests/identity/delete_role.rb +1 -1
- data/lib/fog/openstack/requests/identity/get_tenant.rb +1 -1
- data/lib/fog/openstack/requests/identity/list_roles.rb +7 -0
- data/lib/fog/openstack/requests/image/create_image.rb +36 -38
- data/lib/fog/openstack/requests/image/delete_image.rb +0 -2
- data/lib/fog/openstack/requests/image/list_public_images.rb +7 -25
- data/lib/fog/openstack/requests/image/list_public_images_detailed.rb +2 -41
- data/lib/fog/openstack/requests/image/update_image.rb +26 -21
- data/lib/fog/openstack/requests/image/update_image_members.rb +37 -0
- data/lib/fog/openstack/requests/network/create_network.rb +44 -0
- data/lib/fog/openstack/requests/network/create_port.rb +52 -0
- data/lib/fog/openstack/requests/network/create_subnet.rb +56 -0
- data/lib/fog/openstack/requests/network/delete_network.rb +30 -0
- data/lib/fog/openstack/requests/network/delete_port.rb +30 -0
- data/lib/fog/openstack/requests/network/delete_subnet.rb +30 -0
- data/lib/fog/openstack/requests/network/get_network.rb +42 -0
- data/lib/fog/openstack/requests/network/get_port.rb +48 -0
- data/lib/fog/openstack/requests/network/get_subnet.rb +49 -0
- data/lib/fog/openstack/requests/network/list_networks.rb +27 -0
- data/lib/fog/openstack/requests/network/list_ports.rb +27 -0
- data/lib/fog/openstack/requests/network/list_subnets.rb +27 -0
- data/lib/fog/openstack/requests/network/set_tenant.rb +21 -0
- data/lib/fog/openstack/requests/network/update_network.rb +41 -0
- data/lib/fog/openstack/requests/network/update_port.rb +44 -0
- data/lib/fog/openstack/requests/network/update_subnet.rb +44 -0
- data/lib/fog/openstack/requests/volume/create_volume.rb +10 -10
- data/lib/fog/openstack/requests/volume/create_volume_snapshot.rb +16 -1
- data/lib/fog/openstack/requests/volume/get_snapshot_details.rb +6 -6
- data/lib/fog/openstack/requests/volume/get_volume_details.rb +10 -10
- data/lib/fog/openstack/requests/volume/list_volumes.rb +14 -14
- data/lib/fog/openstack/volume.rb +10 -0
- data/lib/fog/rackspace/models/compute/server.rb +1 -24
- data/lib/fog/rackspace/models/compute_v2/server.rb +4 -2
- data/lib/fog/rackspace/requests/compute_v2/create_server.rb +1 -1
- data/lib/fog/rackspace/requests/compute_v2/list_servers.rb +1 -1
- data/lib/fog/storm_on_demand/models/compute/server.rb +1 -5
- data/lib/fog/virtual_box/models/compute/server.rb +2 -44
- data/lib/fog/vmfusion/models/compute/server.rb +3 -36
- data/lib/fog/vsphere/models/compute/server.rb +1 -1
- data/lib/fog/vsphere/requests/compute/list_virtual_machines.rb +2 -31
- data/lib/fog/vsphere/requests/compute/vm_clone.rb +35 -7
- data/tests/aws/models/cdn/distribution_tests.rb +15 -0
- data/tests/aws/models/cdn/distributions_tests.rb +15 -0
- data/tests/aws/models/cdn/invalidation_tests.rb +32 -0
- data/tests/aws/models/cdn/invalidations_tests.rb +15 -0
- data/tests/aws/models/cdn/streaming_distribution_tests.rb +15 -0
- data/tests/aws/models/cdn/streaming_distributions_tests.rb +15 -0
- data/tests/aws/models/rds/tagging_tests.rb +20 -0
- data/tests/aws/requests/auto_scaling/auto_scaling_tests.rb +1 -11
- data/tests/aws/requests/auto_scaling/describe_types_tests.rb +102 -0
- data/tests/aws/requests/auto_scaling/helper.rb +47 -3
- data/tests/aws/requests/auto_scaling/notification_configuration_tests.rb +123 -0
- data/tests/aws/requests/auto_scaling/tag_tests.rb +62 -0
- data/tests/aws/requests/cdn/cdn_tests.rb +252 -0
- data/tests/aws/requests/compute/image_tests.rb +32 -1
- data/tests/aws/requests/compute/volume_tests.rb +3 -3
- data/tests/aws/requests/rds/describe_events.rb +16 -0
- data/tests/aws/requests/rds/helper.rb +26 -0
- data/tests/aws/requests/rds/subnet_groups_test.rb +48 -0
- data/tests/aws/requests/rds/tagging_tests.rb +78 -0
- data/tests/brightbox/requests/compute/account_tests.rb +24 -4
- data/tests/brightbox/requests/compute/application_test.rb +63 -0
- data/tests/brightbox/requests/compute/helper.rb +49 -1
- data/tests/helper.rb +4 -1
- data/tests/local/models/directory_tests.rb +16 -0
- data/tests/ninefold/requests/compute/helper.rb +53 -0
- data/tests/ninefold/requests/compute/load_balancer_tests.rb +66 -0
- data/tests/openstack/models/image/image_tests.rb +1 -0
- data/tests/openstack/models/network/network_tests.rb +24 -0
- data/tests/openstack/models/network/networks_tests.rb +21 -0
- data/tests/openstack/models/network/port_tests.rb +28 -0
- data/tests/openstack/models/network/ports_tests.rb +25 -0
- data/tests/openstack/models/network/subnet_tests.rb +30 -0
- data/tests/openstack/models/network/subnets_tests.rb +27 -0
- data/tests/openstack/requests/compute/image_tests.rb +3 -4
- data/tests/openstack/requests/compute/quota_tests.rb +2 -0
- data/tests/openstack/requests/compute/security_group_tests.rb +10 -10
- data/tests/openstack/requests/compute/server_tests.rb +3 -1
- data/tests/openstack/requests/compute/volume_tests.rb +11 -12
- data/tests/openstack/requests/identity/tenant_tests.rb +2 -1
- data/tests/openstack/requests/image/image_tests.rb +66 -45
- data/tests/openstack/requests/network/network_tests.rb +56 -0
- data/tests/openstack/requests/network/port_tests.rb +63 -0
- data/tests/openstack/requests/network/subnet_tests.rb +66 -0
- data/tests/rackspace/models/identity/user_tests.rb +1 -1
- data/tests/rackspace/models/identity/users_tests.rb +1 -1
- metadata +137 -13
- data/lib/fog/ninefold/models/storage/directories.rb +0 -48
- data/lib/fog/ninefold/models/storage/directory.rb +0 -53
- data/lib/fog/ninefold/models/storage/file.rb +0 -108
- data/lib/fog/ninefold/models/storage/files.rb +0 -73
- data/lib/fog/ninefold/requests/storage/delete_namespace.rb +0 -19
- data/lib/fog/ninefold/requests/storage/get_namespace.rb +0 -20
- data/lib/fog/ninefold/requests/storage/head_namespace.rb +0 -20
- data/lib/fog/ninefold/requests/storage/post_namespace.rb +0 -20
- data/lib/fog/ninefold/requests/storage/put_namespace.rb +0 -20
@@ -1,48 +0,0 @@
|
|
1
|
-
require 'fog/core/collection'
|
2
|
-
require 'fog/ninefold/models/storage/directory'
|
3
|
-
|
4
|
-
module Fog
|
5
|
-
module Storage
|
6
|
-
class Ninefold
|
7
|
-
|
8
|
-
class Directories < Fog::Collection
|
9
|
-
|
10
|
-
attribute :directory
|
11
|
-
|
12
|
-
model Fog::Storage::Ninefold::Directory
|
13
|
-
|
14
|
-
def all
|
15
|
-
directory ? ns = directory.key : ns = ''
|
16
|
-
ns = ns + '/' unless ns =~ /\/$/
|
17
|
-
data = connection.get_namespace(ns).body[:DirectoryList]
|
18
|
-
data = {:DirectoryEntry => []} if data.kind_of? String
|
19
|
-
data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
|
20
|
-
dirs = data[:DirectoryEntry].select {|de| de[:FileType] == 'directory'}
|
21
|
-
dirs.each do |d|
|
22
|
-
d[:Filename] = ns + d[:Filename] if directory
|
23
|
-
d[:Filename] += '/' unless d[:Filename] =~ /\/$/
|
24
|
-
end
|
25
|
-
load(dirs)
|
26
|
-
end
|
27
|
-
|
28
|
-
def get(key, options = {})
|
29
|
-
return nil if key == '' # Root dir shouldn't be retrieved like this.
|
30
|
-
key =~ /\/$/ ? ns = key : ns = key + '/'
|
31
|
-
res = connection.get_namespace ns
|
32
|
-
emc_meta = res.headers['x-emc-meta']
|
33
|
-
obj_id = emc_meta.scan(/objectid=(\w+),/).flatten[0]
|
34
|
-
new(:objectid => obj_id, :key => ns)
|
35
|
-
rescue Fog::Storage::Ninefold::NotFound
|
36
|
-
nil
|
37
|
-
end
|
38
|
-
|
39
|
-
def new(attributes ={})
|
40
|
-
attributes = {:directory => directory}.merge(attributes) if directory
|
41
|
-
super(attributes)
|
42
|
-
end
|
43
|
-
|
44
|
-
end
|
45
|
-
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
@@ -1,53 +0,0 @@
|
|
1
|
-
require 'fog/core/model'
|
2
|
-
|
3
|
-
module Fog
|
4
|
-
module Storage
|
5
|
-
class Ninefold
|
6
|
-
|
7
|
-
class Directory < Fog::Model
|
8
|
-
|
9
|
-
identity :key, :aliases => :Filename
|
10
|
-
attribute :objectid, :aliases => :ObjectID
|
11
|
-
|
12
|
-
def files
|
13
|
-
@files ||= begin
|
14
|
-
Fog::Storage::Ninefold::Files.new(
|
15
|
-
:directory => self,
|
16
|
-
:connection => connection
|
17
|
-
)
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
def directories
|
22
|
-
@directories ||= begin
|
23
|
-
Fog::Storage::Ninefold::Directories.new(
|
24
|
-
:directory => self,
|
25
|
-
:connection => connection
|
26
|
-
)
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
def save
|
31
|
-
self.key = attributes[:directory].key + key if attributes[:directory]
|
32
|
-
self.key = key + '/' unless key =~ /\/$/
|
33
|
-
res = connection.post_namespace key
|
34
|
-
reload
|
35
|
-
end
|
36
|
-
|
37
|
-
def destroy(opts={})
|
38
|
-
if opts[:recursive]
|
39
|
-
files.each {|f| f.destroy }
|
40
|
-
directories.each do |d|
|
41
|
-
d.files.each {|f| f.destroy }
|
42
|
-
d.destroy(opts)
|
43
|
-
end
|
44
|
-
end
|
45
|
-
connection.delete_namespace key
|
46
|
-
end
|
47
|
-
|
48
|
-
|
49
|
-
end
|
50
|
-
|
51
|
-
end
|
52
|
-
end
|
53
|
-
end
|
@@ -1,108 +0,0 @@
|
|
1
|
-
require 'fog/core/model'
|
2
|
-
|
3
|
-
module Fog
|
4
|
-
module Storage
|
5
|
-
class Ninefold
|
6
|
-
|
7
|
-
class File < Fog::Model
|
8
|
-
|
9
|
-
identity :key, :aliases => :Filename
|
10
|
-
|
11
|
-
attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer
|
12
|
-
attribute :content_type, :aliases => ['content_type', 'Content-Type']
|
13
|
-
attribute :objectid, :aliases => :ObjectID
|
14
|
-
|
15
|
-
def body
|
16
|
-
attributes[:body] ||= if objectid
|
17
|
-
collection.get(identity).body
|
18
|
-
else
|
19
|
-
''
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
def body=(new_body)
|
24
|
-
attributes[:body] = new_body
|
25
|
-
end
|
26
|
-
|
27
|
-
def directory
|
28
|
-
@directory
|
29
|
-
end
|
30
|
-
|
31
|
-
def copy(target_directory_key, target_file_key, options={})
|
32
|
-
target_directory = connection.directories.new(:key => target_directory_key)
|
33
|
-
target_directory.files.create(
|
34
|
-
:key => target_file_key,
|
35
|
-
:body => body
|
36
|
-
)
|
37
|
-
end
|
38
|
-
|
39
|
-
def destroy
|
40
|
-
requires :directory, :key
|
41
|
-
connection.delete_namespace([directory.key, key].join('/'))
|
42
|
-
true
|
43
|
-
end
|
44
|
-
|
45
|
-
# def owner=(new_owner)
|
46
|
-
# if new_owner
|
47
|
-
# attributes[:owner] = {
|
48
|
-
# :display_name => new_owner['DisplayName'],
|
49
|
-
# :id => new_owner['ID']
|
50
|
-
# }
|
51
|
-
# end
|
52
|
-
# end
|
53
|
-
|
54
|
-
def public=(new_public)
|
55
|
-
# NOOP - we don't need to flag files as public, getting the public URL for a file handles it.
|
56
|
-
end
|
57
|
-
|
58
|
-
# By default, expire in 5 years
|
59
|
-
def public_url(expires = (Time.now + 5 * 365 * 24 * 60 * 60))
|
60
|
-
requires :objectid
|
61
|
-
# TODO - more efficient method to get this?
|
62
|
-
storage = Fog::Storage.new(:provider => 'Ninefold')
|
63
|
-
uri = URI::HTTP.build(:scheme => Fog::Storage::Ninefold::STORAGE_SCHEME, :host => Fog::Storage::Ninefold::STORAGE_HOST, :port => Fog::Storage::Ninefold::STORAGE_PORT.to_i, :path => "/rest/objects/#{objectid}" )
|
64
|
-
Fog::Storage.new(:provider => 'Ninefold').uid
|
65
|
-
|
66
|
-
|
67
|
-
sb = "GET\n"
|
68
|
-
sb += uri.path.downcase + "\n"
|
69
|
-
sb += storage.uid + "\n"
|
70
|
-
sb += String(expires.to_i())
|
71
|
-
|
72
|
-
signature = storage.sign( sb )
|
73
|
-
uri.query = "uid=#{CGI::escape(storage.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
|
74
|
-
uri.to_s
|
75
|
-
end
|
76
|
-
|
77
|
-
def save(options = {})
|
78
|
-
requires :body, :directory, :key
|
79
|
-
directory.kind_of?(Directory) ? ns = directory.key : ns = directory
|
80
|
-
ns += key
|
81
|
-
options[:headers] ||= {}
|
82
|
-
options[:headers]['Content-Type'] = content_type if content_type
|
83
|
-
options[:body] = body
|
84
|
-
begin
|
85
|
-
data = connection.post_namespace(ns, options)
|
86
|
-
self.objectid = data.headers['location'].split('/')[-1]
|
87
|
-
rescue => error
|
88
|
-
if error.message =~ /The resource you are trying to create already exists./
|
89
|
-
data = connection.put_namespace(ns, options)
|
90
|
-
else
|
91
|
-
raise error
|
92
|
-
end
|
93
|
-
end
|
94
|
-
# merge_attributes(data.headers)
|
95
|
-
true
|
96
|
-
end
|
97
|
-
|
98
|
-
private
|
99
|
-
|
100
|
-
def directory=(new_directory)
|
101
|
-
@directory = new_directory
|
102
|
-
end
|
103
|
-
|
104
|
-
end
|
105
|
-
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|
@@ -1,73 +0,0 @@
|
|
1
|
-
require 'fog/core/collection'
|
2
|
-
require 'fog/ninefold/models/storage/file'
|
3
|
-
|
4
|
-
module Fog
|
5
|
-
module Storage
|
6
|
-
class Ninefold
|
7
|
-
|
8
|
-
class Files < Fog::Collection
|
9
|
-
|
10
|
-
attribute :directory
|
11
|
-
attribute :limit
|
12
|
-
attribute :marker
|
13
|
-
attribute :path
|
14
|
-
attribute :prefix
|
15
|
-
|
16
|
-
model Fog::Storage::Ninefold::File
|
17
|
-
|
18
|
-
def all(options = {})
|
19
|
-
requires :directory
|
20
|
-
directory ? ns = directory.key : ns = ''
|
21
|
-
ns = ns + '/' unless ns =~ /\/$/
|
22
|
-
data = connection.get_namespace(ns).body[:DirectoryList]
|
23
|
-
data = {:DirectoryEntry => []} if data.kind_of? String
|
24
|
-
data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
|
25
|
-
files = data[:DirectoryEntry].select {|de| de[:FileType] == 'regular'}
|
26
|
-
files.each do |s|
|
27
|
-
s[:directory] = directory
|
28
|
-
end
|
29
|
-
# TODO - Load additional file meta?
|
30
|
-
load(files)
|
31
|
-
end
|
32
|
-
|
33
|
-
def get(key, &block)
|
34
|
-
requires :directory
|
35
|
-
data = connection.get_namespace(directory.key + key, :parse => false)#, &block)
|
36
|
-
file_data = data.headers.merge({
|
37
|
-
:body => data.body,
|
38
|
-
:key => key
|
39
|
-
})
|
40
|
-
new(file_data)
|
41
|
-
rescue Fog::Storage::Ninefold::NotFound
|
42
|
-
nil
|
43
|
-
end
|
44
|
-
|
45
|
-
def get_url(key)
|
46
|
-
requires :directory
|
47
|
-
if self.directory.public_url
|
48
|
-
"#{self.directory.public_url}/#{key}"
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
def head(key, options = {})
|
53
|
-
requires :directory
|
54
|
-
data = connection.head_namespace(directory.key + key, :parse => false)
|
55
|
-
file_data = data.headers.merge({
|
56
|
-
:body => data.body,
|
57
|
-
:key => key
|
58
|
-
})
|
59
|
-
new(file_data)
|
60
|
-
rescue Fog::Storage::Ninefold::NotFound
|
61
|
-
nil
|
62
|
-
end
|
63
|
-
|
64
|
-
def new(attributes = {})
|
65
|
-
requires :directory
|
66
|
-
super({ :directory => directory }.merge!(attributes))
|
67
|
-
end
|
68
|
-
|
69
|
-
end
|
70
|
-
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Storage
|
3
|
-
class Ninefold
|
4
|
-
class Real
|
5
|
-
|
6
|
-
def delete_namespace(namespace = '', options = {})
|
7
|
-
options = options.reject {|key, value| value.nil?}
|
8
|
-
request({
|
9
|
-
:expects => 204,
|
10
|
-
:method => 'DELETE',
|
11
|
-
:path => "namespace/" + namespace,
|
12
|
-
:query => options
|
13
|
-
}.merge(options))
|
14
|
-
end
|
15
|
-
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Storage
|
3
|
-
class Ninefold
|
4
|
-
class Real
|
5
|
-
|
6
|
-
def get_namespace(namespace = '', options = {})
|
7
|
-
options = options.reject {|key, value| value.nil?}
|
8
|
-
request({
|
9
|
-
:expects => 200,
|
10
|
-
:method => 'GET',
|
11
|
-
:path => "namespace/" + namespace,
|
12
|
-
:query => {},
|
13
|
-
:parse => true
|
14
|
-
}.merge(options))
|
15
|
-
end
|
16
|
-
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Storage
|
3
|
-
class Ninefold
|
4
|
-
class Real
|
5
|
-
|
6
|
-
def head_namespace(namespace = '', options = {})
|
7
|
-
options = options.reject {|key, value| value.nil?}
|
8
|
-
request({
|
9
|
-
:expects => 200,
|
10
|
-
:method => 'HEAD',
|
11
|
-
:path => "namespace/" + namespace,
|
12
|
-
:query => {},
|
13
|
-
:parse => true
|
14
|
-
}.merge(options))
|
15
|
-
end
|
16
|
-
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Storage
|
3
|
-
class Ninefold
|
4
|
-
class Real
|
5
|
-
|
6
|
-
def post_namespace(namespace = '', options = {})
|
7
|
-
options = options.reject {|key, value| value.nil?}
|
8
|
-
request({
|
9
|
-
:expects => 201,
|
10
|
-
:method => 'POST',
|
11
|
-
:path => "namespace/" + namespace,
|
12
|
-
:query => {},
|
13
|
-
:parse => true
|
14
|
-
}.merge(options))
|
15
|
-
end
|
16
|
-
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,20 +0,0 @@
|
|
1
|
-
module Fog
|
2
|
-
module Storage
|
3
|
-
class Ninefold
|
4
|
-
class Real
|
5
|
-
|
6
|
-
def put_namespace(namespace = '', options = {})
|
7
|
-
options = options.reject {|key, value| value.nil?}
|
8
|
-
request({
|
9
|
-
:expects => 200,
|
10
|
-
:method => 'PUT',
|
11
|
-
:path => "namespace/" + namespace,
|
12
|
-
:query => {},
|
13
|
-
:parse => true
|
14
|
-
}.merge(options))
|
15
|
-
end
|
16
|
-
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|