cloudwow-not_relational 0.1.0 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 3
 :major: 0
 :minor: 1

data/lib/not_relational/berkeley_repository.rb

@@ -10,7 +10,7 @@ module NotRelational
         aws_secret_key= nil,
         memcache_servers = nil ,
         dummy=nil,
-        append_table_to_domain=nil,
+        use_seperate_domain_per_model=nil,
         options={}
       )
 
@@ -38,7 +38,7 @@ end
      end
      def find_one(table_name, primary_key,attribute_descriptions)#, non_clob_attribute_names, clob_attribute_names)
     end
-    def get_clob(table_name,primary_key,clob_name)
+    def get_text(table_name,primary_key,clob_name)
     end
     def destroy(table_name, primary_key)
     end

data/lib/not_relational/configuration.rb

@@ -5,12 +5,12 @@ module NotRelational
   class Configuration
   
     attr_reader :repository_class
-    attr_reader :domain_prefix
-    attr_reader :clob_bucket
+    attr_reader :base_domain_name
+    attr_reader :blob_bucket
     attr_reader :aws_key_id
     attr_reader :aws_secret_key
     attr_reader :memcache_servers
-    attr_reader :append_table_to_domain
+    attr_reader :use_seperate_domain_per_model
     attr_reader :fail_fast
 
     attr_reader :cipher_key_file
@@ -28,17 +28,17 @@ module NotRelational
         if not_relational_config.has_key?("repository_class")
           @repository_class=eval  not_relational_config["repository_class"]
         else
-          @repository_class=NotRelational::Repository
+          @repository_class=NotRelational::MemoryRepository
         end
-        @domain_prefix= not_relational_config["domain_name_prefix"] || ""
-        @clob_bucket= not_relational_config["s3_clob_bucket"]
+        @base_domain_name= not_relational_config["domain_name_prefix"] || ""
+        @blob_bucket= not_relational_config["blob_bucket"]
         @aws_key_id = not_relational_config["aws_key_id"]
         @aws_secret_key = not_relational_config["aws_secret_key"]
         @memcache_servers= not_relational_config['memcache_servers']
-        @memcache_servers = memcache_servers.split(",") if memcache_servers
+        @memcache_servers = memcache_servers.split(",") if memcache_servers and memcache_servers.respond_to?(:split)
 
-        @append_table_to_domain=not_relational_config['append_table_to_domain']
-        @fail_fast=not_relational_config['fail_fast']
+        @use_seperate_domain_per_model=not_relational_config['use_seperate_domain_per_model']||false
+        @fail_fast=not_relational_config['fail_fast'] ||false
 
         @cipher_key_file = not_relational_config['cipher_key_file']
         @cipher_key_file ||= "./.cipher_key"
@@ -98,7 +98,7 @@ end
           config_file_path = File.join("config", "database.yml")
         end
 
-        config_section =(ENV['not_relational_ENV'] || "production")+"_not_relational"
+        config_section =(ENV['NOT_RELATIONAL_ENV'] || "production")+"_not_relational"
       end
       if config_file_path and config_section
         config_file = YAML.load(File.open( config_file_path))

data/lib/not_relational/domain_model.rb

@@ -165,7 +165,7 @@ module NotRelational
     end
     def is_dirty(attribute_name)
              if @attribute_values[attribute_name]!= nil && 
-                @attribute_values[attribute_name].respond_to?(:value)
+                @attribute_values[attribute_name].is_a?(LazyLoadingText)
                 return @attribute_values[attribute_name].is_dirty
             else
                 return true
@@ -193,7 +193,7 @@ module NotRelational
         
         GETTERDONE
       end
-      if attribute_description.value_type==:clob
+      if attribute_description.value_type==:text
         clob_attribute_names<<attribute_description.name
       else
         non_clob_attribute_names<<attribute_description.name
@@ -228,7 +228,7 @@ module NotRelational
         
         GETTERDONE
     
-      elsif type==:clob
+      elsif type==:text
         class_eval <<-GETTERDONE
          
         def #{attribute_description.name}
@@ -338,7 +338,9 @@ module NotRelational
     #{module_name+domain_class.to_s}.find(self.#{foreign_key_attribute})
 	end
         GETTERDONE
-        index("#{foreign_key_attribute}_index".to_sym,[foreign_key_attribute])
+        if foreign_key_attribute.is_a?(Array)
+          index("#{foreign_key_attribute}_index".to_sym,[foreign_key_attribute])
+        end
       end
 
     end
@@ -629,7 +631,7 @@ module NotRelational
       result={}
       # #todo refactor to avoid this copy
       self.class.attribute_descriptions.values.each do |description|
-        if !description.is_clob || is_dirty(description.name)
+        if !description.is_text? || is_dirty(description.name)
           result[description.name]=@attribute_values[description.name]
         end
       end
@@ -679,7 +681,7 @@ module NotRelational
         attributes={}
         # #todo refactor to avoid this copy
         self.class.attribute_descriptions.values.each do |description|
-          if !description.is_clob || is_dirty(description.name)
+          if !description.is_text? || is_dirty(description.name)
             value=@attribute_values[description.name]
             attributes[description]=value
           end
@@ -788,13 +790,13 @@ module NotRelational
       end
       def istantiate(sdb_attributes,repository)
         this_result=new(sdb_attributes||{})
-        get_clob_proc=nil
+        get_text_proc=nil
         clob_attribute_names.each do |clob_attribute_name|
-          get_clob_proc= proc {
-            repository.get_clob(self.table_name,this_result.primary_key,clob_attribute_name)
+          get_text_proc= proc {
+            repository.get_text(self.table_name,this_result.primary_key,clob_attribute_name)
           }
                   
-          this_result.set_attribute(clob_attribute_name, LazyLoadingText.new(get_clob_proc))
+          this_result.set_attribute(clob_attribute_name, LazyLoadingText.new(get_text_proc))
         end
         this_result
       end

data/lib/not_relational/geo.rb

@@ -1,3 +1,4 @@
+require "not_relational/starts_with_condition.rb"
 module NotRelational
 
 module Geo

data/lib/not_relational/lazy_loading_text.rb

@@ -6,8 +6,8 @@ module NotRelational
 class LazyLoadingText
   attr_reader :is_dirty
    attr_reader :has_loaded
-  def initialize(get_clob_proc)
-    @get_clob_proc=get_clob_proc
+  def initialize(get_text_proc)
+    @get_text_proc=get_text_proc
     @has_loaded=false
     @is_dirty=false
   end
@@ -19,7 +19,7 @@ class LazyLoadingText
   end
   def value
     if !@did_load
-        @value= @get_clob_proc.call      
+        @value= @get_text_proc.call      
         @has_loaded=true          
     end
     return @value

data/lib/not_relational/memcache_repository.rb

@@ -12,13 +12,13 @@ module NotRelational
         aws_secret_key= nil,
         memcache_servers = nil ,
         a_storage=nil,
-        append_table_to_domain=nil,
+        use_seperate_domain_per_model=nil,
         options={}
       )
       options[:memory_only] ||=(aws_key_id==nil)
       @storage||=Storage.new(aws_key_id,aws_secret_key,memcache_servers,[],options)
       @domain_name=domain_name
-      @clob_bucket=clob_bucket
+      @storage_bucket=clob_bucket
     end
 
     def pause
@@ -42,7 +42,7 @@ module NotRelational
       end
       record["metadata%table_name"]=table_name
       record["metadata%primary_key"]=key
-      @storage.put(@clob_bucket,key,record)
+      @storage.put(@storage_bucket,key,record)
     end
     def query_ids(table_name,attribute_descriptions,options)
       raise " not supported for memcache repo"
@@ -55,17 +55,17 @@ module NotRelational
     def find_one(table_name, primary_key,attribute_descriptions)#, non_clob_attribute_names, clob_attribute_names)
 
       key=make_cache_key(table_name,primary_key)
-      @storage.get(@clob_bucket,key)
+      @storage.get(@storage_bucket,key)
 
 
     end
-    def get_clob(table_name,primary_key,clob_name)
+    def get_text(table_name,primary_key,clob_name)
       raise " not supported for memcache repo"
 
     end
     def destroy(table_name, primary_key)
       key=make_cache_key(table_name,primary_key);
-      @storage.put(@clob_bucket,key,nil)
+      @storage.put(@storage_bucket,key,nil)
 
     end
     private

data/lib/not_relational/memory_repository.rb

@@ -13,7 +13,7 @@ module NotRelational
         aws_secret_key= nil,
         memcache_servers = nil ,
         dummy=nil,
-        append_table_to_domain=nil,
+        use_seperate_domain_per_model=nil,
         options={}
       )
       clear
@@ -43,8 +43,8 @@ module NotRelational
       end
     
       attributes.each do |description,value|
-        if description.is_clob
-          @storage.put("",make_clob_key(table_name,primary_key,description.name),value)
+        if description.is_text?
+          @storage.put("",make_storage_key(table_name,primary_key,description.name),value)
         else
           record[description.name]=value
         end
@@ -211,8 +211,8 @@ module NotRelational
       return @records[make_cache_key(table_name,primary_key)]
     end
 
-    def get_clob(table_name,primary_key,clob_name)
-      return @storage.get("",make_clob_key(table_name,primary_key,clob_name))
+    def get_text(table_name,primary_key,clob_name)
+      return @storage.get("",make_storage_key(table_name,primary_key,clob_name))
         
     end
 
@@ -264,7 +264,7 @@ module NotRelational
       return "cached_objects/#{table_name}/#{primary_key}"
     end
 
-    def make_clob_key(table_name,primary_key,clob_name)
+    def make_storage_key(table_name,primary_key,clob_name)
       return "clobs/#{table_name}/#{flatten_key(primary_key)}/#{clob_name}"
     end
 

data/lib/not_relational/memory_storage.rb

@@ -23,11 +23,18 @@ class MemoryStorage
     return @attributes[bucket+"sdsdw555"+key]['Content-Type'] if @attributes.has_key?(bucket+"sdsdw555"+key)
     return nil
   end
+def copy(from_bucket,from_key,to_bucket,to_key,attributes=nil)
+  o=get(from_bucket,from_key)
+  put(to_bucket,to_key,o,attributes)
 
+end
   def clear()
     @stuff={}
     @attributes={}
   end
+  def real_s3
+    return self
+  end
 end
 
 end

data/lib/not_relational/property_description.rb

@@ -24,8 +24,8 @@ class PropertyDescription
     self.is_encrypted=is_encrypted 
     self.is_encrypted=options[:is_encrypted] if options.has_key?(:is_encrypted)  
   end
-  def is_clob
-    return self.value_type==:clob
+  def is_text?
+  return self.value_type==:text
   end
   def format_for_sdb(value)
       return format_for_sdb_single( value) unless self.is_collection==true

data/lib/not_relational/repository_factory.rb

@@ -26,13 +26,13 @@ module NotRelational
       
       options[:fail_fast]=config.fail_fast
       @repository= config.repository_class.new(
-        config.domain_prefix,
-        config.clob_bucket,
+        config.base_domain_name,
+        config.blob_bucket,
         config.aws_key_id,
         config.aws_secret_key,
         config.memcache_servers,
         nil,
-        config.append_table_to_domain,
+        config.use_seperate_domain_per_model,
         options)
       
     end

data/lib/not_relational/repository_interface.rb

@@ -10,7 +10,7 @@ module NotRelational
         aws_secret_key= nil,
         memcache_servers = nil ,
         dummy=nil,
-        append_table_to_domain=nil,
+        use_seperate_domain_per_model=nil,
         options={}
       )
 
@@ -38,7 +38,7 @@ end
      end
      def find_one(table_name, primary_key,attribute_descriptions)#, non_clob_attribute_names, clob_attribute_names)
     end
-    def get_clob(table_name,primary_key,clob_name)
+    def get_text(table_name,primary_key,clob_name)
     end
     def destroy(table_name, primary_key)
     end