cloudwow-not_relational 0.1.8 → 0.1.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 8
+:patch: 9

data/lib/not_relational/configuration.rb

@@ -43,7 +43,7 @@ module NotRelational
         @cipher_key_file = not_relational_config['cipher_key_file']
         @cipher_key_file ||= "./.cipher_key"
         if @cipher_key_file and File.exists?(@cipher_key_file)
-           @cipher_key=File.open(@cipher_key_file).read
+          @cipher_key=File.open(@cipher_key_file).read
         end
 
         @cipher_iv_file=not_relational_config['cipher_iv_file']
@@ -54,19 +54,19 @@ module NotRelational
 
       end
     end
-def  crypto
-  return @crypto if @crypto
-  options={}
-  if cipher_key
-    options[:cipher_key=]= cipher_key
-    options[:cipher_iv  ]= cipher_iv
-    @crypto=Crypto.new()
-  else
-    @crypto=Crypto.new
-    File.open(self.cipher_key_file,'w').write(@crypto.key)
-    File.open(self.cipher_iv_file,'w').write(@crypto.iv)
-  end
-end
+    def  crypto
+      return @crypto if @crypto
+      options={}
+      if cipher_key
+        options[:cipher_key=]= cipher_key
+        options[:cipher_iv  ]= cipher_iv
+        @crypto=Crypto.new()
+      else
+        @crypto=Crypto.new
+        File.open(self.cipher_key_file,'w').write(@crypto.key)
+        File.open(self.cipher_iv_file,'w').write(@crypto.iv)
+      end
+    end
     def cipher_key
       return @cipher_key
     end
@@ -80,7 +80,7 @@ end
       config_file_path=nil
       config_section=nil
 
-      #when using rails use config/database.yml
+      # #when using rails use config/database.yml
       if Object.const_defined?(:RAILS_ROOT)  and ENV.has_key?('RAILS_ENV')
         config_file_path =  File.join("#{RAILS_ROOT}","config","database.yml")
 
@@ -89,7 +89,8 @@ end
 
 
       else
-        #when not using rails use try database.yml then try config/database.yml
+        # #when not using rails use try database.yml then try
+        # config/database.yml
 
         if File.exists?("database.yml")
 

data/lib/not_relational/domain_model.rb

@@ -33,6 +33,8 @@ module NotRelational
             unless @attribute_values.has_key?(attribute_name)
               if description.is_collection
                 @attribute_values[attribute_name]=[]
+              elsif description.value_type==:property_bag
+                @attribute_values[attribute_name]={}
               else
                 @attribute_values[attribute_name]=nil unless @attribute_values.has_key?(attribute_name)
               end

data/lib/not_relational/property_description.rb

@@ -1,4 +1,6 @@
 module NotRelational
+
+require 'ya2yaml'
 require File.dirname(__FILE__) +'/sdb_formatter.rb'
 require File.dirname(__FILE__) +'/crypto.rb'
 require File.dirname(__FILE__) +'/configuration.rb'
@@ -49,7 +51,10 @@ class PropertyDescription
         result= format_unsigned_integer(value)    
       elsif self.value_type==:float
         result= format_float(value)
-      
+
+      elsif self.value_type==:property_bag
+        result= format_property_bag(value)
+
       else
         result= format_string(value.to_s)
       end
@@ -93,7 +98,9 @@ class PropertyDescription
              return parse_unsigned_integer(value)    
       elsif self.value_type==:float
             return parse_float(value)
-       else 
+      elsif self.value_type==:property_bag
+            return parse_property_bag(value)
+       else
             return value.to_s
       end
       return value

data/lib/not_relational/sdb_formatter.rb

@@ -33,16 +33,23 @@ module SdbFormatter
       
     end
      def parse_float(value)
-      return nil if value==nil 
+      return nil if value==nil
       return value.to_f
     end
+
+     def parse_property_bag(value)
+      return {} if value==nil
+      return YAML::load(value)
+
+    end
+
       def parse_unsigned_integer(value)
           return nil if value==nil 
        return value.to_i
     end
    
    def format_reference_set(value)
-        value.to_yaml
+        value.to_yaml#ya2yaml(:syck_compatible => true)
         
     end
     
@@ -91,8 +98,15 @@ module SdbFormatter
            end
        return zero_pad_integer(value)
     end
-    
-    
+
+      def format_property_bag(value)
+           if !value
+                return nil
+           end
+       return value.to_yaml#(:syck_compatible => true)
+    end
+
+
     
     def zero_pad_integer(value)
       value=value.to_i

data/lib/not_relational/storage.rb

@@ -1,4 +1,3 @@
-require 'sqs'
 require 'memcache'
 require File.dirname(__FILE__) +"/s3.rb"
 require File.dirname(__FILE__) +"/query_string_auth_generator.rb"

data/test/models/album.rb

@@ -14,7 +14,7 @@ class Album < NotRelational::DomainModel
   property :last_update_time_utc ,:date  
   property :is_private, :boolean
   property :group_id, :string
-
+property :metadata,:property_bag
   index :group_and_title ,[:group_id,:title],:unique=>true
   many_to_many :Mediaitem,:AlbumMediaItem,:album_id,:mediaitem_id,:mediaitems,:order_by=>:created_time
   belongs_to :Group

data/test/unit_tests/album_test.rb

@@ -174,4 +174,22 @@ class AlbumTest < Test::Unit::TestCase
         assert(found!=nil)         
         assert_equal(1,found.length)
   end
+  def test_metadata
+        a =Album.new
+        a.user_name='david'
+        a.metadata['x']='x1'
+        a.metadata['y']='y1'
+        a.save
+
+        assert_equal(a.metadata['x'],'x1')
+        assert_equal(a.metadata['y'],'y1')
+
+NotRelational::RepositoryFactory.instance.clear_session_cache
+found=Album.find(a.id)
+        assert_not_nil(found.metadata)
+        assert_equal(2,found.metadata.length)
+         assert_equal(found.metadata['x'],'x1')
+        assert_equal(found.metadata['y'],'y1')
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudwow-not_relational
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - cloudwow
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-30 00:00:00 -07:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - lib/not_relational/memory_repository.rb
 - lib/not_relational/memory_storage.rb
 - lib/not_relational/or_condition.rb
+- lib/not_relational/property_bag.rb
 - lib/not_relational/property_description.rb
 - lib/not_relational/query_string_auth_generator.rb
 - lib/not_relational/reference.rb