baccigalupi-aqua 0.1.1 → 0.1.2

data/Aqua.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aqua}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2009-08-21}
+  s.date = %q{2009-08-25}
   s.description = %q{Even with ORMs like ActiveRecord, DataMapper which ease the pain of relational data storage, considerable developer effort goes into wrangling Ruby objects into their databases. Document-oriented databases have made it possible to store nested data structures that easily map to Ruby objects. Aqua (http://github.com/baccigalupi/aqua) is a new Ruby library that aims to painlessly persists objects, allowing developers to focus more on object oriented code and less on storage. Currently Aqua is in pre-alpha testing, with the following big things left to implement: A data query DSL and implementation; Support of all objects in the Standard Library; Class and code storage to allow the sharing and persistence of classes with their data.}
   s.email = %q{baccigalupi@gmail.com}
   s.extra_rdoc_files = [

data/README.rdoc

@@ -12,7 +12,7 @@ Currently Aqua is in pre-alpha testing, with the following big things left to im
 * Object keys, including symbols for hash-like objects
 * Data storage amenity add-ons including: validation, callbacks, AR-styled syntax, and properties that automate some of the object typing, validation, and searchability option.   
 
-Aqua aims to be lean and modular, in addition to transparent. Currently it weighs in at 1000 lines of code with half of that for the CouchDB storage engine. 
+Aqua aims to be lean and modular, in addition to transparent. Currently it weighs in at 1000 lines of code with half of that for the CouchDB storage engine.
 
 == Usage 
 
@@ -67,7 +67,9 @@ Currently, Aqua uses CouchDB for its storage. Make sure you have CouchDB install
   user.reload # retrieves the latest saved version of the object
   u = User.load( user.id ) # returns your persisted user object, like you just added water! 
   puts u.inspect
-  # #<User:0x1a16480 @name=["Kane", "Baccigalupi"], @created_at=Fri Aug 21 12:07:39 -0700 2009, @_store=nil, @username="kane", @dob=#<Date: 4881157/2,0,2299161>, @id="c664770982b92e9fa802e0ed664a9846">        
+  # #<User:0x1a16480 @name=["Kane", "Baccigalupi"], @created_at=Fri Aug 21 12:07:39 -0700 2009, @_store=nil, @username="kane", @dob=#<Date: 4881157/2,0,2299161>, @id="c664770982b92e9fa802e0ed664a9846">
+  
+  # woot!        
 
 == Installation 
 
@@ -76,6 +78,12 @@ Aqua is so young that it hasn't made it over to the established land of rubyforg
   gem sources -a http://gems.github.com
   sudo gem install baccigalupi-aqua
 
+== More Info
+
+Twitter: rubyaqua
+
+Rdocs: http://ruby-aqua.org 
+
 == Contributing
 
 Bug fixes and features are welcome. 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/doc/custom.css

@@ -1 +1,16 @@
-/* Override this stylesheet in your templates directory with any extra declarations */
+/* Override this stylesheet in your templates directory with any extra declarations */ 
+body {
+  font-family: Trebuchet, 'Trebuchet MS', Verdana, Arial, sans-serif;
+  font-size: 11pt; line-height: 1.5;
+} 
+a { color: #069;}
+a:visited { color: #444;}
+
+.section.module h1.title, .section.class h1.title, .section.readme h1 {
+  background-color: #09C; color: white; border-width: 0px;
+}
+.section.readme h1 { margin:0 0 7px -7px;  }
+
+h2 { background-color: #a2e3f9; color:#000000; padding-left: 7px; }
+.readme h2 { margin:0 0 7px -7px; }
+

data/lib/aqua/object/pack.rb

@@ -1,6 +1,6 @@
 # This module is responsible for packing objects into Storage Objects
 # The Storage Object is expected to be a Mash-Like thing (Hash with indifferent access).
-# It is the job of the storage engine to convert the Mash into the actual storage data.
+# It is the job of the storage engine to convert the Mash into the actual storage ivars.
 module Aqua::Pack
   
   def self.included( klass ) 
@@ -68,6 +68,7 @@ module Aqua::Pack
       self.__pack.id = @id if @id
       self.__pack[:_rev] = _rev if _rev 
       self.__pack[:class] = class_name
+      self.__pack[:keys] = []
       _pack_properties
       _pack_singletons
       __pack
@@ -136,9 +137,9 @@ module Aqua::Pack
       # Examines each ivar and converts it to a hash, array, string combo
       # @api private
       def _pack_properties
-        self.__pack[:data] = _pack_ivars( self )
+        self.__pack[:ivars] = _pack_ivars( self )
         initializations = _pack_initializations( self )
-        self.__pack[:initialization] = initializations unless initializations.empty? 
+        self.__pack[:init] = initializations unless initializations.empty? 
       end
       
       def _pack_initializations( obj )
@@ -178,26 +179,27 @@ module Aqua::Pack
         if klass == String
           obj
         elsif [TrueClass, FalseClass].include?( klass )
-          { 'class' => klass.to_s, 'initialization' => obj.to_s }  
+          { 'class' => klass.to_s, 'init' => obj.to_s }  
         elsif [Time, Date, Fixnum, Bignum, Float ].include?( klass )
           {
             'class' => klass.to_s,
-            'initialization' => obj.to_s
+            'init' => obj.to_s
           }
         elsif klass == Rational
           {
             'class' => klass.to_s,
-            'initialization' => obj.to_s.match(/(\d*)\/(\d*)/).to_a.slice(1,2)
+            'init' => obj.to_s.match(/(\d*)\/(\d*)/).to_a.slice(1,2)
           } 
         else # a more complex object, including an array or a hash like thing 
           return_hash = {}
-          if obj.aquatic? # TODO distinguish between internal storage, stubbing and external (obj.aquatic? && obj._embed_me == true)
+          if obj.aquatic? 
+            # TODO distinguish between internal storage, stubbing and external (obj.aquatic? && obj._embed_me == true)
             return_hash = obj._pack    
           elsif !obj.aquatic?
             initialization = _pack_initializations( obj )
-            return_hash['initialization'] = initialization unless initialization.empty?
+            return_hash['init'] = initialization unless initialization.empty?
             data = _pack_ivars( obj )
-            return_hash['data'] = data unless data.empty?
+            return_hash['ivars'] = data unless data.empty?
             return_hash['class'] = klass.to_s  
           # TODO: distinguish between internal storage, stubbing and external (obj.aquatic? && obj._embed_me == true) 
           # elsif obj._embed_me.class == Hash
@@ -216,9 +218,18 @@ module Aqua::Pack
       # @api private
       def _pack_hash( hash )
         return_hash = {}
-        hash.each do |key, value|
-          raise ArgumentError, 'Currently Hash keys must be either strings or symbols' unless [Symbol, String].include?( key.class )
-          return_hash[key.to_s] = _pack_object( value )
+        hash.each do |raw_key, value|
+          key_class = raw_key.class
+          if key_class == Symbol
+            key = ":#{raw_key.to_s}"
+          elsif key_class == String
+            key = raw_key
+          else 
+            index = self.__pack[:keys].length 
+            self.__pack[:keys] << _pack_object( raw_key )
+            key = "/OBJECT_#{index}"
+          end     
+          return_hash[key] = _pack_object( value )
         end
         return_hash  
       end

data/lib/aqua/object/unpack.rb

@@ -59,7 +59,7 @@ module Aqua::Unpack
         if init = _unpack_initialization( _store )
           replace( init ) 
         end
-        if ivars = _store[:data]
+        if ivars = _store[:ivars]
           _unpack_ivars( self, ivars )
         end    
       end 
@@ -80,7 +80,7 @@ module Aqua::Unpack
       end    
       
       def _unpack_initialization( obj )
-        if init = obj[:initialization] 
+        if init = obj[:init] 
           init_class = init.class
           if init_class == String
             init
@@ -103,8 +103,15 @@ module Aqua::Unpack
       
       def _unpack_hash( obj )
         hash = {}
-        obj.each do |key, value|
-          value = _unpack_object( value ) unless value.class == String 
+        obj.each do |raw_key, value|
+          value = _unpack_object( value ) unless value.class == String
+          if raw_key.match(/\A(:)/)
+            key = raw_key.gsub($1, '').to_sym
+          elsif raw_key.match(/\A\/OBJECT_(\d*)\z/) 
+            key = _unpack_object( self._store[:keys][$1.to_i] )
+          else 
+            key = raw_key
+          end  
           hash[key] = value
         end
         hash  
@@ -177,7 +184,7 @@ module Aqua::Unpack
             end
             
             # add the ivars
-            if ivars = store_pack['data'] 
+            if ivars = store_pack['ivars'] 
               ivars.delete('@table') if obj_class.ancestors.include?( OpenStruct )
               _unpack_ivars( return_object, ivars )
             end

data/spec/object/pack_spec.rb

@@ -17,6 +17,11 @@ describe Aqua::Pack do
       :log => @log,
       :password => 'my secret!' 
     )
+    
+    def pack_grab_bag( value )
+      @user.grab_bag = value
+      @user._pack[:ivars][:@grab_bag]
+    end 
   end
   
   describe 'packing classes' do 
@@ -57,7 +62,7 @@ describe Aqua::Pack do
     
     it 'should not pack hidden variables' do
       @pack = @user._pack
-      @pack[:data].keys.should_not include("@password")
+      @pack[:ivars].keys.should_not include("@password")
     end  
   end    
   
@@ -87,25 +92,26 @@ describe Aqua::Pack do
     end    
     
     describe 'instance variables, ' do
-      it 'should be in a hash-like object with the key :data' do 
-        @pack[:data].should_not be_nil
-        @pack[:data].should respond_to(:keys)
-      end 
+      describe 'hashes'
+        it 'should be in a hash-like object with the key :ivars' do 
+          @pack[:ivars].should_not be_nil
+          @pack[:ivars].should respond_to(:keys)
+        end
+        
+        it 'should save symbol keys differently that string keys' do
+          @user.name = {:first => 'Kane', 'last' => 'Baccigalupi'}
+          pack = @user._pack
+          pack[:ivars][:@name][:init].keys.sort.should == [':first', 'last']
+        end   
       
-      describe 'basic data types' do
+      describe 'basic ivars types' do
         it 'should pack strings as strings' do 
-          @pack[:data][:@username].should == 'kane'
+          @pack[:ivars][:@username].should == 'kane'
         end  
     
-        it 'should pack an array of strings as a hash with the :class "Array" and :initialization as the original array' do
-          @pack[:data][:@name].should == {'class' => 'Array', 'initialization' => ['Kane', 'Baccigalupi']}
+        it 'should pack an array of strings as a hash with the :class "Array" and :init as the original array' do
+          @pack[:ivars][:@name].should == {'class' => 'Array', 'init' => ['Kane', 'Baccigalupi']}
         end  
-    
-        it 'should pack an hash containing only strings/symbols for keys and values, with an initialization value that is that hash and a class key' do
-          @user.name = {:first => 'Kane', :last => 'Baccigalupi'}
-          pack = @user._pack
-          pack[:data][:@name].should == {'class' => 'Hash', 'initialization' => {'first' => 'Kane', 'last' => 'Baccigalupi'} }
-        end   
       end
       
       describe 'objects: ' do
@@ -114,14 +120,14 @@ describe Aqua::Pack do
         
         describe 'Time' do
           it 'should save as a hash with the class and to_s as the value' do
-            time_hash = @pack[:data][:@created_at] 
+            time_hash = @pack[:ivars][:@created_at] 
             time_hash['class'].should == 'Time'
-            time_hash['initialization'].class.should == String
+            time_hash['init'].class.should == String
           end
         
           it 'the value should be reconstitutable with Time.parse' do 
             # comparing times directly never works for me. It is probably a micro second issue or something
-            @time.to_s.should == Time.parse( @pack[:data][:@created_at]['initialization'] ).to_s
+            @time.to_s.should == Time.parse( @pack[:ivars][:@created_at]['init'] ).to_s
           end 
         end
         
@@ -129,57 +135,79 @@ describe Aqua::Pack do
           it 'should save as a hash with only the class' do 
             @user.grab_bag = true
             pack = @user._pack
-            pack[:data][:@grab_bag].should == {'class' => 'TrueClass', 'initialization' => 'true'}
+            pack[:ivars][:@grab_bag].should == {'class' => 'TrueClass', 'init' => 'true'}
             
             @user.grab_bag = false
             pack = @user._pack
-            pack[:data][:@grab_bag].should == {'class' => 'FalseClass', 'initialization' => 'false'}
+            pack[:ivars][:@grab_bag].should == {'class' => 'FalseClass', 'init' => 'false'}
           end  
         end    
         
         describe 'Date' do
           it 'should save as a hash with the class and to_s as the value' do
-            time_hash = @pack[:data][:@dob] 
+            time_hash = @pack[:ivars][:@dob] 
             time_hash['class'].should == 'Date'
-            time_hash['initialization'].class.should == String
+            time_hash['init'].class.should == String
           end
         
           it 'the value should be reconstitutable with Date.parse' do 
-            @date.should == Date.parse( @pack[:data][:@dob]['initialization'] )
+            @date.should == Date.parse( @pack[:ivars][:@dob]['init'] )
           end 
         end      
         
         describe 'Numbers' do
-          def pack_grab_bag( value )
-            @user.grab_bag = value
-            @user._pack[:data][:@grab_bag]
-          end 
-          
           it 'should pack Fixnums with correct class and value' do 
             pack = pack_grab_bag( 42 )
             pack[:class].should == 'Fixnum'
-            pack[:initialization].should == '42'
+            pack[:init].should == '42'
           end
           
           it 'should pack Bignums with correct class and value' do 
             pack = pack_grab_bag( 123456789123456789 )
             pack[:class].should == 'Bignum'
-            pack[:initialization].should == '123456789123456789'
+            pack[:init].should == '123456789123456789'
           end 
           
           it 'should pack Floats with correct class and value' do 
             pack = pack_grab_bag( 3.2 )
             pack[:class].should == 'Float'
-            pack[:initialization].should == '3.2'
+            pack[:init].should == '3.2'
           end 
           
           it 'should pack Rationals with the correct class and values' do
             pack = pack_grab_bag( Rational( 1, 17 ) )
             pack[:class].should == 'Rational'
-            pack[:initialization].should == ['1', '17']
+            pack[:init].should == ['1', '17']
           end    
           
-        end  
+        end
+        
+        describe 'hashes with object as keys' do 
+          it 'should pack an hash containing only strings/symbols for keys and values, with an init value that is that hash and a class key' do
+            @user.name = {'first' => 'Kane', 'last' => 'Baccigalupi'}
+            pack = @user._pack
+            pack[:ivars][:@name].should == {'class' => 'Hash', 'init' => {'first' => 'Kane', 'last' => 'Baccigalupi'} }
+          end
+           
+          it 'should pack a numeric object key' do
+            pack = pack_grab_bag( {1 => 'first', 2 => 'second'} )
+            keys = pack[:init].keys
+            keys.should include( '/OBJECT_0', '/OBJECT_1' )
+            user_pack = @user.instance_variable_get("@__pack")
+            user_pack[:keys].size.should == 2
+            user_pack[:keys].first['class'].should == 'Fixnum'  
+          end
+          
+          it 'should pack a more complex object as a key' do
+            struct = OpenStruct.new( :gerbil => true ) 
+            pack = pack_grab_bag( { struct => 'first'} )
+            keys = pack[:init].keys
+            keys.should include( '/OBJECT_0' )
+            user_pack = @user.instance_variable_get("@__pack")
+            user_pack[:keys].size.should == 1
+            user_pack[:keys].first['class'].should == 'OpenStruct'
+          end    
+        end    
          
         describe 'embeddable aquatic' do
           it 'aquatic objects should have packing instructions in the form of #_embed_me' do
@@ -191,10 +219,10 @@ describe Aqua::Pack do
             User.configure_aqua( :embed => false )
           end   
   
-          it 'should save their data correctly' do
-            @pack[:data][:@log].keys.should == ['class', 'data']
-            @pack[:data][:@log]['data'].keys.should == ['@created_at', '@message'] 
-            @pack[:data][:@log]['data']['@message'].should == "Hello World! This is a log entry"
+          it 'should save their ivars correctly' do
+            @pack[:ivars][:@log].keys.sort.should == ['class', 'ivars', 'keys']
+            @pack[:ivars][:@log]['ivars'].keys.should == ['@created_at', '@message'] 
+            @pack[:ivars][:@log]['ivars']['@message'].should == "Hello World! This is a log entry"
           end 
         
           it 'should correctly pack Array derivatives' do 
@@ -205,10 +233,10 @@ describe Aqua::Pack do
             arrayish = Arrayed['a', 'b', 'c', 'd']
             arrayish.my_accessor = 'Newt'
             pack = arrayish._pack
-            pack.keys.sort.should == ['class', 'data', 'initialization']
-            pack['initialization'].class.should == Array
-            pack['initialization'].should == ['a', 'b', 'c', 'd']
-            pack['data']['@my_accessor'].should == 'Newt'   
+            pack.keys.sort.should == ['class', 'init', 'ivars', 'keys']
+            pack['init'].class.should == Array
+            pack['init'].should == ['a', 'b', 'c', 'd']
+            pack['ivars']['@my_accessor'].should == 'Newt'   
           end
           
           it 'should correctly pack Hash derivative' do
@@ -220,10 +248,10 @@ describe Aqua::Pack do
             hashish['1'] = '2'
             hashish.my_accessor = 'Newt'
             pack = hashish._pack
-            pack.keys.sort.should == ['class', 'data', 'initialization']
-            pack['initialization'].class.should == HashWithIndifferentAccess
-            pack['initialization'].should == {'1' => '2'}
-            pack['data']['@my_accessor'].should == 'Newt'
+            pack.keys.sort.should == ['class', 'init', 'ivars', 'keys']
+            pack['init'].class.should == HashWithIndifferentAccess
+            pack['init'].should == {'1' => '2'}
+            pack['ivars']['@my_accessor'].should == 'Newt'
           end    
         
         end
@@ -247,25 +275,25 @@ describe Aqua::Pack do
             before(:each) do
               @user.grab_bag = @struct
               pack = @user._pack
-              @grab_bag = pack[:data][:@grab_bag]
+              @grab_bag = pack[:ivars][:@grab_bag]
             end
               
             it 'the key "class" should map to "OpenStruct"' do
               @grab_bag['class'].should == 'OpenStruct'
             end
             
-            it 'the key "data" should have the keys "@table"' do
-              @grab_bag['data'].keys.should == ['@table'] 
+            it 'the key "ivars" should have the keys "@table"' do
+              @grab_bag['ivars'].keys.should == ['@table'] 
             end
             
             it 'should initialize with the @table instance variable' do  
-              init_keys = @grab_bag['initialization'].keys
-              init_keys.should include('cat')
-              init_keys.should include('disaster')
-              init_keys.should include('gerbil')
-              @grab_bag['initialization']['gerbil'].should == {'class' => 'TrueClass', 'initialization' => 'true'}
-              @grab_bag['initialization']['cat'].should == 'yup, that too!'
-              @grab_bag['initialization']['disaster'].should == {'class' => 'Array', 'initialization' => ['pow', 'blame', 'chase', 'spew']}
+              init_keys = @grab_bag['init'].keys
+              init_keys.should include(':cat')
+              init_keys.should include(':disaster')
+              init_keys.should include(':gerbil')
+              @grab_bag['init'][':gerbil'].should == {'class' => 'TrueClass', 'init' => 'true'}
+              @grab_bag['init'][':cat'].should == 'yup, that too!'
+              @grab_bag['init'][':disaster'].should == {'class' => 'Array', 'init' => ['pow', 'blame', 'chase', 'spew']}
             end
           end
           
@@ -273,15 +301,15 @@ describe Aqua::Pack do
             before(:each) do
               @user.grab_bag = @grounded
               pack = @user._pack
-              @grab_bag = pack[:data][:@grab_bag]
+              @grab_bag = pack[:ivars][:@grab_bag]
             end
             
             it 'the key "class" should map correctly to the class name' do
               @grab_bag['class'].should == 'Grounded'
             end
             
-            it 'should have data keys for all the ivars' do
-              keys = @grab_bag[:data].keys
+            it 'should have ivars keys for all the ivars' do
+              keys = @grab_bag[:ivars].keys
               keys.should include('@openly_structured')
               keys.should include('@hash_up')
               keys.should include('@arraynged')
@@ -289,7 +317,7 @@ describe Aqua::Pack do
             
             it 'should correctly display the nested OpenStruct' do 
               user_2 = User.new(:grab_bag => @struct) # this has already been tested in the set above
-              user_2._pack[:data][:@grab_bag].should == @grab_bag[:data][:@openly_structured]
+              user_2._pack[:ivars][:@grab_bag].should == @grab_bag[:ivars][:@openly_structured]
             end  
           end  
           
@@ -305,7 +333,7 @@ describe Aqua::Pack do
               @strange_array.udder # sets an instance variable
               @user.grab_bag = @strange_array
               pack = @user._pack
-              @grab_bag = pack[:data][:@grab_bag]
+              @grab_bag = pack[:ivars][:@grab_bag]
             end
             
             it 'should correctly map the class name' do
@@ -313,19 +341,19 @@ describe Aqua::Pack do
             end
             
             it 'should store the instance variables' do 
-              @grab_bag[:data].keys.should == ['@udder'] 
+              @grab_bag[:ivars].keys.should == ['@udder'] 
             end
             
             it 'should store the simple array values' do
-              @grab_bag[:initialization].should_not be_nil
-              @grab_bag[:initialization].class.should == Array
-              @grab_bag[:initialization].should include('cat')
-              @grab_bag[:initialization].should include('octopus')
+              @grab_bag[:init].should_not be_nil
+              @grab_bag[:init].class.should == Array
+              @grab_bag[:init].should include('cat')
+              @grab_bag[:init].should include('octopus')
             end 
             
             it 'should store the more complex array values correctly' do
               user_2 = User.new(:grab_bag => @struct) # this has already been tested in the set above
-              user_2._pack[:data][:@grab_bag].should == @grab_bag[:initialization].last
+              user_2._pack[:ivars][:@grab_bag].should == @grab_bag[:init].last
             end   
           end
           
@@ -345,7 +373,7 @@ describe Aqua::Pack do
               @hash_derivative.yum # sets an instance variable
               @user.grab_bag = @hash_derivative
               pack = @user._pack
-              @grab_bag = pack[:data][:@grab_bag]
+              @grab_bag = pack[:ivars][:@grab_bag]
             end
             
             it 'should correctly map the class name' do
@@ -353,21 +381,21 @@ describe Aqua::Pack do
             end
             
             it 'should store the instance variables' do 
-              @grab_bag[:data].keys.should == ['@yum'] 
+              @grab_bag[:ivars].keys.should == ['@yum'] 
             end
             
             it 'should store the simple hash values' do
-              @grab_bag[:initialization].should_not be_nil
-              @grab_bag[:initialization].class.should == HashWithIndifferentAccess
+              @grab_bag[:init].should_not be_nil
+              @grab_bag[:init].class.should == HashWithIndifferentAccess
               
-              @grab_bag[:initialization].keys.should include('ingredients')
-              @grab_bag[:initialization].keys.should include('healthometer')
-              @grab_bag[:initialization].keys.should include('random_struct')
+              @grab_bag[:init].keys.should include('ingredients')
+              @grab_bag[:init].keys.should include('healthometer')
+              @grab_bag[:init].keys.should include('random_struct')
             end 
             
             it 'should store the more complex hash values correctly' do
               user_2 = User.new(:grab_bag => @struct) # this has already been tested in the set above
-              user_2._pack[:data][:@grab_bag].should == @grab_bag[:initialization][:random_struct]
+              user_2._pack[:ivars][:@grab_bag].should == @grab_bag[:init][:random_struct]
             end
           end    
         end

data/spec/object/unpack_spec.rb

@@ -36,7 +36,7 @@ describe Aqua::Unpack do
   end
   
   describe 'unpacking to a new object' do 
-    describe 'initialization' do
+    describe 'init' do
       it 'should initialize an Aquatic object' do
         user = User.load( @user.id )
         user.class.should == User
@@ -59,7 +59,7 @@ describe Aqua::Unpack do
           arrayish_2.class.should == Arrayed 
         end
       
-        it 'should load initialization values into an aquatic Array derivative' do
+        it 'should load init values into an aquatic Array derivative' do
           arrayish_2 = Arrayed.load( @id )
           arrayish_2.first.should == 'a'
         end 
@@ -82,7 +82,7 @@ describe Aqua::Unpack do
           Hashed.load( @id ).class.should == Hashed
         end
            
-        it 'should load initialization values into an aquatic Hash derivative' do
+        it 'should load init values into an aquatic Hash derivative' do
           hashish = Hashed.load( @id )
           hashish['1'].should == '2'  
         end  
@@ -188,7 +188,29 @@ describe Aqua::Unpack do
         @user.commit!
         user = User.load(@user.id)
         user.grab_bag.should == @user.grab_bag
-      end  
+      end
+      
+      it 'should unpack symbol keys differently than unpacking string keys' do  
+        @user.grab_bag = {'first' => '1', :second => '2'}
+        @user.commit!
+        user = User.load(@user.id)
+        user.grab_bag.keys.should include('first', :second)
+      end
+      
+      it 'should unpack a numeric object key' do
+        @user.grab_bag = {1 => 'first', 2 => 'second'}
+        @user.commit!
+        user = User.load(@user.id)
+        user.grab_bag.keys.should include( 1, 2 )
+      end
+      
+      it 'should unpack a more complex object as a key' do
+        struct = OpenStruct.new( :gerbil => true ) 
+        @user.grab_bag = { struct => 'first' }
+        @user.commit!
+        user = User.load(@user.id) 
+        user.grab_bag.keys.should include( struct )
+      end      
       
       it 'should unpack a Hash with non-string values' do 
         @user.grab_bag = {'1' => 2}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: baccigalupi-aqua
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -114,7 +114,6 @@ files:
 - utils/console
 has_rdoc: true
 homepage: http://github.com/baccigalupi/aqua
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -135,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: "Aqua: A Ruby Object Database ... just add water (and CouchDB)"