sdb_dal 0.0.7 → 0.0.8

data/lib/sdb_dal/domain_object.rb

@@ -16,19 +16,19 @@ module SdbDal
       @attribute_values=HashWithIndifferentAccess.new
 
       copy_attributes(options)
-
+     
       @accessor_cache={}
       
     end
 
     def copy_attributes(hash)
       self.class.attribute_descriptions.each do |attribute_name,description|
-          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
+        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
 
@@ -45,10 +45,10 @@ module SdbDal
     end
     def set_map(keys,values)
       (0..keys.length-1).each do |i|
-          key=keys[i]
-          value=values[i]
-          @attribute_values[key]=value
-        end
+        key=keys[i]
+        value=values[i]
+        @attribute_values[key]=value
+      end
 
 
     end
@@ -60,7 +60,7 @@ module SdbDal
 
     def self.index(index_name,columns,options={})
       @index_descriptions||={}
-       return if self.index_descriptions[index_name]
+      return if self.index_descriptions[index_name]
       $columns_xxx=columns
       class_eval <<-GETTERDONE
 
@@ -163,7 +163,7 @@ module SdbDal
             end
     end
       GETTERDONE
-    return if self.attribute_descriptions.has_key?(name)
+      return if self.attribute_descriptions.has_key?(name)
   
       attribute_description=DomainAttributeDescription.new(name,type,self.is_encrypted?,options)
       self.attribute_descriptions[name] = attribute_description
@@ -181,11 +181,11 @@ module SdbDal
         
         GETTERDONE
       end
-        if attribute_description.value_type==:clob
-          clob_attribute_names<<attribute_description.name
-        else
-          non_clob_attribute_names<<attribute_description.name
-        end
+      if attribute_description.value_type==:clob
+        clob_attribute_names<<attribute_description.name
+      else
+        non_clob_attribute_names<<attribute_description.name
+      end
 
       scope=":all"
       if(options[:unique] && options[:unique]==true)
@@ -261,38 +261,49 @@ module SdbDal
 
       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
+      if foreign_key_attribute==:without_prefix
+        # #send all attributes and let the other class figure it out}
+
+        class_eval <<-GETTERDONE
+        def #{accesser_attribute_name}
 
-      class_eval <<-GETTERDONE
-	def #{accesser_attribute_name}
 		#{module_name+domain_class.to_s}.find(@attribute_values)
 	end
-      GETTERDONE
+        GETTERDONE
 
   
-  elsif foreign_key_attribute==:with_prefix
+      elsif foreign_key_attribute==:with_prefix
+        # #the column names that start with the name of the other class are the
+        # fkeys
+        fkeys=[]
+        self.class.attribute_descriptions.each do |attribute_name,description|
+          if attribute_name.index(domain_class.to_s.downcase)==0
+            fkeys<<attribute_name
+            fkey_names<<attribute_name.to_s
+          end
+        end
+        index(fkey_names.join("_"),keys)
 
-      class_eval <<-GETTERDONE
+        class_eval <<-GETTERDONE
 	def #{accesser_attribute_name}
       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
+      prefix='#{domain_class.to_s.downcase}'
+      ['#{fkey_names.join("','")}'].each |key|
+              mapped_values[key.splice(prefix.length)]=@attribute_values[key]
+      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
+        GETTERDONE
+        index("#{foreign_key_attribute}_index".to_sym,[foreign_key_attribute])
+      end
+      
     end
     def self.many_to_many(domain_class,
         through_class,
@@ -411,17 +422,27 @@ module SdbDal
         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 ||= 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(",:")+"]"
 
       accesser_attribute_name ||=domain_class.to_s.downcase+'s'
       order=""
       if options[:order_by]
-        order=",:order_by=>:#{options[:order_by]}"
+        order="{:order_by=>:#{options[:order_by]}"
       end
       if options[:order]
-        order<<",:order=>:#{options[:order]}"
+        if order.length>0
+          order << ","
+        else
+          order<<"{"
+        end
+        order<<":order=>:#{options[:order]}"
+      end
+      if order.length==0
+        order << "{}"
+      else
+        order<<"}"
       end
 
 
@@ -439,7 +460,7 @@ module SdbDal
         result.copy_attributes(self.primary_key_hash)
         result
       end
-XXDONE
+      XXDONE
       #  if options[:tracking]
       #    #add add_xxx method
       #    #add to list of tracker attributes
@@ -462,7 +483,12 @@ XXDONE
 	def #{accesser_attribute_name}
 
             if !@accessor_cache.has_key? :#{accesser_attribute_name}
-               result= #{module_name+domain_class.to_s}.find(:all,:map=>{:keys=>#{reflecting_array_code},:values=>DomainObject::arrayify(self.primary_key)}#{order})
+              h={}
+              pkey=DomainObject::arrayify(self.primary_key)
+              #{reflecting_array_code}.each do |key|
+                h[key]=pkey.shift
+              end
+              result= #{module_name+domain_class.to_s}.find_by_index(h,#{order})
                 @accessor_cache[:#{accesser_attribute_name}]=result || []
             end
             return @accessor_cache[:#{accesser_attribute_name}] 
@@ -485,7 +511,7 @@ XXDONE
       return result[0] if result.length==1
       return result
     end
-      def primary_key_hash
+    def primary_key_hash
 
       result={}
       self.class.primary_key_attribute_names.each do |key_part|
@@ -665,9 +691,26 @@ XXDONE
           return options[:repository]
         end
       
-        $repository   ||= RepositoryFactory.instance(options)
+        return RepositoryFactory.instance(options)
     
-        return $repository
+      end
+      def find_by_index(values,more_options)
+        index_descriptions.each do |name,desc|
+          if desc.keys_match?(values)
+            options={}
+            options[:params]={desc.name=>desc.format_index_entry(self.attribute_descriptions,values)}
+            options[:index]=desc.name
+            options[:index_value]=desc.format_index_entry(self.attribute_descriptions,values)
+            options.merge!(more_options)
+            return find(:all,options)
+          end
+        end
+        options={}
+
+        options[:params]={}
+        options.merge!(more_options)
+        values.each{|key,value|options[:params][key]=value}
+        return find_every(options)
       end
       def find(*arguments)
         scope   = arguments.slice!(0)
@@ -766,7 +809,7 @@ XXDONE
     
     end
     def self.module_name
-       result=""
+      result=""
       result=self.name.slice(0, self.name.rindex(":")+1) if self.name.rindex(":")
       result
     end

data/lib/sdb_dal/index_description.rb

@@ -35,6 +35,12 @@ class IndexDescription < DomainAttributeDescription
     #don't encrypt because the individual elements are encrypted
     return value
   end
-  
+  def keys_match?(h)
+    return false unless h.length==columns.length
+    columns.each do |c|
+      return false unless h.has_key?(c)
+    end
+    return true
+  end
 end
 end

data/lib/sdb_dal/memcache_repository.rb

@@ -5,7 +5,6 @@ module SdbDal
   class MemcacheRepository
     attr_accessor :use_cache #this here just so interface matches sdb repo
     attr_accessor :storage
-
     def initialize(
         sdb_domain= nil,
         clob_bucket= nil,
@@ -13,12 +12,15 @@ module SdbDal
         aws_secret_key= nil,
         memcache_servers = nil ,
         a_storage=nil,
-        append_table_to_domain=nil
+        append_table_to_domain=nil,
+        options={}
       )
-      @storage||=Storage.new(aws_key_id,aws_secret_key,memcache_servers,[],{:memory_only=>(aws_key_id==nil) }  )
+      options[:memory_only] ||=(aws_key_id==nil)
+      @storage||=Storage.new(aws_key_id,aws_secret_key,memcache_servers,[],options)
       @sdb_domain=sdb_domain
       @clob_bucket=clob_bucket
     end
+
     def pause
     end
 

data/lib/sdb_dal/memory_repository.rb

@@ -13,7 +13,8 @@ module SdbDal
         aws_secret_key= nil,
         memcache_servers = nil ,
         dummy=nil,
-        append_table_to_domain=nil
+        append_table_to_domain=nil,
+        options={}
       )
       clear
     end

data/lib/sdb_dal/repository_factory.rb

@@ -3,7 +3,11 @@ require "sdb_dal/memory_repository.rb"
     
 module SdbDal
   class RepositoryFactory
-    
+    def self.clear
+      @repository=nil
+      $sdb_dal_config=nil
+      $repository=nil
+    end
     def self.instance=(repo)
       @repository=repo
     end    
@@ -31,7 +35,11 @@ module SdbDal
         memcache_servers = memcache_servers.split(",") if memcache_servers
 
         append_table_to_domain=sdb_dal_config['append_table_to_domain']
-        @repository= repo_class.new(domain_prefix,clob_bucket,aws_key_id,aws_secret_key,memcache_servers,nil,append_table_to_domain)
+        options={}
+        if sdb_dal_config.has_key?('fail_fast')
+          options[:fail_fast]=sdb_dal_config['fail_fast']
+        end
+        @repository= repo_class.new(domain_prefix,clob_bucket,aws_key_id,aws_secret_key,memcache_servers,nil,append_table_to_domain,options)
       end
     end
 

data/lib/sdb_dal/storage.rb

@@ -15,12 +15,16 @@ class Storage
   @aws_secret_key = nil
   attr_accessor :tokens
   attr_accessor :memory_only
+  attr_accessor :fail_fast
   def initialize( aws_key_id,
       aws_secret_key,
       memcache_servers,
       tokens=[] ,
       options={})
     @memcache_servers=memcache_servers
+     if options.has_key?(:fail_fast)
+      self.fail_fast=options[:fail_fast]
+     end
     if options.has_key?(:memory_only) and options[:memory_only]
       self.memory_only=true
     else
@@ -82,10 +86,11 @@ class Storage
         renew_s3_connection
 
       rescue=> e
+
                  s= "#{e.message}\n#{e.backtrace}"
         puts(s)
         puts "retrying s3 get #{i.to_s}"
-        
+        raise e if self.fail_fast
         sleep(i*i)
       end
     end
@@ -105,6 +110,7 @@ x=nil
 
      break
       rescue =>e
+        raise e if self.fail_fast
                  s= "#{e.message}\n#{e.backtrace}"
         puts(s)
         puts "retrying s3 put #{i.to_s}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sdb_dal
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - David Knight
@@ -9,7 +9,7 @@ autorequire: sdb_dal
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -08:00
+date: 2009-01-23 00:00:00 -08:00
 default_executable: 
 dependencies: []