Rubernate 0.1.2 → 0.1.3

data/lib/rubernate/callbacks.rb

@@ -6,7 +6,7 @@ module Rubernate
 module Callbacks
   # This module contains callback methods and 
   # included in all persisten classes.
-  module Entity
+  module Persistent
     # Invoked if object has just been created in database.
     def on_create
     end

data/lib/rubernate/impl/{dbigeneric.rb → dbi_generic.rb}

@@ -20,10 +20,8 @@ module DBI
   HASH_STRING_REF     = (PARAM_FLAG_HASH  | PARAM_FLAG_STRING).to_i
   HASH_TIME_REF       = (PARAM_FLAG_HASH  | PARAM_FLAG_TIME).to_i
   HASH_DATE_REF       = (PARAM_FLAG_HASH  | PARAM_FLAG_DATE).to_i
-  
-  TimeType = ::DBI::Timestamp
-  
-  # Holds configuration information and serves as factory for Runtime objects.
+
+   # Holds configuration information and serves as factory for Runtime objects.
   class Configuration
     # Accepts Runtime impl class,  db initializer class, database url, user name, and user password
     def initialize klass, init, db_url, db_user, db_password
@@ -36,8 +34,7 @@ module DBI
       @klass.new connect     
     end
     
-    # Creates connection and pass it in block if present 
-    # else return it if there is no block given.
+    # Creates database connection and pass it in block if present else returns it 
     def connect
       return ::DBI.connect(@db_url, @db_user, @db_password, @params) unless block_given?
       ::DBI.connect(@db_url, @db_user, @db_password, @params) { |dbh| yield dbh }
@@ -49,10 +46,13 @@ module DBI
     end
     
     def to_s
-      "runtime impl: #{@klass}, db_url: #{@db_url}, db_user: #{@db_user}, db_password: #{@db_password}"
+      "Impl: #{@klass}, db_url: #{@db_url}, db_user: #{@db_user}, db_password: #{@db_password}"
     end    
   end    
 
+  
+  TimeType = ::DBI::Timestamp  
+
   # Represent base class for all Runtime implementation.
   # Contains generic sql implementations of all required methods except create.
   #Method create should be implemented in subclasses.
@@ -186,7 +186,7 @@ module DBI
     private
       def save_param sth, pk, name, param
         case param
-          when Entity:    save_ref   sth, pk, name, param
+          when Persistent:    save_ref   sth, pk, name, param
           when Hash:      save_hash  sth, pk, name, param
           when Array:     save_array sth, pk, name, param
           when Integer:   save_int   sth, pk, name, param

data/lib/rubernate/impl/memory.rb

@@ -114,7 +114,7 @@ module Memory
     
     def save_param value
       case value
-        when Entity: 
+        when Persistent: 
           Reference.new value.primary_key, value.class
         when Array: 
           value.collect{ |item| Reference.new item.primary_key, item.class }

data/lib/rubernate/mixins.rb

@@ -43,7 +43,7 @@ class Class
   # Creates persistent property in a class
   # The class MUST have an empty constructor.
   def persistent *props
-    include Rubernate::Entity
+    include Rubernate::Persistent
     for prop in props
       define_accessor prop
     end

data/lib/rubernate/{entity.rb → persistent.rb}

@@ -1,9 +1,9 @@
 module Rubernate
 
 # This module contains methods that will be included into persistent objects
-module Entity
+module Persistent
   include Rubernate
-  include Callbacks::Entity
+  include Callbacks::Persistent
 
   # This property holds objects primary key.
   # The primary key is not nil for objects attached to session.
@@ -54,7 +54,7 @@ module Entity
   def self.included klass
     klass.module_eval %{
       def == other
-        return self.primary_key == other.primary_key if other.is_a? Entity
+        return self.primary_key == other.primary_key if other.is_a? Persistent
         super
       end
     }

data/lib/rubernate/queries.rb

@@ -2,7 +2,7 @@
 module Rubernate
 module Queries
   # Log instance for Queries
-  Log = Log4r::Logger.new self.name
+  Log = Rubernate::Log
 
   # Re-Expr express prefix that starts all queries on RQL.
   RQL_PREFIX_REGEXP = /^\s*Select\s+:/
@@ -65,6 +65,7 @@ module Queries
   # 
   # New implementations of elements MUST accept factory as it's first parameter.
   class Factory
+    attr_reader :cache # Queries cache. TODO: limit size!
     # Initalizes default implementations
     def initialize
       @expr     = Generic::Expr
@@ -76,6 +77,7 @@ module Queries
       @r_param  = Generic::RParam 
       @r_object = Generic::RObject
       @query    = Generic::Query
+      @cache    = {}
     end
     def query query=nil, &block
       @query.new self, query, &block
@@ -364,9 +366,10 @@ module Queries
         @order.concat exprs
       end    
       
-      # Returns markers used in query in valid order
+      # Returns markers used in query in valid order.
       def markers
-        @exprs.inject([]){|result, expr| result.concat expr.markers}
+        to_sql unless @sql
+        @markers ||= @exprs.inject([]){|result, expr| result.concat expr.markers}
       end
       
       # Arranges map: values {marker=>value} to ordered array of values 
@@ -377,17 +380,23 @@ module Queries
       
       # Generates SQL for entire query.
       def to_sql
-        eval_query 
-        sql = "select #{@main.to_sql}.* from #{tables_sql}"
-        sql+= "\n\twhere #{where_sql}"
-        sql+= "\n\torder by #{order_by_sql}" unless @order.empty?
-        dbg_query sql
-        sql
+        return @sql if @sql
+        if @query.is_a? String
+          @sql, @markers = @factory.cache[@query]       
+          unless @sql
+            @sql = eval_query
+            @markers = @exprs.inject([]){|result, expr| result.concat expr.markers}
+            @factory.cache[@query] = [@sql, @markers]
+          end
+        else
+          @sql = eval_query
+        end
+        @sql
       end
   
       private
         # Prints debug message
-        def dbg_query sql
+        def log_debug_query sql
           return unless Log.debug?
           query = @query.is_a?(Proc) ? 'query given as block' : @query
           Log.debug "Translate: <<#{query}>> to sql: <<#{sql}>>"
@@ -395,13 +404,16 @@ module Queries
         
         # Evaluates query withing the object context.
         def eval_query
-          return if @evaluated
           if @query.is_a? Proc
             instance_eval(&@query)
           else
             instance_eval @query
           end
-          @evaluated = true
+          sql = "select #{@main.to_sql}.* from #{tables_sql}"
+          sql+= "\n\twhere #{where_sql}"
+          sql+= "\n\torder by #{order_by_sql}" unless @order.empty?
+          log_debug_query sql
+          sql
         end
 
         # Generates where clause for each expression joined by and clause

data/lib/rubernate/runtime.rb

@@ -4,7 +4,7 @@ module Rubernate
     include Callbacks::Runtime
 
     # Log for Runtime events
-    Log = Log4r::Logger.new self.name
+    Log = Rubernate::Log
 
     def initialize
       @pool = {} # Contains objects loaded during the session
@@ -121,7 +121,7 @@ module Rubernate
         object = @pool[pk]
         unless object
           clazz  = klass.is_a?(Class) ? klass : get_class(klass)
-          object = clazz ? clazz.allocate : FakeEntity.new(klass)
+          object = clazz ? clazz.allocate : DummyPersistent.new(klass)
           object.primary_key = pk
           @pool[pk] = object
         end
@@ -199,15 +199,15 @@ module Rubernate
       
       def native_param p
         case p
-          when Rubernate::Entity: p.primary_key
+          when Rubernate::Persistent: p.primary_key
           when Class: p.name
           else p
         end
       end      
   end
 
-  # Represetns fake entity. - objects whose class wasn't found during loading.
-  class FakeEntity
+  # Represetns Dummy Persistent. - objects whose class wasn't found during loading.
+  class DummyPersistent
     persistent
     def initialize class_name
       @class_name = class_name
@@ -216,7 +216,7 @@ module Rubernate
       raise ObjectLoadError.new("class: #{@class_name} not found for object: #{primary_key}")
     end
     def to_s
-      "Fake Entity: #{primaty_key}, for class: #{@class_name}"
+      "Fake Persistent: #{primaty_key}, for class: #{@class_name}"
     end
   end
 end

data/lib/rubernate.rb

@@ -23,19 +23,6 @@ $:.unshift File.dirname(__FILE__) unless
   $:.include? File.dirname(__FILE__)
 
 require 'log4r'
-require 'rubernate/mixins'
-require 'rubernate/callbacks'
-require 'rubernate/entity'
-require 'rubernate/peer'
-require 'rubernate/runtime'
-require 'rubernate/impl/dbigeneric'
-require 'rubernate/queries'
-require 'rubernate/impl/memory'
-require 'rubernate/impl/dbimysql' 
-require 'rubernate/impl/dbioracle'
-require 'rubernate/init/init_mysql'
-require 'rubernate/init/init_oracle'
-
 
 
 # Contains most useful methods. This module is included 
@@ -44,6 +31,19 @@ module Rubernate
   # Common Rubernate Log instance
   Log = Log4r::Logger.new self.name
 
+  require 'rubernate/mixins'
+  require 'rubernate/callbacks'
+  require 'rubernate/persistent'
+  require 'rubernate/peer'
+  require 'rubernate/runtime'
+  require 'rubernate/impl/dbi_generic'
+  require 'rubernate/queries'
+  require 'rubernate/impl/memory'
+  require 'rubernate/impl/dbi_mysql'
+  require 'rubernate/impl/dbi_oracle'
+  require 'rubernate/init/init_mysql'
+  require 'rubernate/init/init_oracle'
+
   # Rubernate core singelton methods.
   class << self
     # Allows you setup Rubernate by yours implementaion of Configuration.
@@ -52,7 +52,7 @@ module Rubernate
       Log.info "Rubernate configured by #{config}"
       @factory = config
     end
-  
+      
     # Performs configuration of Rubernate.
     #   * db  - database type (:mysql, :oracle).
     #   * url - url of database.    
@@ -75,7 +75,9 @@ module Rubernate
     # Returns Runtime object associated with current session 
     # or nil if session does not excists
     def runtime
-      Thread.current[:Rubernate]
+      rt = Thread.current[:Rubernate]
+      raise "Session doesn't exists" unless rt
+      rt
     end
     
     # Checks if session exists

data/tests/all_tests.rb

@@ -8,5 +8,5 @@ require 'rubernate/utils_test'
 require 'rubernate/queries_test'
 require 'rubernate/impl/memory_test'
 require 'rubernate/callbacks_test'
-require 'rubernate/impl/dbioracle_test' if $run_oracle_tests
-require 'rubernate/impl/dbimysql_test'  if $run_mysql_tests
+require 'rubernate/impl/dbi_oracle_test' if $run_oracle_tests
+require 'rubernate/impl/dbi_mysql_test'  if $run_mysql_tests

data/tests/config.rb

@@ -15,20 +15,7 @@ MYSQL_DB_USER       = nil
 MYSQL_DB_PWD        = nil
 
 # Log4r configuration
-$level = Log4r::DEBUG
-$outputter = Log4r::FileOutputter.new 'file', 
+Rubernate::Log.level = Log4r::DEBUG
+Rubernate::Log.add Log4r::FileOutputter.new('file', 
     :filename => File.dirname(__FILE__) + "/../logs/#{$0}.log",
-    :trunc => true
-
-# TODO: make external log configuration
-# Update level for all logs needed
-module Rubernate
-  Log.add $outputter
-  Log.level = $level
-  class Runtime
-    Log.level = $level
-  end
-  module Queries
-    Log.level = $level
-  end
-end
+    :trunc => true)

data/tests/rubernate/callbacks_test.rb

@@ -14,8 +14,8 @@ module Rubernate
     end
     clear
     
-    # This module contains callback methods and included in module Rubernate::Entity
-    module Entity
+    # This module contains callback methods and included in module Rubernate::Persistent
+    module Persistent
       def on_create
         Callbacks.handlers << :on_create
         Callbacks.events << Event.new(self)

data/tests/rubernate/impl/{dbimysql_test.rb → dbi_mysql_test.rb}

@@ -2,7 +2,7 @@ $:.unshift(File.expand_path('../../..', __FILE__)) unless
   $:.include?(File.expand_path('../../..', __FILE__))
 
 require 'rubernate/fixtures' 
-require 'rubernate/impl/dbigeneric_stub'
+require 'rubernate/impl/dbi_generic_stub'
 
 class Rubernate::DBI::MysqlTest < Test::Unit::TestCase
   include Rubernate::DBI::GenericTests  

data/tests/rubernate/impl/{dbioracle_test.rb → dbi_oracle_test.rb}

@@ -2,7 +2,7 @@ $:.unshift(File.expand_path('../../..', __FILE__)) unless
   $:.include?(File.expand_path('../../..', __FILE__))
 
 require 'rubernate/fixtures' 
-require 'rubernate/impl/dbigeneric_stub'
+require 'rubernate/impl/dbi_generic_stub'
 
 class Rubernate::DBI::OracleTest < Test::Unit::TestCase
   include Rubernate::DBI::GenericTests 

data/tests/rubernate/rubernate_test.rb

@@ -21,12 +21,12 @@ class Rubernate::RubernateTest < Test::Unit::TestCase
   end
   
   def test_include
-    assert !C0.include?(Entity)
-    assert  C1.include?(Entity)
-    assert  C2.include?(Entity)
-    assert  C3.include?(Entity)
-    assert !C0.new.kind_of?(Entity)
-    assert  C1.new.kind_of?(Entity)
+    assert !C0.include?(Persistent)
+    assert  C1.include?(Persistent)
+    assert  C2.include?(Persistent)
+    assert  C3.include?(Persistent)
+    assert !C0.new.kind_of?(Persistent)
+    assert  C1.new.kind_of?(Persistent)
   end
   
   def test_properties
@@ -72,7 +72,7 @@ class Rubernate::RubernateTest < Test::Unit::TestCase
     }
     assert_equal 'passed', Thread.current[:close_test]
     assert_equal 'passed', Thread.current[:failed_test]         
-    assert_nil Rubernate.runtime
+    assert_raise(RuntimeError) {Rubernate.runtime}
   end
   
   def test_find_and_load
@@ -289,7 +289,7 @@ class Rubernate::BaseRuntimeTest < Test::Unit::TestCase
     @factory.database = {27 => ['NoSuchClass', {}]}
     Rubernate.session do 
       o = find_by_pk 27
-      assert_equal FakeEntity, o.class
+      assert_equal DummyPersistent, o.class
       assert_equal 27, o.primary_key
       assert_raise(ObjectLoadError) {o.test}
     end
@@ -307,7 +307,7 @@ class Rubernate::BaseRuntimeTest < Test::Unit::TestCase
     o = C1.new
     assert_nothing_raised() {o.p1}
     o, o.peer = C1.new, nil
-    assert_raise(NoMethodError) {o.p1}
+    assert_raise(RuntimeError) {o.p1}
     o, o.peer = C1.new, Peer.new
     assert_nothing_raised() {o.p1}
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: Rubernate
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2006-03-10 00:00:00 +03:00
+  version: 0.1.3
+date: 2006-03-13 00:00:00 +03:00
 summary: Object-oriented storage for Ruby objects based on relational database model
 require_paths: 
 - lib
@@ -31,16 +31,16 @@ files:
 - lib/rubernate
 - lib/rubernate.rb
 - lib/rubernate/callbacks.rb
-- lib/rubernate/entity.rb
 - lib/rubernate/impl
 - lib/rubernate/init
 - lib/rubernate/mixins.rb
 - lib/rubernate/peer.rb
+- lib/rubernate/persistent.rb
 - lib/rubernate/queries.rb
 - lib/rubernate/runtime.rb
-- lib/rubernate/impl/dbigeneric.rb
-- lib/rubernate/impl/dbimysql.rb
-- lib/rubernate/impl/dbioracle.rb
+- lib/rubernate/impl/dbi_generic.rb
+- lib/rubernate/impl/dbi_mysql.rb
+- lib/rubernate/impl/dbi_oracle.rb
 - lib/rubernate/impl/memory.rb
 - lib/rubernate/init/init_mysql.rb
 - lib/rubernate/init/init_oracle.rb
@@ -54,9 +54,9 @@ files:
 - tests/rubernate/queries_test.rb
 - tests/rubernate/rubernate_test.rb
 - tests/rubernate/utils_test.rb
-- tests/rubernate/impl/dbigeneric_stub.rb
-- tests/rubernate/impl/dbimysql_test.rb
-- tests/rubernate/impl/dbioracle_test.rb
+- tests/rubernate/impl/dbi_generic_stub.rb
+- tests/rubernate/impl/dbi_mysql_test.rb
+- tests/rubernate/impl/dbi_oracle_test.rb
 - tests/rubernate/impl/memory_test.rb
 - README
 test_files: