waz-storage 1.0.0 → 1.0.2

data/lib/waz-blobs.rb

@@ -1,16 +1,5 @@
-require 'time'
-require 'cgi'
-require 'base64'
-require 'rexml/document'
-require 'rexml/xpath'
-require 'restclient'
-require 'hmac-sha2'
-
 $:.unshift(File.dirname(__FILE__))
 require 'waz-storage'
-require 'waz/blobs/blob_object'
-require 'waz/blobs/container'
-require 'waz/blobs/exceptions'
-require 'waz/blobs/service'
-
-
+# Application Files (massive include)
+app_files = File.expand_path(File.join('lib', 'waz', 'blobs', '*.rb'))
+Dir[app_files].each(&method(:load))

data/lib/waz-queues.rb

@@ -1,17 +1,6 @@
-require 'time'
-require 'cgi'
-require 'base64'
-require 'rexml/document'
-require 'rexml/xpath'
-
-require 'restclient'
-require 'hmac-sha2'
-
 $:.unshift(File.dirname(__FILE__))
 require 'waz-storage'
-require 'waz/queues/exceptions'
-require 'waz/queues/message'
-require 'waz/queues/queue'
-require 'waz/queues/service'
-
+# Application Files (massive include)
+app_files = File.expand_path(File.join('lib', 'waz', 'queues', '*.rb'))
+Dir[app_files].each(&method(:load))
 

data/lib/waz-storage.rb

@@ -1,11 +1,6 @@
-require 'net/http'
-
-$:.unshift(File.dirname(__FILE__))
-require 'waz/storage/base'
-require 'waz/storage/core_service'
-require 'waz/storage/exceptions'
-require 'waz/storage/version'
-require 'waz/storage/validation_rules'
+%w{time cgi base64 rexml/document rexml/xpath restclient hmac-sha2 net/http}.each(&method(:require))
+app_files = File.expand_path(File.join('lib', 'waz', 'storage', '*.rb'))
+Dir[app_files].each(&method(:load))
 
 # It will depende on which version of Ruby (or if you have Rails) 
 # but this method is required so we will add it the String class.
@@ -28,4 +23,9 @@ module Net
       RESPONSE_HAS_BODY = false
     end
   end
-end
+end
+
+# extendes the Symbol class to assign a type to an entity field
+class Symbol
+  attr_accessor :edm_type
+end

data/lib/waz-tables.rb

@@ -1,20 +1,5 @@
-require 'time'
-require 'cgi'
-require 'base64'
-require 'rexml/document'
-require 'rexml/xpath'
-require 'restclient'
-require 'hmac-sha2'
-
 $:.unshift(File.dirname(__FILE__))
 require 'waz-storage'
-require 'waz/tables/exceptions'
-require 'waz/tables/table'
-require 'waz/tables/table_array'
-require 'waz/tables/service'
-require 'waz/tables/edm_type_helper'
-
-# extendes the Symbol class to assign a type to an entity field
-class Symbol
-  attr_accessor :edm_type
-end
+# Application Files (massive include)
+app_files = File.expand_path(File.join('lib', 'waz', 'tables', '*.rb'))
+Dir[app_files].each(&method(:load))

data/lib/waz/blobs/blob_object.rb

@@ -112,5 +112,4 @@ module WAZ
       end      
     end
   end
-end
-  
+end

data/lib/waz/blobs/service.rb

@@ -7,12 +7,12 @@ module WAZ
       
       # Creates a container on the current Windows Azure Storage account.
       def create_container(container_name)
-        execute :put, container_name
+        execute :put, container_name, {:restype => 'container'}, {:x_ms_version => '2009-09-19'}
       end
       
       # Retrieves all the properties existing on the container.
       def get_container_properties(container_name)
-        execute(:get, container_name).headers
+        execute(:get, container_name, {:restype => 'container'}, {:x_ms_version => '2009-09-19'}).headers
       end
       
       # Set the container properties (metadata). 
@@ -20,14 +20,14 @@ module WAZ
       # Remember that custom properties should be named as :x_ms_meta_{propertyName} in order
       # to have Windows Azure to persist them.
       def set_container_properties(container_name, properties = {})
-        execute :put, container_name, { :comp => 'metadata' }, properties
+        execute :put, container_name, { :restype => 'container', :comp => 'metadata' }, properties.merge!({:x_ms_version => '2009-09-19'})
       end
       
       # Retrieves the value of the :x_ms_prop_publicaccess header from the
       # container properties indicating whether the container is publicly 
       # accessible or not.
       def get_container_acl(container_name)
-        headers = execute(:get, container_name, { :comp => 'acl' }).headers
+        headers = execute(:get, container_name, { :restype => 'container', :comp => 'acl' }, {:x_ms_version => '2009-09-19'}).headers
         headers[:x_ms_prop_publicaccess].downcase == true.to_s
       end
 
@@ -37,7 +37,7 @@ module WAZ
       #
       # Default is _false_
       def set_container_acl(container_name, public_available = false)
-        execute :put, container_name, { :comp => 'acl' }, { :x_ms_prop_publicaccess => public_available.to_s }
+        execute :put, container_name, { :restype => 'container', :comp => 'acl' }, { :x_ms_prop_publicaccess => public_available.to_s, :x_ms_version => '2009-09-19' }
       end
 
       # Lists all the containers existing on the current storage account.
@@ -55,7 +55,7 @@ module WAZ
 
       # Deletes the given container from the Windows Azure Storage account.
       def delete_container(container_name)
-        execute :delete, container_name
+        execute :delete, container_name, {:restype => 'container'}, {:x_ms_version => '2009-09-19'}
       end
 
       # Lists all the blobs inside the given container.
@@ -95,12 +95,12 @@ module WAZ
             
       # Retrieves the properties associated with the blob at the given path.
       def get_blob_properties(path, options = {})
-        execute(:head, path, options).headers
+        execute(:head, path, options, {:x_ms_version => "2009-09-19"}).headers
       end
 
       # Sets the properties (metadata) associated to the blob at given path.
       def set_blob_properties(path, properties ={})
-        execute :put, path, { :comp => 'metadata' }, properties
+        execute :put, path, { :comp => 'properties' }, properties.merge({:x_ms_version => "2009-09-19"})
       end
       
       # Copies a blob within the same account (not necessarily to the same container)

data/lib/waz/queues/queue.rb

@@ -71,6 +71,11 @@ module WAZ
           end
         end
         
+        # Syntax's sugar for find(:queue_name) or create(:queue_name)
+        def ensure(queue_name)
+          return (self.find(queue_name) or self.create(queue_name))
+        end
+        
         # This method is internally used by this class. It's the way we keep a single instance of the 
         # service that wraps the calls the Windows Azure Queues API. It's initialized with the values
         # from the default_connection on WAZ::Storage::Base initialized thru establish_connection!

data/lib/waz/queues/service.rb

@@ -31,11 +31,7 @@ module WAZ
       # Creates a queue on the current storage account. Throws WAZ::Queues::QueueAlreadyExists when 
       # existing metadata and given metadata differ.
       def create_queue(queue_name, metadata = {})
-        begin
-          execute :put, queue_name, nil, metadata.merge!(:x_ms_version => '2009-09-19')
-        rescue RestClient::RequestFailed
-          raise WAZ::Queues::QueueAlreadyExists, queue_name if $!.http_code == 409
-        end
+        execute(:put, queue_name, nil, metadata.merge!(:x_ms_version => '2009-09-19'))
       end
       
       # Deletes the given queue from the current storage account.

data/lib/waz/storage/core_service.rb

@@ -104,7 +104,7 @@ module WAZ
       # Generates a Windows Azure Storage call, it internally calls url generation method
       # and the request generation message.
       def execute(verb, path, query = {}, headers = {}, payload = nil)
-        url = generate_request_uri(path, query)        
+        url = generate_request_uri(path, query)
         request = generate_request(verb, url, headers, payload)
         request.execute()
       end

data/lib/waz/storage/version.rb

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

data/rakefile

@@ -5,15 +5,16 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'lib/waz-storage'
 
-namespace :test do
-  Spec::Rake::SpecTask.new('run_with_rcov') do |t|
-    t.spec_files = FileList['tests/waz/queues/*.rb', 'tests/waz/blobs/*.rb', 'tests/waz/tables/*.rb', 'tests/waz/storage/*.rb']
-    t.rcov = true
-    t.rcov_opts = ['--text-report', '--exclude', "exclude.*/.gem,test,Library,#{ENV['GEM_HOME']}", '--sort', 'coverage' ]
-    t.spec_opts = ['-cfn']
-  end
+task :default => [:specs]
+
+Spec::Rake::SpecTask.new('specs') do |t|
+  t.spec_files = FileList['tests/waz/blobs/*.rb', 'tests/waz/queues/*.rb', 'tests/waz/tables/*.rb', 'tests/waz/storage/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--text-report', '--exclude', "exclude.*/.gem,test,Library,#{ENV['GEM_HOME']}", '--sort', 'coverage' ]
+  t.spec_opts = ['-cfn']
 end
 
+
 namespace :dist do  
   spec = Gem::Specification.new do |s|
     s.name              = 'waz-storage'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: waz-storage
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Johnny G. Halife
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -03:00
+date: 2010-10-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A simple implementation of Windows Azure Storage API for Ruby, inspired by the S3 gems and self experience of dealing with queues. The major goal of the whole gem is to enable ruby developers [like me =)] to leverage Windows Azure Storage features and have another option for cloud storage.
 email: johnny.halife@me.com
 executables: []
@@ -79,18 +88,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Client library for Windows Azure's Storage Service REST API