sdb_dal 0.0.9 → 0.0.11

data/lib/sdb_dal/configuration.rb

@@ -0,0 +1,114 @@
+require "openssl"
+
+
+module SdbDal
+  class Configuration
+   include OpenSSL
+
+    include OpenSSL::Cipher
+ 
+    attr_reader :repository_class
+    attr_reader :domain_prefix
+    attr_reader :clob_bucket
+    attr_reader :aws_key_id
+    attr_reader :aws_secret_key
+    attr_reader :memcache_servers
+    attr_reader :append_table_to_domain
+    attr_reader :fail_fast
+
+    attr_reader :cipher_key_file
+    attr_reader :cipher_iv_file
+
+    def self.singleton
+      @singleton ||= SdbDal::Configuration.new
+      return @singleton
+    end
+
+    def initialize()
+      sdb_dal_config=find_config_section
+
+      if sdb_dal_config
+        if sdb_dal_config.has_key?("repository_class")
+          @repository_class=eval  sdb_dal_config["repository_class"]
+        else
+          @repository_class=SdbDal::Repository
+        end
+        @domain_prefix= sdb_dal_config["sdb_domain_prefix"] || ""
+        @clob_bucket= sdb_dal_config["s3_clob_bucket"]
+        @aws_key_id = sdb_dal_config["aws_key_id"]
+        @aws_secret_key = sdb_dal_config["aws_secret_key"]
+        @memcache_servers= sdb_dal_config['memcache_servers']
+        @memcache_servers = memcache_servers.split(",") if memcache_servers
+
+        @append_table_to_domain=sdb_dal_config['append_table_to_domain']
+        @fail_fast=sdb_dal_config['fail_fast']
+
+        @cipher_key_file = sdb_dal_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
+        end
+
+        @cipher_iv_file ||= "./cipher_iv"
+        @cipher_iv_file=sdb_dal_config['cipher_iv_file']
+        if @cipher_iv_file and File.exists?(@cipher_iv_file)
+          @cipher_iv=File.open(@cipher_iv_file).read
+        end
+
+      end
+    end
+
+    def cipher_key
+      unless @cipher_key
+              @cipher = Cipher.new("AES-256-CBC")
+
+          @cipher_key =  @cipher.random_key()
+          File.open(self.cipher_key_file,'w').write(@cipher_key)
+      end
+      return @cipher_key
+    end
+
+    def cipher_iv
+      unless @cipher_iv
+              @cipher = Cipher.new("AES-256-CBC")
+
+        @cipher_iv =  @cipher.random_iv()
+        File.open(self.cipher_iv_file,'w').write(@cipher_iv)
+      end
+      return @cipher_iv
+    end
+
+    def find_config_section
+      return $sdb_dal_config if $sdb_dal_config
+      config_file_path=nil
+      config_section=nil
+
+      #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")
+
+        config_section =ENV['RAILS_ENV']+"_sdb_dal"
+
+
+
+      else
+        #when not using rails use try database.yml then try config/database.yml
+
+        if File.exists?("database.yml")
+
+          config_file_path = "database.yml"
+        elsif File.exists?(File.join("config", "database.yml"))
+          config_file_path = File.join("config", "database.yml")
+        end
+
+        config_section =(ENV['SDB_DAL_ENV'] || "production")+"_sdb_dal"
+      end
+      if config_file_path and config_section
+        config_file = YAML.load(File.open( config_file_path))
+
+        $sdb_dal_config = config_file[config_section]
+      end
+      return $sdb_dal_config
+    end
+  end
+end

data/lib/sdb_dal/crypto.rb

@@ -1,29 +1,36 @@
 require "openssl"
-include OpenSSL
  
 module SdbDal
   class Crypto
+    include OpenSSL
+
     include OpenSSL::Cipher
     def initialize(options={})
-      key_dir=options[:key_dir] if options.has_key?(:key_dir)
-      key_dir ||="/tmp"
       @cipher = Cipher.new("AES-256-CBC")
 
-      if File.exists?(key_dir+'/.cipher_key')
-        @key=File.open(key_dir+'/.cipher_key').read
-      else
-        @key =  @cipher.random_key()
-        File.open(key_dir+"/.cipher_key",'w').write(@key)
+      @key=options[:cipher_key] if options.has_key?(:cipher_key)
+      @iv=options[:cipher_iv] if options.has_key?(:cipher_iv)
+
+      unless @key
+        key_dir=options[:key_dir] if options.has_key?(:key_dir)
+        key_dir ||="/tmp"
+    
+        if File.exists?(key_dir+'/.cipher_key')
+          @key=File.open(key_dir+'/.cipher_key').read
+        else
+          @key =  @cipher.random_key()
+          File.open(key_dir+"/.cipher_key",'w').write(@key)
+        end
       end
 
 
-
-
-      if File.exists?(key_dir+'/.cipher_iv')
-        @iv=File.open(key_dir+'/.cipher_iv').read
-      else
-        @iv =  @cipher.random_iv()
-        File.open(key_dir+"/.cipher_iv",'w').write(@iv)
+      unless @iv
+        if File.exists?(key_dir+'/.cipher_iv')
+          @iv=File.open(key_dir+'/.cipher_iv').read
+        else
+          @iv =  @cipher.random_iv()
+          File.open(key_dir+"/.cipher_iv",'w').write(@iv)
+        end
       end
     end
 

data/lib/sdb_dal/domain_attribute_description.rb

@@ -1,5 +1,7 @@
 module SdbDal
 require File.dirname(__FILE__) +'/sdb_formatter.rb'
+require File.dirname(__FILE__) +'/crypto.rb'
+require File.dirname(__FILE__) +'/configuration.rb'
 class DomainAttributeDescription
     include SdbFormatter
   attr_accessor :name 
@@ -9,7 +11,10 @@ class DomainAttributeDescription
   attr_accessor :is_encrypted
 
   def self.crypto
-    @@crypto||=Crypto.new
+    @@crypto||=Crypto.new(
+    :cipher_key => Configuration.singleton.cipher_key,
+    :cipher_iv => Configuration.singleton.cipher_iv
+  )
     @@crypto
   end
     

data/lib/sdb_dal/domain_object.rb

@@ -5,7 +5,6 @@ require File.dirname(__FILE__) +"/reference.rb"
 require File.dirname(__FILE__) +"/index_description.rb"
 require File.dirname(__FILE__) +"/lazy_loading_text.rb"
 require File.dirname(__FILE__) +"/repository_factory.rb"
-require File.dirname(__FILE__) +"/crypto.rb"
 module SdbDal
   class DomainObject
     @@is_encrypted=false
@@ -259,6 +258,31 @@ module SdbDal
                find(#{scope},options)
 	end
       GETTERDONE
+
+      if options.has_key?(:enum)
+        attribute_name=attribute_description.name.to_s
+        x=""
+        enum_val=1
+         options[:enum].each { |enum|
+           x<<"#{enum.to_s.upcase} = #{enum_val}\n"
+           enum_val+=1
+        class_eval <<-GETTERDONE
+        def  is_#{attribute_name}_#{enum.to_s.downcase}?
+          #{attribute_name} == #{attribute_name.capitalize}::#{enum.to_s.upcase}
+        end
+	      GETTERDONE
+
+         }
+        class_eval <<-GETTERDONE
+        class #{attribute_name.capitalize}
+          #{x}
+        end
+	      GETTERDONE
+
+
+      end
+
+
     end
   
     def self.belongs_to(domain_class,foreign_key_attribute=nil,accesser_attribute_name=nil,options={})
@@ -310,7 +334,7 @@ module SdbDal
         GETTERDONE
         index("#{foreign_key_attribute}_index".to_sym,[foreign_key_attribute])
       end
-      
+
     end
     def self.many_to_many(domain_class,
         through_class,

data/lib/sdb_dal/index_description.rb

@@ -4,11 +4,6 @@ class IndexDescription < DomainAttributeDescription
     include SdbFormatter
  attr_accessor :columns
   
-
-  def self.crypto
-    @@crypto||=Crypto.new
-    @@crypto
-  end
     
   def initialize(name,columns,is_encrypted=false)
     self.name=name

data/lib/sdb_dal/repository_factory.rb

@@ -1,4 +1,5 @@
 require "sdb_dal/repository.rb"
+require "sdb_dal/configuration.rb"
 require "sdb_dal/memory_repository.rb"
     
 module SdbDal
@@ -8,98 +9,59 @@ module SdbDal
       $sdb_dal_config=nil
       $repository=nil
     end
+
     def self.instance=(repo)
       @repository=repo
-    end    
+    end
+    
     def self.instance(options={})
+
       if options and options.has_key?(:repository)
         return options[:repository]
       end
-      if @repository
-        return @repository
-      end
-
-      sdb_dal_config=find_config_section
       
-      if sdb_dal_config
-        if sdb_dal_config.has_key?("repository_class")
-          repo_class=eval  sdb_dal_config["repository_class"]
-        else
-          repo_class=SdbDal::Repository
-        end
-        domain_prefix= sdb_dal_config["sdb_domain_prefix"] || ""
-        clob_bucket= sdb_dal_config["s3_clob_bucket"]
-        aws_key_id = sdb_dal_config["aws_key_id"]
-        aws_secret_key = sdb_dal_config["aws_secret_key"]
-        memcache_servers= sdb_dal_config['memcache_servers']
-        memcache_servers = memcache_servers.split(",") if memcache_servers
+      return @repository if @repository
 
-        append_table_to_domain=sdb_dal_config['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
+      config=SdbDal::Configuration.singleton
+      
+      options[:fail_fast]=config.fail_fast
+      @repository= config.repository_class.new(
+        config.domain_prefix,
+        config.clob_bucket,
+        config.aws_key_id,
+        config.aws_secret_key,
+        config.memcache_servers,
+        nil,
+        config.append_table_to_domain,
+        options)
+      
     end
 
 
 
-    def self.find_config_section
-      return $sdb_dal_config if $sdb_dal_config
-      config_file_path=nil
-      config_section=nil
-
-      #when using rails use config/database.yml
-      if const_defined?(:RAILS_ROOT)  and ENV.has_key?('RAILS_ENV')
-        config_file_path =  File.join("#{RAILS_ROOT}","config","database.yml")
-
-        config_section =ENV['RAILS_ENV']+"_sdb_dal"
-
-
-
-      else
-        #when not using rails use try database.yml then try config/database.yml
-       
-        if File.exists?("database.yml")
-
-          config_file_path = "database.yml"
-        elsif File.exists?(File.join("config", "database.yml"))
-          config_file_path = File.join("config", "database.yml")
-        end
-
-        config_section =(ENV['SDB_DAL_ENV'] || "production")+"_sdb_dal"
-      end
-      if config_file_path and config_section
-        config_file = YAML.load(File.open( config_file_path))
-
-        $sdb_dal_config = config_file[config_section]
-      end
-      return $sdb_dal_config
-    end
     def self.set_repository(repository)
       @repository=repository
     end
 
   end
-  def self.qualified_const_get(str)
-    path = str.to_s.split('::')
-    from_root = path[0].empty?
-    if from_root
-      from_root = []
-      path = path[1..-1]
-    else
-      start_ns = ((Class === self)||(Module === self)) ? self : self.class
-      from_root = start_ns.to_s.split('::')
-    end
-    until from_root.empty?
-      begin
-        return (from_root+path).inject(Object) { |ns,name| ns.const_get(name) }
-      rescue NameError
-        from_root.delete_at(-1)
-      end
-    end
-    path.inject(Object) { |ns,name| ns.const_get(name) }
-  end
+  #  def self.qualified_const_get(str)
+  #    path = str.to_s.split('::')
+  #    from_root = path[0].empty?
+  #    if from_root
+  #      from_root = []
+  #      path = path[1..-1]
+  #    else
+  #      start_ns = ((Class === self)||(Module === self)) ? self : self.class
+  #      from_root = start_ns.to_s.split('::')
+  #    end
+  #    until from_root.empty?
+  #      begin
+  #        return (from_root+path).inject(Object) { |ns,name| ns.const_get(name) }
+  #      rescue NameError
+  #        from_root.delete_at(-1)
+  #      end
+  #    end
+  #    path.inject(Object) { |ns,name| ns.const_get(name) }
+  #  end
 end
 

data/lib/sdb_dal/s3.rb

@@ -40,7 +40,7 @@ module S3
   METADATA_PREFIX = 'x-amz-meta-'
   AMAZON_HEADER_PREFIX = 'x-amz-'
   AMAZON_TOKEN_HEADER_PREFIX = "x-amz-security-token"
-  CANONICAL_STRING_WORTHY_PATH_ARGS=['acl','torrent','logging','requestPayment']
+
   # builds the canonical string for signing.
   def S3.canonical_string(method, bucket="", path="", path_args={}, headers={}, expires=nil)
     interesting_headers = {}
@@ -86,13 +86,14 @@ module S3
     # append a slash regardless
     buf << "/#{path}"
 
-    # if there is an acl, logging, torrent, or requestPayment parameter
+    # if there is an acl, logging, or torrent parameter
     # add them to the string
-    CANONICAL_STRING_WORTHY_PATH_ARGS.each do |arg_name|
-      if path_args.has_key?(arg_name)
-        buf << "?#{arg_name}"
-        break
-      end
+    if path_args.has_key?('acl')
+      buf << '?acl'
+    elsif path_args.has_key?('torrent')
+      buf << '?torrent'
+    elsif path_args.has_key?('logging')
+      buf << '?logging'
     end
 
     return buf
@@ -143,7 +144,7 @@ module S3
                    is_secure=true,
                    server=DEFAULT_HOST,
                    port=PORTS_BY_SECURITY[is_secure],
-                   calling_format=CallingFormat::REGULAR)
+                   calling_format=CallingFormat::SUBDOMAIN)
       @aws_access_key_id = aws_access_key_id
       @aws_secret_access_key = aws_secret_access_key
       @server = server
@@ -181,6 +182,26 @@ module S3
         make_request('PUT', bucket, CGI::escape(key), {}, headers, object.data, object.metadata)
       )
     end
+    def copy(source_bucket, source_key, destination_bucket,destination_key, headers={})
+      headers['x-amz-copy-source']="#{source_bucket}/#{source_key}"
+      headers['x-amz-metadata-directive']="REPLACE "
+      return GetResponse.new(make_request('PUT', destination_bucket, CGI::escape(destination_key),{}, headers))
+     end
+
+    def get_head(bucket, key, headers={})
+      return GetResponse.new(make_request('HEAD',bucket, CGI::escape(key),{}, headers))
+    end
+    def get_content_type(bucket, key, headers={})
+       response= get_head(bucket, key, headers)
+      if response.http_response.code=='404'
+                    return nil
+
+      elsif response.http_response.code=='200'
+        return response.http_response.header.content_type
+      end
+      raise response.http_response.code
+    end
+
 
     def get(bucket, key, headers={})
       return GetResponse.new(make_request('GET', bucket, CGI::escape(key), {}, headers))
@@ -220,39 +241,6 @@ module S3
       )
     end
 
-
-    #payer may be RequestPayer::REQUESTER or RequestPayer::BUCKET_OWNER
-    def  put_bucket_request_payment( bucket,  payer=RequestPayer::REQUESTER,  headers={})
-
-      body = "<RequestPaymentConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Payer>#{payer}</Payer></RequestPaymentConfiguration>"
-
-      result= make_request(
-                           'PUT',
-                           bucket,
-                           '',
-                           {'requestPayment' => nil },
-                           headers,
-                           body,
-                           {} )
-      return GetResponse.new(result)
-
-    end
-
-    def  get_bucket_request_payment( bucket,    headers={})
-
-      result= make_request(
-                           'GET',
-                           bucket,
-                           '',
-                           {'requestPayment' => nil },
-                           headers,
-                           '',
-                           {} )
-      return GetResponse.new(result)
-
-    end
-
-
     def list_all_my_buckets(headers={})
       return ListAllMyBucketsResponse.new(make_request('GET', '', '', {}, headers))
     end
@@ -306,6 +294,7 @@ module S3
           return http.request(req)
         end
       end
+
     end
 
     def method_to_request_class(method)
@@ -316,6 +305,8 @@ module S3
         return Net::HTTP::Put
       when 'DELETE'
         return Net::HTTP::Delete
+      when 'HEAD'
+        return Net::HTTP::Head
       else
         raise "Unsupported method #{method}"
       end
@@ -356,10 +347,6 @@ module S3
     end
   end
 
-  module RequestPayer
-    REQUESTER="Requester"
-    BUCKET_OWNER="BucketOwner"
-  end
   # class for storing calling format constants
   module CallingFormat
     REGULAR   = 0 # http://s3.amazonaws.com/bucket/key
@@ -435,6 +422,7 @@ module S3
 
     # we have one, add him to the entries list
     def tag_end(name)
+      # this prefix is the one we echo back from the request
       # this prefix is the one we echo back from the request
       if name == 'Name'
         @properties.name = @curr_text

data/lib/sdb_dal.rb

@@ -1,10 +1,10 @@
-require "sdb_dal/repository.rb"
-require "sdb_dal/repository_factory.rb"
-require "sdb_dal/acts_as_sdb_application.rb"
-require "sdb_dal/memory_repository.rb"
-require "sdb_dal/domain_object.rb"
-require "sdb_dal/storage.rb"
-require "sdb_dal/s3.rb"
-require "sdb_dal/attribute_range.rb"
-require "sdb_dal/and_condition.rb"
-require "sdb_dal/or_condition.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/repository.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/repository_factory.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/acts_as_sdb_application.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/memory_repository.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/domain_object.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/storage.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/s3.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/attribute_range.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/and_condition.rb"
+require "#{File.dirname(__FILE__)}/sdb_dal/or_condition.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sdb_dal
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors: 
 - David Knight
@@ -9,7 +9,7 @@ autorequire: sdb_dal
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,7 @@ files:
 - ./lib/sdb_dal/acts_as_sdb_application.rb
 - ./lib/sdb_dal/and_condition.rb
 - ./lib/sdb_dal/attribute_range.rb
+- ./lib/sdb_dal/configuration.rb
 - ./lib/sdb_dal/crypto.rb
 - ./lib/sdb_dal/domain_attribute_description.rb
 - ./lib/sdb_dal/domain_object.rb