lore 0.4.6 → 0.4.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.4.7 / 2008-12-29
+
+* Extended configuration (especially logging). 
+* Several minor bug fixes and convenience changes. 
+
 === 0.4.2 / 2008-11-10
 
 * Major performance increase due to

data/custom_models.rb

@@ -91,3 +91,63 @@ module App
 end
 end
 
+module Some
+module App
+
+  class New_Model < Lore::Model 
+    table :new_model, :public
+    primary_key :model_id, :model_id_seq
+    has_attribute :name, Lore::Type.integer
+    has_attribute :created, Lore::Type.timestamp
+    has_attribute :model_id, Lore::Type.integer
+
+
+  end
+end
+end
+
+module Some
+module App
+
+  class New_Model < Lore::Model 
+    table :new_model, :public
+    primary_key :model_id, :model_id_seq
+    has_attribute :name, Lore::Type.integer
+    has_attribute :created, Lore::Type.timestamp
+    has_attribute :model_id, Lore::Type.integer
+
+
+  end
+end
+end
+
+module Some
+module App
+
+  class New_Model < Lore::Model 
+    table :new_model, :public
+    primary_key :model_id, :model_id_seq
+    has_attribute :name, Lore::Type.integer
+    has_attribute :created, Lore::Type.timestamp
+    has_attribute :model_id, Lore::Type.integer
+
+
+  end
+end
+end
+
+module Some
+module App
+
+  class New_Model < Lore::Model 
+    table :new_model, :public
+    primary_key :model_id, :model_id_seq
+    has_attribute :name, Lore::Type.integer
+    has_attribute :created, Lore::Type.timestamp
+    has_attribute :model_id, Lore::Type.integer
+
+
+  end
+end
+end
+

data/lib/lore/connection.rb

@@ -29,7 +29,7 @@ class Context
   end
   
   def self.enter(context_name)
-    @@logger.debug('Entering context ' + context_name.to_s)
+    Lore.log { 'Entering context ' + context_name.to_s }
     @@context_stack.push(context_name)
   end
   
@@ -128,9 +128,6 @@ class Connection # :nodoc
       # Log database query on low level: 
       
       if Lore.log_queries? then
-        query = query.gsub('WHERE', "\nWHERE").gsub('FROM', "\n}}} \nFROM").gsub('JOIN', "\nJOIN")
-        query = query.gsub('SELECT', "\nSELECT \n{{{").gsub("\n\n","\n")
-        query = query.gsub('SET', "SET\n").gsub(' , ', ", \n")
         query.split("\n").each { |line|
           @@logger.debug { line }
         }

data/lib/lore/exception/invalid_klass_parameters.rb

@@ -49,7 +49,7 @@ module Exception
 		
 		def inspect()
 			'Model('+@invalid_klass.to_s+') => '+
-			@invalid_parameters.inspect+ 
+			@invalid_parameters.serialize + 
 			' Explicit: '+ 
 			@invalid_klass.get_explicit_attributes.inspect
 		end

data/lib/lore/exception/invalid_parameter.rb

@@ -19,7 +19,6 @@ module Exception
       }
       result
     end
-    alias serialize inspect
 
   end
 

data/lib/lore/table_deleter.rb

@@ -33,7 +33,7 @@ module Table_Deleter # :nodoc:
       end
       field_counter += 1
     }
-    query_string += ';'
+    query_string += '; '
 			
     query_string
     
@@ -62,24 +62,23 @@ module Table_Deleter # :nodoc:
   
   def self.delete_query(table_name, is_a_hierarchy, primary_keys, value_keys, query_string='')
     
-    is_a_hierarchy.each_pair { |table, base_tables| 
-      
-      # pass base tables first, recursively, as IS_A-based creation has
-      # to be done bottom-up:
-      query_string += delete_query(table, 
-                                   base_tables, 
-                                   
-                                   primary_keys, 
-                                   value_keys, 
-                                   
-                                   query_string
-                                   ).to_s
-    }
-    # finally, add query string for this table: 
     query_string += atomic_delete_query(table_name, 
                                         primary_keys[table_name], 
                                         value_keys[table_name]
                                         ).to_s
+    is_a_hierarchy.each_pair { |table, base_tables| 
+      
+      # pass base tables afterwards, recursively, as IS_A-based deletion has
+      # to be done top-down (derived tabled first): 
+      query_string = delete_query(table, 
+                                  base_tables, 
+                                 
+                                  primary_keys, 
+                                  value_keys, 
+                                 
+                                  query_string
+                                 ).to_s
+    }
     
     query_string
     

data/lib/lore/table_instance.rb

@@ -113,7 +113,7 @@ module Table_Instance
   def marshal_load(dump)
     klass = eval(dump[:klass])
     dump[:joined].map { |m| m = eval(m) }
-    return initialize(dump[:values], dump[:fields], dump[:joined], :cached)
+    return initialize(dump[:values], dump[:joined], :cached)
   end
 
   # Whether this instance has been loaded from 
@@ -378,6 +378,10 @@ module Table_Instance
     table_accessor.after_instance_delete(self)
 
   end # def
+
+  def inspect
+    get_attribute_values.inspect
+  end # def
   
 end # module
 

data/lib/lore/table_selector.rb

@@ -192,7 +192,7 @@ protected
                                 accessor, 
                                 &block)
 
-    @@logger.debug { 'Select on ' << accessor.to_s }
+    Lore.log { 'Select on ' << accessor.to_s }
 
     result = Array.new
     if Lore.cache_enabled? && accessor.entity_cache && accessor.entity_cache.include?(accessor, query_string) then

data/lib/lore.rb

@@ -3,9 +3,17 @@ require('logger')
 
 module Lore
   
-  VERSION='0.4.6'
+  VERSION='0.4.7'
+
+  @logfile         = STDERR
+  @log_queries     = false
+  @logging_enabled = false
+  @cache_entities  = false
+  @pg_server = 'localhost'
+  @pg_port   = 5432
+  @logins = { }
+
 
-  @logfile = '/var/log/lore/query.log'
   def self.logfile
     @logfile
   end
@@ -23,17 +31,25 @@ module Lore
   end
 
   def self.log_queries? 
-    true
+    @log_queries && @logging_enabled
+  end
+
+  def self.disable_logging
+    @logging_enabled = false
+  end
+  def self.enable_logging
+    @logging_enabled = true
+  end
+  def self.enable_query_log
+    @log_queries = true
+  end
+  def self.disable_query_log
+    @log_queries = false
   end
   def self.logging_disabled? 
-    false
+    !@logging_enabled
   end
 
-  @cache_entities = false
-
-  @logins = { 
-  }
-
   def self.set_login_data(login_hash)
     @logins = login_hash
   end
@@ -45,9 +61,6 @@ module Lore
     File.expand_path(File.dirname(__FILE__)) + '/'
   end
 
-  @pg_server = 'localhost'
-  @pg_port = 5432
-
   def self.pg_server
     @pg_server
   end

data/lore.gemspec

@@ -16,7 +16,7 @@ spec = Gem::Specification.new { |s|
     high coverage of native SQL functions and features. 
     Lore is currently using PostgreSQL as database backend. 
   EOF
-  s.version = '0.4.6'
+  s.version = '0.4.7'
   s.author = 'Tobias Fuchs'
   s.email = 'fuchs@atomnode.net'
   s.date = Time.now