sndacs 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sndacs (0.2.2)
+    sndacs (0.2.3)
       proxies (~> 0.2.0)
 
 GEM

data/README.rdoc

@@ -101,6 +101,12 @@ set bucket public
 Get a temporary url to the object that expires on the timestamp given.Defaults to 1hour expire time
     object.temporary_url( Time.now + 60 )
 
+=== Get url to a public accessible object
+
+Get a url to a public accessible object,the url only work when the object is public accessible
+    
+     object.url( public_accessible = true)
+   
 === Delete an object
 
     object.destroy

data/lib/sndacs/connection.rb

@@ -149,7 +149,7 @@ module Sndacs
                           :x_snda_copy_source_if_none_match,
                           :x_snda_copy_source_if_unmodified_since,
                           :x_snda_copy_source_if_modified_since]
-
+      user_meta_data_prefix = "x-snda-meta-"
       parsed_headers = {}
       if headers
         headers.each do |key, value|
@@ -163,6 +163,12 @@ module Sndacs
             end
 
             parsed_headers[parsed_key] = parsed_value
+          else
+              parsed_key = key.to_s.gsub("_","-")
+              if parsed_key[0,user_meta_data_prefix.length] === user_meta_data_prefix
+                 parsed_headers[parsed_key] = value
+              end
+            
           end
         end
       end

data/lib/sndacs/object.rb

@@ -72,24 +72,25 @@ module Sndacs
     end
 
     # Saves the object, returns true if successfull.
-    def save
-      put_object
+    # ==== Options
+    # request headers
 
+    def save(options = {})
+      put_object(options)
       true
     end
 
-    # Copies the file to another key and/or bucket.
+    # copies the file from another key and/or bucket.
     #
     # ==== Options
-    # * <tt>:key</tt> - New key to store object in
-    # * <tt>:bucket</tt> - New bucket to store object in (instance of
-    #   Sndacs::Bucket)
-    # * <tt>:acl</tt> - ACL of the copied object (default:
-    #   "public-read")
-    # * <tt>:content_type</tt> - Content type of the copied object
-    #   (default: "application/octet-stream")
+    # * <tt>:key</tt> - key for copy
+    # * <tt>:bucket</tt> - bucket's name which the source file stored
+    # * <tt>:x_snda_metadata..</tt> - params for copy which is not nessary
+    #  
     def copy(options = {})
       copy_object(options)
+      retrieve
+      true
     end
 
     # Destroys the file on the server
@@ -155,7 +156,7 @@ module Sndacs
       headers = {}
 
       #headers[:x_snda_acl] = options[:acl] || acl || "public-read"
-      headers[:content_type] = options[:content_type] || content_type || "application/octet-stream"
+      headers[:content_type] = options[:content_type] || content_type || content_type_for_key
       headers[:content_encoding] = options[:content_encoding] if options[:content_encoding]
       headers[:content_disposition] = options[:content_disposition] if options[:content_disposition]
       headers[:cache_control] = options[:cache_control] if options[:cache_control]
@@ -165,9 +166,10 @@ module Sndacs
       headers[:x_snda_copy_source_if_none_match] = options[:if_none_match] if options[:if_none_match]
       headers[:x_snda_copy_source_if_unmodified_since] = options[:if_modified_since] if options[:if_modified_since]
       headers[:x_snda_copy_source_if_modified_since] = options[:if_unmodified_since] if options[:if_unmodified_since]
-      
+      headers = merge_usermetadata_toheader(options,headers)    
       response = object_request(:put,:headers => headers)
-      response.body
+      #response.body
+      #true
     end
 
     def get_object(options = {})
@@ -188,10 +190,11 @@ module Sndacs
       end
     end
 
-    def put_object
-      response = object_request(:put, :body => content, :headers => dump_headers)
+    def put_object(options={})
+      response = object_request(:put, :body => content, :headers => dump_headers(options))
 
       parse_headers(response)
+      retrieve
     end
 
     def delete_object(options = {})
@@ -227,17 +230,37 @@ module Sndacs
       end
     end
 
-    def dump_headers
+    def content_type_for_key
+         if mime_type = MIME::Types.type_for(key).first
+            mime_type.content_type
+         else
+            "application/octet-stream"
+         end
+    end
+
+    def dump_headers(options={})
       headers = {}
-      headers[:x_snda_acl] = @acl || "public-read"
-      headers[:x_snda_storage_class] = @storage_class || "STANDARD"
-      headers[:content_type] = @content_type || "application/octet-stream"
-      headers[:content_encoding] = @content_encoding if @content_encoding
-      headers[:content_disposition] = @content_disposition if @content_disposition
-      headers[:cache_control] = @cache_control if @cache_control
+      #headers[:x_snda_acl] = @acl || "public-read"
+      #headers[:x_snda_storage_class] = @storage_class || "STANDARD"
+      headers[:content_type] = options[:content_type] || @content_type || content_type_for_key
+      headers[:content_encoding] = options[:content_encoding] || @content_encoding if @content_encoding
+      headers[:content_disposition] = options[:content_disposition] || @content_disposition if @content_disposition
+      headers[:cache_control] = options[:cache_control] || @cache_control if @cache_control
+      headers = merge_usermetadata_toheader(options,headers)
       headers
     end
-
+    
+    def merge_usermetadata_toheader(options,headers)
+        user_meta_data_prefix = "x-snda-meta-"
+        options.each do |key,value|
+          parse_key = key.to_s.gsub("_","-").downcase
+          if parse_key[0,user_meta_data_prefix.length] === user_meta_data_prefix
+              headers[parse_key] = value 
+          end
+        end
+        headers
+    end
+ 
     def parse_headers(response)
       @metadata = response.to_hash.select { |k, v| k.to_s.start_with?("x-snda-meta") }
       self.etag = response["etag"] if response.key?("etag")

data/lib/sndacs/version.rb

@@ -1,3 +1,3 @@
 module Sndacs
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/sndacs.rb

@@ -10,6 +10,7 @@ require "net/https"
 require "openssl"
 require "rexml/document"
 require "time"
+require "mime/types"
 
 require "proxies"
 require "sndacs/objects_extension"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sndacs
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - LI Daobing
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-04 00:00:00 Z
+date: 2012-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: proxies