waz-storage 1.0.6 → 1.1.0

data/lib/waz/blobs/container.rb

@@ -120,6 +120,22 @@ module WAZ
                               :url => self.class.service_instance.generate_request_uri("#{self.name}/#{blob_name}"),
                               :content_type => content_type)
       end
+
+      # Uploads the contents of a stream to the specified blob within this container, using
+      # the required <em>content_type</em>. The stream will be uploaded in blocks of size
+      # <em>block_size</em> bytes, which defaults to four megabytes. <strong>The <em>options</em>
+      # parameter, if provided, will set the default metadata properties for the blob</strong>.
+      def upload(blob_name, stream, content_type, options = {}, block_size = 4 * 2**20)
+        blob_name.gsub!(%r{^/}, '')
+        path = "#{self.name}/#{blob_name}"
+        n = 0
+        until stream.eof?
+          self.class.service_instance.put_block path, Base64.encode64('%064d' % n), stream.read(block_size)
+          n += 1
+        end
+        self.class.service_instance.put_block_list path, (0...n).map{|id| Base64.encode64('%064d' % id)}, content_type, options
+        return BlobObject.new(:name => blob_name, :url => self.class.service_instance.generate_request_uri("#{self.name}/#{blob_name}"), :content_type => content_type)
+      end
       
       # Retrieves the blob by the given name. If the blob isn't found on the current container
       # it will return nil instead of throwing an exception.
@@ -136,4 +152,4 @@ module WAZ
       end
     end
   end
-end
+end

data/lib/waz/blobs/service.rb

@@ -83,7 +83,19 @@ module WAZ
         default_headers = {"Content-Type" => content_type, :x_ms_version => "2009-09-19", :x_ms_blob_type => "BlockBlob"}
         execute :put, path, nil, metadata.merge(default_headers), payload
       end
-      
+
+      # Commits a list of blocks to the given blob.
+      #
+      # blockids is a list of valid, already-uploaded block IDs (base64-encoded)
+      #
+      # content_type is required by the blobs api, but on this method is defaulted to "application/octect-stream"
+      #
+      # metadata is a hash that stores all the properties that you want to add to the blob when creating it.
+      def put_block_list(path, blockids, content_type = "application/octet-stream", metadata = {})
+        default_headers = {"Content-Type" => content_type, :x_ms_version => "2009-09-19"}
+        execute :put, path, { :comp => 'blocklist' }, metadata.merge(default_headers), '<?xml version="1.0" encoding="utf-8"?><BlockList>' + blockids.map {|id| "<Latest>#{id.rstrip}</Latest>"}.join + '</BlockList>'
+      end
+
       # Retrieves a blob (content + headers) from the current path.
       def get_blob(path, options = {})
         execute :get, path, options, {:x_ms_version => "2009-09-19"}

data/lib/waz/storage/core_service.rb

@@ -58,7 +58,7 @@ module WAZ
       # Creates a canonical representation of the message by combining account_name/resource_path.
       def canonicalize_message(url)
         uri_component = url.gsub(/https?:\/\/[^\/]+\//i, '').gsub(/\?.*/i, '')
-        comp_component = url.scan(/(comp=[^&]+)/i).first()
+        comp_component = url.scan(/comp=[^&]+/i).first()
         uri_component << "?#{comp_component}" if comp_component
         canonicalized_message = "/#{self.account_name}/#{uri_component}"
         return canonicalized_message
@@ -104,7 +104,7 @@ module WAZ
       def canonicalize_message20090919(url)
         uri_component = url.gsub(/https?:\/\/[^\/]+\//i, '').gsub(/\?.*/i, '')
         query_component = (url.scan(/\?(.*)/i).first() or []).first()
-        query_component = query_component.split('&').sort{|a, b| a <=> b}.map{ |p| p.split('=').join(':') }.join("\n") if query_component
+        query_component = query_component.split('&').sort{|a, b| a <=> b}.map{ |p| CGI::unescape(p.split('=').join(':')) }.join("\n") if query_component
         canonicalized_message = "/#{self.account_name}/#{uri_component}"
         canonicalized_message << "\n#{query_component}" if query_component
         return canonicalized_message

data/lib/waz/storage/version.rb

@@ -2,8 +2,8 @@ module WAZ
   module Storage
     module VERSION #:nodoc:
       MAJOR    = '1'
-      MINOR    = '0'
-      TINY     = '6' 
+      MINOR    = '1'
+      TINY     = '0' 
     end
     
     Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY].compact * '.'

data/lib/waz/tables/service.rb

@@ -139,17 +139,17 @@ module WAZ
         def generate_payload(table_name, entity)
           payload = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" \
                      "<entry xmlns:d=\"#{DATASERVICES_NAMESPACE}\" xmlns:m=\"#{DATASERVICES_METADATA_NAMESPACE}\" xmlns=\"http://www.w3.org/2005/Atom\">" \
-                     "<id>#{generate_request_uri "#{table_name}"}(PartitionKey='#{entity[:partition_key]}',RowKey='#{entity[:row_key]}')</id>" \
-                     "<title /><updated>#{Time.now.utc.iso8601}</updated><author><name /></author><link rel=\"edit\" title=\"#{table_name}\" href=\"#{table_name}(PartitionKey='#{entity[:partition_key]}',RowKey='#{entity[:row_key]}')\" />" \
+                     "<id>#{generate_request_uri "#{table_name}"}(PartitionKey='#{REXML::Text.new(entity[:partition_key], false, nil, false).to_s}',RowKey='#{REXML::Text.new(entity[:row_key], false, nil, false).to_s}')</id>" \
+                     "<title /><updated>#{Time.now.utc.iso8601}</updated><author><name /></author><link rel=\"edit\" title=\"#{table_name}\" href=\"#{table_name}(PartitionKey='#{REXML::Text.new(entity[:partition_key], false, nil, false).to_s}',RowKey='#{REXML::Text.new(entity[:row_key], false, nil, false).to_s}')\" />" \
                      "<content type=\"application/xml\"><m:properties>"
 
           entity.sort_by { |k| k.to_s }.each do |k,v| 
             value, type = EdmTypeHelper.parse_to(v)[0].to_s, EdmTypeHelper.parse_to(v)[1].to_s
-            payload << (!v.nil? ? "<d:#{k.to_s} m:type=\"#{k.edm_type || type}\">#{value}</d:#{k.to_s}>" : "<d:#{k.to_s} m:type=\"#{k.edm_type || type}\" m:null=\"true\" />") unless k.eql?(:partition_key) or k.eql?(:row_key) 
+            payload << (!v.nil? ? "<d:#{k.to_s} m:type=\"#{k.edm_type || type}\">#{REXML::Text.new(value, false, nil, false).to_s}</d:#{k.to_s}>" : "<d:#{k.to_s} m:type=\"#{k.edm_type || type}\" m:null=\"true\" />") unless k.eql?(:partition_key) or k.eql?(:row_key) 
           end  
 
-          payload << "<d:PartitionKey>#{entity[:partition_key]}</d:PartitionKey>" \
-                     "<d:RowKey>#{entity[:row_key]}</d:RowKey>" \
+          payload << "<d:PartitionKey>#{REXML::Text.new(entity[:partition_key], false, nil, false).to_s}</d:PartitionKey>" \
+                     "<d:RowKey>#{REXML::Text.new(entity[:row_key], false, nil, false).to_s}</d:RowKey>" \
                      "</m:properties></content></entry>"
           return payload
         end
@@ -175,4 +175,4 @@ module WAZ
         end
     end
   end
-end
+end

data/rakefile

@@ -44,7 +44,7 @@ end
 namespace :docs do
   Rake::RDocTask.new do |t|
   	t.rdoc_dir = 'rdoc'
-  	t.title    = "Windows Azure Storage library — simple gem for accessing WAZ‘s Storage REST API"
+  	t.title    = "Windows Azure Storage library - simple gem for accessing WAZ's Storage REST API"
   	t.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   	t.options << '--charset' << 'utf-8'
   	t.rdoc_files.include('README.rdoc')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: waz-storage
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 6
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors: 
 - Johnny G. Halife
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2011-06-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency