ruby-atmos 0.6.0 → 1.0.1

data/Rakefile

@@ -45,7 +45,7 @@ spec = Gem::Specification.new do |s|
    s.extra_rdoc_files  = %w(README COPYING)
    s.homepage          = 'http://www.emc.com/atmos'
     #s.rubyforge_project = 'atmos'
-   s.files             = FileList['Rakefile', 'lib/*/*.rb']
+   s.files             = FileList['Rakefile', 'lib/atmos.rb', 'lib/*/*.rb']
    s.test_files        = Dir['test/**/*']
    s.require_path      = 'lib'
    s.add_dependency('log4r',     '>=1.1.9')

data/lib/atmos.rb

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'log4r'
+require 'uri'
+require 'net/http'
+require 'net/https'
+require 'time'
+require 'base64'
+require 'hmac-sha1'
+
+
+Log4r::Logger.new('atmos')
+Log4r::Logger.get('atmos').add(Log4r::StderrOutputter.new 'console')
+Log4r::Logger.get('atmos').level = Log4r::FATAL
+#Log4r::Logger.get('atmos').level = Log4r::WARN
+#Log4r::Logger.get('atmos').level = Log4r::INFO
+#Log4r::Logger.get('atmos').level = Log4r::DEBUG
+
+
+$:.unshift(File.dirname(__FILE__))
+require 'atmos/parser'
+require 'atmos/version'
+require 'atmos/util'
+require 'atmos/exceptions'
+require 'atmos/request'
+require 'atmos/response'
+require 'atmos/rest'
+require 'atmos/store'
+require 'atmos/attributes'
+require 'atmos/object'
+
+#
+# This sets the default, but it can still be overridden by setting the parser elsewhere.
+#
+Atmos::Parser::parser = (File.exists?(File.join(File.dirname(__FILE__), 'atmos/parser/rexml.rb'))) ? Atmos::Parser::REXML : Atmos::Parser::NOKOGIRI
+Atmos::LOG.warn("parser: #{Atmos::Parser::parser}")

data/lib/atmos/object.rb

@@ -75,23 +75,13 @@ module Atmos
    class Object
       attr_reader :aoid, :request, :user # :nodoc:
       
-      # Hash-like object containing user access control properties of the object.
-      attr_reader :user_acl
-
-      # Hash-like object containing group access control properties of the object.
-      attr_reader :group_acl
-
-      # Hash-like object containing non-listable metadata associated with the object.
-      attr_reader :metadata
-
-      # Hash-like object containing listable metadata associated with the object.
-      attr_reader :listable_metadata
-
-      # Hash-like object containing read-only system metadata associated with the object.
-      attr_reader :system_metadata
-      
       @request    = nil
       @checksum   = nil
+      @user_acl   = nil
+      @group_acl         = nil
+      @metadata          = nil
+      @system_metadata   = nil
+      @listable_metadata = nil
     
     
       #
@@ -99,9 +89,10 @@ module Atmos
       # with an Atmos::Store object:
       #
       #    obj = store.create
-      #    obj = store.get(obj_id)
+      #    obj = store.get(:id => obj_id)
+      #    obj = store.get(:namespace => obj_id)
       #
-      def initialize(store, aoid, options = {})
+      def initialize(store, action, options = {})
          Atmos::LOG.debug("obj.new options: #{options.inspect}")   
          validate_options(options)
 
@@ -111,20 +102,85 @@ module Atmos
          @request    = Atmos::Request.new(:store => @store)
          @user       = @store.user
 
-         # this means we're creating a new object, 
-         # not representing an existing one
-         if (@aoid.nil?)
-            response = @request.do(:create_object, options)
-            @aoid = response.id
+         if (action == :create)
+            
+               if (options[:id])
+                  raise Atmos::Exceptions::ArgumentException, "You can't specify an id on object creation."
+               end
+            
+               Atmos::LOG.debug("Object.new: creating new object")
+               response = @request.do(:create_object, options)
+               @aoid = response.id
+            
+         elsif (action == :get)
+            
+               Atmos::LOG.debug("Retrieving object: id: #{options[:id]}; namespace: #{options[:namespace]}")
+               response = @request.do(:get_object_info, options)
+               @aoid = Atmos::Parser::response_get_string(response.http_response, '//xmlns:objectId')            
+               Atmos::LOG.debug("Retrieved object id for namespace: #{@aoid}")
          end
 
-         @system_metadata   = Atmos::Metadata.new(self, Atmos::Metadata::SYSTEM)
-
-         # These guys need the object to have a valid id, so we do it after the create
-         @user_acl          = Atmos::ACL.new(self, Atmos::ACL::USER)
-         @group_acl         = Atmos::ACL.new(self, Atmos::ACL::GROUP)
-         @metadata          = Atmos::Metadata.new(self, Atmos::Metadata::NON_LISTABLE)
-         @listable_metadata = Atmos::Metadata.new(self, Atmos::Metadata::LISTABLE)
+      end
+      
+      #
+      # Lazy evaluation of hash-like object containing user access control properties of the object.
+      # 
+      def user_acl
+         #Atmos::LOG.warn("user_acl: #{@user_acl.inspect}")   
+         if (@user_acl.nil?)
+            @user_acl = Atmos::ACL.new(self, Atmos::ACL::USER)
+            #Atmos::LOG.warn("user_acl: #{@user_acl.inspect}")   
+         end
+         
+         @user_acl
+      end
+      
+      
+      #
+      # Lazy evaluation of hash-like object containing group access control properties of the object.
+      # 
+      def group_acl
+         if (@group_acl.nil?)
+            @group_acl = Atmos::ACL.new(self, Atmos::ACL::GROUP)
+         end
+         
+         @group_acl
+      end
+      
+      
+      #
+      # Lazy evaluation of hash-like object containing non-listable properties of the object.
+      # 
+      def metadata
+         if (@metadata.nil?)
+            @metadata = Atmos::Metadata.new(self, Atmos::Metadata::NON_LISTABLE)
+         end
+         
+         @metadata
+      end
+      
+      
+      #
+      # Lazy evaluation of hash-like object containing listable metadata properties of the object.
+      # 
+      def listable_metadata
+         if (@listable_metadata.nil?)
+            @listable_metadata = Atmos::Metadata.new(self, Atmos::Metadata::LISTABLE)
+         end
+         
+         @listable_metadata
+      end
+      
+      
+      #
+      # Lazy evaluation of Hash-like object containing read-only system metadata associated with the object.
+      # 
+      def system_metadata
+         if (@system_metadata.nil?)
+            @system_metadata = Atmos::Metadata.new(self, Atmos::Metadata::SYSTEM)
+         end
+         
+         @system_metadata
       end
       
       
@@ -230,7 +286,7 @@ module Atmos
          def validate_options(options)
             invalid_values = []
 
-            valid_options = [:checksum, :user_acl, :group_acl, :metadata, :listable_metadata, :mimetype, :length, :data].freeze
+            valid_options = [:checksum, :user_acl, :group_acl, :metadata, :listable_metadata, :mimetype, :length, :data, :namespace, :id].freeze
             invalid_options = options.keys - valid_options
             raise Atmos::Exceptions::ArgumentException, "Unrecognized options: #{invalid_options.inspect}" if (!invalid_options.empty?)
             
@@ -248,6 +304,8 @@ module Atmos
                   invalid_values.push(k) if (options[k].nil? || !options[k].kind_of?(Hash))
                when  :mimetype
                   invalid_values.push(k) if (options[k].nil? || !options[k].kind_of?(String))
+               when  :namespace
+                  invalid_values.push(k) if (options[k].nil? || !options[k].kind_of?(String))
                when  :length 
                   invalid_values.push(k) if (options[k].nil? || !options[k].kind_of?(Integer))
                when  :data

data/lib/atmos/request.rb

@@ -14,6 +14,43 @@ module Atmos
          @http    = options[:store].http
          @tag     = options[:default_tag]
       end
+      
+      
+      #
+      # If there is no namespace option provided, we're using the object interface,
+      # otherwise we're using the namespace interface.  Determine which it is, so we know
+      # which URI to use.
+      #
+      # If aoid is nil, we're creating a new object regardless.
+      #
+      def get_uri(action, options)
+         
+         if (options.has_key?(:namespace) && action.has_key?(:namespace_uri))
+
+            # only two actions need namespace, so if the action doesn't have the 
+            # :namespace_url key, we use the regular :object_url.
+            ns = (options[:namespace].start_with?('/')) ? options[:namespace][1..-1] : options[:namespace]
+            uri = action[:namespace_uri].sub(/:namespace/, ns)
+            
+         else
+            
+            uri = action[:object_uri]
+
+            # only need the following check/substution if the uri requires an id
+            if (!uri.index(':id').nil?)
+
+               if (options.has_key?(:id) && !options[:id].nil?)
+                  uri = uri.sub(/:id/, options[:id])
+               else
+                  raise Atmos::Exceptions::ArgumentException, "An id is required for this action.  This is an internal error."
+               end
+            end
+         end
+
+         Atmos::LOG.info("uri: #{uri}")
+         uri
+      end
+         
 
       
       def do(actionname, options = {}, &block)
@@ -22,14 +59,10 @@ module Atmos
          raise Atmos::Exceptions::InternalLibraryException,
                "Invalid REST action: #{actionname}" if (REST[actionname].nil?)
          
-         action  = REST[actionname]
-         uri     = (options[:id].nil?) ? action[:uri] : action[:uri].sub(/:id/, options[:id])         
-         url     = URI::join(@baseurl.to_s, uri.to_s)
-         verb    = action[:verb]         
-         
-         if (options[:id].nil? && !action[:uri].index(':id').nil?)
-            raise Atmos::Exceptions::ArgumentException, "An id is required for this action (#{actionname})."
-         end
+         action = REST[actionname]
+         uri    = get_uri(action, options)         
+         url    = URI::join(@baseurl.to_s, uri.to_s)
+         verb   = action[:verb]         
 
          request = (verbs.include?(verb)) ? Net::HTTP.const_get(verb.to_s.capitalize).new(uri) : nil
          raise Atmos::Exceptions::AtmosException,

data/lib/atmos/response.rb

@@ -0,0 +1,116 @@
+module Atmos
+   class Response # :nodoc:
+      attr_reader :http_response
+      
+      def initialize(response, action)
+         @http_response = response
+         @action = action
+
+         if (response.kind_of?(Net::HTTPServerError))
+            raise Atmos::Exceptions::ServerException, response.message
+         elsif (response.kind_of?(Net::HTTPClientError))
+            
+            raise Atmos::Exceptions::AtmosException, "Atmos got a bad request.  This is probably a problem in this library." if (response.kind_of?(Net::HTTPBadRequest))
+               
+            Atmos::LOG.debug("#{response.class}")
+            Atmos::LOG.debug("#{response.body}")
+            
+            Atmos::Parser::response_check_action_error(@action, response)
+                        
+         elsif (!response.kind_of?(Net::HTTPSuccess))
+           raise Atmos::Exceptions::NotImplementedException, "This library doesn't handle these kinds of responses: #{response}"
+         end
+
+      end
+      
+      def each(header)
+         if (!self[header].nil?)
+            self[header].split(',').each do |elt|
+               if (!elt.index('=').nil?)
+                  key,val = elt.split('=')
+                  yield key.strip, val.strip
+               else
+                  yield elt.strip
+               end
+            end
+         end
+      end
+      
+      def body
+         @http_response.body
+      end
+      
+      def method_missing(sym, *args)
+         Atmos::LOG.info("method missing: #{sym}")
+         header = "x-emc-#{sym.id2name.sub(/_/, '-')}"
+         if (REST[@action][:return_headers].include?(header))
+            Atmos::LOG.info("header: #{header}")
+            rv = Atmos::Util.header2hash(header, @http_response[header])
+            Atmos::LOG.debug("rv: #{rv.inspect}")
+            return rv
+         else
+            return super.method_missing(sym, *args)
+         end
+      end
+            
+      def delta
+         if (REST[@action][:return_headers].include?('x-emc-delta'))
+            @http_response['x-emc-delta']
+         else
+            raise "A #{@action} request doesn't return a delta."
+         end
+      end
+      
+      def policy
+         if (REST[@action][:return_headers].include?('x-emc-policy'))
+            @http_response['x-emc-policy']
+         else
+            raise "A #{@action} request doesn't return a policy description."
+         end
+      end
+            
+      def id
+         if (REST[@action][:return_headers].include?('location'))
+            @http_response['location'][@http_response['location'].rindex('/')+1..-1]
+         else
+            raise "A #{@action} request doesn't return an id."
+         end
+      end
+            
+      def headers
+         headers = {}
+         @http_response.each do |header, value|
+            headers[header] = value
+         end
+         headers
+      end
+
+      def [](header)
+         @http_response[header]
+      end
+
+   end
+
+   
+         
+
+   
+
+#         while (response.kind_of?(Net::HTTPRedirection))
+            
+            #From http://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/
+#            rurl = (response['location'].nil?) ? response.body.match(/<a href=\"([^>]+)\">/i)[1] : response['location']
+
+#            puts("Got a redirect \nfrom: #{options[:url]}\n  to: #{rurl}")
+
+#            if rurl.start_with?('/')
+#            puts("Got a relative redirect url: #{options[:url]}")
+#             options[:url] = URI.parse("#{url.scheme}://#{url.host}#{redirect_url}")
+#           end
+
+#            options[:redirects] = (options[:redirects].nil?) ? 0 : options[:redirects] += 1    
+#            response = self.generic_request(options)
+#         end
+#         raise "Too many redirects (#{options[:redirects]}): #{url}" if (!options[:redirects].nil? && (options[:redirects] > 3))
+
+end

data/lib/atmos/rest.rb

@@ -1,62 +1,62 @@
 module Atmos
    REST = {
       :listable_tags       => { :verb             => :get, 
-                                :uri              => '/rest/objects?listabletags', 
+                                :object_uri       => '/rest/objects?listabletags', 
                                 :required_headers => ['x-emc-tags'],
                                 :optional_headers => ['x-emc-token'],
                                 :http_response    => 200,
                                 :return_headers   => ['x-emc-listable-tags'],
                               },
       :set_group_acl       => { :verb             => :post, 
-                                :uri              => '/rest/objects/:id?acl', 
+                                :object_uri       => '/rest/objects/:id?acl', 
                                 :required_headers => ['x-emc-groupacl'],
                                 :http_response    => 200,
                               },
       :set_user_acl        => { :verb             => :post, 
-                                :uri              => '/rest/objects/:id?acl', 
+                                :object_uri       => '/rest/objects/:id?acl', 
                                 :required_headers => ['x-emc-useracl'],
                                 :http_response    => 200,
                               },
       :set_metadata        => { :verb             => :post,
-                                :uri              => '/rest/objects/:id?metadata/user', 
+                                :object_uri       => '/rest/objects/:id?metadata/user', 
                                 :http_response    => 200,
                                 :required_headers => ['x-emc-meta'],
                               },
-      :set_listable_metadata => { :verb             => :post,
-                                :uri              => '/rest/objects/:id?metadata/user', 
+      :set_listable_metadata => { :verb           => :post,
+                                :object_uri       => '/rest/objects/:id?metadata/user', 
                                 :http_response    => 200,
                                 :required_headers => ['x-emc-listable-meta'],
                               },
       :delete_metadata     => { :verb             => :delete, 
-                                :uri              => '/rest/objects/:id?metadata/user', 
+                                :object_uri       => '/rest/objects/:id?metadata/user', 
                                 :http_response    => 204,
                                 :required_headers => ['x-emc-tags'],
                               },
       :read_object         => { :verb             => :get, 
-                                :uri              => '/rest/objects/:id', 
+                                :object_uri       => '/rest/objects/:id', 
                                 :http_response    => 200,
                                 :optional_headers => ['Range'],
                               },
       :update_object       => { :verb             => :put, 
-                                :uri              => '/rest/objects/:id', 
+                                :object_uri       => '/rest/objects/:id', 
                                 :http_response    => 200,
                                 :required_headers => ['Content-Type', 'Content-Length'],
                                 :optional_headers => ['x-emc-useracl', 'x-emc-groupacl', 'Range'],
                                 },
       :trunc_object        => { :verb             => :put, 
-                                :uri              => '/rest/objects/:id', 
+                                :object_uri       => '/rest/objects/:id', 
                                 :http_response    => 200,
                                 :required_headers => ['Content-Length'],
                                 :optional_headers => ['x-emc-useracl', 'x-emc-groupacl', 'Range'],
                                 },
       :get_service_info    => { :verb             => :get, 
-                                :uri              => '/rest/service', 
+                                :object_uri       => '/rest/service', 
                                 :response         => :xml,
                                 :http_response    => 200,
                               },
                               
       :list_objects        => { :verb             => :get, 
-                                :uri              => '/rest/objects', 
+                                :object_uri       => '/rest/objects', 
                                 :response         => :xml,
                                 :http_response    => 200,
                                 :required_headers => ['x-emc-tags', 'Content-Type'],
@@ -66,7 +66,8 @@ module Atmos
                               },
 
       :create_object       => { :verb             => :post, 
-                                :uri              => '/rest/objects', 
+                                :namespace_uri    => '/rest/namespace/:namespace', 
+                                :object_uri       => '/rest/objects', 
                                 :http_response    => 201,
                                 :optional_headers => ['x-emc-wschecksum', 'x-emc-useracl', 'x-emc-groupacl', 'x-emc-meta', 'x-emc-listable-meta'],
                                 :required_headers => ['Content-Type', 'Content-Length'],
@@ -78,8 +79,14 @@ module Atmos
                                                       'x-emc-listable-meta' => :listable_metadata},
                               },
 
+      :get_object_info     => { :verb           => :get, 
+                                :namespace_uri  => '/rest/namespace/:namespace?info', 
+                                :object_uri     => '/rest/objects/:id?info', 
+                                :http_response  => 200,
+                                :return_headers   => ['x-emc-policy'],
+                              },
       :delete_object       => { :verb             => :delete, 
-                                :uri              => '/rest/objects/:id', 
+                                :object_uri       => '/rest/objects/:id', 
                                 :http_response    => 204,
                                 :required_headers => ['Content-Type'],
                                 :return_headers   => ['x-emc-delta', 'x-emc-policy'],
@@ -88,27 +95,27 @@ module Atmos
                               },
  
       :list_system_metadata=> { :verb             => :get, 
-                                :uri              => '/rest/objects/:id?metadata/system', 
+                                :object_uri       => '/rest/objects/:id?metadata/system', 
                                 :http_response    => 200,
                                 :return_headers   => ['x-emc-meta'],
                                 :errors           => { '1003' => { :class => Atmos::Exceptions::NoSuchObjectException , 
                                                                    :message => "Object not found to delete." } },
                               },
       :list_metadata       => { :verb             => :get, 
-                                :uri              => '/rest/objects/:id?metadata/user', 
+                                :object_uri       => '/rest/objects/:id?metadata/user', 
                                 :http_response    => 200,
                                 :required_headers => ['Content-Type'],
                                 :return_headers   => ['x-emc-meta', 'x-emc-listable-meta'],
                               },
 
       :list_tags           => { :verb             => :get, 
-                                :uri              => '/rest/objects/:id?metadata/tags', 
+                                :object_uri       => '/rest/objects/:id?metadata/tags', 
                                 :http_response    => 200,
                                 :return_headers   => ['x-emc-tags', 'x-emc-listable-tags'],
                               },
 
       :list_acl            => { :verb             => :get, 
-                                :uri              => '/rest/objects/:id?acl', 
+                                :object_uri       => '/rest/objects/:id?acl', 
                                 :http_response    => 200,
                                 :return_headers   => ['x-emc-useracl', 'x-emc-groupacl'],
                               },
@@ -119,136 +126,20 @@ module Atmos
 
 
 
-      :delete_version      => { :verb => :delete, 
-                                :uri => '/rest/objects/:id?versions', 
-                                :http_response => 204,
-                              },
-      :get_object_info     => { :verb => :get, 
-                                :uri => '/rest/objects/:id?info', 
-                                :http_response => 200,
+      :delete_version      => { :verb           => :delete, 
+                                :object_uri     => '/rest/objects/:id?versions', 
+                                :http_response  => 204,
                               },
-      :create_version      => { :verb => :post, 
-                                :uri => '/rest/objects/:id?versions' , 
-                                :http_response => 201,
+      :create_version      => { :verb           => :post, 
+                                :object_uri     => '/rest/objects/:id?versions' , 
+                                :http_response  => 201,
                               },
-      :list_versions       => { :verb => :get, :uri => '/rest/objects/:id?versions', :http_response => 200},
-      :restore_version     => { :verb => :put, :uri => '/rest/objects/:id?versions', :http_response => 200},
+      :list_versions       => { :verb           => :get,
+                                :object_uri     => '/rest/objects/:id?versions',
+                                :http_response => 200},
+      :restore_version     => { :verb => :put,                                 
+                                :object_uri => '/rest/objects/:id?versions',
+                                :http_response => 200},
    } # :nodoc:
-   
-   
-   
-   class Response # :nodoc:
-      attr_reader :http_response
-      
-      def initialize(response, action)
-         @http_response = response
-         @action = action
-
-         if (response.kind_of?(Net::HTTPServerError))
-            raise Atmos::Exceptions::ServerException, response.message
-         elsif (response.kind_of?(Net::HTTPClientError))
-            
-            raise Atmos::Exceptions::AtmosException, "Atmos got a bad request.  This is probably a problem in this library." if (response.kind_of?(Net::HTTPBadRequest))
-               
-            Atmos::LOG.debug("#{response.class}")
-            Atmos::LOG.debug("#{response.body}")
-            
-            Atmos::Parser::response_check_action_error(@action, response)
-                        
-         elsif (!response.kind_of?(Net::HTTPSuccess))
-           raise Atmos::Exceptions::NotImplementedException, "This library doesn't handle these kinds of responses: #{response}"
-         end
-
-      end
-      
-      def each(header)
-         if (!self[header].nil?)
-            self[header].split(',').each do |elt|
-               if (!elt.index('=').nil?)
-                  key,val = elt.split('=')
-                  yield key.strip, val.strip
-               else
-                  yield elt.strip
-               end
-            end
-         end
-      end
-      
-      def body
-         @http_response.body
-      end
-      
-      def method_missing(sym, *args)
-         Atmos::LOG.info("method missing: #{sym}")
-         header = "x-emc-#{sym.id2name.sub(/_/, '-')}"
-         if (REST[@action][:return_headers].include?(header))
-            Atmos::LOG.info("header: #{header}")
-            rv = Atmos::Util.header2hash(header, @http_response[header])
-            Atmos::LOG.debug("rv: #{rv.inspect}")
-            return rv
-         else
-            return super.method_missing(sym, *args)
-         end
-      end
-            
-      def delta
-         if (REST[@action][:return_headers].include?('x-emc-delta'))
-            @http_response['x-emc-delta']
-         else
-            raise "A #{@action} request doesn't return a delta."
-         end
-      end
-      
-      def policy
-         if (REST[@action][:return_headers].include?('x-emc-policy'))
-            @http_response['x-emc-policy']
-         else
-            raise "A #{@action} request doesn't return a policy description."
-         end
-      end
-            
-      def id
-         if (REST[@action][:return_headers].include?('location'))
-            @http_response['location'][@http_response['location'].rindex('/')+1..-1]
-         else
-            raise "A #{@action} request doesn't return an id."
-         end
-      end
-            
-      def headers
-         headers = {}
-         @http_response.each do |header, value|
-            headers[header] = value
-         end
-         headers
-      end
-
-      def [](header)
-         @http_response[header]
-      end
-
-   end
-
-   
-         
-
-   
-
-#         while (response.kind_of?(Net::HTTPRedirection))
-            
-            #From http://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/
-#            rurl = (response['location'].nil?) ? response.body.match(/<a href=\"([^>]+)\">/i)[1] : response['location']
-
-#            puts("Got a redirect \nfrom: #{options[:url]}\n  to: #{rurl}")
-
-#            if rurl.start_with?('/')
-#            puts("Got a relative redirect url: #{options[:url]}")
-#             options[:url] = URI.parse("#{url.scheme}://#{url.host}#{redirect_url}")
-#           end
-
-#            options[:redirects] = (options[:redirects].nil?) ? 0 : options[:redirects] += 1    
-#            response = self.generic_request(options)
-#         end
-#         raise "Too many redirects (#{options[:redirects]}): #{url}" if (!options[:redirects].nil? && (options[:redirects] > 3))
 
 end

data/lib/atmos/store.rb

@@ -5,9 +5,8 @@ module Atmos
     
     #
     # Create and validate a connection to an Atmos server.
-    # This API currently uses only the Atmos object interface,
-    # not the namespace interface.  Proxy support has been tested
-    # against squid 2.7.STABLE9 on ubuntu 10.10.
+    # This API supports both the object interface and the namespace interface.
+    # Proxy support has been tested against squid 2.7.STABLE9 on ubuntu 10.10.
     #
     # If you have used Atmos Online this example will look familiar:
     #
@@ -130,9 +129,10 @@ module Atmos
     # * <tt>:mimetype</tt>          - defaults to application/octet-stream
     # * <tt>:data</tt>              - a String or an IO stream
     # * <tt>:length</tt>            - a number  (requires <tt>:data</tt>)
+    # * <tt>:namespace</tt>         - name for namespace interface instead of object interface
     #
     def create(options = {})    
-       Atmos::Object.new(self, nil, options)
+       Atmos::Object.new(self, :create, options)
     end
     
     
@@ -143,8 +143,19 @@ module Atmos
     # The blob data is not loaded until
     # accessed, so it can be progressively downloaded.
     #
-    def get(id)
-       Atmos::Object.new(self, id)
+    # Mutually exclusive, one required:
+    # * <tt>:id</tt>          - the id of the object to retrieve
+    # * <tt>:namespace</tt>   - the namespace key of the object to retrieve
+    def get(options)
+              
+       # can't both be set, can't both be empty
+       if (!options[:id].nil? && !options[:namespace].nil?)
+          raise Atmos::Exceptions::ArgumentException, "One of :id, :namespace is required, but not both."
+       elsif (options[:id].nil? && options[:namespace].nil?)
+          raise Atmos::Exceptions::ArgumentException, "One of :id, :namespace is required."
+       end
+       
+       Atmos::Object.new(self, :get, options)
     end
     
     

data/lib/atmos/version.rb

@@ -1,7 +1,7 @@
 module Atmos
    
    # Version number of this library.
-   VERSION = "0.6.0"
+   VERSION = "1.0.1"
 
    # Array of version strings this library has been tested against.
    SUPPORTED_VERSIONS = ["1.2.7", "1.3.4", "1.4.0", "1.4.1", "2.0.1"].freeze

data/test/suite.rb

@@ -4,6 +4,8 @@ require File.dirname(__FILE__) + '/test_util'
 require File.dirname(__FILE__) + '/test_acl'
 require File.dirname(__FILE__) + '/test_metadata'
 require File.dirname(__FILE__) + '/test_object_create'
+require File.dirname(__FILE__) + '/test_object_get'
+require File.dirname(__FILE__) + '/test_object_read'
 require File.dirname(__FILE__) + '/test_object_update'
 require File.dirname(__FILE__) + '/test_object_misc'
 require File.dirname(__FILE__) + '/test_store'

data/test/test_object_create.rb

@@ -22,7 +22,7 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
       $stdout.flush
    end
 
-   def test_create_empty_object
+   def test_create_empty_object_via_object_interface
       obj = @s.create
       @cleanup.push(obj)
 
@@ -33,6 +33,21 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
       assert_equal({Atmos::Test::Util.group => :none}, obj.group_acl)
    end
   
+   def test_create_empty_object_via_namespace_interface
+      time = Time.now()
+      time = time.to_i
+      ns   = "/foo/bar#{time}"
+
+      obj = @s.create(:namespace => ns)
+      @cleanup.push(obj)
+
+      assert_not_nil(obj)
+      assert_equal({}, obj.metadata)
+      assert_equal({}, obj.listable_metadata)
+      assert_equal({Atmos::Test::Util.user => :full}, obj.user_acl)
+      assert_equal({Atmos::Test::Util.group => :none}, obj.group_acl)
+   end
+  
    def test_create_object_with_bad_option
       assert_raise Atmos::Exceptions::ArgumentException do 
          @cleanup.push(@s.create(:tag => ['testtag']))

data/test/test_object_get.rb

@@ -0,0 +1,55 @@
+require 'credentials'
+require 'test/unit'
+require 'atmos'
+
+
+class AtmosObjectGetTest < Test::Unit::TestCase
+
+   def initialize(id)
+      super(id)
+      @cleanup = []
+
+   end
+
+   def setup
+      @s = Atmos::Test::Util.static_store
+   end
+
+
+   def teardown
+      @cleanup.each do |obj|
+         obj.delete
+      end
+      $stdout.flush
+   end
+
+   def test_get_object_via_object_interface
+      obj = @s.create
+      @cleanup.push(obj)
+
+      obj = @s.get(:id => obj.aoid)
+      assert_not_nil(obj)
+      assert_equal({}, obj.metadata)
+      assert_equal({}, obj.listable_metadata)
+      assert_equal({Atmos::Test::Util.user => :full}, obj.user_acl)
+      assert_equal({Atmos::Test::Util.group => :none}, obj.group_acl)
+   end
+  
+   def test_get_object_via_namespace_interface
+      time = Time.now()
+      time = time.to_i#{}"%.6f" % a.to_f   #=> "1195480202.282373"
+
+      ns = "/foo/bar#{time}"
+      obj = @s.create(:namespace => ns)
+      obj = @s.get(:namespace => ns)
+      
+      assert_not_nil(obj)
+      assert_equal({}, obj.metadata)
+      assert_equal({}, obj.listable_metadata)
+      assert_equal({Atmos::Test::Util.user => :full}, obj.user_acl)
+      assert_equal({Atmos::Test::Util.group => :none}, obj.group_acl)
+      
+      obj.delete()
+   end
+  
+end

data/test/test_object_misc.rb

@@ -40,7 +40,7 @@ class AtmosObjectMiscTest < Test::Unit::TestCase
    def test_delete_nonexisting_object
       first = @s.create
       assert_not_nil(first)
-      second = @s.get(first.aoid)
+      second = @s.get(:id => first.aoid)
       assert_not_nil(second)
       first.delete
       assert_raise Atmos::Exceptions::NoSuchObjectException do 

data/test/test_object_read.rb

@@ -3,24 +3,24 @@ require 'test/unit'
 require 'atmos'
 
 
-class AtmosObjectCreateTest < Test::Unit::TestCase
+class AtmosObjectReadTest < Test::Unit::TestCase
 
-  def initialize(id)
-    super(id)
-    @cleanup = []
-  end
+   def initialize(id)
+      super(id)
+      @cleanup = []
+   end
 
-  def setup
-    @s   = Atmos::Test::Util.static_store
-    @md  = {'non' => 'listable', 'user' => 'metadata', 'a' => 'b'}
-    @lmd = {'x' => 'a', 'y' => 'b', 'z' => 'c'}
-    data = open(Atmos::Test::Util.small_binary_filename)
-    obj  = @s.create(:metadata => @md, 
-                     :listable_metadata => @lmd,
-                     :data => File.new(Atmos::Test::Util.small_binary_filename, "rb"))
-    @cleanup.push(obj)
-    @aoid = obj.aoid
-  end
+   def setup    
+      @s   = Atmos::Test::Util.static_store
+      @md  = {'non' => 'listable', 'user' => 'metadata', 'a' => 'b'}
+      @lmd = {'x' => 'a', 'y' => 'b', 'z' => 'c'}
+      data = open(Atmos::Test::Util.small_binary_filename)
+      obj  = @s.create(:metadata => @md, 
+                       :listable_metadata => @lmd,
+                       :data => File.new(Atmos::Test::Util.small_binary_filename, "rb"))
+      @cleanup.push(obj)
+      @aoid = obj.aoid
+   end
 
 
   def teardown
@@ -31,14 +31,10 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
    
    
   def test_read_partial_data_as_stream
-      # something is very strange here
-      # the object shouldn't end up empty, but it does
-      # it doesn't end up empty when this file is run
-      # as a standalone test
+      obj = @s.get(:id => @aoid)
+      
       file = open(Atmos::Test::Util.small_binary_filename)
       contents = file.read
-      obj = @s.get(@aoid)
-      obj.update(contents)
       assert_equal(contents, obj.data)
 
       f = File.new(Atmos::Test::Util.small_binary_filename, "rb")
@@ -57,13 +53,9 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
 
    def test_read_data_as_stream
 
-      # something is very strange here
-      # the object shouldn't end up empty, but it does
-      # it doesn't end up empty when this file is run
-      # as a standalone test
       file = open(Atmos::Test::Util.small_binary_filename)
       contents = file.read
-      obj = @s.get(@aoid)
+      obj = @s.get(:id => @aoid)
       obj.update(contents)
       assert_equal(contents, obj.data)
 
@@ -77,13 +69,9 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
 
    def test_read_partial_data_as_string
       
-      # something is very strange here
-      # the object shouldn't end up empty, but it does
-      # it doesn't end up empty when this file is run
-      # as a standalone test
       file = open(Atmos::Test::Util.small_binary_filename)
       contents = file.read
-      obj = @s.get(@aoid)
+      obj = @s.get(:id => @aoid)
       obj.update(contents)
       assert_equal(contents, obj.data)
 
@@ -97,13 +85,9 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
    end
 
    def test_read_data_as_string
-      # something is very strange here
-      # the object shouldn't end up empty, but it does
-      # it doesn't end up empty when this file is run
-      # as a standalone test
       file = open(Atmos::Test::Util.small_binary_filename)
       contents = file.read
-      obj = @s.get(@aoid)
+      obj = @s.get(:id => @aoid)
       obj.update(contents)
       assert_equal(contents, obj.data)
       

data/test/test_object_update.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'atmos'
 
 
-class AtmosObjectCreateTest < Test::Unit::TestCase
+class AtmosObjectUpdateTest < Test::Unit::TestCase
 
    def initialize(id)
       super(id)
@@ -14,6 +14,7 @@ class AtmosObjectCreateTest < Test::Unit::TestCase
       @s   = Atmos::Test::Util.static_store
       @obj = @s.create
       @cleanup.push(@obj)
+      #print "test_object_update.setup(): obj: #{@obj}; objid: #{@obj.aoid}\n"
    end
 
 

data/test/{request_test.rb → test_request.rb}

@@ -3,7 +3,7 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/atmos'
 
 
-class AtmosUtilTest < Test::Unit::TestCase
+class AtmosRequestTest < Test::Unit::TestCase
 
    def dont_test_signature_calculation
       headers = {}
@@ -44,7 +44,6 @@ class AtmosUtilTest < Test::Unit::TestCase
                               :secret => 'p97mki4AkiAyVi+/7QpdxFAU/jY=',
                               :unsupported => true
                               )
-                              print "#{store.server_version}\n"
 
 end
 end

data/test/test_store.rb

@@ -112,11 +112,11 @@ class AtmosStoreTest < Test::Unit::TestCase
       
       for i in (1...10)
          obj = @s.create(:listable_metadata => {tag => true})
+         @cleanup.push(obj)
       end
       
       i = 0
       @s.each_object_with_listable_tag(tag) do |obj|
-         @cleanup.push(obj)
          i += 1
       end
       assert_equal(9, i)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-atmos
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 21
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Fleur Dragan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -08:00
+date: 2012-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,11 +77,13 @@ extra_rdoc_files:
 - COPYING
 files: 
 - Rakefile
+- lib/atmos.rb
 - lib/atmos/attributes.rb
 - lib/atmos/exceptions.rb
 - lib/atmos/object.rb
 - lib/atmos/parser.rb
 - lib/atmos/request.rb
+- lib/atmos/response.rb
 - lib/atmos/rest.rb
 - lib/atmos/store.rb
 - lib/atmos/util.rb
@@ -91,16 +93,17 @@ files:
 - test/files/dragaf-tiny-from-vsphere.ova
 - test/files/SmallImageForTest.iso
 - test/files/something.txt
-- test/request_test.rb
 - test/suite.rb
 - test/suite_noproxy.rb
 - test/suite_proxy.rb
 - test/test_acl.rb
 - test/test_metadata.rb
 - test/test_object_create.rb
+- test/test_object_get.rb
 - test/test_object_misc.rb
 - test/test_object_read.rb
 - test/test_object_update.rb
+- test/test_request.rb
 - test/test_store.rb
 - test/test_util.rb
 - README
@@ -150,15 +153,16 @@ test_files:
 - test/files/dragaf-tiny-from-vsphere.ova
 - test/files/SmallImageForTest.iso
 - test/files/something.txt
-- test/request_test.rb
 - test/suite.rb
 - test/suite_noproxy.rb
 - test/suite_proxy.rb
 - test/test_acl.rb
 - test/test_metadata.rb
 - test/test_object_create.rb
+- test/test_object_get.rb
 - test/test_object_misc.rb
 - test/test_object_read.rb
 - test/test_object_update.rb
+- test/test_request.rb
 - test/test_store.rb
 - test/test_util.rb