waz-storage 1.0.5 → 1.0.6

data/lib/waz/storage/base.rb

@@ -15,9 +15,11 @@ module WAZ
         #
 				# All other parameters are optional.
 				def establish_connection!(options = {})
-					raise InvalidOption, :account_name unless options.keys.include? :account_name
-					raise InvalidOption, :access_key unless options.keys.include? :access_key
-					options[:use_ssl] = false unless options.keys.include? :use_ssl
+					raise InvalidOption, :account_name unless options.keys.include? :account_name 
+					raise InvalidOption, :access_key if !options.keys.include? :use_sas_auth_only unless options.keys.include? :access_key 
+  				        raise InvalidOption, :use_sas_auth_only if !options.keys.include? :access_key unless options.keys.include? :use_sas_auth_only 
+ 					raise InvalidOption, :sharedaccesssignature if !options.keys.include? :access_key unless options.keys.include? :sharedaccesssignature and options.keys.include? :use_sas_auth_only
+  				        options[:use_ssl] = false unless options.keys.include? :use_ssl
 					(@connections ||= []) << options
 				end
 				
@@ -65,4 +67,4 @@ module WAZ
 			end
 		end
 	end
-end
+end

data/lib/waz/storage/core_service.rb

@@ -3,10 +3,14 @@ module WAZ
     # This module is imported by the specific services that use Shared Key authentication profile. On the current implementation
     # this module is imported from WAZ::Queues::Service and WAZ::Blobs::Service.
     module SharedKeyCoreService
-      attr_accessor :account_name, :access_key, :use_ssl, :base_url, :type_of_service, :use_devenv
+      attr_accessor :account_name, :access_key, :use_ssl, :base_url, :type_of_service, :use_devenv, :use_sas_auth_only, :sharedaccesssignature
       
       # Creates an instance of the implementor service (internally used by the API).
       def initialize(options = {})
+        # Flag to define the use of shared access signature only
+        self.use_sas_auth_only = options[:use_sas_auth_only] or false
+        self.sharedaccesssignature = options[:sharedaccesssignature] 
+
         self.account_name = options[:account_name]
         self.access_key = options[:access_key]
         self.type_of_service = options[:type_of_service]        
@@ -25,7 +29,7 @@ module WAZ
         http_headers.merge!("x-ms-Date" => Time.new.httpdate)
         http_headers.merge!("Content-Length" => (payload or "").size)
         request = {:headers => http_headers, :method => verb.to_s.downcase.to_sym, :url => url, :payload => payload}
-        request[:headers].merge!("Authorization" => "SharedKey #{account_name}:#{generate_signature(request)}")
+        request[:headers].merge!("Authorization" => "SharedKey #{account_name}:#{generate_signature(request)}") unless self.use_sas_auth_only 
         return RestClient::Request.new(request)
       end
       
@@ -36,7 +40,11 @@ module WAZ
         query_params = options.keys.sort{ |a, b| a.to_s <=> b.to_s}.map{ |k| "#{k.to_s.gsub(/_/, '')}=#{CGI.escape(options[k].to_s)}"}.join("&") unless options.nil? or options.empty?
         uri = "#{protocol}://#{base_url}/#{path.start_with?(account_name) ? "" : account_name }#{((path or "").start_with?("/") or path.start_with?(account_name)) ? "" : "/"}#{(path or "")}" if !self.use_devenv.nil? and self.use_devenv
         uri ||= "#{protocol}://#{account_name}.#{base_url}#{(path or "").start_with?("/") ? "" : "/"}#{(path or "")}" 
-        uri << "?#{query_params}" if query_params
+        if self.use_sas_auth_only 
+          uri << "?#{self.sharedaccesssignature.gsub(/\?/,'')}" 
+	else
+          uri << "?#{query_params}" if query_params
+        end        
         return uri
       end
       
@@ -111,4 +119,4 @@ module WAZ
       end
     end
   end
-end
+end

data/lib/waz/storage/version.rb

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

data/rakefile

@@ -1,17 +1,18 @@
 require 'rake'
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'lib/waz-storage'
 
 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']
+RSpec::Core::RakeTask.new do |t|
+  t.name = :specs
+  t.pattern = "tests/**/*.rb"
   t.rcov = true
   t.rcov_opts = ['--text-report', '--exclude', "exclude.*/.gem,test,Library,#{ENV['GEM_HOME']}", '--sort', 'coverage' ]
-  t.spec_opts = ['-cfn']
+  t.rspec_opts = ['-cfn']
 end
 
 

metadata

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