waz-storage 0.5.2 → 0.5.3

data/lib/waz-storage.rb

@@ -3,3 +3,14 @@ require 'waz/storage/base'
 require 'waz/storage/core_service'
 require 'waz/storage/exceptions'
 require 'waz/storage/version'
+
+# 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.
+unless String.method_defined? :start_with?
+  class String
+    def starts_with?(prefix)
+      prefix = prefix.to_s
+      self[0, prefix.length] == prefix
+    end
+  end
+end

data/lib/waz/blobs/blob_object.rb

@@ -30,8 +30,9 @@ module WAZ
         # service that wraps the calls the Windows Azure Blobs API. It's initialized with the values
         # from the default_connection on WAZ::Storage::Base initialized thru establish_connection!
         def service_instance
-          @service_instance ||= Service.new(WAZ::Storage::Base.default_connection.merge(:type_of_service => "blob"))
-        end        
+          options = WAZ::Storage::Base.default_connection.merge(:type_of_service => "blob")
+          (@service_instances ||= {})[:account_name] ||= Service.new(options)
+        end
       end
       
       attr_accessor :name, :url, :content_type

data/lib/waz/blobs/container.rb

@@ -64,7 +64,8 @@ module WAZ
         # service that wraps the calls the Windows Azure Blobs API. It's initialized with the values
         # from the default_connection on WAZ::Storage::Base initialized thru establish_connection!
         def service_instance
-          @service_instance ||= Service.new(WAZ::Storage::Base.default_connection.merge(:type_of_service => "blob"))
+          options = WAZ::Storage::Base.default_connection.merge(:type_of_service => "blob")
+          (@service_instances ||= {})[:account_name] ||= Service.new(options)
         end        
       end
       

data/lib/waz/queues/message.rb

@@ -28,7 +28,8 @@ module WAZ
         # 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!
         def service_instance
-          @service_instance ||= Service.new(WAZ::Storage::Base.default_connection.merge(:type_of_service => 'queue'))
+          options = WAZ::Storage::Base.default_connection.merge(:type_of_service => "queue")
+          (@service_instances ||= {})[:account_name] ||= Service.new(options)
         end
       end
       

data/lib/waz/queues/queue.rb

@@ -71,7 +71,8 @@ module WAZ
         # 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!
         def service_instance
-          @service_instance ||= Service.new(WAZ::Storage::Base.default_connection.merge(:type_of_service => 'queue'))
+          options = WAZ::Storage::Base.default_connection.merge(:type_of_service => "queue")
+          (@service_instances ||= {})[:account_name] ||= Service.new(options)
         end
       end
       

data/lib/waz/storage/base.rb

@@ -18,19 +18,49 @@ module WAZ
 					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
-					@connection = options
+					(@connections ||= []) << options
+				end
+				
+        # Block Syntax
+        #
+        #  Pushes the named repository onto the context-stack,
+        #  yields a new session, and pops the context-stack.
+        #
+        #  This helps you set contextual operations like in the following sample
+        #  
+        #  Base.establish_connection(options) do
+        #   # do some operations on the given context
+        #  end
+        #  
+        #  The context is restored to the previous one (what you configured on establish_connection!)
+        #  or nil.
+        #
+        # Non-Block Syntax
+        #
+        #  Behaves exactly as establish_connection!
+				def establish_connection(options = {}) # :yields: current_context
+			    establish_connection!(options)
+			    if (block_given?)
+  				  begin 
+  				    return yield
+  				  ensure
+  				    @connections.pop() if connected?
+  				  end
+  				end
 				end
 				
 				# Returns the default connection (last set) parameters. It will raise an exception WAZ::Storage::NotConnected
 				# when there's no connection information registered.
 				def default_connection
           raise NotConnected unless connected?
-					return @connection
+					return @connections.last
 				end
 				
 				# Returns a value indicating whether the current connection information has been set or not.
 				def connected?
-					return !@connection.nil?
+					return false if (@connections.nil?)
+					return false if (@connections.empty?)
+					return true
 				end
 			end
 		end

data/lib/waz/storage/version.rb

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

data/rakefile

@@ -8,7 +8,6 @@ require 'lib/waz-storage'
 
 namespace :test do
   Spec::Rake::SpecTask.new('run_with_rcov') do |t|
-    puts "running tests and code coverage"    
     t.spec_files = FileList['tests/waz/queues/*.rb', 'tests/waz/blobs/*.rb', 'tests/waz/storage/*.rb']
     t.rcov = true
     t.rcov_opts = ['--text-report', '--exclude', "exclude.*/.gem,test,Library,#{ENV['GEM_HOME']}", '--sort', 'coverage' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: waz-storage
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Johnny G. Halife
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -03:00
+date: 2009-10-17 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency