sdb_dal 0.0.6 → 0.0.7

data/lib/sdb_dal/domain_object.rb

@@ -15,19 +15,24 @@ module SdbDal
     def initialize(options={})
       @attribute_values=HashWithIndifferentAccess.new
 
+      copy_attributes(options)
+
+      @accessor_cache={}
+      
+    end
+
+    def copy_attributes(hash)
       self.class.attribute_descriptions.each do |attribute_name,description|
-          value=options[attribute_name]
-          value=value || options[attribute_name.intern]
+          value=hash[attribute_name]
+          value=value || hash[attribute_name.intern]
           if !description.is_collection && value.respond_to?(:flatten) && value.length==1
             value=value[0]
           end
           @attribute_values[attribute_name]=value
-        
+
       end
-      @accessor_cache={}
-      @repository=options[:repository]
-    end
 
+    end
 
     def self.primary_key_attribute_names
       return @primary_key_attribute_names
@@ -250,16 +255,44 @@ module SdbDal
     end
   
     def self.belongs_to(domain_class,foreign_key_attribute=nil,accesser_attribute_name=nil,options={})
-    
+
+
+
+
       foreign_key_attribute ||= "#{domain_class.to_s.downcase}_id".to_sym
       accesser_attribute_name ||=domain_class.to_s.downcase
+  if foreign_key_attribute==:without_prefix
+
+      class_eval <<-GETTERDONE
+	def #{accesser_attribute_name}
+		#{module_name+domain_class.to_s}.find(@attribute_values)
+	end
+      GETTERDONE
+
   
+  elsif foreign_key_attribute==:with_prefix
+
       class_eval <<-GETTERDONE
 	def #{accesser_attribute_name}
-		#{module_name+domain_class.to_s}.find(self.#{foreign_key_attribute})
+      mapped_values={}
+      prefix='#{domain_class.to_s.downcase}_'
+      @attribute_values.each{|key,value|
+        if key.index(prefix)==0
+              mapped_values[key.splice(prefix.length)]=value
+         end
+        #{module_name+domain_class.to_s}.find(mapped_values)
+	end
+      GETTERDONE
+
+      else
+        class_eval <<-GETTERDONE
+	def #{accesser_attribute_name}
+    mapped_values={}
+    #{module_name+domain_class.to_s}.find(self.#{foreign_key_attribute})
 	end
-        
       GETTERDONE
+
+    end
     end
     def self.many_to_many(domain_class,
         through_class,
@@ -374,6 +407,10 @@ module SdbDal
         reflecting_key_attributes=nil,
         accesser_attribute_name=nil,
         options={})
+      if reflecting_key_attributes==:without_prefix
+        reflecting_key_attributes = primary_key_attribute_names.map{|x|x.to_s}
+
+      end
     reflecting_key_attributes ||= primary_key_attribute_names.map{|x|self.name.downcase+"_"+x.to_s}
       reflecting_key_attributes =arrayify(reflecting_key_attributes)
       reflecting_array_code="[:"+reflecting_key_attributes.join(",:")+"]"
@@ -386,7 +423,8 @@ module SdbDal
       if options[:order]
         order<<",:order=>:#{options[:order]}"
       end
-  
+
+
       if options[:dependent]
         
         class_eval <<-XXDONE
@@ -394,6 +432,14 @@ module SdbDal
             on_destroy_blocks<<"#{accesser_attribute_name}.each{|item|item.destroy}"
         XXDONE
       end
+      class_eval <<-XXDONE
+      def create_child_#{domain_class.to_s.downcase}(options=nil)
+
+        result=#{module_name+domain_class.to_s}.new(options)
+        result.copy_attributes(self.primary_key_hash)
+        result
+      end
+XXDONE
       #  if options[:tracking]
       #    #add add_xxx method
       #    #add to list of tracker attributes
@@ -438,6 +484,14 @@ module SdbDal
       end
       return result[0] if result.length==1
       return result
+    end
+      def primary_key_hash
+
+      result={}
+      self.class.primary_key_attribute_names.each do |key_part|
+        result[key_part]=@attribute_values[key_part ]
+      end
+      return result
     end
     def primary_key=(value)
       key=DomainObject::arrayify(value)
@@ -672,6 +726,13 @@ module SdbDal
       end
       def find_single(id, options)
         return nil if id==nil
+        if id.is_a?(Hash)
+          id_as_array=[]
+          @primary_key_attribute_names.each do |key_name|
+            id_as_array << id[key_name]
+          end
+          id=id_as_array
+        end
         id=arrayify(id)
         attributes=self.repository(options).find_one(self.table_name,id,attribute_descriptions)
         if attributes && attributes.length>0

data/lib/sdb_dal/repository.rb

@@ -395,6 +395,7 @@ module SdbDal
       parsed_attributes
     end
     def destroy(table_name, primary_key)
+      @session_cache.destroy(table_name,primary_key)
       @sdb.delete_attributes(make_domain_name(table_name),make_cache_key(table_name, primary_key) )
       #    if @use_cache
       #      @storage.delete(@clob_bucket,make_cache_key(table_name,primary_key))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sdb_dal
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - David Knight